ndb-rails 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36faa77fbcb1e44d523252eb2869a286de0e463f39b20c6f387396b87cffae96
-  data.tar.gz: 9e5071e77a89c1e76193c6a85e929e32d4613dd184c38fbae8ed510bf90899ab
+  metadata.gz: d7fe2bcbea6268a30dae29bfa0457dcd8078ae7b485064871a77b6cf970bf173
+  data.tar.gz: cfdde7db03a7c51e58fadf9e4216743aafb8dedfc4dfb7666568c8a9d394cefa
 SHA512:
-  metadata.gz: 41b000dbd96455396f3534c7feed13ae49a94295a01a3cdaeb411bbd44004c577e8ebdbe33400fb2f47ee8e69af43dd47b57fa071ec0aa8d4b4b421932661732
-  data.tar.gz: c3a43e41796660a41d260063d16ab43824ec56e8bef9155eb4d89b65f6cf1b4cd57fb4d0d9f9d26fd03e8225a40638eaf68c6252e1be002ef28dc2079035b8ba
+  metadata.gz: cdba61392f9801da6d52a1c73bebfd64306b570a20817281cfa0b21b04689401dfe571b115e6cbddf37ae2279b4dd1bc17a461e296b28de74f18537c41669df9
+  data.tar.gz: bc12a571537f11c22fcaabb1346c32bc98bcf4403a7cbb789503d1e91e61f4453d37d6365a0f9c39e17936ee3a3ec29f11691df86cc066a2c842e42c7e138a33

data/lib/ndb/rails/persistence.rb

@@ -42,9 +42,10 @@ module Ndb
       def instantiate(row)
         row = row.dup
         version = row.delete("_v")
+        source = row.delete("_coll")
         record = new(row.slice(*attribute_names))
 
-        record.send(:loaded!, version)
+        record.send(:loaded!, version, source)
 
         record
       end
@@ -52,6 +53,10 @@ module Ndb
 
     attr_reader :version
 
+    # The collection a record was read from, when its model reads a
+    # collection pattern (self.collection_name = "logs-2026-*"); nil otherwise.
+    attr_reader :source_collection
+
     # id is an alias of _id.
     def id
       _id
@@ -244,9 +249,10 @@ module Ndb
       self
     end
 
-    def loaded!(version)
+    def loaded!(version, source = nil)
       @persisted = true
       @version = version
+      @source_collection = source if source
 
       changes_applied
     end

data/lib/ndb/rails/record.rb

@@ -18,9 +18,12 @@ module Ndb
 
     attribute :_id, :string
 
+    # The answer of Model.search.
+    SearchResult = Struct.new(:records, :next_cursor, :total)
+
     class << self
       QUERY_METHODS = %i[
-        where order limit offset page after group find find_by find_by! first count pluck exists?
+        where where_raw order limit offset page after group find find_by find_by! first count pluck exists?
         find_each in_batches sum average minimum maximum to_a each destroy_all delete_all
       ].freeze
 
@@ -36,6 +39,19 @@ module Ndb
         Relation.new(self)
       end
 
+      # Runs a find with a whole body built elsewhere, such as from a search
+      # form: { "where" => {...}, "sort" => {...}, "limit" => 50, "after" =>
+      # token, "count" => true }. The body is sent as is (the daemon
+      # validates it). Returns the records, the next cursor (nil on the last
+      # page) and the total (with "count" => true).
+      def search(body)
+        raise ArgumentError, "search takes a Hash, got #{body.class}" unless body.is_a?(Hash)
+
+        page = ndb_find(body.transform_keys(&:to_s))
+
+        SearchResult.new(page.rows.map { |row| instantiate(row) }, page.next_cursor, page.total)
+      end
+
       # Finds the record with these attributes, or builds an unsaved one.
       def find_or_initialize_by(attrs, &block)
         find_by(attrs) || new(attrs).tap { |record| block&.call(record) }
@@ -158,8 +174,17 @@ module Ndb
         definition
       end
 
-      # Declares the collection once per process (and once per client).
+      # A collection pattern ("logs-2026-*") reads many collections and
+      # writes none.
+      def collection_pattern?
+        collection_name.include?("*")
+      end
+
+      # Declares the collection once per process (and once per client). A
+      # pattern declares nothing.
       def ensure_collection!
+        return if collection_pattern?
+
         client = Rails.client
 
         return if @ensured_client.equal?(client)

data/lib/ndb/rails/relation.rb

@@ -28,6 +28,15 @@ module Ndb
       add_clause(Conditions.equality(attrs))
     end
 
+    # A where Hash built elsewhere, such as from a search form, sent as is:
+    # no Rails conventions (an Array stays an Array, not $in). The daemon
+    # validates it. ANDed with the other clauses.
+    def where_raw(where)
+      raise ArgumentError, "where_raw takes a Hash, got #{where.class}" unless where.is_a?(Hash)
+
+      add_clause(Conditions.json_value(where))
+    end
+
     def or(other)
       clauses = [Conditions.combine(values[:where]), Conditions.combine(other.values[:where])]
 

data/lib/ndb/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Ndb
   module Rails
-    VERSION = "0.3.3"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ndb-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - thadeu