funneler 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7a3bf09541da9e35cff85dda980d8e997359390b
-  data.tar.gz: a1ddccb9db1fe53ee2deca111f870da829f192ab
+SHA256:
+  metadata.gz: f7dc39c6f13864d5cd77b31d51408228ac602f6a95e41d572b5c14cba9ea10cc
+  data.tar.gz: 1ab89dcbb940877f23369abe8539ff36828e45b3216817c2db0358c501d78d82
 SHA512:
-  metadata.gz: a8a83dc3f510b91358e01ed93e9db539f82f15008585d50fa83bd0ee172c9883ec254c80813462ae50ca5378bbdf8901b8dbada1936c429293e06ac6c8c69b6c
-  data.tar.gz: cfdf91dbc145f71d3159c454d72713ce48a616841a80dfdf5cf5ac2ffe0d1378b84b20d92eaa2b3a4260bd33995657451b17680f9d71bfd9fd79c0b16047bd8a
+  metadata.gz: f245f3ff37bf840e4ac697e31f20f43b612b511749f281bd52c244a7c3633fd4f7400c4a4b9def4b5ad20a9e9171008f1914bd1d1588c1e7c4fde83c64b83a6b
+  data.tar.gz: 9fd03787d987116a055d7ba9e186338a24d23cc156371c6cd12a343313dfc399ab0423fcf110902b4037c7f51a3135c90e846cf2a72e510e0904c7f5d03896f1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    funneler (1.1.0)
+    funneler (1.2.0)
       jwt
 
 GEM
@@ -10,7 +10,7 @@ GEM
     byebug (8.2.1)
     coderay (1.1.0)
     diff-lcs (1.2.5)
-    jwt (1.5.4)
+    jwt (2.1.0)
     method_source (0.8.2)
     pry (0.10.3)
       coderay (~> 1.1.0)
@@ -48,4 +48,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   1.13.4
+   1.16.4

data/lib/funneler/controller_methods.rb

@@ -1,7 +1,7 @@
 module Funneler
   module ControllerMethods
     def funnel
-      @funnel ||= Funneler.from_token(token: params[:funnel_token])
+      @funnel ||= Funneler.from_token(token: params[:funnel_token], current_page_index: params[:funnel_index])
     end
   end
 end

data/lib/funneler/funnel.rb

@@ -1,10 +1,11 @@
 module Funneler
   class Funnel
 
-    attr_reader :data
+    attr_reader :data, :current_page_index
 
-    def initialize(data = {})
+    def initialize(data = {}, current_page_index = 0)
       @data = data
+      @current_page_index = data.fetch("current_page_index", nil) || current_page_index
       @url_cache = Hash.new {|h, key| h[key] = generate_page_for_index(key) }
     end
 
@@ -35,10 +36,6 @@ module Funneler
       data['meta'] || {}
     end
 
-    def current_page_index
-      data.fetch('current_page_index', 0)
-    end
-
     def token
       TokenHandler.generate_token(data: data)
     end
@@ -49,7 +46,8 @@ module Funneler
       return if bad_index?(index)
 
       token = TokenHandler.generate_token(data: data.merge('current_page_index' => index))
-      add_params_to_url(routes[index], "funnel_token" => token)
+      path  = add_params_to_url(routes[index], "funnel_token" => token )
+      add_params_to_url(path, "funnel_index" => index)
     end
 
     def add_params_to_url(path, new_params)
@@ -65,11 +63,11 @@ module Funneler
     end
 
     def next_index
-      current_page_index + 1
+      current_page_index.to_i + 1
     end
 
     def previous_index
-      index = current_page_index - 1
+      index = current_page_index.to_i - 1
       index < 0 ? 0 : index
     end
 

data/lib/funneler/version.rb

@@ -1,3 +1,3 @@
 module Funneler
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/funneler.rb

@@ -23,9 +23,9 @@ module Funneler
       yield(configuration)
     end
 
-    def from_token(token:)
+    def from_token(token:, current_page_index: 0)
       data = Funneler::TokenHandler.extract_data_from(token)
-      Funneler::Funnel.new(data)
+      Funneler::Funnel.new(data, current_page_index)
     rescue JWT::DecodeError => e
       raise InvalidTokenError, "Invalid token '#{token}': #{e.message}"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funneler
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryan Stawarz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A light-weight approach for routing users through a pre-determined set of