dynamini 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb80f52caa4a21c3f189d5427e7aa9ae90a1a2e0
-  data.tar.gz: 1c2f76b9cd36ccba731f263efabceeeafeb8ae97
+  metadata.gz: 7075482c77f8b6cec60de580a672fed23b646f51
+  data.tar.gz: 03b4480b94b8e8c312885339d06ed86fd59687ad
 SHA512:
-  metadata.gz: 0fc0ddf4c8c732c6943800a1fe735a1176203bb9f3740b2fb6cf762cfbe1d614bb684c7b34c32b9f04893668bc66f7745aa6d93addb55b9c199c09de81866a2e
-  data.tar.gz: a658de15ef8a2b607b68f7799d3ed23262df8df223fbfc838039e310a3986cfba8a99392fe0b5642eb56de2b38b4aa3d221fa244b22af109a34cd5dc5968d7dc
+  metadata.gz: 49a1fff7890939d2cd39c8fb756c29cfd1c852155e90efa797f659d8488b26e720eedd7da0521734a047bb5e9f0ebf7e8c10cd090f8d2bed52337b55a1575b11
+  data.tar.gz: 1e0ece3e30f4c3d7acbc10a6f6a5ecf814f3b09efc4542776cc180c40a2c2e83a2f39fa33f9d3845f3a49155411fdd65e3282d287a47d786c2ae11111aa7c08d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dynamini (2.6.2)
+    dynamini (2.6.3)
       activemodel (>= 3, < 5.0)
       aws-sdk (~> 2)
 

data/README.md

@@ -111,7 +111,7 @@ You can save arrays and sets to your Dynamini model. Optionally, you can have Dy
 ```ruby
 class Vehicle < Dynamini::Base
     set_hash_key :vin
-    handle :parts, :array, of: :symbol # :of accepts the same types as :handle
+    handle :parts, :array, of: :symbol # :of accepts all types except :set and :array 
     handle :other_array, :array
 end
 
@@ -119,7 +119,7 @@ car = Vehicle.new(vin: 'H3LL0')
 car.parts
 > []
 
-car.parts = 'wheel'
+car.parts = ['wheel']
 car.parts
 > :wheel
 
@@ -130,7 +130,7 @@ car.parts
 # This line will raise an error since 5 cannot be converted to a symbol.
 car.parts = ['wheel', 'brakes', 5]
 
-# If you want a multitype array, invoke :handle without the :of option.
+# If you want a multitype array, use :handle without the :of option.
 car.other_array = ['wheel', 'brakes', 5]
 car.other_array
 > ['wheel', 'brakes', 5]
@@ -140,7 +140,7 @@ Vehicle.find('H3LLO').other_array
 > ['wheel', 'brakes', BigDecimal(5)]
 ```
 
-Please note that changing enumerables in place using mutator methods like << or map! will not record a change to the object. 
+Please note that changing enumerables in place using mutator methods like << or map! will not record a change to the object.
 
 If you want to make changes like this, either clone it then use the assignment operator (e.g. model.array = model.array.dup << 'foo') or call model.mark(:attribute) after mutation and before saving to force Dynamini to write the change.
 

data/dynamini.gemspec

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

data/lib/dynamini/adder.rb

@@ -1,16 +1,16 @@
 module Dynamini
   module Adder
+
+    ADDABLE_TYPES = [:set, :array, :integer, :float, :time, :date]
+
     def add_to(attribute, value)
       complain_about(attribute) unless handles[attribute]
       old_value = read_attribute(attribute)
       add_value = attribute_callback(Dynamini::TypeHandler::SETTER_PROCS, handles[attribute], value)
-      case handles[attribute][:format]
-        when :set, :array
-          @attributes[attribute] += add_value
-        when :integer, :float, :time, :date
-          @attributes[attribute] += add_value
-        else
-          complain_about(attribute)
+      if ADDABLE_TYPES.include? handles[attribute][:format]
+        @attributes[attribute] ? @attributes[attribute] += add_value : @attributes[attribute] = add_value
+      else
+        complain_about(attribute)
       end
       record_change(attribute, old_value, add_value, 'ADD')
       self

data/lib/dynamini/test_client.rb

@@ -220,13 +220,11 @@ module Dynamini
     def handle_updates(args, hash_key_value, range_key_value, attribute_hash)
       table = get_table(args[:table_name])
       args[:attribute_updates].each do |k, v|
-
         if v[:action] == 'ADD' && table[hash_key_value]
           # if record has been saved
           data = table[hash_key_value]
           data = (data[range_key_value] ||= {}) if range_key_value
-
-          attribute_hash[k] = (v[:value] + data[k].to_f)
+          attribute_hash[k] = data[k] ? data[k] + v[:value] : v[:value]
         else
           attribute_hash[k] = v[:value]
         end

data/lib/dynamini/type_handler.rb

@@ -27,6 +27,8 @@ module Dynamini
 
     module ClassMethods
       def handle(column, format_class, options = {})
+        validate_handle(format_class, options)
+
         options[:default] ||= format_default(format_class)
         options[:default] ||= Set.new if format_class == :set
 
@@ -62,6 +64,14 @@ module Dynamini
             Set.new
         end
       end
+
+      def validate_handle(format, options)
+        if format == :set
+          if options[:of] && [:set, :array].include?(options[:of])
+            raise ArgumentError, 'Invalid handle: cannot store non-primitive datatypes within a set.'
+          end
+        end
+      end
     end
 
     private
@@ -101,6 +111,5 @@ module Dynamini
     def convert_elements(enumerable, callback)
       enumerable.map { |e| callback.call(e) }
     end
-
   end
 end

data/spec/dynamini/adder_spec.rb

@@ -9,6 +9,8 @@ describe Dynamini::Adder do
     handle :when, :date
     handle :what_time, :time
     handle :widget_count, :integer
+    handle :new_set, :set
+    handle :new_array, :array
   end
 
   let(:model_attributes) {
@@ -22,7 +24,7 @@ describe Dynamini::Adder do
     }
   }
 
-  let(:model) { AddHandledModel.new(model_attributes, false) }
+  let(:model) { AddHandledModel.new(model_attributes) }
 
 
   describe '.add_to' do
@@ -63,6 +65,12 @@ describe Dynamini::Adder do
           expect{ model.add_to(:things, 4) }.to raise_error ArgumentError
         end
       end
+      context 'adding to an uninitialized set' do
+        it 'creates the set' do
+          model.add_to(:new_set, Set.new([4]))
+          expect(model.new_set).to eq(Set.new([4]))
+        end
+      end
     end
 
     context 'adding to an array' do
@@ -77,6 +85,22 @@ describe Dynamini::Adder do
           expect{ model.add_to(:stuff, 4) }.to raise_error ArgumentError
         end
       end
+      context 'adding to an empty array' do
+        it 'creates the array' do
+          model.add_to(:new_array, [4])
+          expect(model.new_array).to eq([4])
+        end
+      end
+    end
+
+    context 'without reading a previously saved item' do
+      it 'still adds' do
+        model.save
+        model2 = AddHandledModel.new(id: model_attributes[:id])
+        model2.add_to(:price, 2)
+        model2.save
+        expect(AddHandledModel.find(model_attributes[:id]).price).to eq(11.99)
+      end
     end
   end
 end

data/spec/dynamini/test_client_spec.rb

@@ -26,6 +26,13 @@ describe Dynamini::TestClient do
         test_client.update_item(table_name: table_name, key: {hash_key_name: 'hash_key_value'}, attribute_updates: {abc: {value: 1, action: 'ADD'}})
         expect(test_client.data[table_name]['hash_key_value']).to eq(abc: 2, hash_key_name: 'hash_key_value')
       end
+
+      it 'should be able to add to an existing set' do
+        test_client = Dynamini::TestClient.new(:hash_key_name)
+        test_client.update_item(table_name: table_name, key: {hash_key_name: 'hash_key_value'}, attribute_updates: {abc: {value: Set.new([1]), action: 'PUT'}})
+        test_client.update_item(table_name: table_name, key: {hash_key_name: 'hash_key_value'}, attribute_updates: {abc: {value: Set.new([2]), action: 'ADD'}})
+        expect(test_client.data[table_name]['hash_key_value']).to eq(abc: Set.new([1, 2]), hash_key_name: 'hash_key_value')
+      end
     end
 
     context 'with Hash key and range key' do

data/spec/dynamini/type_handler_spec.rb

@@ -127,5 +127,13 @@ describe Dynamini::TypeHandler do
       handle_model.float_set = [12,24,48]
       expect(handle_model.float_set).to_not be_a(Array)
     end
+
+    it 'should complain if trying to cast elements as arrays' do
+      expect{ HandleModel.handle :invalid, :set, of: :array}.to raise_error ArgumentError
+    end
+
+    it 'should complain if trying to cast elements as sets' do
+      expect{ HandleModel.handle :invalid, :set, of: :set}.to raise_error ArgumentError
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamini
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
 platform: ruby
 authors:
 - Greg Ward
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel