middleman-pagination 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fe88f717f7ddc57f1ee1a68851a0cfbe3ad4d8f
-  data.tar.gz: cc3230860874e8e19771ae200087a3b9d3e73147
+  metadata.gz: 1a5de30344c93337f35a33f43bb16272af19d0d9
+  data.tar.gz: 47e3482871978d4dd24219b4648f5091e801e976
 SHA512:
-  metadata.gz: 05f8d50c012c3d7f34e0941a6db2bcdad55bc154ab5d0c00b28fd378fe569b5776f44807eac6507c5fb510ee098a05c4bc71a7a30acbeb6acd89ec494139cd81
-  data.tar.gz: c8100e62f88d8ad5893d1f7808e38b1b424ceda6ec777928e8521263e4a885cbd95b1d1cf6a4c7969245203d280f7f80bd868e9adedba7419d2ccec10e8c83e0
+  metadata.gz: adfb6c1815df41983f8e08242ff26469046554f2136a7dac6c87b563803216d50c27b9fecc56e456d46d7524cc33bcf74e5177755866e9cfab9ded25ba810eba
+  data.tar.gz: 715d36ca42f3f1a11520db51520e1d808af8aedcf476bb821810faeb920a7801a1971c3baf15e31d9652d328baf4003b672c67da7e898aaeae26378f54978c71

data/lib/middleman/pagination/index_path.rb

@@ -0,0 +1,68 @@
+module Middleman
+  module Pagination
+    class IndexPath
+      attr_accessor :context, :original_path, :page_num, :symbolic_path_replacement
+
+      def initialize(context, original_path, page_num, symbolic_path_replacement = 'pages/:num')
+        @context = context
+        @original_path = original_path
+        @symbolic_path_replacement = symbolic_path_replacement
+
+        if page_num < 1
+          raise "Expected page_num greater than 0 (page numbers are not zero-indexed"
+        end
+
+        @page_num = page_num
+      end
+
+      def to_s
+        if first_index?
+          original_path
+        else
+          replaced_path
+        end
+      end
+
+      private
+
+      def first_index?
+        page_num == 1
+      end
+
+      def replaced_path
+        if original_path.match(index_file_pattern)
+          original_path.sub(index_file_pattern, "\\1#{replaced_symbolic_path}\\2")
+        else
+          original_path.sub(non_index_path_pattern, "\\1\\2/#{replaced_symbolic_path}.\\3")
+        end
+      end
+
+      def index_file_pattern
+        index_file_ext = File.extname(context.index_file)
+        index_file_path = context.index_file.delete(index_file_ext)
+
+        %r{
+          (/)?                                # An optional slash
+          #{Regexp.escape(index_file_path)}   # Followed by the index path (usually "index")
+          (#{Regexp.escape(index_file_ext)})  # Followed by the index extension (usually ".html")
+          $                                   # Followed by the end of the string  
+        }x
+      end
+
+      def non_index_path_pattern
+        %r{
+          (^|/)   # Match the start of the string or a slash
+          ([^/]*) # Followed by any character not a slash
+          \.      # Followed by a dot
+          ([^/]*) # Followed by any character not a slash
+          $       # Followed by the end of the string
+        }x
+      end
+
+      def replaced_symbolic_path
+        symbolic_path_replacement.sub(':num', page_num.to_s)
+      end
+
+    end
+  end
+end

data/lib/middleman/pagination/manipulated_resources.rb

@@ -45,7 +45,7 @@ module Middleman
 
       def build_new_index(first_index, pageable_context, page_num)
         sitemap = context.sitemap
-        path = secondary_index_path(first_index.path, page_num)
+        path = IndexPath.new(context, first_index.path, page_num).to_s
         source_file = first_index.source_file
 
         new_index = ::Middleman::Sitemap::Resource.new(sitemap, path, source_file)
@@ -56,18 +56,6 @@ module Middleman
         new_index
       end
 
-      def secondary_index_path(original_path, page_num)
-        symbolic_path_replacement = "pages/:num"
-        pattern = %r{^?(/)?#{Regexp.escape(context.index_file)}$}
-        replacement = symbolic_path_replacement.sub(':num', page_num.to_s)
-
-        if original_path.match(pattern)
-          original_path.sub(pattern, "\\1#{replacement}.html")
-        else
-          original_path.sub(%r{(^|/)([^/]*)\.([^/]*)$}, "\\1\\2/#{replacement}.\\3")
-        end
-      end
-
       def add_pagination_to(resource, attributes = {})
         in_page_context = InPageContext.new(attributes)
         resource.add_metadata(:locals => { 'pagination' => in_page_context })

data/lib/middleman/pagination/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Pagination
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/lib/middleman/pagination.rb

@@ -5,6 +5,7 @@ require "middleman/pagination/configuration"
 require "middleman/pagination/extension_context"
 require "middleman/pagination/manipulated_resources"
 require "middleman/pagination/pageable_context"
+require "middleman/pagination/index_path"
 require "middleman/pagination/in_page_context"
 require "middleman/pagination/extension"
 

data/spec/features/pagination_feature_spec.rb

@@ -47,14 +47,6 @@ describe "Simple pagination", :feature do
     find_on_page 'Prev page: /pages/3.html'
     find_on_page 'Next page: none'
   end
-
-  def visit(path)
-    expect(get(path)).to be_ok
-  end
-
-  def find_on_page(string)
-    expect(last_response.body).to include(string)
-  end
 end
 
 describe "Pagination with directory indexes", :feature do

data/spec/middleman/pagination/index_path_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+module Middleman::Pagination
+  describe IndexPath do
+
+    describe "#to_s" do
+      let(:ext_context) { double(index_file: 'index.html') }
+
+      context "when the page num is 0" do
+        it "raises an error" do
+          expect {
+            IndexPath.new(ext_context, 'original.html', 0)
+          }.to raise_error
+        end
+      end
+
+      context "when the page num is 1" do
+        it "returns the original path" do
+          path = IndexPath.new(ext_context, 'original.html', 1)
+          expect(path.to_s).to eql('original.html')
+        end
+      end
+
+      context "when the page num is greater than 1" do
+        it "returns a path including the page number" do
+          path = IndexPath.new(ext_context, 'original.html', 2)
+          expect(path.to_s).to eql('original/pages/2.html')
+        end
+
+        it "supports a custom path format" do
+          path = IndexPath.new(ext_context, 'original.html', 2, 'index/at/:num/list')
+          expect(path.to_s).to eql('original/index/at/2/list.html')
+        end
+
+        it "preserves the original file extension" do
+          path = IndexPath.new(ext_context, 'original.htm', 2)
+          expect(path.to_s).to eql('original/pages/2.htm')
+        end
+
+        it "takes index files into account" do
+          ext_context.stub(index_file: 'index.html')
+          path = IndexPath.new(ext_context, 'original/index.html', 2)
+          expect(path.to_s).to eql('original/pages/2.html')
+        end
+
+        it "preserves the index file extension" do
+          ext_context.stub(index_file: 'index.htm')
+          path = IndexPath.new(ext_context, 'original/index.htm', 2)
+          expect(path.to_s).to eql('original/pages/2.htm')
+        end
+      end
+      
+    end
+
+  end
+end

data/spec/support/middleman_server_helpers.rb

@@ -9,7 +9,7 @@ module MiddlemanServerHelpers
   end
 
   def visit(path)
-    expect(get(path)).to be_ok
+    expect(get(path).status).to eql(200)
   end
 
   def find_on_page(string)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-pagination
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Pete Nicholls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -113,6 +113,7 @@ files:
 - lib/middleman/pagination/extension.rb
 - lib/middleman/pagination/extension_context.rb
 - lib/middleman/pagination/in_page_context.rb
+- lib/middleman/pagination/index_path.rb
 - lib/middleman/pagination/manipulated_resources.rb
 - lib/middleman/pagination/pageable_context.rb
 - lib/middleman/pagination/version.rb
@@ -133,6 +134,7 @@ files:
 - spec/fixtures/recipes/source/recipes/yeti.html.erb
 - spec/middleman/pagination/configuration_spec.rb
 - spec/middleman/pagination/extension_context_spec.rb
+- spec/middleman/pagination/index_path_spec.rb
 - spec/middleman/pagination/manipulated_resources_spec.rb
 - spec/spec_helper.rb
 - spec/support/middleman_server_helpers.rb
@@ -156,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Pagination for Middleman pages.
@@ -176,6 +178,7 @@ test_files:
 - spec/fixtures/recipes/source/recipes/yeti.html.erb
 - spec/middleman/pagination/configuration_spec.rb
 - spec/middleman/pagination/extension_context_spec.rb
+- spec/middleman/pagination/index_path_spec.rb
 - spec/middleman/pagination/manipulated_resources_spec.rb
 - spec/spec_helper.rb
 - spec/support/middleman_server_helpers.rb