dynamini 2.6.8 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdfc84fe329dae011f69a61ac1af6b0c22f7a009
-  data.tar.gz: 85dae7d4ed4e50e863c6717e6beff8ae5bc84ff7
+  metadata.gz: 7e1c5e5210674b1e75d93ca770697f796b9ca42e
+  data.tar.gz: 4de485ac6fa5fad8375104f6e3049abf3a542d09
 SHA512:
-  metadata.gz: dfc9700d794a7c660bdf1090a9774326945bbc7a6f74e5fcb8658c9b453c53578207f0d8116f63c2f5fe62ade2d0e98efcc0a294dca31b81ec588a48a0cf7530
-  data.tar.gz: d62dad577c5100725d13fe9658a13c0784dda7d24d0717e422b01d83d206b06aeba0fa24a09a7859f1b7d6970f82fb879f26a05d15c29ef26c15954174f57c38
+  metadata.gz: 141816813ba6319ebbede710503514cc1a88a55a2f915bc65e7b5d450e21b1ebd96e9df0b4fa6a1d0bf1e27e4f682d8f2eff3c13c87e824d8228dff608bfe1a2
+  data.tar.gz: 49a6b6842b43c606b6e766709d11de5ca8ef0da0eee8039446a3d00a0b8f165ff6ac1aff5a0d88869b62d9a0dd886c00413f6be51802ebf2a844960db5644712

data/dynamini.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'dynamini'
-  s.version = '2.6.8'
+  s.version = '2.7.0'
   s.summary = 'DynamoDB interface'
   s.description = 'Lightweight DynamoDB interface gem designed as
                    a drop-in replacement for ActiveRecord.

data/lib/dynamini/adder.rb

@@ -6,7 +6,7 @@ module Dynamini
     def add_to(attribute, value)
       complain_about(attribute) unless handles[attribute]
       old_value = read_attribute(attribute)
-      add_value = self.class.attribute_callback(TypeHandler::SETTER_PROCS, handles[attribute], value)
+      add_value = self.class.attribute_callback(TypeHandler::SETTER_PROCS, handles[attribute], value, true)
       if ADDABLE_TYPES.include? handles[attribute][:format]
         @attributes[attribute] ? @attributes[attribute] += add_value : @attributes[attribute] = add_value
       else

data/lib/dynamini/base.rb

@@ -172,7 +172,6 @@ module Dynamini
     end
 
     def self.create_key_hash(hash_value, range_value = nil)
-
       key_hash = {self.hash_key => handled_key(self.hash_key, hash_value)}
       key_hash[self.range_key] = handled_key(self.range_key, range_value) if self.range_key
       key_hash
@@ -217,7 +216,7 @@ module Dynamini
     def write_attribute(attribute, new_value, change: true, **options)
       old_value = read_attribute(attribute)
       if (handle = self.class.handles[attribute.to_sym]) && !new_value.nil?
-        new_value = self.class.attribute_callback(TypeHandler::SETTER_PROCS, handle, new_value)
+        new_value = self.class.attribute_callback(TypeHandler::SETTER_PROCS, handle, new_value, change)
       end
       @attributes[attribute] = new_value
       record_change(attribute, old_value, new_value, options[:action]) if change && new_value != old_value
@@ -227,7 +226,7 @@ module Dynamini
       value = @attributes[name]
       if (handle = self.class.handles[name.to_sym])
         value = handle[:options][:default] if value.nil?
-        value = self.class.attribute_callback(TypeHandler::GETTER_PROCS, handle, value) unless value.nil?
+        value = self.class.attribute_callback(TypeHandler::GETTER_PROCS, handle, value, false) unless value.nil?
       end
       value
     end

data/lib/dynamini/type_handler.rb

@@ -9,8 +9,8 @@ module Dynamini
         symbol:   proc { |v| v.to_sym },
         string:   proc { |v| v.to_s },
         boolean:  proc { |v| v },
-        array:    proc { |v| v.to_a },
-        set:      proc { |v| Set.new(v) }
+        array:    proc { |v| v.is_a?(Enumerable) ? v.to_a : [v] },
+        set:      proc { |v| v.is_a?(Enumerable) ? Set.new(v) : Set.new([v]) }
     }
 
     SETTER_PROCS = {
@@ -21,8 +21,8 @@ module Dynamini
         string:   proc { |v| v.to_s },
         boolean:  proc { |v| v },
         date:     proc { |v| v.to_time.to_f },
-        array:    proc { |v| v.to_a },
-        set:      proc { |v| Set.new(v) }
+        array:    proc { |v| v.is_a?(Enumerable) ? v.to_a : [v] },
+        set:      proc { |v| v.is_a?(Enumerable) ? Set.new(v) : Set.new([v]) }
     }
 
     def handle(column, format_class, options = {})
@@ -73,19 +73,19 @@ module Dynamini
     end
 
     def handled_key(column, value)
-      if handle = handles[column]
-        attribute_callback(GETTER_PROCS, handle, value)
+      if handles[column]
+        attribute_callback(GETTER_PROCS, handles[column], value, false)
       else
         value
       end
     end
 
-    def attribute_callback(procs, handle, value)
+    def attribute_callback(procs, handle, value, validate)
       callback = procs[handle[:format]]
       if should_convert_elements?(handle, value)
         result = convert_elements(value, procs[handle[:options][:of]])
         callback.call(result)
-      elsif invalid_enumerable_value?(handle, value)
+      elsif validate && invalid_enumerable_value?(handle, value)
         raise ArgumentError, "Can't write a non-enumerable value to field handled as #{handle[:format]}"
       else
         callback.call(value)

data/spec/dynamini/querying_spec.rb

@@ -7,7 +7,8 @@ describe Dynamini::Querying do
       name: 'Widget',
       price: 9.99,
       id: 'abcd1234',
-      hash_key: '009'
+      hash_key: '009',
+      my_attrib: 'hello'
     }
   }
 
@@ -55,6 +56,19 @@ describe Dynamini::Querying do
       end
     end
 
+    context 'when the record has invalid data types for its handles' do
+      class SetHandler < Dynamini::Base
+        set_hash_key :id
+      end
+
+      it 'loads the record' do
+        SetHandler.create!(id: '1', attrib: 'hello')
+        SetHandler.handle(:attrib, :set)
+        found = SetHandler.find('1')
+        expect(found.id).to eq('1')
+      end
+    end
+
     context 'when retrieving a subclass' do
       class Foo < Dynamini::Base
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamini
 version: !ruby/object:Gem::Version
-  version: 2.6.8
+  version: 2.7.0
 platform: ruby
 authors:
 - Greg Ward
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: DynamoDB interface