fake_dynamo 0.2.0 → 0.2.1

data/README.md

@@ -1,21 +1,28 @@
 # FakeDynamo [![Build Status](https://secure.travis-ci.org/ananthakumaran/fake_dynamo.png)](http://travis-ci.org/ananthakumaran/fake_dynamo)
 
-local hosted, inmemory dynamodb emulator.
+local hosted, inmemory Amazon DynamoDB emulator.
 
+## Versions
 
-# Caveats
+| Amazon DynamoDB | FakeDynamo  |
+| --------------- | ----------- |
+| 2012-08-10      | 0.2.1       |
+| 2011-12-05      | 0.1.3       |
+
+
+## Caveats
 
 *  `ConsumedCapacityUnits` value will be 1 always.
 *  The response size is not constrained by 1mb limit. So operation
    like `BatchGetItem` will return all items irrespective of the
    response size
 
-# Usage
+## Usage
 
 __requires ruby >= 1.9__
 
 ````
-gem install fake_dynamo
+gem install fake_dynamo --version 0.2.0
 
 fake_dynamo --port 4567
 ````
@@ -26,7 +33,7 @@ send a DELETE request to reset the database. eg
 curl -X DELETE http://localhost:4567
 ````
 
-# Clients
+## Clients
 
 * aws-sdk
 
@@ -41,7 +48,7 @@ AWS.config(:use_ssl => false,
 __please open a pull request with your configuration if you are using
 fake_dynamo with clients other than the ones mentioned above__.
 
-# Storage
+## Storage
 fake_dynamo stores the `write operations` (request that changes the
 data) in `/usr/local/var/fake_dynamo/db.fdb` and replays it before
 starting the server. Because of the way fake_dynamo stores the data,

data/bin/fake_dynamo

@@ -4,7 +4,7 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'fake_dynamo'
 require 'optparse'
 
-options = { :port => 4567, :compact => false, :db => '/usr/local/var/fake_dynamo/db.fdb' }
+options = { :port => 4567, :bind => '127.0.0.1', :compact => false, :db => '/usr/local/var/fake_dynamo/db.fdb' }
 OptionParser.new do |opts|
   opts.banner = "Usage: fake_dynamo [options]"
 
@@ -12,6 +12,10 @@ OptionParser.new do |opts|
     options[:port] = v
   end
 
+  opts.on("-b", "--bind ADDR", "Default: #{options[:bind]}") do |v|
+    options[:bind] = v
+  end
+
   opts.on("-d", "--db PATH", "Default: #{options[:db]}") do |v|
     options[:db] = v
   end
@@ -56,7 +60,7 @@ if options[:compact]
 end
 
 FakeDynamo::Storage.instance.load_aof
-FakeDynamo::Server.run!(:port => options[:port])
+FakeDynamo::Server.run!(:port => options[:port], :bind => options[:bind])
 
 at_exit {
   FakeDynamo::Storage.instance.shutdown

data/lib/fake_dynamo/key.rb

@@ -3,7 +3,7 @@ module FakeDynamo
     include Comparable
     extend Validation
 
-    attr_accessor :primary, :range
+    attr_accessor :primary, :range, :tertiary
 
     class << self
       def from_data(key_data, key_schema)
@@ -28,6 +28,28 @@ module FakeDynamo
         key
       end
 
+      # local secondary indexes have a three part key:
+      # hash key -> primary
+      # index range key -> range
+      # table range key -> tertiary
+      def from_index_schema(data, index_schema, table_schema)
+        key = Key.new
+        validate_key_schema(data, index_schema)
+        validate_key_schema(data, table_schema)
+        key.primary = create_attribute(index_schema.hash_key, data)
+        key.range = create_attribute(index_schema.range_key, data)
+        key.tertiary = create_attribute(table_schema.range_key, data)
+        key
+      end
+
+      def from_index_item(item, key_schema)
+        key = Key.new
+        key.primary = item.key.primary
+        key.range = item[key_schema.range_key.name]
+        key.tertiary = item.key.range
+        key
+      end
+
       def create_attribute(key, data)
         name = key.name
         attr = Attribute.from_hash(name, data[name])
@@ -45,11 +67,12 @@ module FakeDynamo
       return false unless key.kind_of? Key
 
       @primary == key.primary &&
-        @range == key.range
+        @range == key.range &&
+        @tertiary == key.tertiary
     end
 
     def hash
-      primary.hash ^ range.hash
+      primary.hash ^ range.hash ^ tertiary.hash
     end
 
     def as_hash
@@ -57,11 +80,14 @@ module FakeDynamo
       if @range
         result.merge!(@range.as_hash)
       end
+      if @tertiary
+        result.merge!(@tertiary.as_hash)
+      end
       result
     end
 
     def <=>(other)
-      [primary, range] <=> [other.primary, other.range]
+      [primary, range, tertiary] <=> [other.primary, other.range, other.tertiary]
     end
 
   end

data/lib/fake_dynamo/key_schema.rb

@@ -10,7 +10,7 @@ module FakeDynamo
     def description
       description = [{'AttributeName' => hash_key.name, 'KeyType' => 'HASH'}]
       if range_key
-        description << [{'AttributeName' => range_key.name, 'KeyType' => 'RANGE'}]
+        description << {'AttributeName' => range_key.name, 'KeyType' => 'RANGE'}
       end
       description
     end

data/lib/fake_dynamo/table.rb

@@ -231,7 +231,11 @@ module FakeDynamo
       matched_items = get_items_by_hash_key(hash_attribute)
 
       forward = data.has_key?('ScanIndexForward') ? data['ScanIndexForward'] : true
-      matched_items = drop_till_start(matched_items, data['ExclusiveStartKey'], forward, schema)
+      if index
+        matched_items = drop_till_start_index(matched_items, data['ExclusiveStartKey'], forward, schema)
+      else
+        matched_items = drop_till_start(matched_items, data['ExclusiveStartKey'], forward, schema)
+      end
 
       if !(range_condition = data['KeyConditions'].clone.tap { |h| h.delete(schema.hash_key.name) }).empty?
         validate_range_condition(range_condition, schema)
@@ -246,7 +250,11 @@ module FakeDynamo
       merge_items(response, data, results, index)
 
       if last_evaluated_item
-        response['LastEvaluatedKey'] = last_evaluated_item.key.as_hash
+        if index
+          response['LastEvaluatedKey'] = Key.from_index_item(last_evaluated_item, schema).as_hash
+        else
+          response['LastEvaluatedKey'] = last_evaluated_item.key.as_hash
+        end
       end
       response
     end
@@ -335,6 +343,27 @@ module FakeDynamo
       end
     end
 
+    def drop_till_start_index(all_items, start_key_hash, forward, schema)
+      all_items = all_items.sort_by { |item| Key.from_index_item(item, schema) }
+
+      unless forward
+        all_items = all_items.reverse
+      end
+
+      if start_key_hash
+        start_key = Key.from_index_schema(start_key_hash, schema, key_schema)
+        all_items.drop_while do |item|
+          if forward
+            Key.from_index_item(item, schema) <= start_key
+          else
+            Key.from_index_item(item, schema) >= start_key
+          end
+        end
+      else
+        all_items
+      end
+    end
+
     def filter(items, conditions, limit, fail_on_type_mismatch)
       limit ||= -1
       result = []

data/lib/fake_dynamo/validation.rb

@@ -81,13 +81,13 @@ module FakeDynamo
             end
           when :map
             map = constrain[:map]
-            raise "#{param(attribute, parents)} must be a Hash" unless data.kind_of? Hash
+            raise ValidationException, "#{param(attribute, parents)} must be a Hash" unless data.kind_of? Hash
             data.each do |key, value|
               validate_spec(key, key, map[:key], new_parents)
               validate_spec(key, value, map[:value], new_parents)
             end
           when :list
-            raise "#{param(attribute, parents)} must be a Array" unless data.kind_of? Array
+            raise ValidationException, "#{param(attribute, parents)} must be a Array" unless data.kind_of? Array
             data.each_with_index do |element, i|
               validate_spec(element, element, constrain[:list], new_parents + [(i+1).to_s])
             end

data/lib/fake_dynamo/version.rb

@@ -1,3 +1,3 @@
 module FakeDynamo
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/fake_dynamo/table_spec.rb

@@ -405,7 +405,7 @@ module FakeDynamo
             next if j.even?
             item['Item']['AttributeName1']['S'] = "att#{i}"
             item['Item']['AttributeName2']['N'] = j.to_s
-            item['Item']['AttributeName3'] = {'N' => j.to_s}
+            item['Item']['AttributeName3'] = {'N' => ((j % 3) + 2).to_s}
             t.put_item(item)
           end
         end
@@ -543,6 +543,12 @@ module FakeDynamo
         result['Count'].should eq(5)
       end
 
+      it 'should sort based on lsi range key' do
+        index_query.delete('Limit')
+        result = subject.query(index_query)
+        keys = result['Items'].map { |i| [i['AttributeName3']['N'].to_i, i['AttributeName2']['N'].to_i] }
+        keys.should eq(keys.sort)
+      end
 
       it 'should handle scanindexforward' do
         result = subject.query(query)
@@ -593,7 +599,7 @@ module FakeDynamo
       end
 
 
-      it 'should return all elements if not rangekeycondition is given' do
+      it 'should return all elements if rangekeycondition is not given' do
         query['KeyConditions'].delete('AttributeName2')
         result = subject.query(query)
         result['Count'].should eq(5)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fake_dynamo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70301515417000 !ruby/object:Gem::Requirement
+  requirement: &70292157821000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301515417000
+  version_requirements: *70292157821000
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70301515416500 !ruby/object:Gem::Requirement
+  requirement: &70292157820120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301515416500
+  version_requirements: *70292157820120
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70301515416080 !ruby/object:Gem::Requirement
+  requirement: &70292157812900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301515416080
+  version_requirements: *70292157812900
 description: 
 email:
 - ananthakumaran@gmail.com