mobile_pagination 0.0.2 → 0.0.3

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+*.orig
 .bundle
 .config
 .yardoc
@@ -19,4 +20,4 @@ tmp
 .ruby-version
 .bundle
 vendor/ruby
-.rvmrc
+.rvmrc

data/README.md

@@ -1,11 +1,10 @@
 # MobilePagination
 
 ## Description
-Rack gem for producing minimal pagination links.
+Gem for producing minimal pagination links, best suited for smaller screens.
 
 ![<Display Name>](http://i.imgur.com/qZcqfx8.png)
 
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -24,6 +23,12 @@ Or install it yourself as:
 Initializes with 4 options: `current_page, total_pages, query, path`
 
 ```ruby
+# in your view, you may have something like this:
+ol
+  = pagination
+
+# in your helpers, you might have something like:
+
 require 'mobile_pagination'
 
 # http://local.m.newhomeguide.com/New-Homes/Georgia/Atlanta/?page=2
@@ -41,22 +46,8 @@ def pagination
   MobilePagination::Paginate.new(opts).html
 end
 
-# in your view, you may have something like this:
-ol
-  = pagination
 ```
 
-### Configuration
-Configuration is optional. Say for example you were paginating slides on a slideshow - instead of using page, you could configure the gem to use a different key.
-
-```ruby
-MobilePagination.configure do |config|
-  config.page_key = 'slide'
-end
-```
-
-Configuration must run prior to initialization. The resulting pagination links will now contain `/?slide=2, /?slide=3` to suit your custom url structure. The default page_key is `page`.
-
 ### Overrides
 
 If you don't like list items, you will need to override `MobilePagination::Templates`
@@ -94,9 +85,23 @@ module MobilePagination
   end
 end
 ```
+### Configuration
+Configuration is optional.
+
+Say for example you were paginating slides on a slideshow - instead of using page, you could configure the gem to use a different key.
+
+```ruby
+MobilePagination.configure do |config|
+  config.page_key = 'slide'
+end
+```
+
+Configuration must run prior to initialization. The resulting pagination links will now contain `/?slide=2, /?slide=3` to suit your custom url structure. The default page_key is `page`.
 
 Please note, any methods ending in `_link` will need to remain, as these methods are responsible for generating the paginated urls.
 
+### Testing
+`rspec spec`
 
 ## Contributing
 

data/lib/mobile_pagination/paginate.rb

@@ -35,12 +35,24 @@ module MobilePagination
         @total_pages > 1
       end
 
+      def first_page?
+        @current_page != 1
+      end
+
       def previous_page?
-        @current_page > 1
+        @current_page > 2
       end
 
       def next_page?
-        not next_page_link.nil?
+        last_page? && !second_to_last?
+      end
+
+      def last_page?
+        @current_page != @total_pages
+      end
+
+      def second_to_last?
+        @current_page == (@total_pages - 1)
       end
 
       def current(page)
@@ -56,13 +68,13 @@ module MobilePagination
         page.nil? ? "#{@path}#{qs_without_key}" : "#{@path}#{qs_with_key(page)}"
       end
 
-
       def qs_with_key(page)
         "?#{hash_to_query(opts_with_key(page))}"
       end
 
       def qs_without_key
-        "?#{hash_to_query(opts_without_key)}"
+        str = "#{hash_to_query(opts_without_key)}"
+        str.insert(0, '?') unless str.empty?
       end
 
       def opts_with_key(page)

data/lib/mobile_pagination/templates.rb

@@ -28,10 +28,10 @@ module MobilePagination
     def html
       return '' unless should_paginate?
       ''.tap do |markup|
-        markup << first_page_html    if previous_page?
+        markup << first_page_html    if first_page?
         markup << previous_page_html if previous_page?
         markup << next_page_html     if next_page?
-        markup << last_page_html     if next_page?
+        markup << last_page_html     if last_page?
       end
     end
 

data/lib/mobile_pagination/utils/utils.rb

@@ -1,3 +1,5 @@
+require 'rack/utils'
+
 module MobilePagination
   module Utils
 

data/lib/mobile_pagination/utils/version.rb

@@ -1,3 +1,3 @@
 module MobilePagination
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/spec_helper.rb

@@ -1,9 +1,12 @@
 require 'rubygems'
 require 'simplecov'
 require 'bundler/setup'
-require 'rack/utils'
 
-SimpleCov.start { add_filter '/spec/' }
+SimpleCov.start {
+  add_filter '/spec/'
+  add_filter '/vendor/'
+
+}
 
 require 'mobile_pagination'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobile_pagination
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake