dynamini 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7666f36d72a5a8cd120410d8d1f915d79ca61d50
-  data.tar.gz: cb3c42f63ecb17bbfc877f534829ee8b915e3fb5
+  metadata.gz: 6de2fb3c93586ae5e29c842aa20c5c4b2ffbe15a
+  data.tar.gz: d010ecba7e323942905a366eb238982520eb7c83
 SHA512:
-  metadata.gz: fdc3861dca2bb1a7c2253b188e70023bffbc90cfc12c8c35f5fadc8b7bf1a382ed4e9619051526e321f28e82fbed062f9d14b74d3f9eb7c6c02d73466289f751
-  data.tar.gz: 090851dfcd7df23511dc98800d3946de5e6133520128953c81980fa545da3f256927ef88a39c491bdca7baebd5e236c4c4cecfdcf47639b415dda9940d93d89a
+  metadata.gz: 4b9452e98ada739ee207ccd048ff29d1cc7762687da1f125160fd19f0ac1e8d24eb7de15de6195f4a79c7e3c0fb61b74bda5a5a14e5fdc8f76aab820a5b57cf7
+  data.tar.gz: 6996d29cd05339962ef97335e98b1e8776b3ded5f2d131bcda222652bc95e027c36bb1f9f71eec744ccfaf253cb588007149705bf5739213d8603a529d0860cd

data/Gemfile.lock

@@ -1,29 +1,30 @@
 PATH
   remote: .
   specs:
-    dynamini (2.10.0)
+    dynamini (2.10.1)
       activemodel (>= 3, < 5.0)
       aws-sdk (~> 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activemodel (4.2.9)
+      activesupport (= 4.2.9)
       builder (~> 3.1)
-    activesupport (4.2.5.1)
+    activesupport (4.2.9)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    aws-sdk (2.2.22)
-      aws-sdk-resources (= 2.2.22)
-    aws-sdk-core (2.2.22)
+    aws-sdk (2.10.48)
+      aws-sdk-resources (= 2.10.48)
+    aws-sdk-core (2.10.48)
+      aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.22)
-      aws-sdk-core (= 2.2.22)
-    builder (3.2.2)
+    aws-sdk-resources (2.10.48)
+      aws-sdk-core (= 2.10.48)
+    aws-sigv4 (1.0.2)
+    builder (3.2.3)
     coderay (1.1.0)
     diff-lcs (1.2.5)
     ffi (1.9.10)
@@ -48,15 +49,14 @@ GEM
     guard-shell (0.7.1)
       guard (>= 2.0.0)
       guard-compat (~> 1.0)
-    i18n (0.7.0)
-    jmespath (1.1.3)
-    json (1.8.3)
+    i18n (0.8.6)
+    jmespath (1.3.1)
     listen (3.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
-    minitest (5.8.4)
+    minitest (5.10.3)
     nenv (0.2.0)
     notiffany (0.0.8)
       nenv (~> 0.1)
@@ -85,8 +85,8 @@ GEM
     shellany (0.0.1)
     slop (3.6.0)
     thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -99,3 +99,6 @@ DEPENDENCIES
   guard-shell
   pry (~> 0)
   rspec (~> 3)
+
+BUNDLED WITH
+   1.16.0.pre.2

data/dynamini.gemspec

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

data/lib/dynamini/querying.rb

@@ -69,10 +69,20 @@ module Dynamini
     end
 
     def build_expression_attribute_values(args)
+      range_key = current_index_range_key(args)
+
+      if (handle = handles[range_key.to_sym])
+        start_val = args[:start] ? attribute_callback(TypeHandler::SETTER_PROCS, handle, args[:start], false) : nil
+        end_val = args[:end] ? attribute_callback(TypeHandler::SETTER_PROCS, handle, args[:end], false) : nil
+      else
+        start_val = args[:start]
+        end_val = args[:end]
+      end
+
       expression_values = {}
       expression_values[':h'] = args[:hash_key]
-      expression_values[':s'] = args[:start] if args[:start]
-      expression_values[':e'] = args[:end] if args[:end]
+      expression_values[':s'] = start_val if start_val
+      expression_values[':e'] = end_val if end_val
       expression_values
     end
 

data/spec/dynamini/querying_spec.rb

@@ -18,8 +18,10 @@ describe Dynamini::Querying do
     set_hash_key :foo
     set_range_key :bar
     set_secondary_index :secondary_index, hash_key: :secondary_hash_key, range_key: :secondary_range_key
+    set_secondary_index :tertiary_index, hash_key: :tertiary_hash_key, range_key: :tertiary_range_key
     handle :bar, :integer
     handle :secondary_range_key, :integer
+    handle :tertiary_range_key, :time
   end
 
   describe '.find' do
@@ -270,6 +272,24 @@ describe Dynamini::Querying do
         expect(TestClassWithRange.query(hash_key: 'non-existent-key', index_name: :secondary_index)).to eq([])
       end
     end
+
+    context 'with a type handled range key' do
+      it 'converts the start and end parameter to the raw type' do
+        start_param = Time.new(2000, 1, 1)
+        end_param =  Time.new(2001, 1, 1)
+
+        expect(TestClassWithRange.client).to receive(:query).with(hash_including(
+            expression_attribute_values: {':h' => '12345', ':s' => start_param.to_f, ':e' => end_param.to_f}
+        )).and_return(OpenStruct.new(items: []))
+
+        TestClassWithRange.query(
+            hash_key: '12345',
+            index_name: :tertiary_index,
+            start: start_param,
+            end: end_param
+        )
+      end
+    end
   end
 
   describe '.exists?' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamini
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - Greg Ward
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel