peiji-san 0.1.1 → 1.0.0

data/rdoc/rdoc-style.css

@@ -0,0 +1,208 @@
+
+body {
+    font-family: Verdana,Arial,Helvetica,sans-serif;
+    font-size:   90%;
+    margin: 0;
+    margin-left: 40px;
+    padding: 0;
+    background: white;
+}
+
+h1,h2,h3,h4 { margin: 0; color: #efefef; background: transparent; }
+h1 { font-size: 150%; }
+h2,h3,h4 { margin-top: 1em; }
+
+a { background: #eef; color: #039; text-decoration: none; }
+a:hover { background: #039; color: #eef; }
+
+/* Override the base stylesheet's Anchor inside a table cell */
+td > a {
+  background: transparent;
+  color: #039;
+  text-decoration: none;
+}
+
+/* and inside a section title */
+.section-title > a {
+  background: transparent;
+  color: #eee;
+  text-decoration: none;
+}
+
+/* === Structural elements =================================== */
+
+div#index {
+    margin: 0;
+    margin-left: -40px;
+    padding: 0;
+    font-size: 90%;
+}
+
+
+div#index a {
+    margin-left: 0.7em;
+}
+
+div#index .section-bar {
+   margin-left: 0px;
+   padding-left: 0.7em;
+   background: #ccc;
+   font-size: small;
+}
+
+
+div#classHeader, div#fileHeader {
+    width: auto;
+    color: white;
+    padding: 0.5em 1.5em 0.5em 1.5em;
+    margin: 0;
+    margin-left: -40px;
+    border-bottom: 3px solid #006;
+}
+
+div#classHeader a, div#fileHeader a {
+    background: inherit;
+    color: white;
+}
+
+div#classHeader td, div#fileHeader td {
+    background: inherit;
+    color: white;
+}
+
+
+div#fileHeader {
+    background: #057;
+}
+
+div#classHeader {
+    background: #048;
+}
+
+
+.class-name-in-header {
+  font-size:  180%;
+  font-weight: bold;
+}
+
+
+div#bodyContent {
+    padding: 0 1.5em 0 1.5em;
+}
+
+div#description {
+    padding: 0.5em 1.5em;
+    background: #efefef;
+    border: 1px dotted #999;
+}
+
+div#description h1,h2,h3,h4,h5,h6 {
+    color: #125;;
+    background: transparent;
+}
+
+div#validator-badges {
+    text-align: center;
+}
+div#validator-badges img { border: 0; }
+
+div#copyright {
+    color: #333;
+    background: #efefef;
+    font: 0.75em sans-serif;
+    margin-top: 5em;
+    margin-bottom: 0;
+    padding: 0.5em 2em;
+}
+
+
+/* === Classes =================================== */
+
+table.header-table {
+    color: white;
+    font-size: small;
+}
+
+.type-note {
+    font-size: small;
+    color: #DEDEDE;
+}
+
+.xxsection-bar {
+    background: #eee;
+    color: #333;
+    padding: 3px;
+}
+
+.section-bar {
+   color: #333;
+   border-bottom: 1px solid #999;
+    margin-left: -20px;
+}
+
+
+.section-title {
+    background: #79a;
+    color: #eee;
+    padding: 3px;
+    margin-top: 2em;
+    margin-left: -30px;
+    border: 1px solid #999;
+}
+
+.top-aligned-row {  vertical-align: top }
+.bottom-aligned-row { vertical-align: bottom }
+
+/* --- Context section classes ----------------------- */
+
+.context-row { }
+.context-item-name { font-family: monospace; font-weight: bold; color: black; }
+.context-item-value { font-size: small; color: #448; }
+.context-item-desc { color: #333; padding-left: 2em; }
+
+/* --- Method classes -------------------------- */
+.method-detail {
+    background: #efefef;
+    padding: 0;
+    margin-top: 0.5em;
+    margin-bottom: 1em;
+    border: 1px dotted #ccc;
+}
+.method-heading {
+  color: black;
+  background: #ccc;
+  border-bottom: 1px solid #666;
+  padding: 0.2em 0.5em 0 0.5em;
+}
+.method-signature { color: black; background: inherit; }
+.method-name { font-weight: bold; }
+.method-args { font-style: italic; }
+.method-description { padding: 0 0.5em 0 0.5em; }
+
+/* --- Source code sections -------------------- */
+
+a.source-toggle { font-size: 90%; }
+div.method-source-code {
+    background: #262626;
+    color: #ffdead;
+    margin: 1em;
+    padding: 0.5em;
+    border: 1px dashed #999;
+    overflow: hidden;
+}
+
+div.method-source-code pre { color: #ffdead; overflow: hidden; }
+
+/* --- Ruby keyword styles --------------------- */
+
+.standalone-code { background: #221111; color: #ffdead; overflow: hidden; }
+
+.ruby-constant  { color: #7fffd4; background: transparent; }
+.ruby-keyword { color: #00ffff; background: transparent; }
+.ruby-ivar    { color: #eedd82; background: transparent; }
+.ruby-operator  { color: #00ffee; background: transparent; }
+.ruby-identifier { color: #ffdead; background: transparent; }
+.ruby-node    { color: #ffa07a; background: transparent; }
+.ruby-comment { color: #b22222; font-weight: bold; background: transparent; }
+.ruby-regexp  { color: #ffa07a; background: transparent; }
+.ruby-value   { color: #7fffd4; background: transparent; }

data/test/peiji_san_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../test_helper', __FILE__)
 
-describe "PeijiSan mixin" do
+describe "A model extended by PeijiSan" do
   it "should define an #entries_per_page= class method with which the max amount of entries per page is specified" do
     Member.should.respond_to :entries_per_page=
     Member.instance_variable_get(:@entries_per_page).should.be 10
@@ -15,7 +15,7 @@ describe "PeijiSan mixin" do
   end
 end
 
-describe "PeijiSan::PageScope" do
+describe "The PeijiSan extended scope" do
   before do
     PeijiSanTest::Initializer.setup_database
     199.times { |i| Member.create(:name => "KRS #{i}") }
@@ -25,68 +25,67 @@ describe "PeijiSan::PageScope" do
     PeijiSanTest::Initializer.teardown_database
   end
   
-  it "should have defined a named_scope called :page which returns the entries belonging to the page number given" do
+  it "returns entries for the specified page" do
     page_1 = Member.page(1)
-    page_1.class.should.be PeijiSan::PageScope
     page_1.length.should.be 10
     page_1.should == Member.find(:all, :offset => 0, :limit => 10)
   end
   
-  it "should return the correct count of pages for the current scope" do
+  it "returns the correct count of pages" do
     Member.all_like_krs_1.page(1).page_count.should.be 11
   end
   
-  it "should know the current page number" do
+  it "knows the current page number" do
     Member.page(2).current_page.should.be 2
     Member.page(4).current_page.should.be 4
   end
   
-  it "should know if there's a next page" do
-    Member.page(1).should.have_next_page
-    Member.page(20).should.not.have_next_page
-    Member.all_like_krs_1.but_ending_with_9.page(1).should.not.have_next_page
+  it "knows if there's a next page" do
+    Member.page(1).should.next_page
+    Member.page(20).should.not.next_page
+    Member.all_like_krs_1.but_ending_with_9.page(1).should.not.next_page
   end
   
-  it "should return the next page" do
+  it "returns the next page number" do
     Member.page(1).next_page.should.be 2
     Member.page(20).next_page.should.be nil
   end
   
-  it "should know if there's a previous page" do
-    Member.page(1).should.not.have_previous_page
-    Member.page(20).should.have_previous_page
+  it "knows if there's a previous page" do
+    Member.page(1).should.not.previous_page
+    Member.page(20).should.previous_page
   end
   
-  it "should return the previous page" do
+  it "returns the previous page" do
     Member.page(1).previous_page.should.be nil
     Member.page(20).previous_page.should.be 19
   end
   
-  it "should return if a given page number is the current page" do
+  it "knows if a given page number is the current page" do
     assert Member.page(1).current_page?(1)
     assert !Member.page(1).current_page?(2)
   end
   
-  it "should default to page 1 if no valid page argument was given" do
+  it "defaults to page 1 if no valid page argument was given" do
     Member.page(nil).current_page.should.be 1
     Member.page('').current_page.should.be 1
   end
   
-  it "should cast the page argument to an integer" do
+  it "casts the page argument to an integer" do
     Member.page('2').current_page.should.be 2
   end
   
-  it "should take an optional second argument which overrides the entries_per_page setting" do
+  it "takes an optional second argument which overrides the entries_per_page setting" do
     Member.all_like_krs_1.page(1, 20).page_count.should.be 6
   end
   
-  it "should return the count of all the entries across all pages for the current scope" do
-    Member.all_like_krs_1.page(1).count.should.be 110
-    Member.all_like_krs_1.page(2).count.should.be 110
-    Member.all_like_krs_1.but_ending_with_9.page(1).count.should.be 10
+  it "returns the count of all the entries across all pages for the current scope" do
+    Member.all_like_krs_1.page(1).unpaged_count.should.be 110
+    Member.all_like_krs_1.page(2).unpaged_count.should.be 110
+    Member.all_like_krs_1.but_ending_with_9.page(1).unpaged_count.should.be 10
   end
   
-  it "should still work when chained with other regular named scopes" do
+  it "works when chained with other regular named scopes" do
     Member.all_like_krs_1.page(1).page_count.should.be 11
     Member.all_like_krs_1.but_ending_with_9.page(2).page_count.should.be 1
     

data/test/test_helper.rb

@@ -1,40 +1,22 @@
 module PeijiSanTest
   module Initializer
-    VENDOR_RAILS = File.expand_path('../../../../rails', __FILE__)
-    OTHER_RAILS = File.expand_path('../../../rails', __FILE__)
-    PLUGIN_ROOT = File.expand_path('../../', __FILE__)
-    
-    def self.rails_directory
-      if File.exist?(File.join(VENDOR_RAILS, 'railties'))
-        VENDOR_RAILS
-      elsif File.exist?(File.join(OTHER_RAILS, 'railties'))
-        OTHER_RAILS
-      end
-    end
-    
     def self.load_dependencies
-      if rails_directory
-        $:.unshift(File.join(rails_directory, 'activesupport', 'lib'))
-        $:.unshift(File.join(rails_directory, 'activerecord', 'lib'))
-        $:.unshift(File.join(rails_directory, 'actionpack', 'lib'))
-      else
-        require 'rubygems' rescue LoadError
-      end
+      $:.unshift File.expand_path('../../lib', __FILE__)
+      
+      require 'rubygems' rescue LoadError
       
       require 'active_support'
       require 'active_record'
       require 'action_view'
       
-      require 'rubygems' rescue LoadError
-      
       require 'test/spec'
       require 'mocha'
       
-      require File.join(PLUGIN_ROOT, 'rails', 'init')
+      require File.expand_path('../../init', __FILE__)
     end
     
     def self.configure_database
-      ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+      ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
       ActiveRecord::Migration.verbose = false
     end
     
@@ -68,21 +50,12 @@ end
 
 PeijiSanTest::Initializer.start
 
-class PeijiSan::PageScope
-  instance_methods.each { |method| alias_method method.sub(/^has_/, 'have_'), method if method =~ /^has_/ }
-  
-  # The delegation of all methods in NamedScope breaks #should.
-  def should
-    Test::Spec::Should.new(self)
-  end
-end
-
 class Member < ActiveRecord::Base
   extend PeijiSan
   self.entries_per_page = 10
   
-  named_scope :all_like_krs_1, :conditions => "name LIKE 'KRS 1%'"
-  named_scope :but_ending_with_9, :conditions => "name LIKE '%9'"
+  scope :all_like_krs_1, where("name LIKE 'KRS 1%'")
+  scope :but_ending_with_9, where("name LIKE '%9'")
   
   has_many :works
 end
@@ -91,5 +64,5 @@ class Work < ActiveRecord::Base
   extend PeijiSan
   self.entries_per_page = 5
   
-  named_scope :uploaded, :conditions => { :status => 'uploaded' }
+  scope :uploaded, where(:status => 'uploaded')
 end

data/test/view_helper_test.rb

@@ -4,15 +4,6 @@ class TestController
   def params
     @params ||= {}
   end
-  
-  def url_for(options)
-    url = "/collections"
-    url += "?page=#{options[:page]}" if options[:page]
-    url += "?pagina=#{options[:pagina]}" if options[:pagina]
-    url += "&starts_with=#{options[:starts_with]}" if options[:starts_with]
-    url += "##{options[:anchor]}" if options[:anchor]
-    url
-  end
 end
 
 module PeijiSanHelperTestHelper
@@ -31,6 +22,19 @@ module PeijiSanHelperTestHelper
         collection.stubs(:current_page?).with(2).returns(false)
         collection.stubs(:page_count).returns(125)
       end
+      
+      def url_for(options)
+        return options if options.kind_of?(String)
+        
+        options = options.with_indifferent_access
+        
+        url = "/collections"
+        url += "?page=#{options[:page]}" if options[:page]
+        url += "?pagina=#{options[:pagina]}" if options[:pagina]
+        url += "&starts_with=#{options[:starts_with]}" if options[:starts_with]
+        url += "##{options[:anchor]}" if options[:anchor]
+        url
+      end
     end
   end
 end
@@ -40,11 +44,11 @@ describe "PeijiSan::ViewHelper::link_to_page" do
   include PeijiSan::ViewHelper
   
   it "should return a link for a given page number" do
-    link_to_page(2, collection).should == '<a href="/collections?page=2#explore">2</a>'
+    link_to_page(2, collection).should == '<a href="/collections?page=2">2</a>'
   end
   
   it "should return a link for a given page number with the specified page parameter" do
-    link_to_page(2, collection, :page_parameter => 'pagina').should == '<a href="/collections?pagina=2#explore">2</a>'
+    link_to_page(2, collection, :page_parameter => 'pagina').should == '<a href="/collections?pagina=2">2</a>'
   end
   
   it "should return a link for a given page number with the specified anchor" do
@@ -53,7 +57,7 @@ describe "PeijiSan::ViewHelper::link_to_page" do
   
   it "should return a link for a given page number and include the original params" do
     controller.params[:starts_with] = 'h'
-    link_to_page(2, collection).should == '<a href="/collections?page=2&amp;starts_with=h#explore">2</a>'
+    link_to_page(2, collection).should == '<a href="/collections?page=2&amp;starts_with=h">2</a>'
   end
   
   it "should return a link which does not include the page GET variable if it's page number 1" do
@@ -63,12 +67,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).should == '<a href="/collections?page=2#explore" class="current">2</a>'
+    link_to_page(2, collection).should == '<a href="/collections?page=2" class="current">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').should == '<a href="/collections?page=2#explore" class="looking_at">2</a>'
+    link_to_page(2, collection, :current_class => 'looking_at').should == '<a href="/collections?page=2" class="looking_at">2</a>'
   end
 end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: peiji-san
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  hash: 23
+  prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Eloy Duran
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 +01:00
+date: 2011-04-05 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -22,16 +28,30 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
+- TODO
 files: 
 - LICENSE
 - README.rdoc
 - Rakefile
 - TODO
 - VERSION.yml
+- init.rb
 - lib/peiji_san.rb
 - lib/peiji_san/view_helper.rb
 - peiji-san.gemspec
-- rails/init.rb
+- rdoc/classes/PeijiSan.html
+- rdoc/classes/PeijiSan/PaginationMethods.html
+- rdoc/classes/PeijiSan/ViewHelper.html
+- rdoc/created.rid
+- rdoc/files/LICENSE.html
+- rdoc/files/README_rdoc.html
+- rdoc/files/lib/peiji_san/view_helper_rb.html
+- rdoc/files/lib/peiji_san_rb.html
+- rdoc/fr_class_index.html
+- rdoc/fr_file_index.html
+- rdoc/fr_method_index.html
+- rdoc/index.html
+- rdoc/rdoc-style.css
 - test/peiji_san_test.rb
 - test/test_helper.rb
 - test/view_helper_test.rb
@@ -40,26 +60,32 @@ homepage: http://github.com/Fingertips/peiji-san
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: PeijiSan is a Rails plugin which uses named scopes to create a thin pagination layer.