nobrainer 0.25.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950e98b70408c2d1fc05a6ee2e80f1f3e942999b
-  data.tar.gz: 5b4ec8da15e3d9f48e1729f07cd336af12c27433
+  metadata.gz: 71e9e6216a8508d483d0c0769b6d8f5137b5f2c2
+  data.tar.gz: 91cc415c1d35b3120fc94edfc322bdc30652aa30
 SHA512:
-  metadata.gz: 3719c006243290324956ec397d700cae2766598460423199bfc9ed3f731761b2d6fceec50365f2a839099b2edc3fb751aa88984a349aab4ef2132b6547444f09
-  data.tar.gz: 02bc9ef3d13a887305d6fdd81a7f1eebd296a63c206f9347bce5e8078f3af71c36e625d9ebe5ac0ce55a93da24b5760842ef3e2b6e55738d38df189d6384c731
+  metadata.gz: b4a4656ab19c63e12e194b3c90dd7f25ffc806cfefee029a352e22deccca5908029bf06f14af097d8ebd069ef5eb0a923550d7411dc520fdb2fa8ef2e34378d6
+  data.tar.gz: 37f77aef1ca56aeda705659162bab344f4c1e6495ea0c9fe5682ac7a3276eaee642b9313153ecbb80caf839054a499db19c3dd20eb144820ea0a9a97cf1e7f50

data/lib/no_brainer/criteria.rb

@@ -4,6 +4,6 @@ class NoBrainer::Criteria
   extend NoBrainer::Autoload
   autoload_and_include :Core, :Run, :Raw, :Scope, :AfterFind, :Where, :OrderBy,
                        :Limit, :Pluck, :Count, :Delete, :Enumerable, :Find,
-                       :First, :FirstOrCreate, :Aggregate, :EagerLoad, :Update,
-                       :Cache, :Index, :Extend
+                       :First, :FirstOrCreate, :Changes, :Aggregate, :EagerLoad,
+                       :Update, :Cache, :Index, :Extend
 end

data/lib/no_brainer/criteria/changes.rb

@@ -0,0 +1,16 @@
+module NoBrainer::Criteria::Changes
+  extend ActiveSupport::Concern
+
+  def changes(*args)
+    return finalized_criteria.changes(*args) unless finalized?
+
+    # We won't do any instantiations with attributes for now.
+    raise 'Please use .raw.changes()' unless raw?
+
+    # We can't have implicit sorting as eager streams are not
+    # supported by r.changes().
+    criteria = self
+    criteria = criteria.without_ordering if ordering_mode == :implicit
+    run { criteria.to_rql.changes(*args) }
+  end
+end

data/lib/no_brainer/criteria/order_by.rb

@@ -2,7 +2,8 @@ module NoBrainer::Criteria::OrderBy
   extend ActiveSupport::Concern
 
   # The latest order_by() wins
-  included { criteria_option :order_by, :ordering_mode, :merge_with => :set_scalar }
+  included { criteria_option :order_by, :ordering_mode, :reversed_ordering,
+                             :merge_with => :set_scalar }
 
   def order_by(*rules, &block)
     # Note: We are relying on the fact that Hashes are ordered (since 1.9)
@@ -19,7 +20,8 @@ module NoBrainer::Criteria::OrderBy
 
     rules.keys.each { |k| model.ensure_valid_key!(k) unless k.is_a?(Proc) } if model
 
-    chain(:order_by => rules, :ordering_mode => :normal)
+    chain(:order_by => rules, :ordering_mode => :explicit,
+                              :reversed_ordering => false)
   end
 
   def without_ordering
@@ -27,12 +29,7 @@ module NoBrainer::Criteria::OrderBy
   end
 
   def reverse_order
-    chain(:ordering_mode => case @options[:ordering_mode]
-                            when nil       then :reversed
-                            when :normal   then :reversed
-                            when :reversed then :normal
-                            when :disabled then :disabled
-                            end)
+    chain(:reversed_ordering => !@options[:reversed_ordering])
   end
 
   def order_by_indexed?
@@ -45,16 +42,21 @@ module NoBrainer::Criteria::OrderBy
 
   private
 
-  def effective_order
-    @options[:order_by].presence || (model ? {model.pk_name => :asc} : {})
+  def ordering_mode
+    @options[:ordering_mode] || :implicit
   end
 
   def reverse_order?
-    @options[:ordering_mode] == :reversed
+    !!@options[:reversed_ordering]
   end
 
-  def should_order?
-    @options[:ordering_mode] != :disabled
+  def effective_order
+    # reversing the order happens later.
+    case ordering_mode
+    when :disabled then nil
+    when :explicit then @options[:order_by]
+    when :implicit then model && {model.pk_name => :asc}
+    end
   end
 
   class IndexFinder < Struct.new(:criteria, :index_name, :rql_proc)
@@ -63,7 +65,7 @@ module NoBrainer::Criteria::OrderBy
     end
 
     def first_key
-      @first_key ||= criteria.__send__(:effective_order).first.try(:[], 0)
+      @first_key ||= criteria.__send__(:effective_order).to_a.first.try(:[], 0)
     end
 
     def first_key_indexable?
@@ -96,9 +98,8 @@ module NoBrainer::Criteria::OrderBy
 
   def compile_rql_pass1
     rql = super
-    return rql unless should_order?
     _effective_order = effective_order
-    return rql if _effective_order.empty?
+    return rql unless _effective_order.present?
 
     rql_rules = _effective_order.map do |k,v|
       if order_by_index_finder.index_name == k

data/lib/no_brainer/document/criteria.rb

@@ -29,6 +29,7 @@ module NoBrainer::Document::Criteria
              :first_or_create, :first_or_create!, # FirstOrCreate
              :min, :max, :sum, :avg,         # Aggregate
              :update_all, :replace_all,      # Update
+             :changes,                       # Changes
              :pluck, :without, :lazy_fetch, :without_plucking, # Pluck
              :find_by?, :find_by, :find_by!, :find?, :find, :find!, # Find
              :to => :all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.25.1
 platform: ruby
 authors:
 - Nicolas Viennot
@@ -97,6 +97,7 @@ files:
 - lib/no_brainer/criteria/after_find.rb
 - lib/no_brainer/criteria/aggregate.rb
 - lib/no_brainer/criteria/cache.rb
+- lib/no_brainer/criteria/changes.rb
 - lib/no_brainer/criteria/core.rb
 - lib/no_brainer/criteria/count.rb
 - lib/no_brainer/criteria/delete.rb