lotus-dynamodb 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4afda395af46d537deed3ac0619746f3c693f53b
-  data.tar.gz: f4c3028928436d9c3d035e48a8ec7a17dab6137c
+  metadata.gz: 4a025c678317bce959cb08e9fe84d43e17ee8b0f
+  data.tar.gz: 408402f20f9a9e9e523039df3e43114732aa013a
 SHA512:
-  metadata.gz: f35e5aa974d0cb68835e04f6fc6e4b7e77d87f8239ef13a84f5acdf23e6c927d2b1e468d67bf19f82854755cc94e119073b13fb4e16bd0f493668a8eb08395e8
-  data.tar.gz: 0d2fea387a98192508cda33c444500374ba1cfe4ff5a2b5b157ecaf1d75e84c4519ec8e8002dffbc84c75a0de6311c0a514f439996f7971173881fcdd3ffdee9
+  metadata.gz: 0863ca668599f711306a9a0c144a52b69f0e42f89b4b6397a86797a13fb5111c2f0b52346627ec59bab791707e4dd6c7fd9865f081706c4cd69de4e418da3f2b
+  data.tar.gz: 17ea2d92690e352a795bb6ccc23fb5cfecc6b7422cc6af583f12f5bb663d85baedf00e3c35d674455d4f602ed5e4a865d5b7e548635982b89c923666fb499239

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+v0.1.2
+------
+
+* Make Collection#update respect nil attributes
+* Fix continuation & limit bug
+
 v0.1.1
 ------
 

data/lib/lotus/dynamodb/version.rb

@@ -3,6 +3,6 @@ module Lotus
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/lib/lotus/model/adapters/dynamodb/collection.rb

@@ -248,7 +248,9 @@ module Lotus
           # @api private
           # @since 0.1.0
           def serialize_item(record)
-            Hash[record.map { |k, v| [k.to_s, format_attribute_value(v)] }]
+            Hash[record.delete_if { |_, v| v.nil? }.map do |k, v|
+              [k.to_s, format_attribute_value(v)]
+            end]
           end
 
           # Serialize given record or primary key to have proper attributes
@@ -282,7 +284,11 @@ module Lotus
           def serialize_attributes(entity)
             keys = key_schema.keys
             Hash[entity.reject { |k, _| keys.include?(k) }.map do |k, v|
-              [k.to_s, { value: format_attribute_value(v), action: "PUT" }]
+              if v.nil?
+                [k.to_s, { action: "DELETE" }]
+              else
+                [k.to_s, { value: format_attribute_value(v), action: "PUT" }]
+              end
             end]
           end
 

data/lib/lotus/model/adapters/dynamodb/command.rb

@@ -94,8 +94,7 @@ module Lotus
           # @api private
           # @since 0.1.0
           def _serialize(entity)
-            serialized = @collection.serialize(entity)
-            serialized.delete_if { |_, v| v.nil? }
+            @collection.serialize(entity)
           end
         end
       end

data/lib/lotus/model/adapters/dynamodb/query.rb

@@ -82,7 +82,8 @@ module Lotus
           # @since 0.1.0
           def all
             response = run
-            while !@options[:limit] && response.last_evaluated_key
+
+            while continue?(response)
               @options[:exclusive_start_key] = response.last_evaluated_key
               response = run(response)
             end
@@ -97,10 +98,11 @@ module Lotus
           # @since 0.1.1
           def each
             response = run
+
             entities = @collection.deserialize(response.entities)
             entities.each { |x| yield(x) }
 
-            while !@options[:limit] && response.last_evaluated_key
+            while continue?(response)
               response.entities = []
 
               @options[:exclusive_start_key] = response.last_evaluated_key
@@ -474,7 +476,7 @@ module Lotus
 
             response = run
 
-            while !@options[:limit] && response.last_evaluated_key
+            while continue?(response)
               @options[:exclusive_start_key] = response.last_evaluated_key
               response = run(response)
             end
@@ -590,6 +592,30 @@ module Lotus
           def run(previous_response = nil)
             @dataset.public_send(operation, @options, previous_response)
           end
+
+          # Check if request needs to be continued.
+          #
+          # @param previous_response [Response] deserialized response from a previous operation
+          #
+          # @return [Boolean]
+          #
+          # @api private
+          # @since 0.1.2
+          def continue?(previous_response)
+            return false unless previous_response.last_evaluated_key
+
+            if @options[:limit]
+              if @options[:limit] > previous_response.count
+                @options[:limit] = @options[:limit] - previous_response.count
+
+                true
+              else
+                false
+              end
+            else
+              true
+            end
+          end
         end
       end
     end

data/test/model/adapters/dynamodb_adapter_test.rb

@@ -146,6 +146,15 @@ describe Lotus::Model::Adapters::DynamodbAdapter do
       entity.id.must_equal id
       @adapter.find(collection, entity.id).must_equal entity
     end
+
+    it 'removes attribute' do
+      entity.name = nil
+      @adapter.update(collection, entity)
+
+      found_entity = @adapter.find(collection, entity.id)
+      found_entity.must_equal entity
+      found_entity.name.must_be_nil
+    end
   end
 
   describe '#delete' do
@@ -831,6 +840,33 @@ describe Lotus::Model::Adapters::DynamodbAdapter do
           result.must_equal [purchase1]
         end
       end
+
+      describe 'with large records set' do
+        before do
+          purchases.each do |entity|
+            @adapter.create(collection, entity)
+          end
+        end
+
+        let(:purchases) do
+          25.times.map do |i|
+            TestPurchase.new(
+              region: 'europe',
+              content: ('A'..'Z').to_a[i]*50_000,
+              created_at: Time.new,
+            )
+          end
+        end
+
+        it 'returns all of them' do
+          query = Proc.new {
+            where(region: 'europe').limit(24)
+          }
+
+          result = @adapter.query(collection, &query).count
+          result.must_equal 24
+        end
+      end
     end
 
     describe 'exists?' do

data/test/version_test.rb

@@ -2,6 +2,6 @@ require 'test_helper'
 
 describe Lotus::Dynamodb::VERSION do
   it 'returns current version' do
-    Lotus::Dynamodb::VERSION.must_equal '0.1.1'
+    Lotus::Dynamodb::VERSION.must_equal '0.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lotus-dynamodb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dmitry Krasnoukhov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-model