data_steroid 0.5.5 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d21c1b531a84b0697685ee26a421b7a56be967ab
-  data.tar.gz: 2b5ff75e423fde47636072d39bee636c2ad05204
+  metadata.gz: 66803e91aebb7aa899c00d2fd2858ddf87b17793
+  data.tar.gz: 15c179bb49866215914ae0a3d8e8b5c5798cd763
 SHA512:
-  metadata.gz: b91bd9dadb3913ee1bb4986d8966446258c1df86970b55d3ae11e4f48eefbc5836a285acc22b65694769f97b14275e53ed359a36b1b4826bb565b0a87dc1fb4b
-  data.tar.gz: 1a8395bc413bbd51d3dff61e3b02fe55bd06cf6abc8f5776efffe544a7ffaed8d3e6d8eeab6b86d95587353f49141addcc3bf46ceb05541c5ce251a42eb35a47
+  metadata.gz: 0e090939ab90bceedffe09921cdfbb0837a6fb275652f62b6f52f7c6ca3fdc895ff361c5d0ea759bae45594450e5cacf4589ecb2eaa9f9f2d00b8660c3b87b3b
+  data.tar.gz: 2f93396f7b336b5c8514b53019c52ca15c62b669a775af30bd280c2b378bf2f33c7d595098e740eced2c22e7869f0714296967e0ec5da85805f225760397212b

data/README.md

@@ -55,6 +55,13 @@ all_products_ordered = Product.fetch Product.query.order('name', :asc)
 # Fetch all
 iphones = Product.fetch Product.query.where('name', '=', 'iPhone 7')
 
+# Parent/child
+
+p1 = Product.new(barcode: '1233', name: 'Xyz', price: 2000).tap { |x| x.save }
+p2 = Product.new(barcode: '1233.1', name: 'Xyz White', price: 1900, parent: p1).tap { |x| x.save }
+
+xyz = Product.fetch Product.query.ancestor(p1.as_parent_key).where('price', '>', '1800')
+
 ```
 
 Develop
@@ -64,3 +71,10 @@ Develop
 gem build data_steroid
 gem install data_steroid-<version>.gem
 ```
+
+Develop with docker
+-------------------
+```
+docker-compose run --rm data_steroid bash
+rspec
+```

data/lib/data_steroid/criteria/findable.rb

@@ -5,8 +5,8 @@ module DataSteroid
       extend ActiveSupport::Concern
 
       class_methods do
-        def find(id)
-          run query.where('__key__', '=', gcloud_key(id.to_i))
+        def find(id, parent: nil)
+          run query.where('__key__', '=', gcloud_key(id.to_i, parent: parent))
         end
       end
     end

data/lib/data_steroid/entity/initializable.rb

@@ -12,7 +12,7 @@ module DataSteroid
             properties_names.each do |property_name|
               send("#{property_name}=", params[property_name.to_s])
             end
-            send('id=', params.key.id)
+            send('id=', params.key.id || params.key.name)
           when ::Hash
             params.each_pair do |key, value|
               send("#{key}=", value)

data/lib/data_steroid/entity.rb

@@ -18,12 +18,19 @@ module DataSteroid
 
       class_attribute :kind
 
+      attr_accessor :parent
+
       def persisted?
         id.present?
       end
 
       def gcloud_key
-        self.class.datastore.key(kind, id)
+        self.class.gcloud_key(id, parent: parent)
+      end
+
+      def as_parent_key
+        raise DataSteroid::Errors::InvalidRecord.new('parent not persisted') unless persisted?
+        gcloud_key
       end
 
       def to_gcloud
@@ -70,10 +77,14 @@ module DataSteroid
         datastore.entity kind
       end
 
-      protected
+      def create(*params)
+        new(*params).tap(&:save)
+      end
 
-      def gcloud_key(id)
-        datastore.key(kind, id)
+      def gcloud_key(id, parent: nil)
+        params = [[kind, id]]
+        params.unshift [parent.class.kind, parent.id] if parent.present?
+        datastore.key(*params)
       end
     end
   end

data/lib/data_steroid/errors/datastore_error.rb

@@ -2,5 +2,8 @@ module DataSteroid
   module Errors
     class DatastoreError < StandardError
     end
+
+    class InvalidRecord < DatastoreError
+    end
   end
 end

data/lib/data_steroid/persistable/savable.rb

@@ -17,7 +17,7 @@ module DataSteroid
           end
 
           to_gcloud.each_pair do |key, value|
-            if key == 'id' && value.present?
+            if key == 'id' && (value.present? || parent.present?)
               gcloud_entity.key = gcloud_key unless gcloud_entity.persisted?
             elsif value.present?
               gcloud_entity[key] = value
@@ -27,7 +27,7 @@ module DataSteroid
           end
 
           if (result = self.class.datastore.save(gcloud_entity).first)
-            send('id=', result.key.id) if id.nil?
+            send('id=', result.key.id || result.key.name) if id.nil?
             true
           else
             false

data/lib/data_steroid/version.rb

@@ -1,5 +1,5 @@
 module DataSteroid
   # version string
   # @api public
-  VERSION = '0.5.5'
-end
+  VERSION = '0.6.2'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_steroid
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.2
 platform: ruby
 authors:
 - Fabio Tomio
@@ -14,58 +14,58 @@ dependencies:
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: coercible
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: google-cloud-datastore
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.23'
 description: Simple ODM to Google Datastore based on Mongoid
 email: fabiotomio@gmail.com
 executables: []
@@ -73,21 +73,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/data_steroid.rb
-- lib/data_steroid/criteria.rb
 - lib/data_steroid/criteria/findable.rb
 - lib/data_steroid/criteria/queryable.rb
-- lib/data_steroid/entity.rb
+- lib/data_steroid/criteria.rb
 - lib/data_steroid/entity/initializable.rb
+- lib/data_steroid/entity.rb
 - lib/data_steroid/errors/datastore_error.rb
-- lib/data_steroid/persistable.rb
 - lib/data_steroid/persistable/creatable.rb
 - lib/data_steroid/persistable/deletable.rb
 - lib/data_steroid/persistable/savable.rb
+- lib/data_steroid/persistable.rb
 - lib/data_steroid/properties.rb
 - lib/data_steroid/timestamps.rb
 - lib/data_steroid/validatable.rb
 - lib/data_steroid/version.rb
+- lib/data_steroid.rb
 homepage: http://github.com/b2beauty/data_steroid
 licenses:
 - MIT
@@ -98,17 +98,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Google Datastore ODM