structure 0.20.1 → 0.21.0

data/.travis.yml

@@ -6,6 +6,3 @@ rvm:
   - rbx
   - rbx-2.0
   - ree
-branches:
-  only:
-    - master

data/lib/structure.rb

@@ -1,4 +1,3 @@
-require 'forwardable'
 begin
   JSON::JSON_LOADED
 rescue NameError
@@ -13,7 +12,6 @@ end
 #    end
 #
 class Structure
-  extend Forwardable
   include Enumerable
 
   # A namespaced basic object.
@@ -102,6 +100,29 @@ class Structure
       key name, Array, []
     end
 
+    alias_method :new_original, :new
+
+    def new(hsh)
+      hsh = hsh.inject({}) do |a, (k, v)|
+        a[Inflector.underscore(k)] =
+          case v
+          when Hash
+            Structure.new(v)
+          when Array
+            v.map { |e| e.is_a?(Hash) ? Structure.new(e) : e }
+          else
+            v
+          end
+        a
+      end
+
+      klass = Class.new(Structure) do
+        hsh.keys.each { |k| key k }
+      end
+
+      klass.new(hsh)
+    end
+
     # Lazy-eval undefined constants, typically other structures,
     # assuming they will be defined later in the text.
     def const_missing(name)
@@ -109,7 +130,9 @@ class Structure
     end; private :const_missing
 
     def inherited(child)
-      child.def_delegator child, :defaults
+      if self.eql? Structure
+        class << child; alias_method :new, :new_original; end
+      end
     end; private :inherited
   end
 
@@ -118,7 +141,7 @@ class Structure
   # A hash, if provided, seeds the attributes.
   def initialize(hsh = {})
     @attributes = defaults.inject({}) do |a, (k, v)|
-      a[k] = v.is_a?(Array) ? v.dup : v
+      a[k] = v.dup rescue v
       a
     end
 
@@ -163,6 +186,26 @@ class Structure
   def ==(other)
     other.is_a?(self.class) && attributes == other.attributes
   end
+
+  def defaults
+    self.class.defaults
+  end; private :defaults
+
+  module Inflector
+    # Makes an underscored, lowercase form from the expression in the
+    # string.
+    #
+    # You know where this is lifted from.
+    def self.underscore(camel_cased_word)
+      word = camel_cased_word.to_s.dup
+      word.gsub!(/::/, '/')
+      word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word.tr!("-", "_")
+      word.downcase!
+      word
+    end
+  end
 end
 
-require 'structure/active_support' if defined?(Rails)
+require 'structure/ext/active_support' if defined?(Rails)

data/lib/structure/version.rb

@@ -1,3 +1,3 @@
 class Structure
-  VERSION = '0.20.1'
+  VERSION = '0.21.0'
 end

data/test/structure_test.rb

@@ -26,6 +26,24 @@ class TestStructure < Test::Unit::TestCase
     assert_kind_of Fixnum, double
   end
 
+  def test_anonymous
+    hsh = { 'FirstName' => 'John', 'LastName' => 'Doe' }
+    str = Structure.new(hsh)
+    assert_equal hsh['FirstName'], str.first_name
+    assert_equal hsh['LastName'], str.last_name
+    assert_raise(NoMethodError) { str.FirstName }
+  end
+
+  def test_anonymous_recursion
+    hsh = { 'Name' => 'John',
+            'Address' => { 'City' => 'Oslo' },
+            'Friends' => [{ 'Name' => 'Jane' }]
+          }
+    str = Structure.new(hsh)
+    assert_equal hsh['Address']['City'], str.address.city
+    assert_equal hsh['Friends'].first['Name'], str.friends.first.name
+  end
+
   def test_enumeration
     assert_respond_to Person.new, :map
   end
@@ -80,7 +98,7 @@ class TestStructure < Test::Unit::TestCase
 
     require 'active_support/ordered_hash'
     require 'active_support/json'
-    require 'structure/active_support'
+    require 'structure/ext/active_support'
 
     assert_equal true,  person.as_json(:only => :name).has_key?(:name)
     assert_equal false, person.as_json(:except => :name).has_key?(:name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: structure
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000Z
+date: 2011-09-10 00:00:00.000000000Z
 dependencies: []
 description: Structure is a typed, nestable key/value container.
 email:
@@ -25,7 +25,7 @@ files:
 - README.md
 - Rakefile
 - lib/structure.rb
-- lib/structure/active_support.rb
+- lib/structure/ext/active_support.rb
 - lib/structure/version.rb
 - structure.gemspec
 - test/structure_test.rb
@@ -43,7 +43,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2865426665799321471
+      hash: -3352714224337607479
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -52,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2865426665799321471
+      hash: -3352714224337607479
 requirements: []
 rubyforge_project: structure
 rubygems_version: 1.8.6