toy-dynamo 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c200687788c6b7a3f14139e9f60218351d727d5
-  data.tar.gz: d33761b18756be48b14b95a75df082882b81fa82
+  metadata.gz: fee8a5ce5e8c53a63a3e3628865248bcad2cd3f4
+  data.tar.gz: 747adb260fc32634e3822ccc400bdeec62287365
 SHA512:
-  metadata.gz: 0fb5f56fd1968cca48dd11e7ffc7cda99611683c3a721fc703d864bb5b9204a3e602e946568661e92b31b45ecf750d387bb4af5bb767b08b919e5c83de3e054f
-  data.tar.gz: 549aeeb91acdcbb163416f7c6bbd52dfd8eb622ddd87eea071c4dcbabb8d9d339bf98f1f1312e368533bf1d8242604e37481016ca28a48af994b3a3143a9e176
+  metadata.gz: b5c21d126ba6a2c17c9bd1447a921b348e45edac1cc3f26f31e855c881e33f761e533e1bbd926fb8aeb7438633dff06fc4cf005d3089104bd5c5e40a535d880e
+  data.tar.gz: adcab81f3e2a4a68d8a67d19cdd4f24178d95885730898868640a36d5bf7f5362a13108ad8ce16f4cc52a7fa55cee6a424a423536b9be0a08628bfbcd4dd9909

data/README.md

@@ -109,13 +109,3 @@ end
 * Tested with
 	* Rails 4
 	* Ruby 2.0.0p0
-
-## TODO
-* 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)
-* string and number sets (mostly for scans)
-* use MAX_ITEM_SIZE (64kb)
-* fix binary data storage support
-  * add compression (gzip/lzo) => binary
-* support some sort of rolling tables (for time series type tables)
-  * cross table range queries
-

data/lib/toy/dynamo/adapter.rb

@@ -31,7 +31,7 @@ module Toy
           attrs = (result[:member].empty? ? nil : Response.strip_attr_types(result[:member].first))
         else
           result = @options[:model].dynamo_table.get_item(key, options)
-          attrs = (result[:item].empty? ? nil : Response.strip_attr_types(result[:item]))
+          attrs = (result.try(:[], :item).blank? ? nil : Response.strip_attr_types(result[:item]))
         end
 
         attrs

data/lib/toy/dynamo/schema.rb

@@ -16,15 +16,23 @@ module Toy
           :include => "INCLUDE"
         }
 
-        def dynamo_table(&block)
+        def dynamo_table(options={}, &block)
           if block
             @dynamo_table_config_block ||= block
           else
             @dynamo_table_config_block.call unless @dynamo_table_configged
 
             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
+              begin
+                @dynamo_table = Table.new(table_schema, self.adapter.client, options)
+              rescue Exception => e
+                # Reset table_schema
+                @local_secondary_indexes = []
+                raise e
+              end
+              unless options[:novalidate]
+                validate_key_schema if @dynamo_table.schema_loaded_from_dynamo
+              end
               @dynamo_table_configged = true
             end
             @dynamo_table
@@ -41,7 +49,7 @@ module Toy
             :key_schema => key_schema,
             :attribute_definitions => attribute_definitions
           }
-          schema.merge!(:local_secondary_indexes => local_secondary_indexes) unless local_secondary_indexes.blank?
+          schema[:local_secondary_indexes] = local_secondary_indexes unless local_secondary_indexes.blank?
           schema
         end
 
@@ -135,6 +143,7 @@ module Toy
             hash_key_attribute = self.attributes[hash_key_key.to_s]
             raise(ArgumentError, "Could not find attribute definition for hash_key #{hash_key_key}") unless hash_key_attribute
             raise(ArgumentError, "Cannot use virtual attributes for hash_key") if hash_key_attribute.virtual?
+            raise(ArgumentError, "Invalid attribute type for hash_key") unless [String, Integer, Float].include?(hash_key_attribute.type)
             @dynamo_hash_key = {
               :attribute_name => hash_key_attribute.name,
               :key_type => KEY_TYPE[:hash]
@@ -149,6 +158,7 @@ module Toy
             range_key_attribute = self.attributes[range_key_key.to_s]
             raise(ArgumentError, "Could not find attribute definition for range_key #{range_key_key}") unless range_key_attribute
             raise(ArgumentError, "Cannot use virtual attributes for range_key") if range_key_attribute.virtual?
+            raise(ArgumentError, "Invalid attribute type for range_key") unless [String, Integer, Float].include?(range_key_attribute.type)
 
             validates_presence_of range_key_attribute.name.to_sym
 

data/lib/toy/dynamo/table.rb

@@ -34,16 +34,10 @@ module Toy
         :between => "BETWEEN"
       }
 
-      def initialize(table_schema, client)
+      def initialize(table_schema, client, options={})
         @table_schema = table_schema
         @client = client
-        begin
-          self.load_schema
-        rescue AWS::DynamoDB::Errors::ResourceNotFoundException => e
-          Toy::Dynamo::Config.logger.error "No table found!"
-          #self.create
-          #self.load_schema
-        end
+        self.load_schema unless options[:novalidate]
       end
 
       def load_schema
@@ -67,9 +61,11 @@ module Toy
         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" }
+            lsi_range_attribute = @table_schema[:attribute_definitions].find{|h| h[:attribute_name] == lsi_range_key[:attribute_name]}
+            next if lsi_range_attribute.nil?
             (@range_keys ||= []) << {
               :attribute_name => lsi_range_key[:attribute_name],
-              :attribute_type => @table_schema[:attribute_definitions].find{|h| h[:attribute_name] == lsi_range_key[:attribute_name]}[:attribute_type],
+              :attribute_type => lsi_range_attribute[:attribute_type],
               :index_name => key[:index_name]
             }
           end
@@ -345,6 +341,8 @@ module Toy
         while (table_metadata = self.describe(options))[:table][:table_status] == "CREATING"
           sleep 1
         end
+
+        self.load_schema
         table_metadata
       end
 

data/lib/toy/dynamo/tasks.rb

@@ -4,9 +4,20 @@ 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)
+    if ENV["CLASS"] == "all"
+      Toy::Dynamo::Config.included_models.each do |klass|
+        puts "Creating table for #{klass}..."
+        begin
+          klass.dynamo_table(:novalidate => true).create
+        rescue Exception => e
+          puts "Could not create table! #{e.inspect}"
+        end
+      end
+    else
+      options = {}
+      options.merge!(:table_name => ENV['TABLE']) if ENV['TABLE']
+      ENV['CLASS'].constantize.dynamo_table(:novalidate => true).create(options)
+    end
   end
 
   desc 'Resize a DynamoDB table read/write provision'
@@ -19,10 +30,11 @@ namespace :ddb do
     ENV['CLASS'].constantize.dynamo_table.resize(options)
   end
 
+  desc 'Destroy a DynamoDB table'
   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)
+    ENV['CLASS'].constantize.dynamo_table(:novalidate => true).delete(options)
   end
 end

data/lib/toy/dynamo/version.rb

@@ -1,5 +1,5 @@
 module Toy
   module Dynamo
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/todo.otl

@@ -0,0 +1,9 @@
+[_] Batch delete
+[_] 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)
+[_] string and number sets (mostly for scans)
+[_] use MAX_ITEM_SIZE (64kb)
+[_] fix binary data storage support
+[_] add compression (gzip/lzo) => binary
+[_] support some sort of rolling tables (for time series type tables)
+[_] cross table range queries
+[_] model.reload for models with hash + range

data/toy-dynamo.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'adapter', '~> 0.7.0'
   spec.add_dependency 'rake'
   spec.add_dependency 'aws-sdk', '~> 1.9'
+  spec.add_dependency 'orm_adapter'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toy-dynamo
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Cary Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: orm_adapter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: DynamoDB extension to toystore.  Provides an ActiveModel based ORM for
   AWS DynamoDB.
 email:
@@ -99,6 +113,7 @@ files:
 - lib/toy/dynamo/table.rb
 - lib/toy/dynamo/tasks.rb
 - lib/toy/dynamo/version.rb
+- todo.otl
 - toy-dynamo.gemspec
 homepage: https://github.com/cdunn/toy-dynamo
 licenses: