voterable 0.0.2 → 0.0.2.0001

data/lib/voterable/version.rb

@@ -1,3 +1,3 @@
 module Voterable
-  VERSION = "0.0.2"
+  VERSION = "0.0.2.0001"
 end

data/lib/voterable/voteable.rb

@@ -1,5 +1,6 @@
 
 require "voterable/functions"
+# require 'kaminari'
 
 # DUDE! Remember you need to restart the sever to get this file to reload!
 module Voterable
@@ -67,16 +68,18 @@ module Voterable
 
       def self.sort_by(hsh = {})
 
-         hsh[:page]       ||= 1
+         hsh[:page]       ||= 1         
          hsh[:limit]      ||= 30
          hsh[:period]     ||= :all_time
          hsh[:tally_type] ||= :point 
 
-         skip_count = (hsh[:page]-1)*hsh[:limit]
+         page = ( hsh[:page].to_i >= 1 ? hsh[:page].to_i : 1 ) 
+         skip_count = (page-1)*hsh[:limit]
 
          case hsh[:period]
          when :latest
-            return self.order_by(:created_at, :desc).skip(skip_count)
+            # return self.order_by(:created_at, :desc).page(hsh[:page]).per(hsh[:limit])
+            return self.order_by(:created_at, :desc).skip(skip_count).limit(hsh[:limit])
          when :all_time
             index = '0.'
          when :year
@@ -91,7 +94,26 @@ module Voterable
 
          string = "tallys." + index + hsh[:tally_type].to_s
 
-         self.order_by(string,:desc).skip(skip_count) #.where(:tallys.exists => true)
+         #self.order_by(string,:desc).page(hsh[:page]).per(hsh[:limit]) #.where(:tallys.exists => true)
+         sorted = self.order_by(string,:desc).skip(skip_count).limit(hsh[:limit]) #.where(:tallys.exists => true)
+
+         # Array into the class and add necessary methods for pagination
+         sorted.instance_variable_set("@current_page", page)
+         sorted.instance_variable_set("@num_pages", (self.count.to_f/hsh[:limit]).ceil )
+         sorted.instance_variable_set("@limit_value", hsh[:limit])
+         sorted.instance_eval do
+            def current_page
+               @current_page        
+            end
+            def num_pages
+               @num_pages
+            end
+            def limit_value
+               @limit_value
+            end
+         end
+
+         sorted
       end
 
 

data/spec/voteable_spec.rb

@@ -34,6 +34,20 @@ describe Voterable::Voteable do
          it{@all[2].should == @third}
       end
 
+      describe "checking for correct pagination" do
+         
+         before(:each) do
+            @all = Voteable.sort_by(:period => :all_time,
+                                    :page => 2, 
+                                    :limit => 2)
+         end
+
+         it{@all.all.count.should == 1}
+         it{@all.current_page.should == 2}
+         it{@all.num_pages.should    == 2}
+         it{@all.limit_value.should  == 2}
+      end
+
    end
 
 

data/voterable.gemspec

@@ -25,6 +25,9 @@ Gem::Specification.new do |s|
   s.add_dependency "bson", ["= 1.4.0"]
   s.add_dependency "bson_ext", ["= 1.4.0"]
 
+  #Pagination
+  # s.add_dependency 'kaminari', '>=0.10.2'
+
   #Testing
   s.add_development_dependency "rspec"
   s.add_development_dependency "factory_girl", ["~> 2.1.0"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voterable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.2.0001
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000Z
+date: 2011-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70252860449820 !ruby/object:Gem::Requirement
+  requirement: &70187430656440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70252860449820
+  version_requirements: *70187430656440
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &70252860448820 !ruby/object:Gem::Requirement
+  requirement: &70187430655920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70252860448820
+  version_requirements: *70187430655920
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70252860448120 !ruby/object:Gem::Requirement
+  requirement: &70187430655380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70252860448120
+  version_requirements: *70187430655380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70252860447540 !ruby/object:Gem::Requirement
+  requirement: &70187430655000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252860447540
+  version_requirements: *70187430655000
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70252860446980 !ruby/object:Gem::Requirement
+  requirement: &70187430654300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *70252860446980
+  version_requirements: *70187430654300
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70252860446540 !ruby/object:Gem::Requirement
+  requirement: &70187430653820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252860446540
+  version_requirements: *70187430653820
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70252860446040 !ruby/object:Gem::Requirement
+  requirement: &70187430653340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252860446040
+  version_requirements: *70187430653340
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &70252860445620 !ruby/object:Gem::Requirement
+  requirement: &70187430652780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252860445620
+  version_requirements: *70187430652780
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70252860445200 !ruby/object:Gem::Requirement
+  requirement: &70187430652260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252860445200
+  version_requirements: *70187430652260
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70252860444780 !ruby/object:Gem::Requirement
+  requirement: &70187430651600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252860444780
+  version_requirements: *70187430651600
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70252860444360 !ruby/object:Gem::Requirement
+  requirement: &70187430651000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252860444360
+  version_requirements: *70187430651000
 description: Hackish implementaiton of voting on of voteable objects by a voter
 email:
 - benguest@gmail.com