pagelux 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbeb5f2ff84c4cd8b9cb8455a173e0a025dfa721
-  data.tar.gz: ca7386b257dde68a6dc9fde359362ed9767e363d
+  metadata.gz: 71e370b775e3f741c799079db211a151e684ed4b
+  data.tar.gz: bc64214d693c26bbb172534a91af47ad75dd7b2f
 SHA512:
-  metadata.gz: c88f8c3b298e9c218cd6f72ca2225bde9e88fbd5f84f9db189f33ffbd9a58dcfa610bd3380821d8ad44b6a4fffa762796b2879e470cdcbf6444423a86d1e99e3
-  data.tar.gz: bd1bf24b25af0a785770f6bac1e76aeb36a07cfc0e7a5952aac469f61d4e98adf15f718654495b66b1dd7970baad1b9b72ca95287bebbd3c85bc56a11fe9e60f
+  metadata.gz: 8173fc58874fae1ac61bcde84bdbb8306208994aa1bf0bdcd0553925c79b5f41de2ef6fdbf66bd410689171fc01af056c0a3341ace02c0883b1a3bc606506de6
+  data.tar.gz: 7721ba2cf925c31074241d3a1679e034ba70d88850f11a292d38e0d83dbc67226ac106cec9bf8cfba61a24724f72b835fcd1ba7b812c90e6c4fc18260b8c6728

data/README.md

@@ -22,6 +22,15 @@ Or install it yourself as:
 
 ## Contributing
 
+Test database can be created with this:
+    createdb pagelux_test
+
+In pgsql you will need to setup the table:
+
+    psql -d pagelux_test
+
+    CREATE TABLE queries (n int);
+
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)

data/lib/pagelux/query_paginator.rb

@@ -38,8 +38,8 @@ module Pagelux
 
       def normalize_page(n)
         n = (n  || self.class.default_page).to_i
-        n = self.class.default_page if n < self.class.default_page
         n = n > last_page ? last_page : n
+        n = self.class.default_page if n < self.class.default_page
         n
       end
 

data/lib/pagelux/version.rb

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

data/pagelux.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  # spec.add_dependency ''
+  spec.add_dependency 'activerecord'
 
+  spec.add_development_dependency 'pg'
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'rspec'

data/spec/query_paginator_spec.rb

@@ -1,7 +1,13 @@
 require 'spec_helper'
 
 describe Pagelux::QueryPaginator do
-  let(:query) { Query.new(('a'..'m').to_a) }
+  let(:query) { 
+    (1..13).to_a.each do |n|
+      Query.create!(n: n)
+    end
+
+    Query.all
+  }
   let(:paginator) { Pagelux::QueryPaginator.new(query) }
   # let(:results) { paginator.paginate(params) }
 
@@ -45,23 +51,39 @@ describe Pagelux::QueryPaginator do
         paginator.page.should == 3
       end
     end
+
+    context "when the query count is 0" do
+      let(:query) { Query.all }
+
+      let(:params) {
+        {
+          page: nil,
+          limit: 200
+        }
+      }
+
+      it "uses the first page" do
+        paginator.paginate(params)
+        paginator.page.should == 1
+      end
+    end
   end
 
   describe 'query pagination' do
-    let(:results) { paginator.paginate({page: page, limit: 5}) }
+    let(:results) { paginator.paginate({page: page, limit: 5}).map(&:n) }
 
     context 'when on first page' do
       let(:page) { 1 }
 
       it "will return the right records" do
-        results.should == ('a'..'e').to_a
+        results.should == (1..5).to_a
       end
     end
 
     context 'when on middle page' do
       let(:page) { 2 }
       it "will return the right records for a middle page" do
-        results.should == ('f'..'j').to_a
+        results.should == (6..10).to_a
       end
     end
 
@@ -69,7 +91,7 @@ describe Pagelux::QueryPaginator do
       let(:page) { 3 }
 
       it "will return the right records no the last page" do
-        results.should == ('k'..'m').to_a
+        results.should == (11..13).to_a
       end
     end
   end

data/spec/query_spec.rb

@@ -35,21 +35,27 @@ describe Pagelux::Query do
 
   describe 'query pagination' do
     let(:limit) { 5 }
-    let(:sample_query) { Query.new(('a'..'m').to_a) }
-    let(:results) { paginator.perform(sample_query) }
+    let(:sample_query) { 
+      (1..13).to_a.each do |n|
+        Query.create!(n: n)
+      end
+      Query.all
+    }
+
+    let(:results) { paginator.perform(sample_query).map(&:n) }
 
     context 'when on first page' do
       let(:page) { 1 }
 
       it "will return the right records" do
-        results.should == ('a'..'e').to_a
+        results.should == (1..5).to_a
       end
     end
 
     context 'when on middle page' do
       let(:page) { 2 }
       it "will return the right records for a middle page" do
-        results.should == ('f'..'j').to_a
+        results.should == (6..10).to_a
       end
     end
 
@@ -57,7 +63,7 @@ describe Pagelux::Query do
       let(:page) { 3 }
 
       it "will return the right records no the last page" do
-        results.should == ('k'..'m').to_a
+        results.should == (11..13).to_a
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,3 +1,7 @@
+require 'active_record'
+require 'pg'
+
+require_relative './support/db_connection'
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
 $: << File.dirname(__FILE__) + "/../lib"
@@ -19,4 +23,8 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+
+  config.before do
+    Query.delete_all
+  end
 end

data/spec/support/db_connection.rb

@@ -0,0 +1,6 @@
+ActiveRecord::Base.establish_connection(
+  adapter:  'postgresql', # or 'postgresql' or 'sqlite3'
+  database: 'pagelux_test',
+  username: 'socialchorus',
+  host:     'localhost'
+)

data/spec/support/query.rb

@@ -1,16 +1,2 @@
-# Suppose to act like an ActiveRecord::Relation
-class Query < Struct.new(:items, :index)
-
-  def offset(page_num)
-    self.index = page_num
-    self
-  end
-
-  def limit(num)
-    items.slice(index, num)
-  end
-
-  def count
-    items.length
-  end
+class Query < ActiveRecord::Base
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagelux
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Rae Bonfanti
@@ -11,8 +11,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +105,7 @@ files:
 - spec/query_paginator_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb
+- spec/support/db_connection.rb
 - spec/support/query.rb
 homepage: ''
 licenses:
@@ -107,4 +136,5 @@ test_files:
 - spec/query_paginator_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb
+- spec/support/db_connection.rb
 - spec/support/query.rb