activemodel-datastore 0.3.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 42e22683055e9669d08d461101ad0df167ed71af
-  data.tar.gz: a889f3599926be1f5dbd57fc8411446a46703782
+SHA256:
+  metadata.gz: 9b42d53d2541bb4b6195b830a9702d7276976ffe8b2a18fccf8591184225dc01
+  data.tar.gz: 4d0639726343a339d1192ac802f5321662e72afb2bc66b0f0a0f3b855fc93cc2
 SHA512:
-  metadata.gz: 6726447be7d06ca5630cd0b3516329d9280a3b0240e06d8ca5fe413722d4b699124aba7c3f1634b7dde42bf82a9e9d0b17aff708eb0ed9b98f0626d627e6d74a
-  data.tar.gz: 44d319fa90658e1ef6ab655a5e85c85a1291505d75dca3a91c0a8aff4ef3cd37774a7b0693c0c89fc9e87310b2bbd6ae5c62a54bcea8a02dd897a53819181952
+  metadata.gz: 2714fbfe7c92f1351275bd15e464441b25c4a380f086bc03375525a8aa96de11d916739f5de522eaf1546dab18de4546bd6234385bf09ffb32056ae1aca8ec23
+  data.tar.gz: 26eaa3c1d30ca938c4ee25b6ae71a66a611fe0ae84a1afa44d93d7620de3826c18364b68c288bdac63833859b2260ae6a030ed3d304d3c0eaae2a3c03fdfd988

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 0.7.0 / 2021-11-04
+* adding support for Ruby 3
+
+### 0.6.0 / 2021-09-20
+* defaulting the Google::Cloud.datastore network timeout to 15 sec and providing the env var DATASTORE_NETWORK_TIMEOUT as an override.
+
+### 0.5.0 / 2020-08-17
+* adding support Google::Cloud::Datastore 2.0.0 (rewritten low-level client, with improved performance and stability).
+
+### 0.4.0 / 2019-08-23
+* adding support for Rails 6
+
 ### 0.3.0 / 2018-04-17
 * adding Travis CI configuration (rud)
 * no longer override connection related environment variables if already defined(shao1555)

data/README.md

@@ -1,7 +1,7 @@
 Active Model Datastore
 ===================================
 
-Makes the [google-cloud-datastore](https://github.com/GoogleCloudPlatform/google-cloud-ruby/tree/master/google-cloud-datastore) gem compliant with [active_model](https://github.com/rails/rails/tree/master/activemodel) conventions and compatible with your Rails 5 applications. 
+Makes the [google-cloud-datastore](https://github.com/GoogleCloudPlatform/google-cloud-ruby/tree/master/google-cloud-datastore) gem compliant with [active_model](https://github.com/rails/rails/tree/master/activemodel) conventions and compatible with your Rails 5+ applications. 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 Why would you want to use Google's NoSQL [Cloud Datastore](https://cloud.google.com/datastore) 
@@ -255,6 +255,7 @@ users, cursor = User.all(limit: 7)
 # @option options [String] :order Sort the results by property name.
 # @option options [String] :desc_order Sort the results by descending property name.
 # @option options [Array] :select Retrieve only select properties from the matched entities.
+# @option options [Array] :distinct_on Group results by a list of properties.
 # @option options [Array] :where Adds a property filter of arrays in the format[name, operator, value].
 ```
 

data/lib/active_model/datastore/connection.rb

@@ -27,7 +27,8 @@ module CloudDatastore
   end
 
   def self.dataset
-    @dataset ||= Google::Cloud.datastore
+    timeout = ENV.fetch('DATASTORE_NETWORK_TIMEOUT', 15).to_i
+    @dataset ||= Google::Cloud.datastore(timeout: timeout)
   end
 
   def self.reset_dataset

data/lib/active_model/datastore/nested_attr.rb

@@ -180,6 +180,7 @@ module ActiveModel::Datastore
       unless attributes.is_a?(Hash)
         raise ArgumentError, "Hash expected, got #{attributes.class.name} (#{attributes.inspect})"
       end
+
       attributes
     end
 
@@ -214,6 +215,7 @@ module ActiveModel::Datastore
     #
     def call_reject_if(attributes, options)
       return false if destroy_flag?(attributes)
+
       attributes = attributes.with_indifferent_access
       blank_proc = proc { |attrs| attrs.all? { |_key, value| value.blank? } }
       options[:reject_if] = blank_proc if options[:reject_if] == :all_blank
@@ -245,7 +247,8 @@ module ActiveModel::Datastore
     class AssociatedValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
         return unless Array(value).reject(&:valid?).any?
-        record.errors.add(attribute, :invalid, options.merge(value: value))
+
+        record.errors.add(attribute, :invalid, **options.merge(value: value))
       end
     end
   end

data/lib/active_model/datastore/property_values.rb

@@ -38,6 +38,7 @@ module ActiveModel::Datastore
     #
     def format_property_value(attr, type)
       return unless send(attr.to_sym).present?
+
       case type.to_sym
       when :integer
         send("#{attr.to_sym}=", send(attr.to_sym).to_i)

data/lib/active_model/datastore/track_changes.rb

@@ -70,9 +70,11 @@ module ActiveModel::Datastore
       unless tracked_attributes.present?
         raise TrackChangesError, 'Object has not been configured for change tracking.'
       end
+
       changed = marked_for_destruction? ? true : false
       tracked_attributes.each do |attr|
         break if changed
+
         changed = send(attr) != send("#{attr}_was") if send("#{attr}_changed?")
       end
       self.exclude_from_save = !changed
@@ -81,6 +83,7 @@ module ActiveModel::Datastore
 
     def remove_unmodified_children
       return unless tracked_attributes.present? && nested_attributes?
+
       nested_attributes.each do |attr|
         with_changes = Array(send(attr.to_sym)).select(&:values_changed?)
         send("#{attr}=", with_changes)

data/lib/active_model/datastore/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   module Datastore
-    VERSION = '0.3.0'
+    VERSION = '0.7.0'
   end
 end

data/lib/active_model/datastore.rb

@@ -154,6 +154,7 @@ module ActiveModel::Datastore
     entity = CloudDatastore.dataset.entity self.class.name, id
     if parent.present?
       raise ArgumentError, 'Must be a Key' unless parent.is_a? Google::Cloud::Datastore::Key
+
       entity.key.parent = parent
     elsif parent?
       entity.key.parent = self.class.parent_key(parent_key_id)
@@ -179,6 +180,7 @@ module ActiveModel::Datastore
   def update(params)
     assign_attributes(params)
     return unless valid?
+
     run_callbacks :update do
       entity = build_entity
       self.class.retry_on_exception? { CloudDatastore.dataset.save entity }
@@ -197,6 +199,7 @@ module ActiveModel::Datastore
 
   def save_entity(parent = nil)
     return unless valid?
+
     run_callbacks :save do
       entity = build_entity(parent)
       success = self.class.retry_on_exception? { CloudDatastore.dataset.save entity }
@@ -273,6 +276,7 @@ module ActiveModel::Datastore
     # @option options [String] :order Sort the results by property name.
     # @option options [String] :desc_order Sort the results by descending property name.
     # @option options [Array] :select Retrieve only select properties from the matched entities.
+    # @option options [Array] :distinct_on Group results by a list of properties.
     # @option options [Array] :where Adds a property filter of arrays in the format
     #   [name, operator, value].
     #
@@ -352,6 +356,7 @@ module ActiveModel::Datastore
     #
     def from_entities(entities)
       raise ArgumentError, 'Entities param must be an Enumerator' unless entities.is_a? Enumerator
+
       entities.map { |entity| from_entity(entity) }
     end
 
@@ -363,6 +368,7 @@ module ActiveModel::Datastore
     #
     def from_entity(entity)
       return if entity.nil?
+
       model_entity = build_model(entity)
       model_entity.entity_property_values = entity.properties.to_h
       entity.properties.to_h.each do |name, value|
@@ -383,6 +389,7 @@ module ActiveModel::Datastore
     # @option options [String] :order Sort the results by property name.
     # @option options [String] :desc_order Sort the results by descending property name.
     # @option options [Array] :select Retrieve only select properties from the matched entities.
+    # @option options [Array] :distinct_on Group results by a list of properties.
     # @option options [Array] :where Adds a property filter of arrays in the format
     #   [name, operator, value].
     #
@@ -400,6 +407,7 @@ module ActiveModel::Datastore
         yield
       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.
         sleep sleep_time
@@ -416,6 +424,7 @@ module ActiveModel::Datastore
         yield
       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.
         sleep sleep_time
@@ -440,6 +449,7 @@ module ActiveModel::Datastore
       query.limit(options[:limit]) if options[:limit]
       query_sort(query, options)
       query.select(*options[:select]) if options[:select]
+      query.distinct_on(*options[:distinct_on]) if options[:distinct_on]
       query_property_filter(query, options)
     end
 

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-datastore
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Bryce McLean
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: google-cloud-datastore
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -70,50 +70,50 @@ dependencies:
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 2.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -134,28 +134,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
 description: Makes the google-cloud-datastore gem compliant with active_model conventions
   and compatible with your Rails 5+ applications.
 email:
@@ -185,7 +185,7 @@ metadata:
   changelog_uri: https://github.com/Agrimatics/activemodel-datastore/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/Agrimatics/activemodel-datastore/
   bug_tracker_uri: https://github.com/Agrimatics/activemodel-datastore/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,9 +200,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Cloud Datastore integration with Active Model
 test_files: []