gdatastore_mapper 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa320055068d5564fcdcc0b8096dce15383a35aa
-  data.tar.gz: 3fe5c73bdaafdbf425749d9a81e1eccf97a8619c
+  metadata.gz: e6ba358c0a8c21946a0c0c38cb4449b26cc9705c
+  data.tar.gz: f8cad2beee638c900f6418fa06a9e2b8336acc3b
 SHA512:
-  metadata.gz: 73593026c0db91d4794ce427d23a387ddae474ec86ea51a597a557f993f47cc0d3e5a1e86edc42e9b26c9e1284fd45db9f737453b583baef9cf0d74927ab90e4
-  data.tar.gz: 7aef4ddd1a987f6741ce9a97bc435bcd27cde748b6efd2b6035047c7f4bbb456829020ade488d95de5deee17b6b993d61f55e2fd16c3bfb84ff7c94c18d8d51c
+  metadata.gz: 972712b50dd7ccdd03be8d5e557271e577dda9d4de3aa8dff47cab82313fbc9b2d8b74a03160f51f35d0fe0743ee59252229f35246b2d2bfb290c6abdc1aa12e
+  data.tar.gz: b945a9e7168001e830bed9cb08bedb23812127950e5fe55e56ff18ab908db287f9679f4a1b568056afb6ec9b7f4947683753ea0f36539bb393f9fda42396363e

data/README.md

@@ -91,6 +91,8 @@ end
 
 ## Persistence Methods
 
+new record
+
 ```
 book = Book.new
 book.title = 'Harry Potter'
@@ -103,12 +105,21 @@ book.save
 ```
 Book.create(title: 'Harry Potter')
 ```
+
+update
+
 ```
 book.update(title: 'Harry Potter 2')
 ```
+
+delete
+
 ```
 book.delete
 ```
+```
+Book.delete_all
+```
 
 ## Scoping Methods
 

data/gdatastore_mapper.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec', '~> 3.5'
 end

data/lib/gdatastore_mapper/base.rb

@@ -2,6 +2,7 @@ require 'gdatastore_mapper/session'
 require 'gdatastore_mapper/scoping'
 require 'gdatastore_mapper/associations'
 require 'gdatastore_mapper/persistence'
+require 'gdatastore_mapper/persistence/class_methods'
 
 module GdatastoreMapper
   module Base
@@ -18,6 +19,7 @@ module GdatastoreMapper
       extend Scoping
       extend Associations
       include Persistence
+      extend Persistence::ClassMethods
     end
 
     module ClassMethods
@@ -43,12 +45,6 @@ module GdatastoreMapper
         record
       end
 
-      def create params
-        record = self.new params
-        record.save
-        record
-      end
-
     end
 
     def attributes

data/lib/gdatastore_mapper/persistence.rb

@@ -13,6 +13,7 @@ module GdatastoreMapper
     end
 
     def update attributes
+      return false if !valid?
       run_callbacks :update do
         attributes.each do |name, value|
           send "#{name}=", value if respond_to? "#{name}="

data/lib/gdatastore_mapper/persistence/class_methods.rb

@@ -0,0 +1,20 @@
+module GdatastoreMapper
+  module Persistence
+    module ClassMethods
+
+      def create params
+        record = self.new params
+        record.save
+        record
+      end
+
+      def delete_all
+        self.each do |resource|
+          resource.destroy
+        end
+        true
+      end
+
+    end
+  end
+end

data/lib/gdatastore_mapper/scoping.rb

@@ -3,9 +3,9 @@ require "gdatastore_mapper/relation"
 module GdatastoreMapper
   module Scoping
 
-    def where condition
+    def where condition, &block
       return nil unless condition.is_a?(Hash)
-      dataset_run(where_query condition)
+      dataset_run(where_query(condition), &block)
     end
 
     def find id
@@ -29,15 +29,15 @@ module GdatastoreMapper
       end
     end
 
-    def order condition
+    def order condition, &block
       return nil unless condition.is_a?(Hash)
-      dataset_run(order_query condition)
+      dataset_run(order_query(condition), &block)
     end
 
-    def all
-      order(created_at: :asc)
+    def all &block
+      order(created_at: :asc, &block)
     end
-
+    alias_method :each, :all
 
     def first
       all.first
@@ -71,11 +71,14 @@ module GdatastoreMapper
       query
     end
 
-    def dataset_run query
+    def dataset_run query, &block
       entities = GdatastoreMapper::Session.dataset.run query
       result = GdatastoreMapper::Relation.new(self, nil)
       entities.each do |entity|
-        result << (from_entity entity)
+        record = from_entity(entity)
+        block.call(record) if block_given?
+        record = find(record.id)
+        result << record if record
       end
       result
     end

data/lib/gdatastore_mapper/version.rb

@@ -1,3 +1,3 @@
 module GdatastoreMapper
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gdatastore_mapper
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Shinya Kitamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-datastore
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
 description: Google Cloud Datastore ORM/ODM (Mapper) in Ruby and Ruby on Rails
 email:
 - shinya.kitamura.14@gmail.com
@@ -117,6 +117,7 @@ files:
 - lib/gdatastore_mapper/associations/has_many.rb
 - lib/gdatastore_mapper/base.rb
 - lib/gdatastore_mapper/persistence.rb
+- lib/gdatastore_mapper/persistence/class_methods.rb
 - lib/gdatastore_mapper/relation.rb
 - lib/gdatastore_mapper/scoping.rb
 - lib/gdatastore_mapper/session.rb