moar 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c1b234cea1895e80c38ebe0568b780d05af5dab2bbff91aa02a43d30ac624b0
-  data.tar.gz: 44c2c5379aeb4b18fcbc4e5d5d957a48157228038567137f6316459d664fdb9c
+  metadata.gz: a326ba6916580da9c124db958eda52918d81fde5d13f6516cb613ac317181002
+  data.tar.gz: 878bac6ff03712086eb27dcb84c00a5982e02314899b52245dca0b7229a3eebe
 SHA512:
-  metadata.gz: 5e6fb50987247ca2c73fe35ac359f56e0c854d641e0e5ad8448f05381c7788196df96bcefbe49dedd538bac13cf855998870049482e36e823b047932e7a58496
-  data.tar.gz: '068724bbd447a433e309c7eedf5d7ef6c21d64cf001107815e8e2ed8765fb091d57f68b482bbc69acc48446a0b0b799959fcbb35e6678732fed59f40ee3806c5'
+  metadata.gz: eb2aadac7f69bf538a678a70be57a0405e9834ba45b7661a4d1a76f3002e56ba8d1853c5326d93b46adc862d24b8eb0a5616e012275cad22a1338fe99f70a593
+  data.tar.gz: ffee5afebc4dc869440f63bcde6696b40cdf4de21825d7232843aad01afa79d68f9e3f0da9af2156fd28d31b642286b28299c070dc5dcc880a2d7befa28b65e0

data/README.md

@@ -25,6 +25,7 @@ With *moar*, this story can be realized using the following code:
 
 ```ruby
 ## app/controllers/posts_controller.rb
+
 class PostsController < ApplicationController
   # Step 1 (optional): set controller-specific pagination increments
   moar_increments [10, 20, 30]
@@ -36,8 +37,9 @@ class PostsController < ApplicationController
 end
 ```
 
-```erb
+```html+erb
 <!-- app/views/posts/index.html.erb -->
+
 <h1>Posts</h1>
 <ul id="list-of-posts">
 <% @posts.each do |post| %>

data/Rakefile

@@ -9,14 +9,13 @@ require 'yard'
 YARD::Rake::YardocTask.new(:doc) do |t|
 end
 
-
 require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.test_files = FileList['test/**/*_test.rb'].exclude('test/tmp/**/*')
   t.verbose = false
 end
 

data/lib/generators/moar/install/install_generator.rb

@@ -1,5 +1,3 @@
-#require "rails/generators/base"
-
 module Moar
   # @!visibility private
   module Generators

data/lib/moar/helper.rb

@@ -1,14 +1,13 @@
 module Moar
   module Helper
 
-    # Generates an anchor element that links to more paginated results.
-    # If JavaScript is active, and the current page number is less than
+    # Renders an anchor element that links to more paginated results.
+    # If JavaScript is enabled, and the current page number is less than
     # the number of pagination increments (see {Moar::Config#increments}
     # or {Moar::Controller::ClassMethods#moar_increments}), the link
-    # will use Ajax to fetch the results and inject them into the
-    # element matching the CSS selector specified by +target+.
-    # Otherwise, the link will behave normally and navigate to the next
-    # page of results.
+    # will use Ajax to fetch the results and append them to the element
+    # matching the CSS selector specified by +target+.  Otherwise, the
+    # link will navigate to the next page of results.
     #
     # The text of the link is determined via I18n using translation key
     # +:"moar.more"+.  A +results_name+ interpolation argument is
@@ -18,17 +17,13 @@ module Moar
     # is an array of +CowBell+ models, the link text will be "Need more
     # cow bells!".
     #
-    # This helper method accepts an +html_options+ Hash, and passes it
-    # to Rails' +ActionView::Helpers::UrlHelper#link_to+.  See its
-    # documentation for information about available options.
-    #
     # If no more results are available, this helper method will return
     # nil so that no link is rendered.  Whether there are more results
-    # is estimated by comparing +results.length+ with the limit applied
-    # by {Moar::Controller#moar}.  This technique eliminates the need
-    # for an extra database query, but can result in a false positive
-    # (i.e. rendering a link to an empty page) when the actual last page
-    # of results is also a full page.  This is deemed an acceptable
+    # is estimated by comparing +results.size+ with the limit applied by
+    # {Moar::Controller#moar}.  This technique eliminates the need for
+    # an extra database query, but can result in a false positive (i.e.
+    # rendering a link to an empty page) when the actual last page of
+    # results is also a full page.  This is deemed an acceptable
     # trade-off because with a large number of pages and a large total
     # number of results per page it is an unlikely occurrence, and
     # because an extra database query cannot entirely prevent a link to
@@ -36,23 +31,32 @@ module Moar
     # user can click through to the final page.
     #
     # @param results [ActiveRecord::Relation, Array<ActiveModel::Naming>]
+    #   query results for current page
     # @param target [String]
+    #   CSS selector of element containing rendered results
     # @param html_options [Hash]
+    #   HTML options (see +ActionView::Helpers::UrlHelper#link_to+)
     # @return [String, nil]
     # @raise [RuntimeError]
     #   if controller action did not invoke {Moar::Controller#moar}
     def link_to_more(results, target, html_options = {})
       raise "#{controller.class}##{action_name} did not invoke #moar" unless defined?(@moar)
 
-      unless results.length < @moar.limit
+      unless results.size < @moar.limit
         params = request.query_parameters.except(Moar.config.accumulation_param.to_s)
         params[Moar.config.page_param.to_s] = @moar.page + 1
 
         options = { controller: controller_path, action: action_name, params: params }
 
+        model_name = if results.is_a?(ActiveRecord::Relation)
+          results.model
+        else
+          results.first
+        end.model_name
+
         i18n_options = {
-          results_name: results.first.model_name.human(
-            count: 2, default: results.first.model_name.human.pluralize(I18n.locale)
+          results_name: model_name.human(
+            count: 2, default: model_name.human.pluralize(I18n.locale)
           ).downcase,
         }
 

data/lib/moar/version.rb

@@ -1,3 +1,3 @@
 module Moar
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: moar
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jonathan Hefner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-18 00:00:00.000000000 Z
+date: 2019-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
 - !ruby/object:Gem::Dependency
@@ -168,8 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: More-style pagination for Rails