sinatra_bicyclist 0.1.0 → 0.2.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dd623dcfeee2a86c6f472b1801b2c07f9e2c9f0
-  data.tar.gz: 64954cb95a7eeb1493fc5b649585eff62100b3b1
+  metadata.gz: d5c2a1d3397cf39b0a76a57869621bcae9ef7449
+  data.tar.gz: 6d9f76a78fbf2eff1fcba489ce496452431c1b23
 SHA512:
-  metadata.gz: 3d50bfcc4d50c04ab38d240144d64703ee8c02d1befdccf4c83980bbf041fcc24002cb566fd455844857a59c5e23f3f3dbe844baba713fc30480d0cea1d9bb96
-  data.tar.gz: 33e8eddc21a9ae711176fff87920184e2d5cfce469001a46d696eda5dd417fa4cb9cefdb461a8389848889e56bd40e95e463eb48154dd5598da0db9954aa722f
+  metadata.gz: a0e5f2df39d9fc6c165569eb4e3d4ee6b0c7d8483839372f0eaa85a1a0712642f6df2d823051f03b5c75d33a1911e2557b11b59a6c563d8739518ad552ab2a12
+  data.tar.gz: 8974ef82cdfae4a3df2c8bd31c64c1289f8bdb2c8ae47335fc58c291aeb02e00324e521475be37a77cbd27eba26b30871c40038bc177a612a35b6f56d97b06d2

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 0.2.0 - 2014-10-07
+### Added
+- added `Sinatra::Bicyclist::Cycle` that handles cycling the session
+
+### Changed
+- moved methods that require session from `Sinatra::Bicyclist::Cycler` to `Sinatra::Bicyclist::Cycle`
+
 ## 0.1.0 - 2014-09-30
 ### Added
 - support for more cycle groups

data/lib/sinatra/bicyclist/cycle.rb

@@ -0,0 +1,40 @@
+module Sinatra
+  module Bicyclist
+    class Cycle
+      def initialize(session)
+        @session = session
+      end
+
+      def page_index
+        @session[:_cycle_page_index] ||= -1
+      end
+
+      def next_index
+        page_index.succ
+      end
+
+      def page_index=(value)
+        @session[:_cycle_page_index] = value
+      end
+
+      def reset_index
+        @session[:_cycle_page_index] = -1
+      end
+
+      def last_cycle
+        @session[:_last_cycle].to_s
+      end
+
+      def page(pages)
+        index = next_route(pages)
+        pages[index]
+      end
+
+      def next_route(pages)
+        routes = pages.length
+
+        self.page_index = next_index % routes
+      end
+    end
+  end
+end

data/lib/sinatra/bicyclist/cycler.rb

@@ -1,10 +1,13 @@
+require_relative 'cycle'
+
 module Sinatra
   module Bicyclist
     class Cycler
       attr_accessor :duration
 
-      def initialize(settings)
+      def initialize(settings, cycle_class = Bicyclist::Cycle)
         @settings = settings
+        @cycle_class = cycle_class
       end
 
       def routes
@@ -32,23 +35,10 @@ module Sinatra
         has_groups?
       end
 
-      def page_index(session)
-        page_index = session[:_cycle_page_index] || -1
-        session[:_cycle_page_index] = page_index + 1
-      end
-
-      def random_route(session, group)
-        number_of_routes = pages(group).length
-        pages(group)[page_index(session) % number_of_routes]
-      end
-
-      def reset_index(session)
-        session[:_cycle_page_index] = -1
-      end
-
       def page(session, group = nil)
-        reset_index(session) if group.to_s != session[:_last_cycle].to_s
-        page = random_route(session, group)
+        cycle = @cycle_class.new(session)
+        cycle.reset_index unless cycle.last_cycle == group.to_s
+        page = cycle.page pages(group)
         session[:_cycle] = group || (has_groups? && page)
         page
       end

data/lib/sinatra/bicyclist/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Bicyclist
-    VERSION = '0.1.0'
+    VERSION = '0.2.0.pre1'
   end
 end

data/spec/byciclist_spec.rb

@@ -1,6 +1,7 @@
 require 'sinatra'
 require 'sinatra/bicyclist'
 
+set :environment, :test
 set :routes_to_cycle_through, {
     one: [:foo],
     two: [:bar, :baz]
@@ -15,7 +16,6 @@ RSpec.describe Sinatra::Application do
     it { expect(response.status).to eq(302) }
     it { expect(response.headers).to include('Location' => 'http://example.org/_cycle/one') }
 
-
     context 'two' do
       before { get '/_cycle/two' }
 

data/spec/cycle_spec.rb

@@ -0,0 +1,45 @@
+RSpec.describe Sinatra::Bicyclist::Cycle do
+  let(:routes) { ['a', 'b'] }
+  let(:session) { Hash.new }
+  subject(:cycle) { described_class.new(session) }
+
+  it 'cycles page' do
+    page = cycle.page(routes)
+    expect(page).to eq('a')
+  end
+
+  it 'cycles all page' do
+    pages = 2.times.map { cycle.page(routes) }
+    expect(pages).to eq(['a', 'b'])
+  end
+
+  it 'has -1 index' do
+    expect(cycle.page_index).to eq(-1)
+  end
+
+  context 'cycled page' do
+    let!(:page) { cycle.page(routes) }
+    before { page }
+
+    it 'changes the index' do
+      expect(cycle.page_index).to eq(0)
+    end
+  end
+
+  context 'looped page' do
+    let(:first) { cycle.page(routes) }
+    let(:second) { cycle.page(routes) }
+    let(:third) { cycle.page(routes) }
+
+    it 'loops index' do
+      expect(cycle.page_index).to eq(-1)
+      expect(first).to eq('a')
+      expect(cycle.page_index).to eq(0)
+      expect(second).to eq('b')
+      expect(cycle.page_index).to eq(1)
+      expect(third).to eq('a')
+      expect(cycle.page_index).to eq(0)
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra_bicyclist
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.pre1
 platform: ruby
 authors:
 - Michael Lavrisha
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -87,10 +87,13 @@ files:
 - examples/config.ru
 - examples/modular_application.rb
 - lib/sinatra/bicyclist.rb
+- lib/sinatra/bicyclist/cycle.rb
 - lib/sinatra/bicyclist/cycler.rb
 - lib/sinatra/bicyclist/version.rb
 - sinatra_cyclist.gemspec
 - spec/byciclist_spec.rb
+- spec/cycle_spec.rb
+- spec/cycler_spec.rb
 - spec/spec_helper.rb
 - spec/support/rack.rb
 homepage: https://github.com/mikz/sinatra_bicyclist
@@ -107,9 +110,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -118,5 +121,7 @@ specification_version: 4
 summary: Sinatra can ride a bicycle over and over and over again
 test_files:
 - spec/byciclist_spec.rb
+- spec/cycle_spec.rb
+- spec/cycler_spec.rb
 - spec/spec_helper.rb
 - spec/support/rack.rb