dyna_model 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2739ba4513b27ea83ebe29ba3de12d9a3f96f1b0
-  data.tar.gz: 1277e4a3d77f03f82d27a06777fa05bc1b5fb122
+  metadata.gz: dc459be343530c48011ba904ffd9c63471f1019d
+  data.tar.gz: b825c0d34229dd97637876a93aef82a607098ba4
 SHA512:
-  metadata.gz: 4eee37ed2c9f653ed8ef651ff4c1e72625e8dbc480a75299752d0d236377ee2b69537f7e21b0a6ebfb278631c223d2e0cde07947b6bdf7b17736b3a7982a6792
-  data.tar.gz: f3518b6a0546434f24f54fb57cad8a1ba73cbcc6fd6720ade4d25b3d529b85662261732f5f7b86f90e2d6bbd8f65f0d909286e8a0de06abe805d4af3dbe8c9e0
+  metadata.gz: 36075469a864e5175e3f9a5ab58115eeac91e9855fbbce69974d8c3a37ab26839f90aba0d2aad07e980f5dba4577673b6194e9984168dd4f15bc8bb8908e3192
+  data.tar.gz: 5595a51d3846421051df79a6b7033dbe6d82188099e4ed56f60a12bb0f5f79cc63c8a2d0a4be18f3e7faf45efd67a974c43bb3698be10cbac8d73339adf7c40f

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.DS_Store
 Gemfile.lock
 InstalledFiles
 _yardoc

data/lib/dyna_model/aws/record/attributes/date_time_attr.rb

@@ -0,0 +1,20 @@
+module AWS
+  module Record
+    module Attributes
+      class SerializedAttr < BaseAttr
+
+        # OVERRIDE
+        # https://github.com/aws/aws-sdk-ruby/blob/master/lib/aws/record/attributes.rb#L372
+        # Allow Time instead of just DateTime
+        def self.serialize datetime, options = {}
+          unless datetime.is_a?(DateTime) || datetime.is_a?(Time)
+            msg = "expected a DateTime value, got #{datetime.class}"
+            raise ArgumentError, msg
+          end
+          datetime.strftime('%Y-%m-%dT%H:%M:%S%Z')
+        end
+
+      end
+    end
+  end
+end

data/lib/dyna_model/config.rb

@@ -11,16 +11,20 @@ module DynaModel
     extend Options
 
     # All the default options.
-    option :logger, :default => defined?(Rails)
-    option :read_provision, :default => 50
-    option :write_provision, :default => 10
+    option :logger, default: defined?(Rails)
+    option :read_provision, default: 50
+    option :write_provision, default: 10
     # TODO - default adapter client based on config
     #option :namespace, :default => defined?(Rails) ? "#{Rails.application.class.parent_name}_#{Rails.env}" : ""
-    option :endpoint, :default => 'dynamodb.us-west-2.amazonaws.com'
-    option :port, :default => 443
-    option :use_ssl, :default => true
-    option :default_guid_delimiter, :default => ":"
-    option :namespace, :default => ""
+    option :endpoint, default: 'dynamodb.us-west-2.amazonaws.com'
+    option :port, default: 443
+    option :use_ssl, default: true
+    option :default_guid_delimiter, default: ":"
+    option :namespace, default: ""
+
+    option :lock_extension_read_provision, default: 10
+    option :lock_extension_write_provision, default: 4
+    option :lock_extension_shard_name, default: "lock"
 
     # The default logger: either the Rails logger or just stdout.
     def default_logger

data/lib/dyna_model/extensions/lock.rb

@@ -0,0 +1,125 @@
+module DynaModel
+  module Extensions
+    class Lock
+
+      class LockNotAcquired < StandardError
+      end
+
+      HOST = `hostname`.strip
+
+      include DynaModel::Document
+
+      string_attr :lock_name
+      datetime_attr :locked_at
+      datetime_attr :expires_at
+      string_attr :locked_by
+
+      hash_key :lock_name
+
+      set_shard_name DynaModel::Config.lock_extension_shard_name
+
+      read_provision DynaModel::Config.lock_extension_read_provision
+      write_provision DynaModel::Config.lock_extension_write_provision
+
+      def self.locked_by
+        "#{HOST}:#{Process.pid}"
+      end
+
+      def self.lock(lock_name, options={}, &block)
+        lock_acquired = false
+        if lock_obj_acquired = self.acquire(lock_name, options)
+          lock_acquired = true
+          if block
+            begin
+              result = (block.arity == 1) ? block.call(lock_obj_acquired) : block.call
+            ensure
+              release(lock_name) if lock_acquired
+            end
+          end
+          result
+        end
+      end
+
+      def self.acquire(lock_name, options={})
+        options[:acquisition_timeout] ||= 15
+        options[:expires_in] ||= 10
+
+        retries = 0
+        begin
+          Timeout::timeout(options[:acquisition_timeout]) do
+            begin
+              locked_at = DateTime.now
+              expires_at = locked_at + options[:expires_in].seconds
+              lock_obj = self.new(
+                lock_name: lock_name,
+                locked_at: locked_at,
+                expires_at: expires_at,
+                locked_by: self.locked_by
+              )
+              if lock_obj.save(expected: {
+                :locked_by.null => "",
+                :expires_at.le => locked_at
+              }, conditional_operator: :or)
+                DynaModel::Config.logger.info "Acquired lock '#{lock_name}'"
+                lock_obj
+              else
+                raise "Error acquiring lock: #{lock_obj.errors.full_messages.to_sentence}"
+              end
+            rescue AWS::DynamoDB::Errors::ConditionalCheckFailedException
+              DynaModel::Config.logger.info "Lock condition failed for '#{lock_name}'. Retrying..."
+              sleep((2 ** retries) * 0.05)
+              retries += 1
+              retry
+            end
+          end
+        rescue Timeout::Error
+          raise LockNotAcquired, "Could not acquire lock after #{options[:acquisition_timeout]} seconds"
+        end
+      end
+
+      def self.release(lock_name, options={})
+        lock_obj = self.new(
+          lock_name: lock_name,
+          locked_at: nil,
+          expires_at: nil,
+          locked_by: nil
+        )
+
+        if lock_obj.save(expected: {
+          :locked_by.eq => self.locked_by
+        })
+          DynaModel::Config.logger.info "Released lock '#{lock_name}'"
+          true
+        else
+          raise "Error releasing lock: #{lock_obj.errors.full_messages.to_sentence}"
+        end
+      rescue AWS::DynamoDB::Errors::ConditionalCheckFailedException => e
+        DynaModel::Config.logger.info "Condition failed to release lock '#{lock_name}'"
+      end
+
+      def self.extend(lock_name, extension_time=5.seconds)
+        locked_at = DateTime.now
+        expires_at = locked_at + extension_time
+
+        lock_obj = self.new(
+          lock_name: lock_name,
+          locked_at: locked_at,
+          expires_at: expires_at,
+          locked_by: self.locked_by
+        )
+
+        if lock_obj.save(expected: {
+          :locked_by.eq => self.locked_by
+        })
+          DynaModel::Config.logger.info "Extended lock '#{lock_name}' for #{extension_time} seconds"
+          true
+        else
+          raise "Error extending lock: #{lock_obj.errors.full_messages.to_sentence}"
+        end
+      rescue AWS::DynamoDB::Errors::ConditionalCheckFailedException => e
+        DynaModel::Config.logger.info "Condition failed to extend lock '#{lock_name}'"
+      end
+
+    end
+  end
+end

data/lib/dyna_model/table.rb

@@ -155,11 +155,11 @@ module DynaModel
       end
 
       if @schema_loaded_from_dynamo[:table][:provisioned_throughput][:read_capacity_units] != @table_schema[:provisioned_throughput][:read_capacity_units]
-        Toy::Dynamo::Config.logger.error "read_capacity_units mismatch. Need to update table?"
+        DynaModel::Config.logger.error "read_capacity_units mismatch. Need to update table?"
       end
 
       if @schema_loaded_from_dynamo[:table][:provisioned_throughput][:write_capacity_units] != @table_schema[:provisioned_throughput][:write_capacity_units]
-        Toy::Dynamo::Config.logger.error "write_capacity_units mismatch. Need to update table?"
+        DynaModel::Config.logger.error "write_capacity_units mismatch. Need to update table?"
       end
     end
 
@@ -513,6 +513,7 @@ module DynaModel
       attr_name, comparison_operator = attr_conditional.keys.first.split(".")
       raise ArgumentError, "Comparison operator must be one of (#{(COMPARISON_OPERATOR.keys - COMPARISON_OPERATOR_SCAN_ONLY).join(", ")})" unless COMPARISON_OPERATOR.keys.include?(comparison_operator.to_sym)
       attr_key = @model.attributes[attr_name]
+      attr_class = attr_key.class
       raise ArgumentError, "#{attr_name} not a valid attribute" unless attr_key
       attr_type = @model.attribute_type_indicator(attr_key)
       raise ArgumentError, "#{attr_name} key must be a Range if using the operator BETWEEN" if comparison_operator == "between" && !attr_conditional.values.first.is_a?(Range)
@@ -522,14 +523,14 @@ module DynaModel
 
       attribute_value_list = []
       if comparison_operator == "in"
-        attr_conditional.values.first.each do |in_v|
-          attribute_value_list << { attr_type => in_v.to_s }
+        attr_value.each do |in_v|
+          attribute_value_list << { attr_type => casted_attr_value(attr_class, in_v).to_s }
         end
       elsif comparison_operator == "between"
         attribute_value_list << { attr_type => attr_value.min.to_s }
         attribute_value_list << { attr_type => attr_value.max.to_s }
       else
-        attribute_value_list = [{ attr_type => attr_value.to_s }]
+        attribute_value_list = [{ attr_type => casted_attr_value(attr_class, attr_value).to_s }]
       end
 
       attribute_comparison_hash = {
@@ -540,5 +541,11 @@ module DynaModel
       { attr_name => attribute_comparison_hash }
     end
 
+    def casted_attr_value(attr_class, val)
+      casted = attr_class.type_cast(val)
+      return nil if casted.nil?
+      attr_class.serialize(casted)
+    end
+
   end
 end

data/lib/dyna_model/version.rb

@@ -1,3 +1,3 @@
 module DynaModel
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/dyna_model.rb

@@ -14,9 +14,10 @@ require "dyna_model/table"
 require "dyna_model/query"
 require "dyna_model/response"
 require "dyna_model/validations"
+require "dyna_model/document"
 require "dyna_model/extensions/symbol"
 require "dyna_model/extensions/s3_backup"
-require "dyna_model/document"
+require "dyna_model/extensions/lock"
 
 module DynaModel
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyna_model
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Cary Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,10 +139,12 @@ files:
 - 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/date_time_attr.rb
 - lib/dyna_model/aws/record/attributes/serialized_attr.rb
 - lib/dyna_model/config.rb
 - lib/dyna_model/config/options.rb
 - lib/dyna_model/document.rb
+- lib/dyna_model/extensions/lock.rb
 - lib/dyna_model/extensions/s3_backup.rb
 - lib/dyna_model/extensions/symbol.rb
 - lib/dyna_model/persistence.rb