activemodel-datastore 0.2.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1c51e60669ae324f89ee6d6ceb70aedcc1b8f3e1
-  data.tar.gz: a71e2146d58414c7c3251cf5452d65fa11f4613d
+SHA256:
+  metadata.gz: 6cb0d9446cce815b9dd1b3ef33c955b79c2170643256b60e059b867e7c39fa09
+  data.tar.gz: 8b3664f1e5bbe8aad5647397d392f5d80071a943c5dc86bd1a06126aa2ef04ee
 SHA512:
-  metadata.gz: 211b19499c3c1523805e4989641d44bb4253afb80fccf0a885e385bfe2ba45abe94cac1a121acb878605da46bc5ac858451642d89d291ee79c85b89269145e4d
-  data.tar.gz: aee1048afd652a79d7cc45fa94d0a4e438c85b08f6b7bf642b149378be1bea1bed23918ad56f225082c074edb00a01ba4647398c7d4a00487c339ead8208107a
+  metadata.gz: daf7db6ad22662105e6fe1e8be137abf3a1e65d3effdc9dad679edfa4d6ae1ab4d523e6958699bbaf795e40ce59c2e7e8a9f8f8c787879915524f06f6ed15822
+  data.tar.gz: 8cbfa6c1916501f812be09040bcd34e4d0de7cac93aa24fe52781cd82fcc6924f96495da39f029998a837c3ab78ddec0f085ecda64f96fcd86927a5413df218b

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+### 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)
+* adding support for passing query an array of select properties
+
 ### 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

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) 
@@ -13,6 +13,7 @@ automatically scales to handle your applications' load. Cloud Datastore is a sch
 suited for unstructured or semi-structured application data.
 
 [![Gem Version](https://badge.fury.io/rb/activemodel-datastore.svg)](https://badge.fury.io/rb/activemodel-datastore)
+[![Build Status](https://travis-ci.org/Agrimatics/activemodel-datastore.svg?branch=master)](https://travis-ci.org/Agrimatics/activemodel-datastore)
  
 ## Table of contents
  
@@ -254,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

@@ -14,20 +14,21 @@
 module CloudDatastore
   if defined?(Rails) == 'constant'
     if Rails.env.development?
-      ENV['DATASTORE_EMULATOR_HOST'] = 'localhost:8180'
-      ENV['GCLOUD_PROJECT'] = 'local-datastore'
+      ENV['DATASTORE_EMULATOR_HOST'] ||= 'localhost:8180'
+      ENV['GCLOUD_PROJECT'] ||= 'local-datastore'
     elsif Rails.env.test?
-      ENV['DATASTORE_EMULATOR_HOST'] = 'localhost:8181'
-      ENV['GCLOUD_PROJECT'] = 'test-datastore'
+      ENV['DATASTORE_EMULATOR_HOST'] ||= 'localhost:8181'
+      ENV['GCLOUD_PROJECT'] ||= 'test-datastore'
     elsif ENV['SERVICE_ACCOUNT_PRIVATE_KEY'].present? &&
           ENV['SERVICE_ACCOUNT_CLIENT_EMAIL'].present?
-      ENV['GCLOUD_KEYFILE_JSON'] = '{"private_key": "' + ENV['SERVICE_ACCOUNT_PRIVATE_KEY'] + '",
+      ENV['GCLOUD_KEYFILE_JSON'] ||= '{"private_key": "' + ENV['SERVICE_ACCOUNT_PRIVATE_KEY'] + '",
       "client_email": "' + ENV['SERVICE_ACCOUNT_CLIENT_EMAIL'] + '"}'
     end
   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

@@ -105,9 +105,7 @@ module ActiveModel::Datastore
 
     def nested_model_class_names
       entity_kinds = []
-      if nested_attributes?
-        nested_models.each { |x| entity_kinds << x.class.name }
-      end
+      nested_models.each { |x| entity_kinds << x.class.name } if nested_attributes?
       entity_kinds.uniq
     end
 
@@ -182,6 +180,7 @@ module ActiveModel::Datastore
       unless attributes.is_a?(Hash)
         raise ArgumentError, "Hash expected, got #{attributes.class.name} (#{attributes.inspect})"
       end
+
       attributes
     end
 
@@ -216,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
@@ -247,6 +247,7 @@ 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))
       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.2.5'
+    VERSION = '0.6.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
@@ -439,7 +448,8 @@ module ActiveModel::Datastore
       query.cursor(options[:cursor]) if options[:cursor]
       query.limit(options[:limit]) if options[:limit]
       query_sort(query, options)
-      query.select(options[:select]) if options[:select]
+      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.2.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Bryce McLean
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2021-09-20 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
@@ -128,54 +128,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.10'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.14
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.14
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     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:
@@ -200,8 +180,12 @@ files:
 homepage: https://github.com/Agrimatics/activemodel-datastore
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/Agrimatics/activemodel-datastore
+  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:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,9 +200,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Cloud Datastore integration with Active Model
 test_files: []