dyna_model 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 254b9c0ebdd7a60601af697b4702fa53d9dc3f0e
-  data.tar.gz: 9129d092e187f9284e1853d63e744ffa56e9d84a
+  metadata.gz: 28909cf001a45617ccab2dd172777e7fc30da156
+  data.tar.gz: 558bab75c352c91888ad15dc1efb9c11242bca4d
 SHA512:
-  metadata.gz: 3dd8cca0fe4249f173fceb88d4a29b706409de9a017049844493a6066ef67f2238548bddd18b9278d5ba390eeeb0910d82c103ad4db3ffe4e7171903433d164f
-  data.tar.gz: 9c27a58d8bb188a5a29bf49c4ab6163ae9d3f3525d85e4d6a16f6466a586c31aed0e744a36ba7de1ff31b37f4d0aefd0a50cf95ca1bbb07cce6122d5defd1ab7
+  metadata.gz: 1a86fff50cdefb2e16b1d0d490b4b595615a3d3c58b56ff8de283b87379f0696719fa6a0de9c37be7062173b7328854529e2ef4dea36377eae6c63951e1dd753
+  data.tar.gz: 10b9bd47c3694eeba33bfc7b29ac493bbfbfb4f982d23f492c1245709efe5602f7596d7ad74ebded563e2668daa7800ea4ec66925934a0efd0253f95c62bcabb

data/README.md

@@ -86,6 +86,15 @@ class Item
 end
 ```
 
-# AWS::Record
+## CarrierWave compatible adapter
+```
+require "dyna_model/adapters/carrierwave/dyna_model"
+class Item
+  include DynaModel::Document
+  mount_uploader :favicon, FaviconUploader
+end
+```
+
+## AWS::Record
 * http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/Record.html
 * https://github.com/aws/aws-sdk-ruby/blob/master/lib/aws/record/abstract_base.rb

data/lib/dyna_model/adapters/carrierwave/dyna_model.rb

@@ -0,0 +1,33 @@
+require 'carrierwave'
+require 'carrierwave/validations/active_model'
+
+module CarrierWave
+  module DynaModel
+    include CarrierWave::Mount
+
+    def mount_uploader(column, uploader, options={}, &block)
+      options[:mount_on] ||= "#{column}_identifier"
+      string_attr options[:mount_on].to_sym
+
+      super
+
+      alias_method :read_uploader, :[]
+      alias_method :write_uploader, :[]=
+      public :read_uploader
+      public :write_uploader
+
+      include CarrierWave::Validations::ActiveModel
+
+      validates_integrity_of  column if uploader_option(column.to_sym, :validate_integrity)
+      validates_processing_of column if uploader_option(column.to_sym, :validate_processing)
+      
+      after_save "store_#{column}!".to_sym
+      before_save "write_#{column}_identifier".to_sym
+      after_destroy "remove_#{column}!".to_sym
+
+    end
+
+  end
+end
+
+DynaModel::Document::ClassMethods.send(:include, CarrierWave::DynaModel)

data/lib/dyna_model/document.rb

@@ -45,6 +45,17 @@ module DynaModel
           hash.merge(attr_name => __send__(attr_name))
         end
       end
+
+      # OVERRIDE
+      # https://github.com/aws/aws-sdk-ruby/blob/master/lib/aws/record/abstract_base.rb#L273
+      # AWS::Record::AbstractBase to trigger update even without changes (for callbacks etc)
+      private
+      def update
+        #return unless changed?
+        touch_timestamps('updated_at')
+        increment_optimistic_lock_value
+        update_storage
+      end
     end
 
     include ActiveModel::Conversion

data/lib/dyna_model/persistence.rb

@@ -27,19 +27,19 @@ module DynaModel
     def update_storage
       # Only enumerating dirty (i.e. changed) attributes.  Empty
       # (nil and empty set) values are deleted, the others are replaced.
-      attr_updates = {}
-      changed.each do |attr_name|
-        attribute = self.class.attribute_for(attr_name)
-        value = serialize_attribute(attribute, @_data[attr_name])
-        if value.nil? or value == []
-          attr_updates[attr_name] = nil
-        else
-          attr_updates[attr_name] = value
-        end
-      end
-
       run_callbacks :save do
         run_callbacks :update do
+          attr_updates = {}
+          changed.each do |attr_name|
+            attribute = self.class.attribute_for(attr_name)
+            value = serialize_attribute(attribute, @_data[attr_name])
+            if value.nil? or value == []
+              attr_updates[attr_name] = nil
+            else
+              attr_updates[attr_name] = value
+            end
+          end
+
           self.class.dynamo_db_table.write(attr_updates, {
             update_item: dynamo_db_item_key_values,
             shard_name: self.shard

data/lib/dyna_model/table.rb

@@ -168,7 +168,8 @@ module DynaModel
     def get_item(hash_key, options={})
       options[:consistent_read] = false unless options[:consistent_read]
       options[:return_consumed_capacity] ||= :none # "NONE" # || "TOTAL"
-      options[:select] ||= []
+      options[:select] ||= [] # no :projected option, always an array or :all
+      raise ArgumentError, "Invalid :select. GetItem :select must be an Array (blank for :all)" unless options[:select].is_a?(Array)
 
       get_item_request = {
         table_name: @model.dynamo_db_table_name(options[:shard_name]),
@@ -176,7 +177,11 @@ module DynaModel
         consistent_read: options[:consistent_read],
         return_consumed_capacity: RETURNED_CONSUMED_CAPACITY[options[:return_consumed_capacity]]
       }
-      get_item_request.merge!( attributes_to_get: [options[:select]].flatten ) unless options[:select].blank?
+      if options[:select].blank?
+        options[:select] = :all # for obj_from_attrs
+      else
+        get_item_request.merge!( attributes_to_get: [options[:select]].flatten )
+      end
       @model.dynamo_db_client.get_item(get_item_request)
     end
 
@@ -273,7 +278,7 @@ module DynaModel
 
     def batch_get_item(keys, options={})
       options[:return_consumed_capacity] ||= :none
-      options[:select] ||= []
+      options[:select] ||= [] # no :projected option, always an array or :all
       options[:consistent_read] = false unless options[:consistent_read]
 
       raise ArgumentError, "must include between 1 - 100 keys" if keys.size == 0 || keys.size > 100
@@ -295,7 +300,11 @@ module DynaModel
 
       request_items_request = {}
       request_items_request.merge!( keys: keys_request )
-      request_items_request.merge!( attributes_to_get: [options[:select]].flatten ) unless options[:select].blank?
+      if options[:select].blank?
+        options[:select] = :all # for obj_from_attrs
+      else
+        request_items_request.merge!( attributes_to_get: [options[:select]].flatten )
+      end
       request_items_request.merge!( consistent_read: options[:consistent_read] ) if options[:consistent_read]
       batch_get_item_request = {
         request_items: { @model.dynamo_db_table_name(options[:shard_name]) => request_items_request },

data/lib/dyna_model/version.rb

@@ -1,3 +1,3 @@
 module DynaModel
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyna_model
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Cary Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,7 @@ files:
 - Rakefile
 - dyna_model.gemspec
 - lib/dyna_model.rb
+- lib/dyna_model/adapters/carrierwave/dyna_model.rb
 - lib/dyna_model/adapters/elasticsearch/dyna_model_adapter.rb
 - lib/dyna_model/attributes.rb
 - lib/dyna_model/aws/record/attributes/serialized_attr.rb