ripplr 0.0.7.beta → 0.0.8.beta

data/README.md

@@ -33,6 +33,7 @@ And then create, index and search for your documents like so:
 ```ruby
 todays_wod = Wod.create :description => 'Lawnmower 8x35lbs. Sqt Jumps 10x. Lunge Twist 20x10lbs ...', :performed_at = Time.now 
 todays_wod.index #add the index for your document
-Wod.search(:description, "jumps") # Search WODs for descriptions that contain jump, returns an array of matching WODs
+criteria = Wod.where(:description => "jumps") # Builds a criteria object
+# Iterating over a criteria object, calling count(size, or length), or calling to_a executes the search
 ```
 

data/lib/ripplr.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'ripplr/queryable'
+require 'ripplr/null_object'
 require 'ripplr/query_field'
 require 'ripplr/indexers'
 require 'ripplr/criteria'

data/lib/ripplr/criteria.rb

@@ -11,6 +11,21 @@ module Ripplr
       self
     end
 
+    def order_by(field)
+      @order_by_field = @target.queryable_field(field)
+      self
+    end
+
+    def ascending
+      @order_by_direction = " asc"
+      self
+    end
+
+    def descending
+      @order_by_direction = " desc"
+      self
+    end
+
     def each(&block)
       results.each do |result|
         yield result
@@ -30,7 +45,7 @@ module Ripplr
     def execute
       return @target.list if condition.nil?
 
-      @indexer.search @target, query
+      @indexer.search @target, query, options
     end
 
     def conditions
@@ -43,6 +58,17 @@ module Ripplr
       @results
     end
 
+    def options
+      Maybe(ordering) { Hash.new }
+    end
+
+    def ordering
+      return NullObject.new if @order_by_field.nil?
+      sort = { :sort => "#{@order_by_field.to_s}" }
+      sort[:sort] += @order_by_direction unless @order_by_direction.nil?
+      sort
+    end
+
     def condition
       @condition
     end

data/lib/ripplr/null_object.rb

@@ -0,0 +1,20 @@
+class NullObject
+ def initialize
+    @origin = caller.first ### SETS ORIGIN FOR INSPECT INFO
+  end
+
+  def method_missing(*args, &block)
+    self
+  end
+
+  def nil?; true; end
+end
+
+
+def Maybe(value)
+  if value.nil? then
+    block_given? ? yield : NullObject.new
+  else
+    value
+  end
+end

data/lib/ripplr/version.rb

@@ -1,3 +1,3 @@
 module Ripplr
-  VERSION = "0.0.7.beta"
+  VERSION = "0.0.8.beta"
 end

data/spec/ripplr/criteria_spec.rb

@@ -10,14 +10,14 @@ describe Ripplr::Criteria do
 
   describe "searching with a query against a field" do
     Given (:indexer) { mock }
-    Given { indexer.should_receive(:search).with(Person,"first_name_text: \"skrillex\"").and_return ["Awesome"] }
+    Given { indexer.should_receive(:search).with(Person,"first_name_text: \"skrillex\"", {}).and_return ["Awesome"] }
     When (:results) { Ripplr::Criteria.new(Person, indexer).where(:first_name => "skrillex").execute }
     Then { results.should == ["Awesome"] }
   end
 
   describe "searching with a query against a different field" do
     Given (:indexer) { mock }
-    Given { indexer.should_receive(:search).with(Person,"last_name_text: \"Auerbach\"").and_return ["Dan"] }
+    Given { indexer.should_receive(:search).with(Person,"last_name_text: \"Auerbach\"", {}).and_return ["Dan"] }
     When (:results) { Ripplr::Criteria.new(Person, indexer).where(:last_name => "Auerbach").execute }
     Then { results.should == ["Dan"] }
   end
@@ -29,7 +29,7 @@ describe Ripplr::Criteria do
   describe "treating a criteria object like a collection executes the query" do
     Given (:criteria) {  Ripplr::Criteria.new(Person, indexer).where(:first_name => "Dan") }
     Given (:indexer) { mock }
-    Given { indexer.should_receive(:search).with(Person,"first_name_text: \"Dan\"").once.and_return(["Dan"]) }
+    Given { indexer.should_receive(:search).with(Person,"first_name_text: \"Dan\"", {}).once.and_return(["Dan"]) }
 
     context "by calling #each" do
       Given (:iterated) { Array.new }
@@ -61,4 +61,40 @@ describe Ripplr::Criteria do
     end
   end
 
+  describe "adding a sort to a query" do
+    Given (:indexer) { mock }
+    Given (:criteria) { Ripplr::Criteria.new(Person, indexer).where(:first_name => 'Patrick') }
+
+    describe "is reflective" do
+      Then { criteria.order_by(:last_name).should == criteria }
+    end
+
+    context "when sorting by a queryable field" do
+      Given { indexer.should_receive(:search).with(Person, "first_name_text: \"Patrick\"", :sort => "created_at_dt").and_return [1,2,3] }
+      When(:result) { criteria.order_by(:created_at) }
+      Then { criteria.execute.should == [1,2,3] }
+    end
+
+    context "when sorting by a non queryable field" do
+      Then { expect { criteria.order_by(:junk_field) }.to raise_error RuntimeError }
+    end
+
+    context "when sorting in descending order" do
+      Given { indexer.should_receive(:search).with(Person, "first_name_text: \"Patrick\"", :sort => "created_at_dt desc").and_return [3,2,1] }
+      When(:result) { criteria.order_by(:created_at).descending }
+      Then { criteria.execute.should == [3,2,1] }
+    end
+
+     context "when sorting in ascending order (force default)" do
+      Given { indexer.should_receive(:search).with(Person, "first_name_text: \"Patrick\"", :sort => "created_at_dt asc").and_return [1,2,3] }
+      When(:result) { criteria.order_by(:created_at).ascending }
+      Then { criteria.execute.should == [1,2,3] }
+    end
+
+    context "when trying to confuse the sort direction" do
+      Given { indexer.should_receive(:search).with(Person, "first_name_text: \"Patrick\"", :sort => "created_at_dt desc").and_return [3,2,1] }
+      When(:result) { criteria.order_by(:created_at).ascending.descending }
+      Then { criteria.execute.should == [3,2,1] }
+    end
+  end
 end

data/spec/support/models/person.rb

@@ -2,9 +2,11 @@ class Person
   include Ripple::Document
   property :first_name, String
   property :last_name, String
+  timestamps!
 
   include Ripplr::Queryable
   queryable do
     text :first_name, :last_name
+    time :created_at
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ripplr
 version: !ruby/object:Gem::Version
-  version: 0.0.7.beta
+  version: 0.0.8.beta
   prerelease: 6
 platform: ruby
 authors:
@@ -79,6 +79,7 @@ files:
 - lib/ripplr/indexers/ripple.rb
 - lib/ripplr/indexers.rb
 - lib/ripplr/locale/en.yml
+- lib/ripplr/null_object.rb
 - lib/ripplr/query_field.rb
 - lib/ripplr/queryable.rb
 - lib/ripplr/translation.rb