volt-pagination 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 373ef27d71c2ca92b75dcff62c92ef113b7808d3
-  data.tar.gz: 2d55d969cdbbad4233afec8d93f2b62c7bfd7e04
+  metadata.gz: a186f2ffcfcf6c4ace38907c0599b20b024cef38
+  data.tar.gz: 80083dda88f4738bd2b7b5c962d8e4f4bac881df
 SHA512:
-  metadata.gz: e4804bb18efd502e2ce4488a649366a78c40b6c2fc2b0d6fac9333609c31a4a2c0191f922b798c5b87d5de2f4f0665db0f31563e73a6e57e8a97965e3ddee7c4
-  data.tar.gz: b5a300aeb3e643557ee663482342b4f3f3d5775fa4bf0b511f92f8db572a844d8a1e78b0444b57b1869d4ed8acf19615348f3a5d1dabd899cab604c9402c0465
+  metadata.gz: fdf762278f0b42c9944ace9009e2cf1c84c221f4ed74656aebc930cdae07f5181d4da6a330ad99ab1e87d1f0a2a8d221ffdbd2b2799756f670caac79621600d9
+  data.tar.gz: 9682d06b831441e9ed0c8e1a06032781b7211d8409c56193eecd10067d1182d1baaa412c82d6d69ad68e77c575202b7dc3d136d18135c5c2b1492e25e5739169

data/README.md

@@ -20,7 +20,7 @@ To page a collection or query, simply use ```.skip``` and ```.limit```
 Assuming a page size of 10:
 
     def items_on_page
-      store._items.find({active: true}).skip((params._page || 1).to_i - 1) * 10).limit(10)
+      store._items.where({active: true}).skip((params._page || 1).to_i - 1) * 10).limit(10).all
     end
 
 Then in your view you can add:

data/app/pagination/controllers/main_controller.rb

@@ -23,31 +23,33 @@ module Pagination
     end
 
     def page_numbers
-      total = total_pages()
-      cpage = current_page()
+      total_pages.then do |total|
 
-      start_pos, end_pos = middle_window(cpage, total)
-      middle_window = (start_pos..end_pos).to_a
+        cpage = current_page()
 
-      if outer_window == 0
-        pages = middle_window
-      else
-        side_size = ((outer_window - 1) / 2).ceil
+        start_pos, end_pos = middle_window(cpage, total)
+        middle_window = (start_pos..end_pos).to_a
 
-        start_outer_pos = [1 + side_size, start_pos-1].min
-        end_outer_pos = [total - side_size, end_pos + 1].max
+        if outer_window == 0
+          pages = middle_window
+        else
+          side_size = ((outer_window - 1) / 2).ceil
 
-        start_window = (1..start_outer_pos).to_a
-        end_window = (end_outer_pos..total).to_a
+          start_outer_pos = [1 + side_size, start_pos-1].min
+          end_outer_pos = [total - side_size, end_pos + 1].max
 
-        pages = start_window
-        pages << nil unless start_outer_pos == (middle_window[0] - 1)
-        pages += middle_window
-        pages << nil unless end_outer_pos == middle_window[-1] + 1
-        pages += end_window
-      end
+          start_window = (1..start_outer_pos).to_a
+          end_window = (end_outer_pos..total).to_a
+
+          pages = start_window
+          pages << nil unless start_outer_pos == (middle_window[0] - 1)
+          pages += middle_window
+          pages << nil unless end_outer_pos == middle_window[-1] + 1
+          pages += end_window
+        end
 
-      return pages
+        pages
+      end
     end
 
     def window
@@ -66,8 +68,11 @@ module Pagination
       (params.send(:"_#{page_param_name}") || 1).to_i
     end
 
+    # Assumes a promise and returns a promise
     def total_pages
-      (attrs.total.to_i / per_page.to_f).ceil
+      attrs.total.then do |total|
+        (total.to_i / per_page.to_f).ceil
+      end
     end
 
     def last_page
@@ -79,12 +84,14 @@ module Pagination
     end
 
     def next_page_url
-      new_page = current_page + 1
-      if new_page > total_pages
-        return ''
-      end
+      total_pages.then do |total_pages|
+        new_page = current_page + 1
+        if new_page > total_pages
+          next ''
+        end
 
-      return url_for_page(new_page)
+        url_for_page(new_page)
+      end
     end
 
     def previous_page_url

data/app/pagination/views/main/index.html

@@ -1,18 +1,17 @@
-<:Body>
-  <ul class="pagination">
-    <li class="{{ if first_page }}disabled{{ end }}">
-      <a href="{{ previous_page_url }}">&laquo;</a>
-    </li>
-    {{ page_numbers.each do |page_number| }}
-      {{ if page_number.nil? }}
-        <li><a>...</a></li>
-      {{ else }}
-        <li class="{{ if current_page == page_number }}active{{ end }}">
-          <a href="{{ url_for_page(page_number) }}">{{ page_number }}</a>
-        </li>
-      {{ end }}
+<ul class="pagination">
+  <li class="{{ if first_page }}disabled{{ end }}">
+    <a href="{{ previous_page_url }}">&laquo;</a>
+  </li>
+  {{ page_numbers.each do |page_number| }}
+    {{ if page_number.nil? }}
+      <li><a>...</a></li>
+    {{ else }}
+      <li class="{{ if current_page == page_number }}active{{ end }}">
+        <a href="{{ url_for_page(page_number) }}">{{ page_number }}</a>
+      </li>
     {{ end }}
-    <li class="{{ if last_page }}disabled{{ end }}">
-      <a href="{{ next_page_url }}">&raquo;</a>
-    </li>
-  </ul>
+  {{ end }}
+  <li class="{{ if last_page }}disabled{{ end }}">
+    <a href="{{ next_page_url }}">&raquo;</a>
+  </li>
+</ul>

data/lib/volt/pagination.rb

@@ -1,7 +1,7 @@
 require "volt/pagination/version"
 
-class Volt
-  class Pagination
+module Volt
+  module Pagination
     # Your code goes here...
   end
 end

data/lib/volt/pagination/version.rb

@@ -0,0 +1,5 @@
+module Volt
+  module Pagination
+    VERSION = '0.2.1'
+  end
+end

data/volt-pagination.gemspec

@@ -1,13 +1,12 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-version = File.read(File.expand_path('../VERSION', __FILE__)).strip
+require 'volt/pagination/version'
 
 
 Gem::Specification.new do |spec|
   spec.name          = "volt-pagination"
-  spec.version       = version
+  spec.version       = Volt::Pagination::VERSION
   spec.authors       = ["Ryan Stout"]
   spec.email         = ["ryanstout@gmail.com"]
   spec.summary       = %q{A Volt component that provides a :pagination tag}
@@ -19,6 +18,5 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "volt", "~> 0.8.0"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: volt-pagination
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: volt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -49,12 +35,12 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- VERSION
 - app/pagination/config/dependencies.rb
 - app/pagination/config/routes.rb
 - app/pagination/controllers/main_controller.rb
 - app/pagination/views/main/index.html
 - lib/volt/pagination.rb
+- lib/volt/pagination/version.rb
 - volt-pagination.gemspec
 homepage: ''
 licenses:
@@ -76,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Volt component that provides a :pagination tag

data/VERSION

@@ -1 +0,0 @@
-0.1.0