toy-dynamo 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f54db7e521096d9ee23c898eaa57a8932f8cf299
-  data.tar.gz: add67a16a2bad5923b97e4916820d8bb00bab878
+  metadata.gz: 2c505b06ca1b99d16eb355a403fa7dcc40b9653a
+  data.tar.gz: 010db3bf334c8759fc922cd5801b235b76cf3f05
 SHA512:
-  metadata.gz: 6038f327a79d71a8b6575dc4aaef030528ae5f303d0317c462c15d2fa30ea6bd85e57e8e5a879eb8d83d599ea4fdd9fc83fb4c0fe83ccc3530d42945cc287742
-  data.tar.gz: 2a973d5349a42a2b85c0e79877123f08496984c7642beca613033021a34efd20ad49a37af9baa02accbca80dfc7209ba2a659d71b5005d79e7088fdd550d7804
+  metadata.gz: 7c76caefca0f5ecb58c5230afa9940b9e8efbc1c3c840d788f04296c4a40afdb064c3fd843a8dab837fedf3a4e7b0f4c89359ac4615a9139f791ef65afae947a
+  data.tar.gz: 1a48d0ef0c3efd90e26bb154850500ca462bc229b2fb6328522d2a5a453970e1400ce67a7f8cd3b632b875e04560d1e65cb99c6bce072c29d813b8ca9a4ad015

data/README.md

@@ -24,7 +24,7 @@ end
 		* Can also specify an Array of attributes to project besides the primary keys ex:
 			* :projection => [:subject, :commenter_name]
 
-## Usage
+## Basic Usage
 * **Read Hash Key Only**
 	* Example:
 		* Model.read("xyz")
@@ -59,6 +59,16 @@ end
 		* Model.count_range("xyz", :range => {:comment_id.eq => "123"})
 	* Returns the number of total results (no attributes)
 
+## Extras Usage
+* **Init a UUID value**
+  * attribute :user_guid, String, :default => lambda { SimpleUUID::UUID.new.to_guid }
+* **Use with fake_dynamo**
+  * adapter :dynamo, AWS::DynamoDB::ClientV2.new({
+      :use_ssl => false,
+      :dynamo_db_endpoint => 'localhost',
+      :dynamo_db_port => 4567
+    }), {:model => self}
+
 ## Compatibility
 * Tested with
 	* Rails 4
@@ -68,3 +78,4 @@ end
 * raise error if trying to use an attribute that wasn't 'select'ed (defaulting to selecting all attributes which loads everything with an extra read)
 * while loop for situation where batch_get_item returns batched results
 * error out on mismatch of table schema from dynamo_table schema (changed?)
+* allow changes to read write capacity

data/lib/toy/dynamo/schema.rb

@@ -22,8 +22,11 @@ module Toy
           else
             @dynamo_table_config_block.call unless @dynamo_table_configged
 
-            @dynamo_table ||= Table.new(table_schema, self.adapter.client)
-            @dynamo_table_configged = true
+            unless @dynamo_table && @dynamo_table_configged
+              @dynamo_table = Table.new(table_schema, self.adapter.client)
+              validate_key_schema if @dynamo_table.schema_loaded_from_dynamo
+              @dynamo_table_configged = true
+            end
             @dynamo_table
           end
         end
@@ -158,6 +161,28 @@ module Toy
           end
         end
 
+        def validate_key_schema
+          if (@dynamo_table.schema_loaded_from_dynamo[:table][:key_schema] != table_schema[:key_schema])
+            raise ArgumentError, "It appears your key schema (Hash Key/Range Key) have changed from the table definition. Rebuilding the table is necessary."
+          end
+
+          if (@dynamo_table.schema_loaded_from_dynamo[:table][:attribute_definitions] != table_schema[:attribute_definitions])
+            raise ArgumentError, "It appears your attribute definition (types?) have changed from the table definition. Rebuilding the table is necessary."
+          end
+          
+          if (@dynamo_table.schema_loaded_from_dynamo[:table][:local_secondary_indexes].dup.collect {|i| i.delete_if{|k, v| [:index_size_bytes, :item_count].include?(k) }; i } != table_schema[:local_secondary_indexes])
+            raise ArgumentError, "It appears your local secondary indexes have changed from the table definition. Rebuilding the table is necessary."
+          end
+
+          if @dynamo_table.schema_loaded_from_dynamo[:table][:provisioned_throughput][:read_capacity_units] != read_provision
+            puts "read_capacity_units mismatch. Need to update table?"
+          end
+
+          if @dynamo_table.schema_loaded_from_dynamo[:table][:provisioned_throughput][:write_capacity_units] != write_provision
+            puts "write_capacity_units mismatch. Need to update table?"
+          end
+        end
+
         def local_secondary_indexes
           @local_secondary_indexes ||= []
         end

data/lib/toy/dynamo/table.rb

@@ -2,7 +2,7 @@ module Toy
   module Dynamo
     class Table
 
-      attr_reader :table_schema, :client, :schema_loaded, :hash_key, :range_keys
+      attr_reader :table_schema, :client, :schema_loaded_from_dynamo, :hash_key, :range_keys
 
       RETURNED_CONSUMED_CAPACITY = {
         :none => "NONE",
@@ -40,19 +40,21 @@ module Toy
         begin
           self.load_schema
         rescue AWS::DynamoDB::Errors::ResourceNotFoundException => e
-          puts "No table found! Creating..."
-          self.create
-          self.load_schema
+          puts "No table found!"
+          #self.create
+          #self.load_schema
         end
       end
 
       def load_schema
-        @schema_loaded = @client.describe_table(:table_name => @table_schema[:table_name])
+        @schema_loaded_from_dynamo = self.describe
 
-        @schema_loaded[:table][:key_schema].each do |key|
+        @schema_loaded_from_dynamo[:table][:key_schema].each do |key|
+          key_attr = @table_schema[:attribute_definitions].find{|h| h[:attribute_name] == key[:attribute_name]}
+          next if key_attr.nil?
           key_schema_attr = {
             :attribute_name => key[:attribute_name],
-            :attribute_type => @table_schema[:attribute_definitions].find{|h| h[:attribute_name] == key[:attribute_name]}[:attribute_type]
+            :attribute_type => key_attr[:attribute_type]
           }
 
           if key[:key_type] == "HASH"
@@ -62,8 +64,8 @@ module Toy
           end
         end
 
-        if @schema_loaded[:table][:local_secondary_indexes]
-          @schema_loaded[:table][:local_secondary_indexes].each do |key|
+        if @schema_loaded_from_dynamo[:table][:local_secondary_indexes]
+          @schema_loaded_from_dynamo[:table][:local_secondary_indexes].each do |key|
             lsi_range_key = key[:key_schema].find{|h| h[:key_type] == "RANGE" }
             (@range_keys ||= []) << {
               :attribute_name => lsi_range_key[:attribute_name],
@@ -73,7 +75,7 @@ module Toy
           end
         end
 
-        @schema_loaded
+        @schema_loaded_from_dynamo
       end
 
       def hash_key_item_param(value)
@@ -331,14 +333,14 @@ module Toy
           :table_name => options[:table_name] || @table_schema[:table_name]
         }))
 
-        while (table_metadata = self.describe)[:table][:table_status] == "CREATING"
+        while (table_metadata = self.describe(options))[:table][:table_status] == "CREATING"
           sleep 1
         end
         table_metadata
       end
 
-      def describe
-        @client.describe_table(:table_name => @table_schema[:table_name])
+      def describe(options={})
+        @client.describe_table(:table_name => options[:table_name] || @table_schema[:table_name])
       end
 
       def delete(options={})

data/lib/toy/dynamo/tasks.rb

@@ -0,0 +1,18 @@
+require 'rake'
+
+namespace :ddb do
+  desc 'Create a DynamoDB table'
+  task :create => :environment do
+    raise "expected usage: rake ddb:create CLASS=User" unless ENV['CLASS']
+    options = {}
+    options.merge!(:table_name => ENV['TABLE']) if ENV['TABLE']
+    ENV['CLASS'].constantize.dynamo_table.create(options)
+  end
+
+  task :destroy => :environment do
+    raise "expected usage: rake ddb:destroy CLASS=User" unless ENV['CLASS']
+    options = {}
+    options.merge!(:table_name => ENV['TABLE']) if ENV['TABLE']
+    ENV['CLASS'].constantize.dynamo_table.delete(options)
+  end
+end

data/lib/toy/dynamo/version.rb

@@ -1,5 +1,5 @@
 module Toy
   module Dynamo
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/toy/dynamo.rb

@@ -2,6 +2,7 @@ require "toy/dynamo/version"
 require "toy/dynamo/adapter"
 require "toy/dynamo/schema"
 require "toy/dynamo/table"
+require "toy/dynamo/tasks"
 require "toy/dynamo/querying"
 require "toy/dynamo/response"
 require "toy/dynamo/persistence"

data/toy-dynamo.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
 
   spec.add_dependency 'adapter', '~> 0.7.0'
+  spec.add_dependency 'rake'
   spec.add_dependency 'aws-sdk', '~> 1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toy-dynamo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Cary Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.7.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: adapter
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +93,7 @@ files:
 - lib/toy/dynamo/response.rb
 - lib/toy/dynamo/schema.rb
 - lib/toy/dynamo/table.rb
+- lib/toy/dynamo/tasks.rb
 - lib/toy/dynamo/version.rb
 - toy-dynamo.gemspec
 homepage: https://github.com/cdunn/toy-dynamo