tiny_dyno 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46edd795c299649097dd995e9bafe6798acbadba
-  data.tar.gz: 65c18b06c46db96b1e6c8045a0f7f0fa7598c15a
+  metadata.gz: 9067dea5947eebd4d2863cc818c600580e7defbf
+  data.tar.gz: 8c6d8737297deed27c5ac6338bdd72e0f42e8ed6
 SHA512:
-  metadata.gz: 9810309f84cc71ef4c232351ebf4f966e0fdefd46e4dde29215a3cd8f6b36e4090439c78d238572818e7f5d2105f216a24ab3461794f7bcf2477b72ee3a2f21a
-  data.tar.gz: 781f989e07ac91dda6dfdc8f7cf0a3abb75ed09a817ce89ce02930fec49fb9ae0a579c2eb72a86965923faeb9ef4517519e00ce9aadcf0c7acf0d1ca27774603
+  metadata.gz: 76148078a22a31259f34bd79739fb11a8eb802301621ed36f4f8f6136eb753eecf9c1a022a974a80f80ece3d81d20878783f1c3d4e51de1a083f08b1635a0481
+  data.tar.gz: c1aacda3deed812850d722de5b531d1b31cf13abcc31a2314d0264deff8c928d6e1c26f65d2d64fa0b009bf7fb50a63e10e474746d5c323f6f5023e2c0e3fb0a

data/CHANGES.md

@@ -1,3 +1,8 @@
+0.1.19 (2015-09-09)
+-------------------
+
+* New/Fix - support deletion of documents with range key
+
 0.1.18 (2015-09-09)
 -------------------
 

data/lib/tiny_dyno/document.rb

@@ -46,7 +46,7 @@ module TinyDyno
     def request_delete
       request = {
           table_name: self.class.table_name,
-          key: hash_key_as_selector
+          key: keys_as_selector
       }
       TinyDyno::Adapter.delete_item(request: request)
     end

data/lib/tiny_dyno/fields/range_key.rb

@@ -20,7 +20,7 @@ module TinyDyno
       # @since 3.0.0
       def initialize(name, options = {})
         @name = name
-        @options = options
+        @options = options.merge(range_key: true)
         @label = options[:label]
         @default_val = options[:default]
         @type = options[:type]

data/lib/tiny_dyno/fields.rb

@@ -1,6 +1,5 @@
 require 'tiny_dyno/fields/standard'
 require 'tiny_dyno/fields/range_key'
-require 'tracer'
 
 module TinyDyno
   module Fields
@@ -163,8 +162,11 @@ module TinyDyno
         opts = options.merge(klass: self)
         if opts.has_key?(:range_key) && opts[:range_key] == true
           named = name.to_s
-          attribute_definitions << build_attribute_definition(named,options[:type])
-          key_schema << { attribute_name: named, key_type: 'RANGE' }
+          ad = build_attribute_definition(named,opts[:type])
+          attribute_definitions << ad
+          ks = { attribute_name: named, key_type: 'RANGE' }
+          key_schema << ks
+          self.range_key = ks.merge(ad)
           Fields::RangeKey.new(name, opts)
         else
           Fields::Standard.new(name, opts)

data/lib/tiny_dyno/hash_key.rb

@@ -3,20 +3,28 @@ module TinyDyno
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :attribute_definitions, :key_schema, :primary_key
+      class_attribute :attribute_definitions, :key_schema, :primary_key, :range_key
 
       # TODO :local_secondary_indexes, :global_secondary_indexes
       self.attribute_definitions ||= []
       self.key_schema ||= []
       self.primary_key ||= {}
+      self.range_key ||= {}
     end
 
     # return all defined hash keys on an instantiated object
     # for further use in DynamoDB queries, i.e. to look up an object
     #
-    def hash_key_as_selector
-      key_field = self.class.primary_key[:attr]
-      { "#{ self.class.primary_key[:attr] }": TinyDyno::Adapter.aws_attribute(field_type: fields[key_field].options[:type], value: attributes[key_field]) }
+    def keys_as_selector
+      selector = {}
+      primary_key_field = self.class.primary_key[:attr]
+      selector[primary_key_field.to_sym] = TinyDyno::Adapter.aws_attribute(field_type: fields[primary_key_field].options[:type], value: attributes[primary_key_field])
+      unless range_key.empty?
+        range_key_field = self.class.range_key[:attribute_name]
+        selector[range_key_field.to_sym] = TinyDyno::Adapter.aws_attribute(field_type: fields[range_key_field].options[:type], value: attributes[range_key_field])
+      end
+      return nil if selector.empty?
+      selector
     end
 
     module ClassMethods

data/lib/tiny_dyno/persistable.rb

@@ -40,14 +40,6 @@ module TinyDyno
       }
     end
 
-    # def build_update_item_request
-    #   {
-    #       key: hash_key_as_selector,
-    #       table_name: self.class.table_name,
-    #       attribute_updates: build_attribute_updates
-    #   }
-    # end
-
     def build_item_request_entries
       item_entries = {}
       attributes.each { |k,v| item_entries[k] = TinyDyno::Adapter.aws_attribute(field_type: fields[k].options[:type], value: v) }

data/lib/tiny_dyno/version.rb

@@ -1,3 +1,3 @@
 module TinyDyno
-  VERSION = '0.1.18'
+  VERSION = '0.1.19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny_dyno
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Tobias Gerschner