gdatastore_mapper 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21b840689c7c1696a1d03a4e94780db8d29f6e4b
-  data.tar.gz: 0e55089540444e6f7d37dad011a6a52847d533c2
+  metadata.gz: e000cc4729803880f3e3e8ff0ec67db4e6569c1d
+  data.tar.gz: 567ca61e5a2f5e8aab79f10dd8fe370dd01678db
 SHA512:
-  metadata.gz: ab14005088a2fae2c1219b18224517e141e0402bc266a4653818d20b5201feaee2930b889438603367ab666499b9a59274cb40523f8accae25b1610bbd50574c
-  data.tar.gz: 1e2bcbdcd38a22b70eba990ef9571659ccf26aeac6ca135e7fc53cbc6cf24fa344b991e2bdc657d8235d36c545890f0ed31c672eac69419840355530184a8148
+  metadata.gz: e202e556bb85658c2527f4bc553c01162b5f630c3570677ff780193e4be27f2a30c1f3bb9ff969441957ac939727acbba3d208dd43642001521ea0d58b19ae2c
+  data.tar.gz: 753114eb2ecdec0bc736e164c0972973d6a771d34766eb8426e9557d5370040bc2ede8a5cea96fe4a8ad84aac7fa991756e33862a85c5d0a448ef80aa5086f7e

data/README.md

@@ -15,6 +15,7 @@ Once you install GdatastoreMapper you can use Google Cloud Datastore like Active
 - [Timestamp](#timestamp)
 - [Associations](#associations)
   - [One to Many](#one-to-many)
+  - [Method Chaining](#method-chaining)
 - [Callbacks](#callbacks)
 - [Validations](#validations)
 - [Contact](#contact)
@@ -212,6 +213,16 @@ rowling.books.count
 harry_poter.author
 => [#<Author:0x00 @name="J. K. Rowling" .... ]
 ```
+### Method Chaining
+
+```
+rowling.books.order(created_at: :desc).limit(3)
+=> [#<Book:0x00 @title="Harry Potter" .... ]
+```
+```
+rowling.books.where(series: 'Harry Potter').order(published_at: :asc).limit(3)
+=> [#<Book:0x00 @title="Harry Potter" .... ]
+```
 
 ## Callbacks
 

data/lib/gdatastore_mapper/relation.rb

@@ -1,5 +1,11 @@
+require 'gdatastore_mapper/relation/query_methods'
+
 module GdatastoreMapper
   class Relation < Array
+    include QueryMethods
+
+    attr_accessor :klass, :association
+
     def initialize(klass, association)
       @klass = klass
       @association = association
@@ -30,5 +36,6 @@ module GdatastoreMapper
       owner_attr[@association.belonging_id] = (existing_ids << belonging.id)
       @association.owner.update(owner_attr)
     end
+
   end
 end

data/lib/gdatastore_mapper/relation/query_methods.rb

@@ -0,0 +1,83 @@
+module GdatastoreMapper
+  module QueryMethods
+    extend ActiveSupport::Concern
+
+    def order condition, &block
+      return nil unless condition.is_a?(Hash)
+      dataset_run(order_query(condition), &block)
+    end
+
+    def where condition, &block
+      return nil unless condition.is_a?(Hash)
+      dataset_run(where_query(condition), &block)
+    end
+
+    def find id
+      return nil if id.nil?
+      query = Google::Cloud::Datastore::Key.new in_class, id.to_i
+      entities = GdatastoreMapper::Session.dataset.lookup query
+      from_entity entities.first if entities.any?
+    end
+
+    def find_by condition
+      return nil unless condition.is_a?(Hash)
+      where(condition)&.first
+    end
+
+    def find_or_create condition
+      return nil unless condition.is_a?(Hash)
+      if record = where(condition)&.first
+        record
+      else
+        create condition
+      end
+    end
+
+    def limit condition
+      return nil unless condition.is_a?(Fixnum)
+      self[0..condition-1]
+    end
+
+    private
+
+    def in_class
+      self&.first&.class&.to_s
+    end
+
+    def order_query condition
+      query = Google::Cloud::Datastore::Query.new.kind(in_class)
+      condition.each do |property, value|
+        query.order(property.to_s, value)
+      end
+      query
+    end
+
+    def where_query condition
+      query = Google::Cloud::Datastore::Query.new.kind(in_class)
+      condition.each do |property, value|
+        query.where(property.to_s, '=', value)
+      end
+      query
+    end
+
+    def dataset_run query, &block
+      entities = GdatastoreMapper::Session.dataset.run query
+      result = GdatastoreMapper::Relation.new(in_class, self.association)
+      entities.each do |entity|
+        record = from_entity(entity)
+        block.call(record) if block_given?
+        result << record if record
+      end
+      result
+    end
+
+    def from_entity entity
+      record = self.first.class.new
+      record.id = entity.key.id
+      entity.properties.to_hash.each do |name, value|
+        record.send "#{name}=", value if record.respond_to? "#{name}="
+      end
+      record
+    end
+  end
+end

data/lib/gdatastore_mapper/scoping.rb

@@ -51,11 +51,15 @@ module GdatastoreMapper
       all.count
     end
 
+    def limit condition
+      return nil unless condition.is_a?(Fixnum)
+      all[0..condition-1]
+    end
+
     private
 
     def where_query condition
-      query = Google::Cloud::Datastore::Query.new
-      query.kind self.to_s
+      query = Google::Cloud::Datastore::Query.new.kind(self.to_s)
       condition.each do |property, value|
         query.where(property.to_s, '=', value)
       end
@@ -63,8 +67,7 @@ module GdatastoreMapper
     end
 
     def order_query condition
-      query = Google::Cloud::Datastore::Query.new
-      query.kind self.to_s
+      query = Google::Cloud::Datastore::Query.new.kind(self.to_s)
       condition.each do |property, value|
         query.order(property.to_s, value)
       end

data/lib/gdatastore_mapper/version.rb

@@ -1,3 +1,3 @@
 module GdatastoreMapper
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gdatastore_mapper
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Shinya Kitamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-datastore
@@ -120,6 +120,7 @@ files:
 - lib/gdatastore_mapper/persistence.rb
 - lib/gdatastore_mapper/persistence/class_methods.rb
 - lib/gdatastore_mapper/relation.rb
+- lib/gdatastore_mapper/relation/query_methods.rb
 - lib/gdatastore_mapper/scoping.rb
 - lib/gdatastore_mapper/session.rb
 - lib/gdatastore_mapper/validations.rb