leaf 0.1.0 → 0.1.1

data/README.rdoc

@@ -1,18 +1,46 @@
 = Leaf
 
-A _really_ simple pagination library
+A _really_ simple pagination library, heavily based on the agnostic branch of
+{will_paginate}[http://github.com/mislav/will_paginate/tree/agnostic].
+
+= Description
+
+Leaf supports pagination for collections responding to +total_pages+, 
++per_page+, +previous_page+ and +total_entries+ in Sinatra views out of the box.
 
 == Installation
-  
-The recommended way is that you get the gem
 
   gem install leaf
-  
+
 == Example usage
 
+  require 'rubygems'
+  require 'sinatra'
+  require 'leaf'
+
+  include Leaf::ViewHelpers::Base
+
+  # Needed to paginate any array, you’ll probably use something else.
+  require 'leaf/array'
+
+  get '/' do
+    page = (params[:page]) ? params[:page] : 1
+    array = ('a'..'z').to_a
+
+    haml :index, :locals => { 
+      :collection => array.paginate({:page => page, :per_page => 5}) 
+    }
+  end
+
+  __END__
+  @@ index
+  = leaf(collection)
+  %ul
+    - collection.each do |letter|
+      %li= letter
+
 == Authors and credits
 
-Leaf is heavily based on the agnostic branch of 
-{will_paginate}[http://github.com/mislav/will_paginate/tree/agnostic]. 
-will_paginate was originally written by PJ Hyett, who later handed over 
-development to Mislav Marohnić. (The library was completely rewritten since then.)
+Leaf is based on {will_paginate}[http://github.com/mislav/will_paginate/] which 
+was originally written by PJ Hyett, who later handed over development to Mislav 
+Marohnić. (The library was completely rewritten since then.)

data/lib/leaf/version.rb

@@ -2,7 +2,7 @@ module Leaf
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/leaf/view_helpers/base.rb

@@ -1,12 +1,6 @@
-require 'i18n'
 require 'leaf/core_ext'
 require 'leaf/view_helpers'
 
-# REPLACE WITH REAL CODE :)
-['sv', 'en'].each do |locale|
-  I18n.load_path << "locales/#{locale}.yml"
-end
-
 module Leaf
   module ViewHelpers
     # = The main view helpers module
@@ -63,67 +57,6 @@ module Leaf
         renderer.prepare collection, options, self
         renderer.to_html
       end
-      
-      # Renders a helpful message with numbers of displayed vs. total entries.
-      # You can use this as a blueprint for your own, similar helpers.
-      #
-      #   <%= page_entries_info @posts %>
-      #   #-> Displaying posts 6 - 10 of 26 in total
-      #
-      # By default, the message will use the humanized class name of objects
-      # in collection: for instance, "project types" for ProjectType models.
-      # Override this to your liking with the <tt>:entry_name</tt> parameter:
-      #
-      #   <%= page_entries_info @posts, :entry_name => 'item' %>
-      #   #-> Displaying items 6 - 10 of 26 in total
-      #
-      # Entry name is entered in singular and pluralized with
-      # <tt>String#pluralize</tt> method from ActiveSupport. If it isn't
-      # loaded, specify plural with <tt>:plural_name</tt> parameter:
-      #
-      #   <%= page_entries_info @posts, :entry_name => 'item', :plural_name => 'items' %>
-      #
-      # By default, this method produces HTML output. You can trigger plain
-      # text output by passing <tt>:html => false</tt> in options.
-      def page_entries_info(collection, options = {})
-        entry_name = options[:entry_name] || (collection.empty?? 'entry' :
-                     collection.first.class.name.underscore.gsub('_', ' '))
-        
-        plural_name = if options[:plural_name]
-          options[:plural_name]
-        elsif entry_name == 'entry'
-          plural_name = 'entries'
-        elsif entry_name.respond_to? :pluralize
-          plural_name = entry_name.pluralize
-        else
-          entry_name + 's'
-        end
-
-        unless options[:html] == false
-          b  = '<b>'
-          eb = '</b>'
-          sp = '&nbsp;'
-        else
-          b  = eb = ''
-          sp = ' '
-        end
-        
-        if collection.total_pages < 2
-          case collection.size
-          when 0; I18n::t('leaf.page_entries_info.one_page.nothing', :plural_name => plural_name)
-          when 1; I18n::t('leaf.page_entries_info.one_page.one', :b => b, :eb => eb, :entry_name => entry_name)
-          else;   I18n::t('leaf.page_entries_info.one_page.many', :b => b, :collection_size => collection.size, :eb => eb, :plural_name => plural_name) 
-          end
-        else
-          I18n::t('leaf.page_entries_info.default', 
-            :plural_name => plural_name,
-            :b => b, :sp => sp, :eb => eb,
-            :from_number => (collection.offset + 1),
-            :to_number => (collection.offset + collection.length),
-            :total_entries => collection.total_entries
-          )
-        end
-      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: leaf
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Peter Hellberg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-27 00:00:00 +02:00
+date: 2010-06-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,23 +34,7 @@ dependencies:
         version: 1.2.0
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: i18n
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.0
-  type: :runtime
-  version_requirements: *id002
-description: A really simple pagination library for Sinatra
+description: A really simple pagination library, heavily based on the agnostic branch of will_paginate
 email: peter@c7.se
 executables: []
 
@@ -73,13 +57,11 @@ files:
 - lib/leaf/view_helpers/sinatra.rb
 - lib/leaf/view_helpers.rb
 - lib/leaf.rb
-- locales/en.yml
-- locales/sv.yml
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
 has_rdoc: true
-homepage: http://github.com/c7/leaf
+homepage: http://c7.github.com/leaf/
 licenses: 
 - MIT-LICENSE
 post_install_message: 
@@ -113,6 +95,6 @@ rubyforge_project: leaf
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Simple Sinatra pagination
+summary: Simple pagination library
 test_files: []
 

data/locales/en.yml

@@ -1,11 +0,0 @@
-# English
-en:
-  leaf:
-    next_label: "Next →"
-    previous_label: "← Previous"
-    page_entries_info:
-      one_page:
-        nothing: "No %{plural_name} found"
-        one: "Displaying %{b}1%{eb} %{entry_name}"
-        many: "Displaying %{b}all %{collection_size}%{eb} %{plural_name}"
-      default: "Displaying %{plural_name} %{b}%{from_number}%{sp}-%{sp}%{to_number}%{eb} of %{b}%{total_entries}%{eb} in total"

data/locales/sv.yml

@@ -1,11 +0,0 @@
-# Swedish
-sv:
-  leaf:
-    next_label: "Nästa →"
-    previous_label: "← Föregående"
-    page_entries_info:
-      one_page:
-        nothing: "Hittade inga %{plural_name}"
-        one: "Visar %{b}1%{eb} %{entry_name}"
-        many: "Visar %{b}alla %{collection_size}%{eb} %{plural_name}"
-      default: "Visar %{plural_name} %{b}%{from_number}%{sp}-%{sp}%{to_number}%{eb} av totalt %{b}%{total_entries}%{eb}"