attribute_struct 0.1.6 → 0.1.8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.1.8
+* Basic (optional) auto camel detection on import
+* Add hash helper methods out to class
+
 ## v0.1.6
 * Add helpers for walking up the tree
 * Update hashie dependency restriction

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    attribute_struct (0.1.6)
+    attribute_struct (0.1.7)
       hashie (>= 2.0.0)
 
 GEM

data/lib/attribute_struct/attribute_struct.rb

@@ -1,5 +1,5 @@
 class AttributeStruct < BasicObject
-  
+
   class << self
 
     # Global flag for camel cased keys
@@ -28,18 +28,24 @@ class AttributeStruct < BasicObject
         if(defined?(Chef) || force_chef)
           require 'chef/mash'
           require 'chef/mixin/deep_merge'
+          @hash_loaded = :chef
         else
           require 'attribute_struct/attribute_hash'
+          @hash_loaded = :attribute_hash
         end
-        @hash_loaded = true
       end
     end
 
+    def hashish
+      load_the_hash
+      @hash_loaded == :chef ? ::Mash : ::AttributeStruct::AttributeHash
+    end
+
   end
 
   # Flag for camel cased keys
   attr_reader :_camel_keys
-  
+
   def initialize(*args, &block)
     _klass.load_the_hash
     @_camel_keys = _klass.camel_keys
@@ -182,7 +188,16 @@ class AttributeStruct < BasicObject
   # Clears current instance data and replaces with provided hash
   def _load(hashish)
     @table.clear
+    if(_root._camel_keys_action == :auto_discovery)
+      starts = hashish.keys.map{|k|k[0,1]}
+      unless(starts.detect{|k| k =~ /[A-Z]/})
+        _camel_keys_set(:auto_disable)
+      else
+        _camel_keys_set(:auto_enable) unless _parent.nil?
+      end
+    end
     hashish.each do |key, value|
+      key = key.dup
       if(value.is_a?(::Enumerable))
         flat = value.map do |v|
           v.is_a?(::Hash) ? _klass.new(v) : v
@@ -203,7 +218,7 @@ class AttributeStruct < BasicObject
   def _merge(target)
     source = _deep_copy
     dest = target._deep_copy
-    if(defined?(::Mash))
+    if(defined?(::Chef))
       result = ::Chef::Mixin::DeepMerge.merge(source, dest)
     else
       result = source.deep_merge(dest)
@@ -222,7 +237,7 @@ class AttributeStruct < BasicObject
 
   # Returns a new Hash type instance based on what is available
   def __hashish
-    defined?(::Mash) ? ::Mash : ::AttributeStruct::AttributeHash
+    defined?(::Chef) ? ::Mash : ::AttributeStruct::AttributeHash
   end
 
   # Returns dup of value. Converts Symbol objects to strings
@@ -283,7 +298,10 @@ class AttributeStruct < BasicObject
   # Helper to return new instance of current instance type
   def _klass_new
     n = _klass.new
-    n._camel_keys_set(_camel_keys_action)
+    unless(_camel_keys_action == :auto_discovery)
+      n._camel_keys_set(_camel_keys_action)
+    end
+    n._camel_keys = _camel_keys
     n._parent(self)
     n
   end
@@ -331,5 +349,5 @@ class AttributeStruct < BasicObject
       end
     end
   end
-  
+
 end

data/lib/attribute_struct/version.rb

@@ -4,5 +4,5 @@ class AttributeStruct
   class Version < ::Gem::Version
   end
 
-  VERSION = Version.new('0.1.6')
+  VERSION = Version.new('0.1.8')
 end

data/test/specs/camel.rb

@@ -40,4 +40,41 @@ describe AttributeStruct do
       dump['ValueTwo']['Nesting'].must_equal true
     end
   end
+  describe 'Camel enabled imports' do
+    before do
+      @struct = AttributeStruct.new
+      @struct._camel_keys = true
+      @struct._camel_keys_set(:auto_discovery)
+      @struct._load(
+        {
+          'Fubar' => {
+            'FooBar' => true,
+            'FeeBar' => {
+              'FauxBar' => 'done'
+            },
+            'FooDar' => {
+              'snake_case' => {
+                'still_snake' => {
+                  'NowCamel' => {
+                    'CamelCamel' => 'yep, a camel'
+                  }
+                }
+              }
+            }
+          }
+        }
+      )
+      @struct._camel_keys_set(nil)
+    end
+
+    it 'should properly export keys after discovery' do
+      @struct.fubar.new_bar.halt 'new_value'
+      @struct.fubar.foo_dar.snake_case.new_snake 'snake!'
+      @struct.fubar.foo_dar.snake_case.still_snake.now_camel.new_camel 'a camel!'
+      hash = @struct._dump
+      hash['Fubar']['NewBar']['Halt'].must_equal 'new_value'
+      hash['Fubar']['FooDar']['snake_case']['new_snake'].must_equal 'snake!'
+      hash['Fubar']['FooDar']['snake_case']['still_snake']['NowCamel']['NewCamel'].must_equal 'a camel!'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attribute_struct
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -44,7 +44,6 @@ files:
 - test/specs/basic.rb
 - Gemfile
 - README.md
-- attribute_struct-0.1.4.gem
 - attribute_struct.gemspec
 - CHANGELOG.md
 - Gemfile.lock