changeling 0.1.0 → 0.1.1

data/README.md

@@ -79,7 +79,7 @@ When your object is saved, a job is placed in the 'changeling' queue.
 class Post
   # include Changeling::Trackling
   include Changeling::Async::Trackling
-  
+
   # Model logic here...
 end
 ```
@@ -111,14 +111,7 @@ You can access a different number of records by passing in a number to the .logl
 @post.loglings(50)
 ```
 
-Access all of an objects history:
-
-```ruby
-# Alias for this method: @post.all_history
-@post.all_loglings
-```
-
-Access all of an objects history where a specific field was changed:
+Access an object's last 10 changes where a specific field was changed:
 
 ```ruby
 # Alias for this method: @post.history_for_field(field)
@@ -126,8 +119,8 @@ Access all of an objects history where a specific field was changed:
 # Or if you prefer stringified fields:
 @post.loglings_for_field('title')
 
-# You can also pass in a number to limit your results
-@post.loglings_for_field(:title, 10)
+# You can also pass in a number to get more results
+@post.loglings_for_field(:title, 50)
 ```
 
 ### Logling Properties (history objects):

data/lib/changeling/models/logling.rb

@@ -59,13 +59,7 @@ module Changeling
             :direction => :desc
           }
 
-          results = Changeling::Support::Search.find_by(:filters => filters, :sort => sort)
-
-          if length
-            results.take(length)
-          else
-            results
-          end
+          results = Changeling::Support::Search.find_by(:filters => filters, :sort => sort, :size => length)
         end
       end
 

data/lib/changeling/probeling.rb

@@ -1,17 +1,12 @@
 module Changeling
   module Probeling
-    def all_loglings
-      Changeling::Models::Logling.records_for(self)
-    end
-    alias_method :all_history, :all_loglings
-
     def loglings(records = 10)
       Changeling::Models::Logling.records_for(self, records.to_i)
     end
     alias_method :history, :loglings
 
-    def loglings_for_field(field_name, records = nil)
-      Changeling::Models::Logling.records_for(self, records ? records.to_i : nil, field_name.to_s)
+    def loglings_for_field(field_name, records = 10)
+      Changeling::Models::Logling.records_for(self, records.to_i, field_name.to_s)
     end
     alias_method :history_for_field, :loglings_for_field
   end

data/lib/changeling/support/search.rb

@@ -8,10 +8,12 @@ module Changeling
         sort = args[:sort]
         return [] unless filters || sort
 
+        size = args[:size] || 10
+
         @class = Changeling::Models::Logling
         @class.tire.index.refresh
 
-        results = @class.search do
+        results = @class.search :per_page => size do
           query do
             filtered do
               query { all }

data/lib/changeling/version.rb

@@ -1,3 +1,3 @@
 module Changeling
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/controllers/blameling_integration_spec.rb

@@ -15,7 +15,7 @@ describe RailsApp, "Testing Blameling Integration" do
       Thread.new {
         post :create
         # Look in application.rb for the User class and it's id method.
-        BlogPost.last.all_loglings.last.modified_by.should == nil
+        BlogPost.last.loglings.first.modified_by.should == nil
       }.join
     end
   end
@@ -34,7 +34,7 @@ describe RailsApp, "Testing Blameling Integration" do
       Thread.new {
         post :create
         # Look in application.rb for the User class and it's id method.
-        BlogPost.last.all_loglings.last.modified_by.should == 33
+        BlogPost.last.loglings.first.modified_by.should == 33
       }.join
     end
   end
@@ -53,7 +53,7 @@ describe RailsApp, "Testing Blameling Integration" do
       Thread.new {
         post :create
         # Look in application.rb for the User class and it's id method.
-        BlogPost.last.all_loglings.last.modified_by.should == nil
+        BlogPost.last.loglings.first.modified_by.should == nil
       }.join
     end
   end
@@ -72,7 +72,7 @@ describe RailsApp, "Testing Blameling Integration" do
       Thread.new {
         post :create
         # Look in application.rb for the User class and it's id method.
-        BlogPost.last.all_loglings.last.modified_by.should == 88
+        BlogPost.last.loglings.first.modified_by.should == 88
       }.join
     end
   end

data/spec/lib/changeling/models/logling_spec.rb

@@ -176,14 +176,14 @@ describe Changeling::Models::Logling do
               @search.stub(:find_by).and_return(@results)
             end
 
-            it "should only return the amount specified" do
+            it "should be passed into the Search module" do
               num = 5
-              @results.should_receive(:take).with(num).and_return([])
+              @search.should_receive(:find_by).with(hash_including({ :size => num })).and_return(@results)
               @klass.records_for(@object, 5)
             end
 
-            it "should return all if no amount is specified" do
-              @results.should_not_receive(:take)
+            it "should pass nil for size option into Search module" do
+              @search.should_receive(:find_by).with(hash_including({ :size => nil })).and_return(@results)
               @klass.records_for(@object)
             end
           end

data/spec/lib/changeling/probeling_spec.rb

@@ -17,18 +17,21 @@ describe Changeling::Probeling do
         end
       end
 
-      @object.all_loglings.count.should == 4
+      @object.loglings.count.should == 4
     end
   end
 
-  describe ".all_loglings" do
-    it "should query Logling with it's class name, and it's own ID" do
-      @klass.should_receive(:records_for).with(@object)
-      @object.all_loglings
+  describe "pagination" do
+    before(:each) do
+      (1..50).each do |num|
+        @object.title = "Title #{num}"
+        @object.save!
+      end
     end
 
-    it "should return an array of Loglings" do
-      @object.all_loglings.map(&:class).uniq.should == [@klass]
+    it "should return the specified amount of data when calling .loglings" do
+      @object.loglings.count.should == 10
+      @object.loglings(60).count.should == 54
     end
   end
 
@@ -49,7 +52,6 @@ describe Changeling::Probeling do
     end
 
     it "should only return the amount of loglings requested" do
-      @object.all_loglings.count.should == 4
       @object.loglings(2).count.should == 2
     end
 
@@ -59,8 +61,8 @@ describe Changeling::Probeling do
   end
 
   describe ".loglings_for_field" do
-    it "should query Logling with it's class name, and it's own ID, and a field name" do
-      @klass.should_receive(:records_for).with(@object, nil, "field")
+    it "should query Logling with it's class name, and it's own ID, a field name, and a default number of loglings to return" do
+      @klass.should_receive(:records_for).with(@object, 10, "field")
       @object.loglings_for_field("field")
     end
 
@@ -75,7 +77,7 @@ describe Changeling::Probeling do
     end
 
     it "should handle symbol arguments for field" do
-      @klass.should_receive(:records_for).with(@object, nil, "field")
+      @klass.should_receive(:records_for).with(@object, 10, "field")
       @object.loglings_for_field(:field)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: changeling
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tire