act_as_fire_record_beta 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f91046f509170198a4f91b0530f583bfe4dcf525d860f4951dd42c53d8511cd3
-  data.tar.gz: 8ffec0b70b05f93b64a8f6ebe4399d8d85478782f43d8dcb8adf8f49d8ce463b
+  metadata.gz: 0d8ee306c4e6bccb39cdd7cfa2c84dbe0a89c13a011354619bdf99ed1151227b
+  data.tar.gz: 5b969ad0910739a3d4d0e67e03e28ff7d0e292b60df0dabf9e837fc3030c90f4
 SHA512:
-  metadata.gz: 07da3548becfcd449bf53f4d056fbea0a7eadf9012f984dd7274a08805e41b51e6dbc287ddb3c48fa89ad9c5f6c50d1850fe1b6af2d91ea472c6230107857965
-  data.tar.gz: a9f732055b79f3ae0985c2b7d2c6f6c4c42dd63923cae92bef16a5473f4631f6b43219ca5cc507a6c0fa6ec6459826cf9e887591aa6c5ca668225ee12c6f4434
+  metadata.gz: d8aaa747059a1deb309124fd69e180dc1b08789d361a5cd86a4bc6274361d6dcc90a4d5f51448f4ebb408ad865138be49d3b3dab1b90c85fa08b77590316b3df
+  data.tar.gz: 37673dc337b3bcbd127d434a03ba0e8c2c50577233546ccb05a234a3270fe1aa5718f116395086150a13977d4d703ec442d9cfe179aa21d245d770c46df6fab3

data/lib/act_as_fire_record_beta/google/cloud/firestore/query.rb

@@ -2,35 +2,29 @@ module Google
   module Cloud
     module Firestore
       class Query
-        def find_one(&block)
-          find_many(limit: 1, &block)[0]
-        end
-
-        def find_one!(&block)
-          find_one(&block) || raise(ActiveRecord::RecordNotFound)
-        end
-
-        def find_many(limit: nil, &block)
+        def get_records(limit: nil)
           scope = limit ? limit(limit) : self
           scope.get.map do |data|
-            model_lass = ActAsFireRecordBeta.class_mapping[query.from[0].collection_id]
-            record = model_lass.to_instance(data)
-            block.call(record) if block
-            record
+            fire_record_class.to_instance(data)
           end
         end
 
         def destroy_all
-          find_many.each(&:destroy)
+          doc_refs = get_records.map(&:doc_ref)
+          fire_record_class.delete_in_batch(doc_refs)
+        end
+
+        def first(limit = 1)
+          records = get_records(limit: limit)
+          limit == 1 ? records[0] : records
         end
 
         def exists?
-          !!find_one
+          !!first
         end
 
-        def first(limit = 1)
-          records = find_many(limit: limit)
-          limit == 1 ? records[0] : records
+        def fire_record_class
+          @_fire_record_class ||= ActAsFireRecordBeta.class_mapping[query.from[0].collection_id]
         end
       end
     end

data/lib/act_as_fire_record_beta/version.rb

@@ -1,3 +1,3 @@
 module ActAsFireRecordBeta
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/lib/act_as_fire_record_beta.rb

@@ -23,6 +23,8 @@ module ActAsFireRecordBeta
     attribute :created_at, :time
     attribute :updated_at, :time
 
+    attr_accessor :doc_ref
+
     ActAsFireRecordBeta.class_mapping[collection_name_with_env] = self
   end
 
@@ -43,8 +45,8 @@ module ActAsFireRecordBeta
       client.doc("#{collection_name_with_env}/#{id}")
     end
 
-    def all(&block)
-      col.find_many(&block)
+    def all
+      col.get_records
     end
 
     def find(id)
@@ -55,14 +57,14 @@ module ActAsFireRecordBeta
     end
 
     def find_by(param)
-      raise ArgumentError, "param size should 1: #{param}" unless param.size == 1
+      raise ArgumentError, "param size should be 1: #{param}" unless param.size == 1
       field, value = param.to_a.flatten
 
-      col.where(field, :==, value).limit(1).get do |data|
-        return to_instance(data)
-      end
+      where(field, :==, value).first
+    end
 
-      nil
+    def find_by!(param)
+      find_by(param) || raise(ActiveRecord::RecordNotFound)
     end
 
     def where(field, operator, value)
@@ -74,7 +76,7 @@ module ActAsFireRecordBeta
     end
 
     def first(limit = 1)
-      records = col.find_many(limit: limit)
+      records = col.get_records(limit: limit)
       limit == 1 ? records[0] : records
     end
 
@@ -91,7 +93,20 @@ module ActAsFireRecordBeta
     end
 
     def destroy_all
-      col.list_documents.each(&:delete)
+      delete_in_batch(col.list_documents)
+    end
+
+    def delete_in_batch(doc_refs)
+      max_batch_size = 500
+      nested_doc_refs = doc_refs.each_slice(max_batch_size)
+      firestore = Google::Cloud::Firestore.new
+      nested_doc_refs.each do |doc_refs|
+        firestore.batch do |b|
+          doc_refs.each do |doc_ref|
+            b.delete(doc_ref)
+          end
+        end
+      end
     end
 
     def save_params(record)
@@ -107,7 +122,7 @@ module ActAsFireRecordBeta
       @_firestore_attributes.each do |key|
         params[key] = data[key]
       end
-      new(params)
+      new(params).tap { |record| record.doc_ref = data }
     end
 
     private
@@ -165,6 +180,13 @@ module ActAsFireRecordBeta
     true
   end
 
+  # Override
+  def inspect
+    hash = attributes.transform_keys(&:to_sym)
+    hash_text = hash.to_s[1..-2]
+    "#<#{self.class} #{hash_text}>"
+  end
+
   private
 
   def save_params

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: act_as_fire_record_beta
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Junichi Ito
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-22 00:00:00.000000000 Z
+date: 2022-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -69,14 +69,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: ActiveRecord like interface for Firestore