attribute_struct 0.2.20 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d48c85e42d6879e924f24f40bada06f9f1b6c1b0
-  data.tar.gz: 6f41e2b3229b0229f9edc53943e23c6e086453b2
+  metadata.gz: b824f9b0f1c12f9d33cf496af7d88899dc9634e7
+  data.tar.gz: 1a6e058a77f4ebc0189a8367b56797208519ed1c
 SHA512:
-  metadata.gz: f84ee43890fd47d888a3df06d1f6009de2a5b684af3dc9743207534372c5c781c21d9037db87f52f1571130a24d08e950e4427e9d034510c26ec78d8d086329a
-  data.tar.gz: 16e3b57dc6f98c57e4b73da3c0e94323a19c0cc1141d60bb79900b26ce7a1ab9beae5ef6019c3f47ad57590424e0a50599762ef85296a98d0e3f6d81c28c2f79
+  metadata.gz: 73056b0aaf9645e3a51db712dd5d4351483760135a26e395fa4170e507bb21c8488f3fdb1eb816a9e1e5a29a925c89a553fd596dacb339f5cef9ab2b7c8bb25d
+  data.tar.gz: 3350700bcd1745bf4ffa03d5f25b840ea7908dd554a50cb147ac2e9d2cf31a401e20e68780974d11ea21027359ac42ae5e2b1c208bc6a811609bc488aa2bd13f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.2.22
+* Add more helper method bang aliases
+* Properly persist camel data on Hash keys
+* Support optional automatic AttributeStruct loading on Hash set
+
 ## v0.2.20
 * Fix: remove nil structs
 

data/lib/attribute_struct/attribute_hash.rb

@@ -1,4 +1,4 @@
-require 'attribute_struct/attribute_struct'
+require 'attribute_struct'
 
 class AttributeStruct
 
@@ -211,7 +211,7 @@ class AttributeStruct
     #
     # @api private
     def convert_key(key)
-      key.kind_of?(Symbol) ? key.to_s : key
+      key.kind_of?(Symbol) || key.kind_of?(String) ? CamelString.new(key.to_s) : key
     end
 
     # @param value<Object> The value to convert.

data/lib/attribute_struct/attribute_struct.rb

@@ -1,7 +1,9 @@
-require 'attribute_struct/irb_compat'
+require 'attribute_struct'
 
 class AttributeStruct < BasicObject
 
+  autoload :Mash, 'attribute_struct/attribute_hash'
+
   class << self
 
     # @return [Truthy, Falsey] global flag for camel keys
@@ -214,14 +216,31 @@ class AttributeStruct < BasicObject
           end
           return endpoint # custom break out
         else
+          if(args.size > 1)
+            val = args.map do |v|
+              if(v.is_a?(::Hash) && _state(:hash_load_struct))
+                val = _klass_new
+                val._load(v)
+              else
+                v
+              end
+            end
+          else
+            if(args.first.is_a?(::Hash) && _state(:hash_load_struct))
+              val = _klass_new
+              val._load(args.first)
+            else
+              val = args.first
+            end
+          end
           if(_state(:value_collapse) && !(leaf = @table[sym]).nil?)
             unless(leaf.is_a?(CollapseArray))
               leaf = CollapseArray.new.push(leaf)
             end
-            leaf << (args.size > 1 ? args : args.first)
+            leaf << val
             @table[sym] = leaf
           else
-            @table[sym] = (args.size > 1 ? args : args.first)
+            @table[sym] = val
           end
         end
       end
@@ -301,7 +320,6 @@ class AttributeStruct < BasicObject
       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
@@ -380,8 +398,8 @@ class AttributeStruct < BasicObject
   # @param args [Object] argument list (:force will force processing)
   # @return [String, Symbol]
   def _process_key(key, *args)
-    key = key.to_s
-    if(_camel_keys && _camel_keys_action)
+    key = ::CamelString.new(key.to_s)
+    if(_camel_keys && _camel_keys_action && !key._hump_format_requested?)
       case _camel_keys_action
       when :auto_disable
         key._no_hump
@@ -394,10 +412,6 @@ class AttributeStruct < BasicObject
         "#{part[0,1].upcase}#{part[1,part.size]}"
       end.join.to_sym
     else
-      if(_camel_keys)
-        # Convert so Hash doesn't make a new one and lose the meta
-        key = ::CamelString.new(key) unless key.is_a?(::CamelString)
-      end
       key
     end
   end
@@ -430,6 +444,7 @@ class AttributeStruct < BasicObject
   def _camel_keys_set(v)
     @_camel_keys_set = v
   end
+  alias_method :camel_keys_set!, :_camel_keys_set
 
   # @return [Symbol, NilClass] :auto_disable or :auto_enable
   def _camel_keys_action

data/lib/attribute_struct/monkey_camels.rb

@@ -21,9 +21,13 @@ unless(defined?(MonkeyCamels))
     # Create a camel copy based on settings
     #
     # @return [String]
-    def camel_initialize_copy(orig)
+    def camel_initialize_copy(orig, hump=nil)
       new_val = un_camel_initialize_copy(orig)
-      orig._camel? ? new_val : new_val._no_hump
+      if(hump.nil?)
+        orig._camel? ? new_val : new_val._no_hump
+      else
+        new_val._no_hump if hump == false
+      end
     end
 
     # Provide string formatted based on hump setting
@@ -36,6 +40,11 @@ unless(defined?(MonkeyCamels))
 
     module Humps
 
+      # @return [TrueClass, FalseClass] specific style requested
+      def _hump_format_requested?
+        @__not_camel != nil
+      end
+
       # @return [TrueClass, FalseClass] camelized
       def _camel?
         !@__not_camel
@@ -46,12 +55,14 @@ unless(defined?(MonkeyCamels))
         @__not_camel = true
         self
       end
+      alias_method :disable_camel!, :_no_hump
 
       # @return [self] enable camelizing
       def _hump
         @__not_camel = false
         self
       end
+      alias_method :camel!, :_hump
 
     end
 

data/lib/attribute_struct/version.rb

@@ -2,5 +2,5 @@ require 'attribute_struct/attribute_struct'
 
 class AttributeStruct
   # Current library version
-  VERSION = ::Gem::Version.new('0.2.20')
+  VERSION = ::Gem::Version.new('0.2.22')
 end

data/lib/attribute_struct.rb

@@ -1 +1,7 @@
-require 'attribute_struct/attribute_struct'
+
+autoload :AttributeStruct, 'attribute_struct/attribute_struct'
+autoload :MonkeyCamels, 'attribute_struct/monkey_camels'
+autoload :CamelString, 'attribute_struct/monkey_camels'
+autoload :IrbCompat, 'attribute_struct/irb_compat'
+
+require 'attribute_struct/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attribute_struct
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.22
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies: []
 description: Attribute structures
 email: chrisroberts.code@gmail.com
@@ -52,3 +52,4 @@ signing_key:
 specification_version: 4
 summary: Attribute structures
 test_files: []
+has_rdoc: