Use Hash[] instead of DataMapper::Ext::Array.to_hash

datamapper · Mar 23, 2011 · 2cb5be4 · 2cb5be4
1 parent ee08a69
commit 2cb5be4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/lib/dm-serializer/to_json.rb b/lib/dm-serializer/to_json.rb
@@ -69,7 +69,7 @@ def to_json(*args)
     module ValidationErrors
       module ToJson
         def to_json(*args)
-          DataMapper::Ext::Array.to_hash(errors).to_json
+          Hash[ errors ].to_json
         end
       end
     end

diff --git a/lib/dm-serializer/to_yaml.rb b/lib/dm-serializer/to_yaml.rb
@@ -39,7 +39,7 @@ def to_yaml(opts_or_emitter = {})
     module ValidationErrors
       module ToYaml
         def to_yaml(*args)
-          DataMapper::Ext::Array.to_hash(errors).to_yaml(*args)
+          Hash[ errors ].to_yaml(*args)
         end
       end
     end

diff --git a/spec/lib/serialization_method_shared_spec.rb b/spec/lib/serialization_method_shared_spec.rb
@@ -31,8 +31,8 @@
     keys = %w[ id composite name breed ]
 
     resources = [
-      keys.zip([  1,  2, 'Betsy', 'Jersey'   ]).to_hash,
-      keys.zip([ 89, 34, 'Berta', 'Guernsey' ]).to_hash,
+      Hash[ keys.zip([  1,  2, 'Betsy', 'Jersey'   ]) ],
+      Hash[ keys.zip([ 89, 34, 'Berta', 'Guernsey' ]) ],
     ]
 
     collection = DataMapper::Collection.new(query, query.model.load(resources, query))
@@ -183,8 +183,8 @@
       keys = %w[ id composite name breed ]
 
       resources = [
-        keys.zip([  1,  2, 'Betsy', 'Jersey'   ]).to_hash,
-        keys.zip([ 10, 20, 'Berta', 'Guernsey' ]).to_hash,
+        Hash[ keys.zip([  1,  2, 'Betsy', 'Jersey'   ]) ],
+        Hash[ keys.zip([ 10, 20, 'Berta', 'Guernsey' ]) ],
       ]
 
       collection = DataMapper::Collection.new(query, query.model.load(resources, query))

diff --git a/spec/public/to_json_spec.rb b/spec/public/to_json_spec.rb
@@ -13,8 +13,8 @@
     keys = %w[ id composite name breed ]
 
     resources = [
-      keys.zip([  1,  2, 'Betsy', 'Jersey'   ]).to_hash,
-      keys.zip([ 10, 20, 'Berta', 'Guernsey' ]).to_hash,
+      Hash[ keys.zip([  1,  2, 'Betsy', 'Jersey'   ]) ],
+      Hash[ keys.zip([ 10, 20, 'Berta', 'Guernsey' ]) ],
     ]
 
     @collection = DataMapper::Collection.new(query, query.model.load(resources, query))

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -7,12 +7,6 @@
 
 require File.expand_path('spec/lib/serialization_method_shared_spec')
 
-class Array
-  def to_hash
-    DataMapper::Ext::Array.to_hash(self)
-  end
-end
-
 # require fixture resources
 SPEC_ROOT = Pathname(__FILE__).dirname.expand_path
 Pathname.glob((SPEC_ROOT + 'fixtures/**/*.rb').to_s).each { |file| require file }