dynamoid 1.3.0 → 1.3.1

data/lib/dynamoid/fields.rb

@@ -5,6 +5,7 @@ module Dynamoid #:nodoc:
   module Fields
     extend ActiveSupport::Concern
 
+    # Types allowed in indexes:
     PERMITTED_KEY_TYPES = [
       :number,
       :integer,
@@ -145,14 +146,14 @@ module Dynamoid #:nodoc:
     #
     # @since 0.2.0
     def set_created_at
-      self.created_at = DateTime.now if Dynamoid::Config.timestamps
+      self.created_at = DateTime.now.in_time_zone(Time.zone) if Dynamoid::Config.timestamps
     end
 
     # Automatically called during the save callback to set the updated_at time.
     #
     # @since 0.2.0
     def set_updated_at
-      self.updated_at = DateTime.now if Dynamoid::Config.timestamps
+      self.updated_at = DateTime.now.in_time_zone(Time.zone) if Dynamoid::Config.timestamps
     end
 
     def set_type

data/lib/dynamoid/persistence.rb

@@ -52,6 +52,11 @@ module Dynamoid
         Dynamoid.adapter.create_table(options[:table_name], options[:id], options)
       end
 
+      # Deletes the table for the model
+      def delete_table
+        Dynamoid.adapter.delete_table(self.table_name)
+      end
+
       def from_database(attrs = {})
         clazz = attrs[:type] ? obj = attrs[:type].constantize : self
         clazz.new(attrs).tap { |r| r.new_record = false }
@@ -131,6 +136,41 @@ module Dynamoid
         end
       end
 
+      def dump_field(value, options)
+        if (field_class = options[:type]).is_a?(Class)
+          if value.respond_to?(:dynamoid_dump)
+            value.dynamoid_dump
+          elsif field_class.respond_to?(:dynamoid_dump)
+            field_class.dynamoid_dump(value)
+          else
+            raise ArgumentError, "Neither #{field_class} nor #{value} support serialization for Dynamoid."
+          end
+        else
+          case options[:type]
+            when :string
+              !value.nil? ? value.to_s : nil
+            when :integer
+              !value.nil? ? Integer(value) : nil
+            when :number
+              !value.nil? ? value : nil
+            when :set
+              !value.nil? ? Set.new(value) : nil
+            when :array
+              !value.nil? ? value : nil
+            when :datetime
+              !value.nil? ? value.to_time.to_f : nil
+            when :serialized
+              options[:serializer] ? options[:serializer].dump(value) : value.to_yaml
+            when :raw
+              !value.nil? ? value : nil
+            when :boolean
+              !value.nil? ? value.to_s[0] : nil
+            else
+              raise ArgumentError, "Unknown type #{options[:type]}"
+          end
+        end
+      end
+
       def dynamo_type(type)
         if type.is_a?(Class)
           type.respond_to?(:dynamoid_field_type) ? type.dynamoid_field_type : :string
@@ -241,10 +281,14 @@ module Dynamoid
     #
     # @since 0.2.0
     def destroy
-      run_callbacks(:destroy) do
+      ret = run_callbacks(:destroy) do
         self.delete
       end
-      self
+      (ret == false) ? false : self
+    end
+
+    def destroy!
+      destroy || raise(Dynamoid::Errors::RecordNotDestroyed.new(self))
     end
 
     # Delete this object from the datastore.
@@ -287,38 +331,7 @@ module Dynamoid
     #
     # @since 0.2.0
     def dump_field(value, options)
-      if (field_class = options[:type]).is_a?(Class)
-        if value.respond_to?(:dynamoid_dump)
-          value.dynamoid_dump
-        elsif field_class.respond_to?(:dynamoid_dump)
-          field_class.dynamoid_dump(value)
-        else
-          raise ArgumentError, "Neither #{field_class} nor #{value} support serialization for Dynamoid."
-        end
-      else
-        case options[:type]
-          when :string
-            !value.nil? ? value.to_s : nil
-          when :integer
-            !value.nil? ? Integer(value) : nil
-          when :number
-            !value.nil? ? value : nil
-          when :set
-            !value.nil? ? Set.new(value) : nil
-          when :array
-            !value.nil? ? value : nil
-          when :datetime
-            !value.nil? ? value.to_time.to_f : nil
-          when :serialized
-            options[:serializer] ? options[:serializer].dump(value) : value.to_yaml
-          when :raw
-            !value.nil? ? value : nil
-          when :boolean
-            !value.nil? ? value.to_s[0] : nil
-          else
-            raise ArgumentError, "Unknown type #{options[:type]}"
-        end
-      end
+      self.class.dump_field(value, options)
     end
 
     # Persist the object into the datastore. Assign it an id first if it doesn't have one.

data/lib/dynamoid/railtie.rb

@@ -0,0 +1,11 @@
+if defined? (Rails)
+
+  module Dynamoid
+    class Railtie < Rails::Railtie
+      rake_tasks do
+        Dir[File.join(File.dirname(__FILE__),'tasks/*.rake')].each { |f| load f }
+      end
+    end
+  end
+
+end

data/lib/dynamoid/tasks/database.rake

@@ -0,0 +1,40 @@
+require 'dynamoid'
+require 'dynamoid/tasks/database'
+
+MODELS = File.join(Rails.root, "app/models")
+
+Dir[ File.join(MODELS, "*.rb") ].sort.each { |file| require file }
+
+
+namespace :dynamoid do
+  desc "Creates DynamoDB tables, one for each of your Dynamoid models - does not modify pre-existing tables"
+  task :create_tables => :environment do
+    tables = Dynamoid::Tasks::Database.create_tables
+    result = tables[:created].map{ |c| "#{c} created" } + tables[:existing].map{ |e| "#{e} already exists" }
+    result.sort.each{ |r| puts r }
+  end
+
+  desc 'Tests if the DynamoDB instance can be contacted using your configuration'
+  task :ping => :environment do
+    success = false
+    failure_reason = nil
+
+    begin
+      Dynamoid::Tasks::Database.ping
+      success = true
+    rescue Exception => e
+      failure_reason = e.message
+    end
+
+    msg = "Connection to DynamoDB #{success ? 'OK' : 'FAILED'}"
+    msg << if Dynamoid.config.endpoint
+             " at local endpoint '#{Dynamoid.config.endpoint}'"
+           else
+             ' at remote AWS endpoint'
+           end
+    if not success
+      msg << ", reason being '#{failure_reason}'"
+    end
+    puts msg
+  end
+end

data/lib/dynamoid/tasks/database.rb

@@ -0,0 +1,30 @@
+module Dynamoid
+  module Tasks
+    module Database
+      extend self
+
+      # Create any new tables for the models. Existing tables are not
+      # modified.
+      def create_tables
+        results = { created: [], existing: [] }
+        # We can't quite rely on Dynamoid.included_models alone, we need to select only viable models
+        Dynamoid.included_models.select{ |m| not m.base_class.try(:name).blank? }.uniq(&:table_name).each do |model|
+          if Dynamoid.adapter.list_tables.include? model.table_name
+            results[:existing] << model.table_name
+          else
+            model.create_table
+            results[:created] << model.table_name
+          end
+        end
+        results
+      end
+
+      # Is the DynamoDB reachable?
+      def ping
+        Dynamoid.adapter.list_tables
+        true
+      end
+
+    end
+  end
+end

data/lib/dynamoid/version.rb

@@ -1,3 +1,3 @@
 module Dynamoid
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Josh Symonds
@@ -20,20 +20,34 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
@@ -65,91 +79,91 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: github-markup
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -163,7 +177,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-retry
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -177,19 +191,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rspec-retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 description: Dynamoid is an ORM for Amazon's DynamoDB that supports offline development,
   associations, querying, and everything else you'd expect from an ActiveRecord-style
   replacement.
@@ -206,12 +220,21 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - dynamoid.gemspec
+- gemfiles/rails_4_0.gemfile
+- gemfiles/rails_4_0.gemfile.lock
+- gemfiles/rails_4_1.gemfile
+- gemfiles/rails_4_1.gemfile.lock
+- gemfiles/rails_4_2.gemfile
+- gemfiles/rails_4_2.gemfile.lock
+- gemfiles/rails_5_0.gemfile
+- gemfiles/rails_5_0.gemfile.lock
 - lib/dynamoid.rb
 - lib/dynamoid/adapter.rb
 - lib/dynamoid/adapter_plugin/aws_sdk_v2.rb
@@ -237,6 +260,9 @@ files:
 - lib/dynamoid/indexes.rb
 - lib/dynamoid/middleware/identity_map.rb
 - lib/dynamoid/persistence.rb
+- lib/dynamoid/railtie.rb
+- lib/dynamoid/tasks/database.rake
+- lib/dynamoid/tasks/database.rb
 - lib/dynamoid/validations.rb
 - lib/dynamoid/version.rb
 homepage: http://github.com/Dynamoid/Dynamoid
@@ -259,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Dynamoid is an ORM for Amazon's DynamoDB