peiji-san 1.1.1 → 1.2.0.pre

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 373aefbd57bea1d12fb01e0b27685991c7954a97
+  data.tar.gz: 69656282f80bc4eb90572f2e5dc181a7c5bf7155
+SHA512:
+  metadata.gz: ddfaae2205eea8af0480a2916ab87bf32375241740a3285f6af7aace21ba9b9c3717d17c00e3ac4e2c4390805b0fa09ad8df4ce5bb8f2fd080f7d3450988323b
+  data.tar.gz: fc7ae2eb5f36cf8bee6a473afe2efd7b0c3481fa5ff0f4be9a2b78a0e9d4be751b66348a9fa4e06efd07431c6559060a8876642c5b59eaa3ebdaef80957a2c26

data/lib/peiji_san.rb

@@ -110,12 +110,19 @@ module PeijiSan
     page = page.blank? ? 1 : page.to_i
     entries_per_page = entries_per_page || self.entries_per_page || ENTRIES_PER_PAGE
     
-    entries = scoped
+    entries = limit(entries_per_page).offset((page - 1) * entries_per_page)
+
     entries.extend(PeijiSan::PaginationMethods)
     entries.current_page = page
     entries.entries_per_page = entries_per_page
-    entries.scope_without_pagination = scoped
-    
-    entries.limit(entries_per_page).offset((page - 1) * entries_per_page)
+    entries.scope_without_pagination = _use_scoped? ? scoped : all
+
+    entries
+  end
+  
+  private
+  
+  def _use_scoped?
+    !const_defined?(:ActiveRecord) || ActiveRecord::VERSION::MAJOR < 4
   end
 end

data/lib/peiji_san/view_helper.rb

@@ -60,7 +60,7 @@ module PeijiSan
       normalized_url_options = if respond_to?(:controller) # Rails
         url_for(url_options)
       else # Sinatra
-        root_path = env['SCRIPT_NAME'].blank? ? "/" : env["SCRIPT_NAME"]
+        root_path = env['PATH_INFO'].blank? ? "/" : env["PATH_INFO"]
         url_for(root_path, url_options)
       end
       
@@ -76,8 +76,8 @@ module PeijiSan
       # What follows is a very simplistic implementation of link_to
       link_text, url, html_options = arguments[0..2]
       html_options[:href] = url
-      attr_string = html_options.map do | attribute, value |
-        '%s="%s"' %  [Rack::Utils.escape_html(attribute), Rack::Utils.escape_html(value)]
+      attr_string = html_options.keys.sort.map do |attribute|
+        '%s="%s"' %  [Rack::Utils.escape_html(attribute), Rack::Utils.escape_html(html_options[attribute])]
       end.join(' ')
       
       # Compose the tag

data/test/peiji_san_test.rb

@@ -29,7 +29,11 @@ describe "The PeijiSan extended scope" do
   it "returns entries for the specified page" do
     page_1 = Member.page(1)
     page_1.length.must_equal 10
-    page_1.must_equal Member.find(:all, :offset => 0, :limit => 10)
+    if ActiveRecord::VERSION::MAJOR < 4
+      page_1.must_equal Member.find(:all, :offset => 0, :limit => 10)
+    else
+      page_1.to_a.must_equal Member.offset(0).limit(10).to_a
+    end
   end
   
   it "returns the correct count of pages" do
@@ -90,8 +94,13 @@ describe "The PeijiSan extended scope" do
     Member.all_like_krs_1.page(1).page_count.must_equal 11
     Member.all_like_krs_1.but_ending_with_9.page(2).page_count.must_equal 1
     
-    Member.all_like_krs_1.page(2).must_equal Member.find(:all, :conditions => "name LIKE 'KRS 1%'", :offset => 10, :limit => 10)
-    Member.all_like_krs_1.but_ending_with_9.page(1).must_equal Member.find(:all, :conditions => "name LIKE 'KRS 1%' AND name LIKE '%9'", :offset => 0, :limit => 10)
+    if ActiveRecord::VERSION::MAJOR < 4
+      Member.all_like_krs_1.page(2).must_equal Member.find(:all, :conditions => "name LIKE 'KRS 1%'", :offset => 10, :limit => 10)
+      Member.all_like_krs_1.but_ending_with_9.page(1).must_equal Member.find(:all, :conditions => "name LIKE 'KRS 1%' AND name LIKE '%9'", :offset => 0, :limit => 10)
+    else
+      Member.all_like_krs_1.page(2).to_a.must_equal Member.where("name LIKE 'KRS 1%'").offset(10).limit(10).to_a
+      Member.all_like_krs_1.but_ending_with_9.page(1).to_a.must_equal Member.where("name LIKE 'KRS 1%' AND name LIKE '%9'").offset(0).limit(10).to_a
+    end
   end
   
   it "should still work when chained through an association proxy" do

data/test/sinatra_test.rb

@@ -18,6 +18,14 @@ class SimplisticApp < Sinatra::Base
     collection.stubs(:page_count).returns(125)
     link_to_page(2, collection)
   end
+  
+  get '/something' do
+    collection = stub('Articles in a subdirectory')
+    collection.stubs(:current_page?).with(1).returns(false)
+    collection.stubs(:current_page?).with(2).returns(false)
+    collection.stubs(:page_count).returns(125)
+    link_to_page(2, collection)
+  end
 end
 
 ENV['RACK_ENV'] = 'test'
@@ -34,6 +42,12 @@ describe "A Sinatra app that uses Peiji-San" do
     Rack::Utils.parse_query(query)
   end
   
+  it "has it's link_to_page method working in subdirectories" do
+    get '/something'
+    last_response.status.must_equal 200
+    assert_equal '<a href="&#x2F;something?page=2">2</a>', last_response.body
+  end
+  
   it "has it's link_to_page method put in place and operational" do
     get '/'
     last_response.status.must_equal 200

data/test/test_helper.rb

@@ -9,7 +9,7 @@ module PeijiSanTest
 
       require 'minitest/autorun'
       require 'minitest/spec'
-      require 'mocha'
+      require 'mocha/setup'
 
       require 'active_support'
       require 'active_record'
@@ -58,8 +58,13 @@ class Member < ActiveRecord::Base
   extend PeijiSan
   self.entries_per_page = 10
   
-  scope :all_like_krs_1, where("name LIKE 'KRS 1%'")
-  scope :but_ending_with_9, where("name LIKE '%9'")
+  if ActiveRecord::VERSION::MAJOR < 4
+    scope :all_like_krs_1, where("name LIKE 'KRS 1%'")
+    scope :but_ending_with_9, where("name LIKE '%9'")
+  else
+    scope :all_like_krs_1, -> { where("name LIKE 'KRS 1%'") }
+    scope :but_ending_with_9, -> { where("name LIKE '%9'") }
+  end
   
   has_many :works
 end
@@ -68,5 +73,9 @@ class Work < ActiveRecord::Base
   extend PeijiSan
   self.entries_per_page = 5
   
-  scope :uploaded, where(:status => 'uploaded')
+  if ActiveRecord::VERSION::MAJOR < 4
+    scope :uploaded, where(:status => 'uploaded')
+  else
+    scope :uploaded, -> { where(:status => 'uploaded') }
+  end
 end

data/test/view_helper_test.rb

@@ -68,12 +68,12 @@ describe "PeijiSan::ViewHelper::link_to_page" do
   
   it "should return a link with the class current if it's for the currently selected page" do
     collection.stubs(:current_page?).with(2).returns(true)
-    link_to_page(2, collection).must_equal '<a href="/collections?page=2" class="current">2</a>'
+    link_to_page(2, collection).must_equal '<a class="current" href="/collections?page=2">2</a>'
   end
   
   it "should return a link with the class current if it's for the currently selected page" do
     collection.stubs(:current_page?).with(2).returns(true)
-    link_to_page(2, collection, :current_class => 'looking_at').must_equal '<a href="/collections?page=2" class="looking_at">2</a>'
+    link_to_page(2, collection, :current_class => 'looking_at').must_equal '<a class="looking_at" href="/collections?page=2">2</a>'
   end
 end
 
@@ -158,7 +158,7 @@ describe "ApplicationHelper, when overriding defaults" do
   
   it "should return a link with the class current if it's for the currently selected page" do
     collection.stubs(:current_page?).with(2).returns(true)
-    link_to_page(2, collection, :current_class => 'looking_at').must_equal '<a href="/collections?pagina=2#dude_so_many_pages" class="looking_at">2</a>'
+    link_to_page(2, collection, :current_class => 'looking_at').must_equal '<a class="looking_at" href="/collections?pagina=2#dude_so_many_pages">2</a>'
   end
   
   it "should return a list of page numbers that should be included in the pagination list with the specified number of :max_visible" do

metadata

@@ -1,184 +1,182 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: peiji-san
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 1
-  segments_generated: true
-  version: 1.1.1
+version: !ruby/object:Gem::Version
+  version: 1.2.0.pre
 platform: ruby
-authors: 
+authors:
 - Eloy Duran
 - Manfred Stienstra
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-23 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id001
+date: 2013-07-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id002
-  name: mocha
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id003
-  name: rake
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id004
-  name: rack-test
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id005
-  name: rdoc
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 1
-        segments_generated: true
-        version: "3.1"
-  requirement: *id006
-  name: activesupport
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 1
-        segments_generated: true
-        version: "3.1"
-  requirement: *id007
-  name: activerecord
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 1
-        segments_generated: true
-        version: "3.1"
-  requirement: *id008
-  name: actionpack
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id009
-  name: sqlite3
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id010
-  name: sinatra
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id011
-  name: tobias-sinatra-url-for
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tobias-sinatra-url-for
+  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'
 description: 
-email: 
+email:
 - eloy.de.enige@gmail.com
 - manfred@fngtps.com
 - me@julik.nl
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -189,37 +187,28 @@ files:
 - test/sinatra_test.rb
 - test/test_helper.rb
 - test/view_helper_test.rb
-has_rdoc: true
 homepage: http://github.com/Fingertips/peiji-san
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      segments_generated: true
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      segments_generated: true
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
-summary: PeijiSan is a Rails plugin which uses named scopes to create a thin pagination layer.
+specification_version: 4
+summary: PeijiSan is a Rails plugin which uses named scopes to create a thin pagination
+  layer.
 test_files: []
-