dynamini 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7327a446583484fbedb633d9dcd247c9d93d563f
-  data.tar.gz: 1a505662583dbfbb6a2a0f2975ce7f6c15d95806
+  metadata.gz: 2142757afc1e24fc1ba5e2b4a94ce6b2c78233d1
+  data.tar.gz: d4d7db8f6d7cca4b4ce9db53c9cb96b654d5e8e8
 SHA512:
-  metadata.gz: 2103f9bfdb4277c7d6c7a2c01c19980cd8c52ac567dab5105a57fcb2af8a4b092f3377cdeb08d582d9bb15b574766c4d76ab07b8943be9bac96d1cd989e7e5bd
-  data.tar.gz: 15b47f8a2fc609b6f312ea030ec44aec66ac11c70d937fb60d4898fef25580ade46a291246f92cbde1d1def20234a79e57f10760aa3ac7263c7a5b207f6b3ab8
+  metadata.gz: f0b6a462b83cf6fbedf57b9461609c93c0365ec464c7375efe52d771b344aa527b01e7987c175dcec1f211b25f99de8e97301270d99cae415d6da685afbc9ade
+  data.tar.gz: 554c023d9ff949d396087def3f109954a369de499fd4ed1fb7b4a2f4537ac4d034dda782342337b818e11ded424ae022710406464c8496d79728ebc5ff23323c

data/Gemfile.lock

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

data/dynamini.gemspec

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

data/lib/dynamini/test_client.rb

@@ -114,19 +114,9 @@ module Dynamini
       hash_key_name, range_key_name = determine_hash_and_range(args)
 
       inspect_for_correct_keys?(tokens, hash_key_name, range_key_name)
-      start_val, end_val = range_key_limits(tokens)
 
-      if args[:index_name]
-        secondary_index_query(args, start_val, end_val)
-      else
-        hash_key = hash_key_value(args).is_a?(Integer) ? tokens[2].to_i : tokens[2]
+      args[:index_name] ?  secondary_index_query(args, tokens) : range_key_query(args, tokens)
 
-        parent = get_table(args[:table_name])[hash_key]
-        return OpenStruct.new(items: []) unless parent
-        selected = apply_filter_options(parent, args, start_val, end_val)
-
-        OpenStruct.new(items: selected)
-      end
     end
 
     def determine_hash_and_range(args)
@@ -156,7 +146,19 @@ module Dynamini
       records
     end
 
-    def secondary_index_query(args = {}, start_val = nil, end_val = nil)
+    def range_key_query(args, tokens)
+      start_val, end_val = range_key_limits(tokens)
+      hash_key = hash_key_value(args).is_a?(Integer) ? tokens[2].to_i : tokens[2]
+      parent = get_table(args[:table_name])[hash_key]
+
+      return OpenStruct.new(items: []) unless parent
+
+      selected = apply_filter_options(parent, args, start_val, end_val)
+      OpenStruct.new(items: selected)
+    end
+
+    def secondary_index_query(args = {}, tokens)
+      start_val, end_val = range_key_limits(tokens)
       index = secondary_index[args[:index_name].to_s]
       table = get_table(args[:table_name])
 
@@ -204,25 +206,28 @@ module Dynamini
       hash_key_value = args[:key][hash_key_attr]
       range_key_value = args[:key][range_key_attr]
 
-      if args[:attribute_updates]
-        args[:attribute_updates].each do |k, v|
-          table = get_table(args[:table_name])
+      handle_updates(args, hash_key_value, range_key_value, attribute_hash) if args[:attribute_updates]
+
+      attribute_hash
+    end
+
+    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
+        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)
-          else
-            attribute_hash[k] = v[:value]
-          end
+          attribute_hash[k] = (v[:value] + data[k].to_f)
+        else
+          attribute_hash[k] = v[:value]
         end
       end
-
-      attribute_hash
     end
 
+
     def inspect_for_correct_keys?(tokens, hash_key_name, range_key_name)
       missed_keys = []
       missed_keys << hash_key_name unless tokens[0] == hash_key_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamini
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Greg Ward
@@ -15,110 +15,110 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-shell
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |-
@@ -130,9 +130,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -170,17 +170,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: DynamoDB interface