Cleaning up

lib/musicbrainz/client.rb

@@ -14,24 +14,11 @@ module MusicBrainz
       data = params[:binding].parse(xml)
 
       if params[:create_model]
-        result_model = params[:create_model].new
+        params[:create_model].new(data)
-        data.each do |field, value|
-          result_model.send("#{field}=".to_sym, value)
-        end
-        result_model
       elsif params[:create_models]
-        result_models = []
+        models = data.map{ |item| params[:create_models].new(item) }
-        data.each do |item|
+        models.sort!{ |a, b| a.send(params[:sort]) <=> b.send(params[:sort]) } if params[:sort]
-          result_model = params[:create_models].new
+        models
-          item.each do |field, value|
-            result_model.send("#{field}=".to_sym, value)
-          end
-          result_models << result_model
-        end
-        if params[:sort]
-          result_models.sort!{ |a, b| a.send(params[:sort]) <=> b.send(params[:sort]) }
-        end
-        result_models
       else
         data
       end

lib/musicbrainz/deprecated.rb

@@ -1,22 +1,6 @@
 module MusicBrainz
-  def query_interval
+  module Deprecated
-    MusicBrainz.config.query_interval
+    module ProxyConfig
-  end
-
-  def query_interval=(value)
-    MusicBrainz.config.query_interval = value
-  end
-
-  def cache_path
-    MusicBrainz.config.cache_path
-  end
-
-  def cache_path=(value)
-    MusicBrainz.config.cache_path = value
-  end
-
-  module Tools
-    module Proxy
       def query_interval
         MusicBrainz.config.query_interval
       end
@@ -24,11 +8,9 @@ module MusicBrainz
       def query_interval=(value)
         MusicBrainz.config.query_interval = value
       end
-
-      extend self
     end
 
-    module Cache
+    module CacheConfig
       def cache_path
         MusicBrainz.config.cache_path
       end
@@ -36,10 +18,19 @@ module MusicBrainz
       def cache_path=(value)
         MusicBrainz.config.cache_path = value
       end
-
-      extend self
     end
   end
 
-  extend self
+  module Tools
+    module Proxy
+      extend Deprecated::ProxyConfig
+    end
+
+    module Cache
+      extend Deprecated::CacheConfig
+    end
+  end
+
+  extend Deprecated::ProxyConfig
+  extend Deprecated::CacheConfig
 end

lib/musicbrainz/models/base_model.rb

@@ -18,6 +18,12 @@ module MusicBrainz
     end
 
     module InstanceMethods
+      def initialize(params = {})
+        params.each do |field, value|
+          self.send :"#{field}=", value
+        end
+      end
+
       def validate_type(val, type)
         if type == Integer
           val.to_i

musicbrainz.gemspec

@@ -17,5 +17,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency("faraday")
   gem.add_dependency("nokogiri")
   gem.add_development_dependency("rspec")
-  gem.add_development_dependency("awesome_print")
 end

spec/tools/cache_spec.rb

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
 require "ostruct"
 require "spec_helper"