date_paginate 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ddbde00a4e66f4f3dc40034dedd120fb3111627
-  data.tar.gz: 2bf193b3e26e9e1af79b711fcdd4c71629f9cdf7
+  metadata.gz: e83eeb515cf4a5037db8c82a7b08dda1fa0840bf
+  data.tar.gz: 6349d2179b9b52aac193cb2452f32162ca311963
 SHA512:
-  metadata.gz: 08fe527c750371c94f5aa426e1c8b1a0092712851f20e2c0af5761d0ca339377b5dbfc209e3cda4dfb90c47a2ab352b3c93c806479ede92eb26e1a93d3ff6403
-  data.tar.gz: 142ab10240acbb9c8de9cd010d7060870593bb12af51e030d5599c848873fd483f9ad7c2fde90b396a939f0d764308fa5f174ae9970d38ba3957bbaf46234485
+  metadata.gz: 05fffc1ce465b407b56aba16d630432ded3a60f40a54201cfa0f65deff007969b3d90abd90651fd51d02eb4dee670e860016f1a342dc649b4a95d11c49d06a1c
+  data.tar.gz: 087fd3e93a5f76ff02ff869e548de2b29a2e1c778699f97e0771bd9004a52787230d140ba2633746353b63949fea1209eea032b8fdf7931aa30cf4b58f386a73

data/app/views/date_paginate/_paginate_days.html.erb

@@ -3,7 +3,7 @@
     <% recent_days.each do |begin_time| %>
       <% begin_time = begin_time.in_time_zone if date.is_a? ActiveSupport::TimeWithZone %>
       <span class="page<%=' current' if (date.between? begin_time, begin_time.end_of_day) %>">
-        <%= link_to_unless (date.between? begin_time, begin_time.end_of_day), begin_time.strftime('%Y-%m-%d'), year: begin_time.year, month: begin_time.month, day: begin_time.day %>
+        <%= link_to_unless (date.between? begin_time, begin_time.end_of_day), begin_time.strftime('%Y-%m-%d'), params.merge(year: begin_time.year, month: begin_time.month, day: begin_time.day) %>
       </span>
     <% end %>
   </nav>

data/app/views/date_paginate/_paginate_months.html.erb

@@ -3,7 +3,7 @@
     <% recent_months.each do |begin_date| %>
       <% begin_date = begin_date.in_time_zone if date.is_a? ActiveSupport::TimeWithZone %>
       <span class="page<%=' current' if (date.between? begin_date, begin_date.end_of_month) %>">
-        <%= link_to_unless (date.between? begin_date, begin_date.end_of_month), begin_date.strftime('%Y-%m'), year: begin_date.year, month: begin_date.month %>
+        <%= link_to_unless (date.between? begin_date, begin_date.end_of_month), begin_date.strftime('%Y-%m'), params.merge(year: begin_date.year, month: begin_date.month) %>
       </span>
     <% end %>
   </nav>

data/app/views/date_paginate/_paginate_weeks.html.erb

@@ -3,7 +3,7 @@
     <% recent_weeks.each do |begin_date| %>
       <% begin_date = begin_date.in_time_zone if date.is_a? ActiveSupport::TimeWithZone %>
       <span class="page<%=' current' if (date.between? begin_date, begin_date.end_of_week) %>">
-        <%= link_to_unless (date.between? begin_date, begin_date.end_of_week), "#{begin_date.strftime('%Y-%m-%d')} ~ #{begin_date.end_of_week.strftime('%Y-%m-%d')}", year: begin_date.year, month: begin_date.month, day: begin_date.day %>
+        <%= link_to_unless (date.between? begin_date, begin_date.end_of_week), "#{begin_date.strftime('%Y-%m-%d')} ~ #{begin_date.end_of_week.strftime('%Y-%m-%d')}", params.merge(year: begin_date.year, month: begin_date.month, day: begin_date.day) %>
       </span>
     <% end %>
   </nav>

data/lib/date_paginate/helpers/paginator.rb

@@ -7,6 +7,8 @@ module DatePaginate
     class Paginator
       include ::ActionView::Context
 
+      PARAM_KEY_BLACKLIST = :authenticity_token, :commit, :utf8, :_method
+
       def self.paginate_type_list
         [:days, :weeks, :months]
       end
@@ -23,6 +25,7 @@ module DatePaginate
         @date_paginate_type = @options.delete(:date_paginate_type)
         @num_pages = @options.delete(:num_pages)
         @options["recent_#{@date_paginate_type}".to_sym] = send("recent_#{@date_paginate_type}")
+        @params = template.params.except(*PARAM_KEY_BLACKLIST).merge(@options.delete(:params) || {})
       end
 
       paginate_type_list.each do |date_paginate_type|
@@ -53,7 +56,8 @@ module DatePaginate
       private :method_missing
 
       def to_s(locals = {})
-        @template.render :partial => partial_path, :locals => @options.merge(locals), :formats => [:html]
+        locals = @options.merge(params: @params).merge(locals)
+        @template.render :partial => partial_path, :locals => locals, :formats => [:html]
       end
     end
   end

data/lib/date_paginate/version.rb

@@ -1,3 +1,3 @@
 module DatePaginate
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/controllers/action_view_extension_spec.rb

@@ -8,6 +8,11 @@ describe DiariesController do
       get "index", year: Time.current.months_ago(1).year, month: Time.current.months_ago(1).month
       expect(response.body.scan(/<a href=\"\/diaries\?.+">/).size).to eq(5)
     end
+
+    it "with other params" do
+      get "index", status: 0, year: Time.current.months_ago(1).year, month: Time.current.months_ago(1).month
+      expect(response.body.scan(/<a href=\"\/diaries\?.+status=0.+">/).size).to eq(5)
+    end
   end
 
   describe "set_week" do
@@ -15,6 +20,11 @@ describe DiariesController do
       get "week_partition", year: Time.current.year, month: Time.current.month, day: Time.current.day
       expect(response.body.scan(/<a href=\"\/diaries\/week_partition\/archive\/\d+\/\d+\/\d+\">/).size).to eq(5)
     end
+
+    it "with other params" do
+      get "week_partition", status: 0, year: Time.current.year, month: Time.current.month, day: Time.current.day
+      expect(response.body.scan(/<a href=\"\/diaries\/week_partition\/archive\/\d+\/\d+\/\d+\?status=0\">/).size).to eq(5)
+    end
   end
 
   describe "set_date" do
@@ -22,5 +32,10 @@ describe DiariesController do
       get "day_partition", year: Time.current.year, month: Time.current.month, day: Time.current.day
       expect(response.body.scan(/<a href=\"\/diaries\/day_partition\/archive\/\d+\/\d+\/\d+\">/).size).to eq(2)
     end
+
+    it "with other params" do
+      get "week_partition", status: 0, year: Time.current.year, month: Time.current.month, day: Time.current.day
+      expect(response.body.scan(/<a href=\"\/diaries\/week_partition\/archive\/\d+\/\d+\/\d+\?status=0\">/).size).to eq(5)
+    end
   end
 end