fake_dynamo 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8333d5e9d5e01c91f1ec911ad7b6ba01af87b16a
-  data.tar.gz: c95189c6e7ef0b1bb321b1facd746ea49ee3f840
+  metadata.gz: 00648c19b3f1c992a04883bf4d11c9f20dbcb0fc
+  data.tar.gz: 682d63c6cdd1d7cfb71b5cb6e49015e2511e78cf
 SHA512:
-  metadata.gz: 51aea4e7d2e47b6c9c16017b5704157c5ca39156a68e80a9825107a2aade9a745362a189ba1c2905afcfa98b5a41f6556efa0312f7b2fb77e56787f714687dbe
-  data.tar.gz: 6adbf3ac4ce20bc9b89af8ee7717d2adbc86f066a305203926c5fa02acbc2ce68a1bbf4d8df31234182f73057b94ab3769e01319b9dba478ee641328527365e9
+  metadata.gz: 451e3ecb17977f41920ecc97c5a83f609914665be57d567624704b6b4b6ede06a5423e1208b7b811eebc44323610ab2141b8c2dc1ab1aad9866fd228e77b3401
+  data.tar.gz: ea9338856d85b0550e44fe69090a33872470fe2bf861f09985f4a4707d42f03c6656ce91be213999c4a58ee698a9f1191b60d34717f882f458e410d1b4264cb9

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.2.4 <2013-07-17>
+## 0.2.4 (2013-07-17)
 
 * Remove attribute if the set becomes empty - #27
 * Do not append '\n' at the end of base64 encoded binary - #24

data/README.md

@@ -6,7 +6,7 @@ local hosted, inmemory Amazon DynamoDB emulator.
 
 | Amazon DynamoDB API version | FakeDynamo gem version|
 | --------------------------- | ----------------------|
-| [2012-08-10][v2]            | 0.2.4                 |
+| [2012-08-10][v2]            | 0.2.5                 |
 | [2011-12-05][v1]            | 0.1.3                 |
 
 
@@ -19,7 +19,7 @@ local hosted, inmemory Amazon DynamoDB emulator.
 __requires ruby >= 1.9__
 
 ````
-gem install fake_dynamo --version 0.2.3
+gem install fake_dynamo --version 0.2.5
 
 fake_dynamo --port 4567
 ````
@@ -53,6 +53,14 @@ AWS.config(:use_ssl => false,
                     region:          "xxx"});
 ````
 
+* [aws-sdk-java](https://github.com/aws/aws-sdk-java) (AWS SDK for Java)
+
+````java
+AWSCredentials credentials = new BasicAWSCredentials("xxx", "xxx");
+AmazonDynamoDB client = new AmazonDynamoDBClient(credentials);
+client.setEndpoint("http://localhost:4567");
+````
+
 __please open a pull request with your configuration if you are using
 fake_dynamo with clients other than the ones mentioned above__.
 

data/bin/fake_dynamo

@@ -57,7 +57,7 @@ if (pid = options[:pid])
   File.open(pid, 'w') { |f| f.write(Process.pid) }
 end
 
-FakeDynamo::Storage.db_path = options[:db]
+FakeDynamo::Storage.instance.init_db(options[:db])
 FakeDynamo::Logger.setup(options[:log_level])
 
 if options[:compact]

data/lib/fake_dynamo/api_2012-08-10.yml

@@ -1065,6 +1065,7 @@
             - :required
             - :enum: [EQ, LE, LT, GE, GT, BEGINS_WITH, BETWEEN]
     - :within: !ruby/range 1..2
+    - :required
     ScanIndexForward:
     - :boolean
     ExclusiveStartKey:

data/lib/fake_dynamo/item.rb

@@ -4,7 +4,7 @@ module FakeDynamo
     attr_accessor :key, :attributes
 
     class << self
-      def from_data(data, key_schema)
+      def from_data(data, key_schema, attribute_definitions)
         item = Item.new
         item.key = Key.from_schema(data, key_schema)
 
@@ -14,6 +14,8 @@ module FakeDynamo
             item.attributes[name] = Attribute.from_hash(name, value)
           end
         end
+
+        item.validate_attribute_types(attribute_definitions)
         item
       end
 
@@ -116,5 +118,13 @@ module FakeDynamo
         {}
       end
     end
+
+    def validate_attribute_types(definitions)
+      definitions.each do |definition|
+        if attr = self[definition.name]
+          validate_type(attr.as_hash[definition.name], definition)
+        end
+      end
+    end
   end
 end

data/lib/fake_dynamo/storage.rb

@@ -4,11 +4,9 @@ require 'tempfile'
 module FakeDynamo
   class Storage
 
-    attr_accessor :compacted, :loaded
+    attr_accessor :compacted, :loaded, :db_path
 
     class << self
-      attr_accessor :db_path
-
       def instance
         @storage ||= Storage.new
       end
@@ -18,10 +16,6 @@ module FakeDynamo
       Logger.log
     end
 
-    def initialize
-      init_db
-    end
-
     def write_commands
       %w[CreateTable DeleteItem DeleteTable PutItem UpdateItem UpdateTable BatchWriteItem]
     end
@@ -30,14 +24,17 @@ module FakeDynamo
       write_commands.include?(command)
     end
 
-    def db_path
-      self.class.db_path
-    end
+    def init_db(path)
+      @db_path = path
+
+      return if File.exists?(db_path) && File.writable?(db_path)
 
-    def init_db
-      return if File.exists? db_path
       FileUtils.mkdir_p(File.dirname(db_path))
       FileUtils.touch(db_path)
+    rescue Errno::EACCES
+      puts "Cannot create or access db file at #{db_path}"
+      puts "Make sure you have write access to #{db_path}"
+      exit(1)
     end
 
     def delete_db

data/lib/fake_dynamo/table.rb

@@ -106,7 +106,7 @@ module FakeDynamo
     end
 
     def put_item(data)
-      item = Item.from_data(data['Item'], key_schema)
+      item = Item.from_data(data['Item'], key_schema, attribute_definitions)
       old_item = @items[item.key]
       check_conditions(old_item, data['Expected'])
       @items[item.key] = item
@@ -115,7 +115,7 @@ module FakeDynamo
     end
 
     def batch_put_request(data)
-      Item.from_data(data['Item'], key_schema)
+      Item.from_data(data['Item'], key_schema, attribute_definitions)
     end
 
     def batch_put(item)
@@ -193,6 +193,8 @@ module FakeDynamo
           attribute_updates.each do |name, update_data|
             item.update(name, update_data)
           end
+
+          item.validate_attribute_types(attribute_definitions)
         end
       rescue => e
         if item_created
@@ -318,14 +320,14 @@ module FakeDynamo
     end
 
     def sack_attributes(data, index)
-      return unless index
+      return if !index || index.projection.type == 'ALL'
 
       if data['Select'] == 'COUNT'
         return projected_attributes(index)
       end
 
       if attrs = attributes_to_get(data, index)
-        if (attrs - projected_attributes(index)).empty?
+        if (attrs - (projected_attributes(index))).empty?
           return projected_attributes(index)
         end
       end

data/lib/fake_dynamo/version.rb

@@ -1,3 +1,3 @@
 module FakeDynamo
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/fake_dynamo/table_spec.rb

@@ -30,7 +30,7 @@ module FakeDynamo
         'Item' => {
           'AttributeName1' => { 'S' => "test" },
           'AttributeName2' => { 'N' => '11' },
-          'AttributeName3' => { 'S' => "another" },
+          'AttributeName3' => { 'N' => "14" },
           'binary' => { 'B' => Base64.strict_encode64("binary") },
           'binary_set' => { 'BS' => [Base64.strict_encode64("binary")] }
         },
@@ -146,6 +146,17 @@ module FakeDynamo
         end.to raise_error(ValidationException, /mismatch/i)
       end
 
+      it 'should fail on index type mismatch' do
+        expect do
+          subject.put_item({ 'TableName' => 'Table1',
+              'Item' => {
+                'AttributeName1' => { 'S' => "test" },
+                'AttributeName2' => { 'N' => '11' },
+                'AttributeName3' => { 'S' => 'another' },
+              }})
+        end.to raise_error(ValidationException, /mismatch/i)
+      end
+
       it 'should fail if the attribute value contains empty string' do
         expect do
           subject.put_item({ 'TableName' => 'Table1',
@@ -204,9 +215,9 @@ module FakeDynamo
           [[{}, /set to null/],
            [{'Exists' => true}, /set to true/],
            [{'Exists' => false}],
-           [{'Value' => { 'S' => 'xxx' } }],
-           [{'Value' => { 'S' => 'xxx' }, 'Exists' => true}],
-           [{'Value' => { 'S' => 'xxx' }, 'Exists' => false}, /cannot expect/i]].each do |value, message|
+           [{'Value' => { 'N' => '15' } }],
+           [{'Value' => { 'N' => '15' }, 'Exists' => true}],
+           [{'Value' => { 'N' => '15' }, 'Exists' => false}, /cannot expect/i]].each do |value, message|
 
             op = lambda {
               subject.put_item(item.merge({'Expected' => { 'AttributeName3' => value }}))
@@ -221,14 +232,14 @@ module FakeDynamo
         end
 
         it 'should give default response' do
-          item['Item']['AttributeName3'] = { 'S' => "new" }
+          item['Item']['AttributeName3'] = { 'N' => "17" }
           subject.put_item(item).should include(consumed_capacity)
         end
 
         it 'should send old item' do
           old_item = Utils.deep_copy(item)
           new_item = Utils.deep_copy(item)
-          new_item['Item']['AttributeName3'] = { 'S' => "new" }
+          new_item['Item']['AttributeName3'] = { 'N' => "17" }
           new_item.merge!({'ReturnValues' => 'ALL_OLD'})
           subject.put_item(new_item)['Attributes'].should == old_item['Item']
         end
@@ -261,7 +272,7 @@ module FakeDynamo
                                       'AttributesToGet' => ['AttributeName3', 'xxx'],
                                       'ReturnConsumedCapacity' => 'TOTAL'
                                     })
-        response.should eq({ 'Item' => { 'AttributeName3' => { 'S' => 'another'}}}
+        response.should eq({ 'Item' => { 'AttributeName3' => { 'N' => '14'}}}
             .merge(consumed_capacity))
       end
     end
@@ -293,13 +304,13 @@ module FakeDynamo
 
         response = subject.delete_item(key.merge({'Expected' =>
                                                    {'AttributeName3' =>
-                                                     {'Value' => { 'S' => 'another'}}}}))
+                                                     {'Value' => { 'N' => '14'}}}}))
         response.should eq(consumed_capacity)
 
         expect do
           subject.delete_item(key.merge({'Expected' =>
                                           {'AttributeName3' =>
-                                            {'Value' => { 'S' => 'another'}}}}))
+                                            {'Value' => { 'N' => '14'}}}}))
         end.to raise_error(ConditionalCheckFailedException)
       end
 
@@ -317,7 +328,7 @@ module FakeDynamo
       end
 
       let(:put) do
-        {'AttributeUpdates' => {'AttributeName3' => { 'Value' => { 'S' => 'updated' },
+        {'AttributeUpdates' => {'AttributeName3' => { 'Value' => { 'N' => '18' },
             'Action' => 'PUT'}}}
       end
 
@@ -348,13 +359,20 @@ module FakeDynamo
         end.to raise_error(ConditionalCheckFailedException)
       end
 
+      it "should check index types" do
+        expect do
+          put['AttributeUpdates']['AttributeName3']['Value'] = {'S' => 'another'}
+          subject.update_item(key.merge(put))
+        end.to raise_error(ValidationException, /mismatch/i)
+      end
+
       it "should create new item if the key doesn't exist" do
         key['Key']['AttributeName1']['S'] = 'new'
         subject.update_item(key.merge(put))
         subject.get_item(key).should include( "Item"=>
                                               {"AttributeName1"=>{"S"=>"new"},
                                                 "AttributeName2"=>{"N"=>"11"},
-                                                "AttributeName3"=>{"S"=>"updated"}})
+                                                "AttributeName3"=>{"N"=>"18"}})
       end
 
       it "shouldn't create a new item if key doesn't exist and action is delete" do
@@ -365,13 +383,13 @@ module FakeDynamo
 
       it "should handle return values" do
         data = key.merge(put).merge({'ReturnValues' => 'UPDATED_NEW'})
-        subject.update_item(data).should include({'Attributes' => { 'AttributeName3' => { 'S' => 'updated'}}})
+        subject.update_item(data).should include({'Attributes' => { 'AttributeName3' => { 'N' => '18'}}})
       end
     end
 
     context '#return_values' do
       let(:put) do
-        {'AttributeUpdates' => {'AttributeName3' => { 'Value' => { 'S' => 'updated' },
+        {'AttributeUpdates' => {'AttributeName3' => { 'Value' => { 'N' => '19' },
               'Action' => 'PUT'}}}
       end
 
@@ -388,13 +406,13 @@ module FakeDynamo
       it "should return update old value" do
         subject.put_item(item)
         data = key.merge(put).merge({'ReturnValues' => 'UPDATED_OLD'})
-        subject.update_item(data).should include({'Attributes' => { 'AttributeName3' => { 'S' => 'another'}}})
+        subject.update_item(data).should include({'Attributes' => { 'AttributeName3' => { 'N' => '14'}}})
       end
 
       it "should return update new value" do
         subject.put_item(item)
         data = key.merge(put).merge({'ReturnValues' => 'UPDATED_NEW'})
-        subject.update_item(data).should include({'Attributes' => { 'AttributeName3' => { 'S' => 'updated'}}})
+        subject.update_item(data).should include({'Attributes' => { 'AttributeName3' => { 'N' => '19'}}})
       end
     end
 
@@ -636,6 +654,12 @@ module FakeDynamo
         result['Items'].first.should eq('AttributeName1' => { 'S' => 'att1'},
                                         'AttributeName2' => { 'N' => '3' })
       end
+
+      it 'should handle attributes_to_get within index' do
+        index_query['AttributesToGet'] = ['AttributeName1']
+        result = subject.query(index_query)
+        result['Items'].first.should eq('AttributeName1' => { 'S' => 'att1'})
+      end
     end
 
     context '#scan' do

data/spec/spec_helper.rb

@@ -17,11 +17,10 @@ end
 module FakeDynamo
   class Storage
     def initialize
+      init_db('/tmp/test_db.fdb')
       delete_db
-      init_db
     end
   end
 end
 
-FakeDynamo::Storage.db_path = '/tmp/test_db.fdb'
 FakeDynamo::Logger.setup(:debug)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fake_dynamo
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Anantha Kumaran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra