activemodel-datastore 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cd72c0b2cf1855d6318ed72469e49010f79e30d
-  data.tar.gz: 3ce0b65d84b608e041a155154d36b70d8d566ce2
+  metadata.gz: 1c51e60669ae324f89ee6d6ceb70aedcc1b8f3e1
+  data.tar.gz: a71e2146d58414c7c3251cf5452d65fa11f4613d
 SHA512:
-  metadata.gz: 196767913b8dc1fa292feca091217c3f6b518efdfddb0b28641d29a10309461058994281d310eca6fba81dc747de204db25657cdd56a9e98d6166c3ca7e59ec1
-  data.tar.gz: 3b747dc5d543ab8a358473328bb459c531ea486a29c60fd8493b1461ef2e033ccbfaa430e6b96a78f203a3bd745114c13687507cd4b7b77bcbb391ff0c3249ee
+  metadata.gz: 211b19499c3c1523805e4989641d44bb4253afb80fccf0a885e385bfe2ba45abe94cac1a121acb878605da46bc5ac858451642d89d291ee79c85b89269145e4d
+  data.tar.gz: aee1048afd652a79d7cc45fa94d0a4e438c85b08f6b7bf642b149378be1bea1bed23918ad56f225082c074edb00a01ba4647398c7d4a00487c339ead8208107a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.2.5 / 2017-11-06
+* adding support for setting indexed false on individual entity properties
+* updating example Cloud Datastore Rails app to 5.1.4
+* retry on exceptions are now specific to Google::Cloud::Error
+
 ### 0.2.4 / 2017-10-31
 * non-Rails projects now source client authentication settings automatically (rjmooney)
 * documentation improvements

data/lib/active_model/datastore.rb

@@ -114,6 +114,7 @@ module ActiveModel::Datastore
   include ActiveModel::Dirty
   include ActiveModel::Validations
   include ActiveModel::Validations::Callbacks
+  include ActiveModel::Datastore::ExcludedIndexes
   include ActiveModel::Datastore::NestedAttr
   include ActiveModel::Datastore::PropertyValues
   include ActiveModel::Datastore::TrackChanges
@@ -159,6 +160,7 @@ module ActiveModel::Datastore
     end
     entity_properties.each do |attr|
       entity[attr] = instance_variable_get("@#{attr}")
+      entity.exclude_from_indexes!(attr, true) if no_index_attributes.include? attr
     end
     entity
   end
@@ -168,7 +170,7 @@ module ActiveModel::Datastore
   end
 
   ##
-  # For compatibility with libraries that require the bang method version (example, factory_girl).
+  # For compatibility with libraries that require the bang method version (example, factory_bot).
   #
   def save!
     save_entity || raise(EntityNotSavedError, 'Failed to save the entity')
@@ -370,12 +372,6 @@ module ActiveModel::Datastore
       model_entity
     end
 
-    def exclude_from_index(entity, boolean)
-      entity.properties.to_h.keys.each do |value|
-        entity.exclude_from_indexes! value, boolean
-      end
-    end
-
     ##
     # Constructs a Google::Cloud::Datastore::Query.
     #
@@ -402,7 +398,7 @@ module ActiveModel::Datastore
       sleep_time = 0.25
       begin
         yield
-      rescue => e
+      rescue Google::Cloud::Error => e
         return false if retries >= max_retry_count
         puts "\e[33mRescued exception #{e.message.inspect}, retrying in #{sleep_time}\e[0m"
         # 0.25, 0.5, 1, 2, and 4 second between retries.
@@ -418,7 +414,7 @@ module ActiveModel::Datastore
       sleep_time = 0.25
       begin
         yield
-      rescue => e
+      rescue Google::Cloud::Error => e
         raise e if retries >= max_retry_count
         puts "\e[33mRescued exception #{e.message.inspect}, retrying in #{sleep_time}\e[0m"
         # 0.25, 0.5, 1, 2, and 4 second between retries.

data/lib/active_model/datastore/excluded_indexes.rb

@@ -0,0 +1,38 @@
+module ActiveModel::Datastore
+  module ExcludedIndexes
+    extend ActiveSupport::Concern
+
+    def no_index_attributes
+      []
+    end
+
+    ##
+    # Sets all entity properties to be included/excluded from the Datastore indexes.
+    #
+    def exclude_from_index(entity, boolean)
+      entity.properties.to_h.each_key do |value|
+        entity.exclude_from_indexes! value, boolean
+      end
+    end
+
+    module ClassMethods
+      ##
+      # Sets attributes to be excluded from the Datastore indexes.
+      #
+      # Overrides no_index_attributes to return an Array of the attributes configured
+      # to be indexed.
+      #
+      # For example, an indexed string property can not exceed 1500 bytes. String properties
+      # that are not indexed can be up to 1,048,487 bytes. All properties indexed by default.
+      #
+      def no_indexes(*attributes)
+        attributes = attributes.collect(&:to_s)
+        define_method('no_index_attributes') { attributes }
+      end
+
+      def clear_index_exclusions!
+        define_method('no_index_attributes') { [] }
+      end
+    end
+  end
+end

data/lib/active_model/datastore/nested_attr.rb

@@ -159,7 +159,7 @@ module ActiveModel::Datastore
       association_name = association_name.to_sym
       send("#{association_name}=", []) if send(association_name).nil?
 
-      attributes.each do |_i, params|
+      attributes.each_value do |params|
         if params['id'].blank?
           unless reject_new_record?(params, options)
             new = association_name.to_c.new(params.except(*UNASSIGNABLE_KEYS))

data/lib/active_model/datastore/track_changes.rb

@@ -73,9 +73,7 @@ module ActiveModel::Datastore
       changed = marked_for_destruction? ? true : false
       tracked_attributes.each do |attr|
         break if changed
-        if send("#{attr}_changed?")
-          changed = send(attr) == send("#{attr}_was") ? false : true
-        end
+        changed = send(attr) != send("#{attr}_was") if send("#{attr}_changed?")
       end
       self.exclude_from_save = !changed
       changed

data/lib/active_model/datastore/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   module Datastore
-    VERSION = '0.2.4'
+    VERSION = '0.2.5'
   end
 end

data/lib/activemodel/datastore.rb

@@ -7,6 +7,7 @@ require 'active_model'
 
 require 'active_model/datastore/connection'
 require 'active_model/datastore/errors'
+require 'active_model/datastore/excluded_indexes'
 require 'active_model/datastore/nested_attr'
 require 'active_model/datastore/property_values'
 require 'active_model/datastore/track_changes'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-datastore
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Bryce McLean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -191,6 +191,7 @@ files:
 - lib/active_model/datastore/carrier_wave_uploader.rb
 - lib/active_model/datastore/connection.rb
 - lib/active_model/datastore/errors.rb
+- lib/active_model/datastore/excluded_indexes.rb
 - lib/active_model/datastore/nested_attr.rb
 - lib/active_model/datastore/property_values.rb
 - lib/active_model/datastore/track_changes.rb