Encoding headers, wrapping eigenclasses

lib/musicbrainz.rb

@@ -6,10 +6,8 @@ require "nokogiri"
 require "cgi"
 
 module MusicBrainz
-  module Tools
-  end
-  module Parsers
-  end
+  module Tools; end
+  module Parsers; end
 end
 
 require "version"

lib/musicbrainz/base.rb

@@ -17,7 +17,7 @@ module MusicBrainz
 
       def load(params, query)
         parser = MusicBrainz::Parsers.get_by_name(params[:parser])
-        xml = MusicBrainz::Tools::Proxy.load(query)
+        xml = MusicBrainz::Tools::Proxy.query(query)
         result = parser[:const].send(parser[:method], Nokogiri::XML(xml))
         if params[:create_model]
           result_model = params[:create_model].new

lib/parsers/base.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 module MusicBrainz
   module Parsers
     class << self

lib/tools/cache.rb

@@ -1,22 +1,24 @@
 # -*- encoding: utf-8 -*-
+
 module MusicBrainz
   module Tools
     class Cache
+      class << self
         @@cache_path = nil
 
-      def self.cache_path=(path)
+        def cache_path=(path)
           @@cache_path = path
         end
 
-      def self.cache_path
+        def cache_path
           @@cache_path
         end
 
-      def self.clear_cache
+        def clear_cache
           FileUtils.rm_r(@@cache_path) if @@cache_path && File.exist?(@@cache_path)
         end
 
-      def self.cache_contents(url)
+        def cache_contents(url)
           response = nil
           url_parts = url.split('/')
           file_name = url_parts.pop
@@ -43,3 +45,4 @@ module MusicBrainz
       end
     end
   end
+end

lib/tools/proxy.rb

@@ -1,7 +1,9 @@
 # -*- encoding: utf-8 -*-
+
 module MusicBrainz
   module Tools
     class Proxy
+      class << self
         @@last_query_time = 0
         @@query_interval = 1.5 # Min: 1.0 Safe: 1.5
         @@tries_limit = 5
@@ -9,19 +11,19 @@ module MusicBrainz
         WEB_SERVICE_URL = 'http://musicbrainz.org/ws/2/'
         USER_AGENT = "gem musicbrainz (https://github.com/magnolia-fan/musicbrainz) @ " + Socket.gethostname
 
-      def self.query_interval=(sec)
+        def query_interval=(sec)
           @@query_interval = sec.to_f
         end
 
-      def self.query_interval
+        def query_interval
           @@query_interval
         end
 
-      def self.tries_limit=(num)
+        def tries_limit=(num)
           @@tries_limit = num.to_i
         end
 
-      def self.load(params = {})
+        def query(params = {})
           url = WEB_SERVICE_URL + params[:resource].to_s.gsub('_', '-') + '/' + (params[:id].to_s || '')
           params.delete(:resource)
           params.delete(:id) unless params[:id].nil?
@@ -31,11 +33,11 @@ module MusicBrainz
             k + '=' + v
           }.join('&') unless params.empty?
           MusicBrainz::Tools::Cache.cache_contents(url) {
-          self.get_contents url
+            get_contents url
           }
         end
 
-      def self.get_contents(url)
+        def get_contents(url)
           response = nil
 
           @@tries_limit.times {
@@ -57,3 +59,4 @@ module MusicBrainz
       end
     end
   end
+end

lib/version.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 module MusicBrainz
   VERSION = "0.6.0"
 end

spec/misc/deprecated_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require "spec_helper"
 
 describe MusicBrainz do

spec/requests/artist_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require "spec_helper"
 
 describe MusicBrainz::Artist do

spec/requests/release_group_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require "spec_helper"
 
 describe MusicBrainz::ReleaseGroup do

spec/requests/release_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require "spec_helper"
 
 describe MusicBrainz::Release do

spec/requests/track_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require "spec_helper"
 
 describe MusicBrainz::Track do

spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require "rubygems"
 require "bundler/setup"
 require "ap"

spec/tools/cache_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require "spec_helper"
 
 describe MusicBrainz::Tools::Cache do