active_scaffold_vho 3.2.7 → 3.2.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2Q4ZjNiYmY1OGY2ZjRjZDM5NDk2YzA0M2QyODZlNDNjMzU0ZDJlNQ==
+    ODYyNmNhOThiNDY0MmRhYWIzNmM2ZjBlYzM1MzdhOTI0ZTc2M2U2Nw==
   data.tar.gz: !binary |-
-    MzAyMTAzNDZjMTA2MzhiZTVkOTEyOTc0ZGRjYzM4NTk5NDI4MDQ1Yw==
+    NGQ1YzFjNGNkZDg5MDQ3ZWIyZDc4YjI0YzNmMDQ0YjZkZmIzYTcxOA==
 SHA512:
   metadata.gz: !binary |-
-    MzM4NjI4OWNmNzczNTY5OTgyNjE2NmNhYmQzZmY2YTNkOWQyOTA1ZDU5N2E2
-    MTQzNTVmZjc1MWYzMTVhYWMyOGE4Yjk0YzEzM2JiNWE3OGEyNTg3MjRiZjUx
-    YjkxYmM3NWE5Y2FjZWE1YTY5YjM1M2I4MTQ5NjJjMmNhYTk2OTY=
+    ZmM3Zjk1YWJiMTIwZGQ0ZjNmNmM0YjBlZWE0NzZhZWQ3OWU3NWRiODVjYTUw
+    OWI2ZThkNzcwOWY3ZGQ2ZGRjNmRiYTViYWIyNTlhNGYwZWY4NjZkNzUzMGYw
+    MjU4NmRkMmQ3MmFmYTFhNTUwYzkxY2FhNzNjMWZiNTU5MWY0Njc=
   data.tar.gz: !binary |-
-    MDQxMTczYTNiYzY5NjE1NWM1MTQwYTc1NDlkM2E5MTZlMDM1MDZkNGY3ZTMz
-    Y2ZhMTVmMTcwZjIwMGI1NThjZmUyMzRmNDRhODcyMjhhMmMwNzdlZjMyZWRm
-    ODAyMDg2OTdmM2U4OWNkNGQ2YTVjMGQzNWM4ZjgzZTY4NjAyMDE=
+    NmJiNTZhM2VlYmJhN2QzZWIxMTc1OTRmMDhjZmE4ZTdjYzRlNTBmMjliYmQ3
+    ZmE1OTJhYmQxMTdmMjcxNWNjYmQ5NTE5MjUwMWRmNTQ0ZWNkZjZiZjcxMmYy
+    MTg0Y2Q5NDQ0YzNiNGE3ZTU4YmEyMmM0NWZmNTYwMWVhOGVjOTc=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_scaffold_vho (3.2.6)
+    active_scaffold_vho (3.2.7)
       kaminari
       rails (>= 3.1.0)
 
@@ -39,18 +39,18 @@ GEM
     builder (3.0.4)
     erubis (2.7.0)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.6.11)
     journey (1.0.4)
     json (1.8.1)
-    kaminari (0.15.1)
+    kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    multi_json (1.10.0)
-    polyglot (0.3.4)
+    multi_json (1.10.1)
+    polyglot (0.3.5)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -88,7 +88,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.39)
+    tzinfo (0.3.41)
 
 PLATFORMS
   ruby

data/lib/active_scaffold/engine.rb

@@ -16,7 +16,7 @@ module ActiveScaffold
         end
 
         ActiveSupport.on_load(:action_view) do
-          ['name_option_for_datetime', 'action_view_rendering', 'action_view_resolver', 'usa_state'].each do |extension|
+          ['name_option_for_datetime', 'action_view_rendering', 'action_view_resolver', 'usa_state', 'kaminari_first_page_patch'].each do |extension|
             require "#{File.dirname __FILE__}/extensions/#{extension}.rb"
           end
           include ActiveScaffold::Helpers::ViewHelpers

data/lib/active_scaffold/extensions/kaminari_first_page_patch.rb

@@ -0,0 +1,10 @@
+module Kaminari
+  module Helpers
+    class Tag
+      #kaminary sets page 1 to nil.. that conflicts withc activescaffold, cause in case of nil we try to use page stored in session
+      def page_url_for(page)
+        @template.url_for @params.merge(@param_name => (page <= 1 ? 1 : page), :only_path => true)
+      end
+    end
+  end
+end

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -124,8 +124,8 @@ module ActiveScaffold
           format_column_value(record, column)
         else
           value = record.send(column.name)
-          value = value.to_s unless value.nil?
-          text, val = column.options[:options].find {|text, val| (val || text).to_s == value}
+
+          text, val = column.options[:options].find {|text, val| (val.nil? ? text : val).to_s == value.to_s}
           value = active_scaffold_translated_option(column, text, val).first if text
           format_column_value(record, column, value)
         end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 7
+    PATCH = 8
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.8
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -268,6 +268,7 @@ files:
 - lib/active_scaffold/extensions/action_view_resolver.rb
 - lib/active_scaffold/extensions/active_association_reflection.rb
 - lib/active_scaffold/extensions/array.rb
+- lib/active_scaffold/extensions/kaminari_first_page_patch.rb
 - lib/active_scaffold/extensions/localize.rb
 - lib/active_scaffold/extensions/name_option_for_datetime.rb
 - lib/active_scaffold/extensions/nil_id_in_url_params.rb