act_as_fire_record_beta 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f91046f509170198a4f91b0530f583bfe4dcf525d860f4951dd42c53d8511cd3
-  data.tar.gz: 8ffec0b70b05f93b64a8f6ebe4399d8d85478782f43d8dcb8adf8f49d8ce463b
+  metadata.gz: 7fa5ffce208135ba537f2eba3ae37caf239e6b49446f2d31c77668263ec178c3
+  data.tar.gz: c4705cc8018288e15a766bd7efde203fdb03d701db208a66cbb46409732b1077
 SHA512:
-  metadata.gz: 07da3548becfcd449bf53f4d056fbea0a7eadf9012f984dd7274a08805e41b51e6dbc287ddb3c48fa89ad9c5f6c50d1850fe1b6af2d91ea472c6230107857965
-  data.tar.gz: a9f732055b79f3ae0985c2b7d2c6f6c4c42dd63923cae92bef16a5473f4631f6b43219ca5cc507a6c0fa6ec6459826cf9e887591aa6c5ca668225ee12c6f4434
+  metadata.gz: 382202705f5383d954bfd336137b6d74e0bf66879a3a07e8a480e4ec3e1d9427bd35e5d23180a929c39c74ab8d7d2607eff70802a8f8c86f6825a7c6e3fedcfc
+  data.tar.gz: '01158cd356bae1b962f62ba6575d52fb9e5648d83dc501ab8e3d0aaf2c19bffe6a5f1501aa17206a3f6f8f71a3f841370b5f7295aa8c19a07faecc249de319ab'

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

@@ -2,36 +2,26 @@ 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
+            model_lass.to_instance(data)
           end
         end
 
         def destroy_all
-          find_many.each(&:destroy)
-        end
-
-        def exists?
-          !!find_one
+          get_records.each(&:destroy)
         end
 
         def first(limit = 1)
-          records = find_many(limit: limit)
+          records = get_records(limit: limit)
           limit == 1 ? records[0] : records
         end
+
+        def exists?
+          !!first
+        end
       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.2"
 end

data/lib/act_as_fire_record_beta.rb

@@ -43,8 +43,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 +55,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 +74,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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: act_as_fire_record_beta
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Junichi Ito
@@ -69,7 +69,7 @@ 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:
   - - ">="