deep_struct 1.0.1 → 1.0.2

data/lib/deep_struct/array.rb

@@ -1,9 +1,6 @@
 class DeepStruct::Array < Array
   def [](index)
-    v = super
-    return DeepStruct::Hash.new(v)  if v.is_a?(::Hash)
-    return DeepStruct::Array.new(v) if v.is_a?(::Array)
-    return v
+    DeepStruct.convert_element_if_possible(super)
   end
 
   # The annoyance of subclassing Array is that ruby implements many array
@@ -13,4 +10,10 @@ class DeepStruct::Array < Array
   def first
     self[0]
   end
+
+  def each(&block)
+    self.to_a.each do |e|
+      DeepStruct.convert_element_if_possible(e)
+    end
+  end
 end

data/lib/deep_struct/hash.rb

@@ -7,10 +7,7 @@ class DeepStruct::Hash < Hash
   end
 
   def [](key)
-    v = super(key)
-    return DeepStruct::Hash.new(v)  if v.is_a?(::Hash)
-    return DeepStruct::Array.new(v) if v.is_a?(::Array)
-    return v
+    DeepStruct.convert_element_if_possible(super)
   end
 
   def method_missing(key, *args, &block)

data/lib/deep_struct/version.rb

@@ -1,3 +1,3 @@
 module DeepStruct
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/deep_struct.rb

@@ -10,6 +10,15 @@ module DeepStruct
     end
   end
 
+  def self.convert_element_if_possible(e)
+    case e
+    when ::Array then DeepStruct::Array.new(e)
+    when ::Hash  then DeepStruct::Hash.new(e)
+    else
+      e
+    end
+  end
+
   def self.from_file(path)
     from_data(FileReader.new(path).data)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep_struct
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000 Z
+date: 2012-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70225496191660 !ruby/object:Gem::Requirement
+  requirement: &70359156170300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70225496191660
+  version_requirements: *70359156170300
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70225496191200 !ruby/object:Gem::Requirement
+  requirement: &70359156168880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70225496191200
+  version_requirements: *70359156168880
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70225496190740 !ruby/object:Gem::Requirement
+  requirement: &70359156167620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70225496190740
+  version_requirements: *70359156167620
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70225496189620 !ruby/object:Gem::Requirement
+  requirement: &70359156166220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70225496189620
+  version_requirements: *70359156166220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70225496204280 !ruby/object:Gem::Requirement
+  requirement: &70359156164860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70225496204280
+  version_requirements: *70359156164860
 - !ruby/object:Gem::Dependency
   name: gem-release
-  requirement: &70225496201800 !ruby/object:Gem::Requirement
+  requirement: &70359156163900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70225496201800
+  version_requirements: *70359156163900
 description: Converts ruby hashes and arrays into objects.  Also works with JSON &
   YAML files.
 email: us@thunderboltlabs.com