gretel 2.2.0.rc1 → 2.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8655da4c27996c4a3cfa81b8e64b7096a9a8a59a
-  data.tar.gz: a108906eacb8b38d53fc748d55a57bab030d5dcd
+  metadata.gz: 63912baa8d7b8687330b6469ca18b82fef24a6d9
+  data.tar.gz: 93e5d1939577261f3ee204f6874749c4675d4c41
 SHA512:
-  metadata.gz: 2807debcf21aa80f5643bdef961003f299520469ad07e60e03ce9a0484b656e3b626edf56a957eec39126ef68dc43e7576a89b23d7f6192a1e199d910fad0f14
-  data.tar.gz: d69ab2b538e39e97de79ae712481f4bdd586062869ed552beb68af667f0ad4572c800baf01c550b9cc34af8c6416c8c96b9a3a892991ae1ba17a37c6fb0771c5
+  metadata.gz: 2d99b7fe134a685a49f6eb4b6d167ebe9e6c22134e2851fac27f3bee17159ab51bd5290a9647400a64b0a52470630e31305a62443469b29983e792036e0ed2ac
+  data.tar.gz: f17fdfdc5ab2a03578230b8d5c00b48b3094a611234621facbba87448c96b896b202e6ddc102d275583d6fa725b144f427a1c0f6c12eec9168f2f57d09a3bc26

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
-  - 1.8.7
 before_script:
   - "cd test/dummy; rake db:migrate; rake db:test:prepare; cd ../.."
 notifications:

data/README.md

@@ -205,10 +205,10 @@ If you supply a block to the `breadcrumbs` method, it will yield an array with t
 <% end %>
 ```
 
-Setting custom breadcrumb trails
+Setting breadcrumb trails
 --------------------------------
 
-You can set a custom breadcrumb trail via `params[:trail]`. This makes it possible to link to a different breadcrumb trail than the one specified in your breadcrumb.
+You can set a breadcrumb trail via `params[:trail]`. This makes it possible to link to a different breadcrumb trail than the one specified in your breadcrumb.
 
 An example is if you have a store with products that have a default parent to their category, but when linking from the review section, you want to link back to the reviews instead.
 
@@ -247,6 +247,14 @@ Gretel has a built-in view helper method named `breadcrumb_trail` that contains
 
 The product view will now have the breadcrumb trail from the first page (reviews) instead of its default parent.
 
+### Custom trail param
+
+The default trail param is `params[:trail]`. You can change it in an initializer:
+
+```ruby
+Gretel::Trail.trail_param = :other_param
+```
+
 ### Note
 
 Please use the trail functionality with care; the trails can get very long.

data/lib/gretel/trail.rb

@@ -50,13 +50,13 @@ module Gretel
       # Encodes links array to Base64, internally using YAML for serialization.
       def encode_base64(links)
         arr = links.map { |link| [link.key, link.text, link.url] }
-        Base64.urlsafe_encode64(arr.to_yaml)
+        Base64.urlsafe_encode64(arr.to_json)
       end
 
       # Decodes links array from Base64.
       def decode_base64(base64)
-        yaml = Base64.urlsafe_decode64(base64)
-        arr = YAML.load(yaml)
+        json = Base64.urlsafe_decode64(base64)
+        arr = JSON.parse(json)
         arr.map { |key, text, url| Link.new(key, text, url) }
       rescue
         Rails.logger.info "[Gretel] Trail decode failed: Invalid Base64 '#{base64}' in trail"

data/lib/gretel/version.rb

@@ -1,3 +1,3 @@
 module Gretel
-  VERSION = "2.2.0.rc1"
+  VERSION = "2.2.0.rc2"
 end

data/test/helper_methods_test.rb

@@ -181,11 +181,11 @@ class HelperMethodsTest < ActionView::TestCase
   test "trail helper" do
     breadcrumb :basic
 
-    assert_equal "12hY7tdmRCBzQ_LS0tCi0gLSA6YmFzaWMKICAtIEFib3V0CiAgLSAvYWJvdXQK", breadcrumb_trail
+    assert_equal "12MoG3DY5eLzU_W1siYmFzaWMiLCJBYm91dCIsIi9hYm91dCJdXQ==", breadcrumb_trail
   end
 
   test "loading trail" do
-    params[:trail] = "12hY7tdmRCBzQ_LS0tCi0gLSA6YmFzaWMKICAtIEFib3V0CiAgLSAvYWJvdXQK"
+    params[:trail] = "12MoG3DY5eLzU_W1siYmFzaWMiLCJBYm91dCIsIi9hYm91dCJdXQ=="
     breadcrumb :multiple_links
 
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <a href="/about">About</a> &gt; <a href="/about/contact">Contact</a> &gt; <span class="current">Contact form</span></div>},
@@ -194,7 +194,7 @@ class HelperMethodsTest < ActionView::TestCase
 
   test "different trail param" do
     Gretel::Trail.trail_param = :mytest
-    params[:mytest] = "12hY7tdmRCBzQ_LS0tCi0gLSA6YmFzaWMKICAtIEFib3V0CiAgLSAvYWJvdXQK"
+    params[:mytest] = "12MoG3DY5eLzU_W1siYmFzaWMiLCJBYm91dCIsIi9hYm91dCJdXQ=="
     breadcrumb :multiple_links
 
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <a href="/about">About</a> &gt; <a href="/about/contact">Contact</a> &gt; <span class="current">Contact form</span></div>},

data/test/trail_test.rb

@@ -15,16 +15,16 @@ class TrailTest < ActiveSupport::TestCase
   end
 
   test "encoding" do
-    assert_equal "12hY7tdmRCBzQ_LS0tCi0gLSByb290CiAgLSBIb21lCiAgLSAvCi0gLSBzdG9yZQogIC0gU3RvcmUKICAtIC9zdG9yZQotIC0gc2VhcmNoCiAgLSBTZWFyY2gKICAtIC9zdG9yZS9zZWFyY2g_cT10ZXN0Cg==",
+    assert_equal "122.5Th13fvkg_W1sicm9vdCIsIkhvbWUiLCIvIl0sWyJzdG9yZSIsIlN0b3JlIiwiL3N0b3JlIl0sWyJzZWFyY2giLCJTZWFyY2giLCIvc3RvcmUvc2VhcmNoP3E9dGVzdCJdXQ==",
                  Gretel::Trail.encode(@links.map { |key, text, url| Gretel::Link.new(key, text, url) })
   end
 
   test "decoding" do
     assert_equal @links,
-                 Gretel::Trail.decode("12hY7tdmRCBzQ_LS0tCi0gLSByb290CiAgLSBIb21lCiAgLSAvCi0gLSBzdG9yZQogIC0gU3RvcmUKICAtIC9zdG9yZQotIC0gc2VhcmNoCiAgLSBTZWFyY2gKICAtIC9zdG9yZS9zZWFyY2g_cT10ZXN0Cg==").map { |link| [link.key, link.text, link.url] }
+                 Gretel::Trail.decode("122.5Th13fvkg_W1sicm9vdCIsIkhvbWUiLCIvIl0sWyJzdG9yZSIsIlN0b3JlIiwiL3N0b3JlIl0sWyJzZWFyY2giLCJTZWFyY2giLCIvc3RvcmUvc2VhcmNoP3E9dGVzdCJdXQ==").map { |link| [link.key, link.text, link.url] }
   end
 
   test "invalid trail" do
-    assert_equal [], Gretel::Trail.decode("12hY7tdmRCBzZ_LS0tCi0gLSByb290CiAgLSBIb21lCiAgLSAvCi0gLSBzdG9yZQogIC0gU3RvcmUKICAtIC9zdG9yZQotIC0gc2VhcmNoCiAgLSBTZWFyY2gKICAtIC9zdG9yZS9zZWFyY2g_cT10ZXN0Cc==")
+    assert_equal [], Gretel::Trail.decode("122.5Th13fvkg_X1sicm9vdCIsIkhvbWUiLCIvIl0sWyJzdG9yZSIsIlN0b3JlIiwiL3N0b3JlIl0sWyJzZWFyY2giLCJTZWFyY2giLCIvc3RvcmUvc2VhcmNoP3E9dGVzdCJdXQ==")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gretel
 version: !ruby/object:Gem::Version
-  version: 2.2.0.rc1
+  version: 2.2.0.rc2
 platform: ruby
 authors:
 - Lasse Bunk