micro_sessions 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c46747cad6fd140413833b912ecf05a62239a36a
+  data.tar.gz: 3b79a6cb3a77fa652d49de1879e26adb7d1ec7a8
+SHA512:
+  metadata.gz: f6b498a063510ed25780015d9b346f0652e222d779ae96aa9062874972d54c81eb99058a4013d1ac80e91fe3d808f63c21f37a5ebcc1129b075b7a7fa1d38868
+  data.tar.gz: c3cff2675dcb281ced97f4c1f4739a00557eb4eb1bc24d5587b0b9562a903eed0b673cf2559317c1d7fa9039010083c109b6d4d187441c2f8832cae33a203d58

data/Appraisals

@@ -1,9 +1,18 @@
-appraise "rails-3.0" do
-  gem "rails", "~> 3.0.12"
-  gem "micro_sessions", :path => "../"
+appraise 'rails-3.0' do
+  gem 'rails', '~> 3.0.12'
+  gem 'rdoc', '~> 3.4'
 end
 
-appraise "rails-3.1" do
-  gem "rails", "~> 3.1.4"
-  gem "micro_sessions", :path => "../"
+appraise 'rails-3.1' do
+  gem 'rails', '~> 3.1.4'
+  gem 'rdoc', '~> 3.4'
+end
+
+appraise 'rails-3.2' do
+  gem 'rails', '~> 3.2.2'
+  gem 'rdoc', '~> 3.4'
+end
+
+appraise 'rails-4.1' do
+  gem 'rails', '~> 4.1.1'
 end

data/Gemfile

@@ -1,3 +1,20 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
+
+gem 'rake', '< 11'
+gem 'rdoc', '~> 4.2.2' # This is to support Ruby 1.8 and 1.9
+
+group :development do
+  # Travis simulator - faster + no more waiting for build emails
+  gem 'wwtd', '~> 1.3.0'
+  gem 'appraisal', '~> 2.2.0'
+end
+
+group :test do
+  gem 'rspec', '>= 3'
+  gem 'capybara', '~> 2.0'
+  gem 'launchy', '~> 2.4.3'
+  gem 'sqlite3', '~> 1.3.4'
+  gem 'addressable', '~> 2.3.7'
+end
 
 gemspec

data/Gemfile.lock

@@ -1,135 +1,140 @@
 PATH
   remote: .
   specs:
-    micro_sessions (0.1.1)
-      rails (>= 3.0.0, < 3.2.0)
+    micro_sessions (0.3.0)
+      rails (>= 3.0.0, <= 4.1.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.12)
-      actionpack (= 3.0.12)
-      mail (~> 2.2.19)
-    actionpack (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.5)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.12)
-      activesupport (= 3.0.12)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
-    activesupport (3.0.12)
-    addressable (2.2.7)
-    appraisal (0.4.1)
+    actionmailer (4.1.1)
+      actionpack (= 4.1.1)
+      actionview (= 4.1.1)
+      mail (~> 2.5.4)
+    actionpack (4.1.1)
+      actionview (= 4.1.1)
+      activesupport (= 4.1.1)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+    activerecord (4.1.1)
+      activemodel (= 4.1.1)
+      activesupport (= 4.1.1)
+      arel (~> 5.0.0)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    addressable (2.3.7)
+    appraisal (2.2.0)
       bundler
       rake
-    arel (2.0.10)
-    builder (2.1.2)
-    capybara (1.1.2)
-      mime-types (>= 1.16)
+      thor (>= 0.14.0)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    capybara (2.15.2)
+      addressable
+      mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.1)
-      ffi (~> 1.0.6)
-    cucumber (1.0.6)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.18)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    diff-lcs (1.1.3)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    ffi (1.0.11)
-    gherkin (2.4.21)
-      json (>= 1.4.6)
-    i18n (0.5.0)
-    json (1.6.6)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
+      xpath (~> 2.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.7.0)
+    json (1.8.6)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
-    multi_json (1.2.0)
-    nokogiri (1.5.2)
-    polyglot (0.3.3)
-    rack (1.2.5)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    mime-types (1.25.1)
+    mini_mime (0.1.4)
+    mini_portile2 (2.3.0)
+    minitest (5.5.1)
+    multi_json (1.10.1)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    polyglot (0.3.5)
+    rack (1.5.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.0.12)
-      actionmailer (= 3.0.12)
-      actionpack (= 3.0.12)
-      activerecord (= 3.0.12)
-      activeresource (= 3.0.12)
-      activesupport (= 3.0.12)
-      bundler (~> 1.0)
-      railties (= 3.0.12)
-    railties (3.0.12)
-      actionpack (= 3.0.12)
-      activesupport (= 3.0.12)
+    rails (4.1.1)
+      actionmailer (= 4.1.1)
+      actionpack (= 4.1.1)
+      actionview (= 4.1.1)
+      activemodel (= 4.1.1)
+      activerecord (= 4.1.1)
+      activesupport (= 4.1.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.1)
+      sprockets-rails (~> 2.0)
+    railties (4.1.1)
+      actionpack (= 4.1.1)
+      activesupport (= 4.1.1)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (0.9.2.2)
-    rdoc (3.12)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.5.0)
+    rdoc (4.2.2)
       json (~> 1.4)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    rubyzip (0.9.6.1)
-    selenium-webdriver (2.20.0)
-      childprocess (>= 0.2.5)
-      ffi (~> 1.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    sprockets (2.12.3)
+      hike (~> 1.2)
       multi_json (~> 1.0)
-      rubyzip
-    sqlite3 (1.3.5)
-    term-ansicolor (1.0.7)
-    thor (0.14.6)
-    treetop (1.4.10)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.2.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.13)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
-    xpath (0.1.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    wwtd (1.3.0)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (~> 0.4.0)
-  capybara (~> 1.1.0)
-  cucumber (~> 1.0.4)
-  launchy
+  addressable (~> 2.3.7)
+  appraisal (~> 2.2.0)
+  capybara (~> 2.0)
+  launchy (~> 2.4.3)
   micro_sessions!
-  rake
-  rdoc (~> 3.12)
-  rspec (~> 2.0)
+  rake (< 11)
+  rdoc (~> 4.2.2)
+  rspec (>= 3)
   sqlite3 (~> 1.3.4)
+  wwtd (~> 1.3.0)
+
+BUNDLED WITH
+   1.15.4

data/Rakefile

@@ -3,7 +3,6 @@ require 'bundler/setup'
 
 require 'rake'
 require 'rspec/core/rake_task'
-require 'cucumber/rake/task'
 require 'appraisal'
 
 Bundler::GemHelper.install_tasks
@@ -21,17 +20,11 @@ desc "Run Specs"
 RSpec::Core::RakeTask.new(:spec) do |t|
 end
 
-task :test => [:spec, :cucumber]
-
-Cucumber::Rake::Task.new(:cucumber) do |t|
-  t.fork = true
-  t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
-end
+task :test => [:spec]
 
 desc "Clean up files."
 task :clean do |t|
   FileUtils.rm_rf "tmp"
-  Dir.glob("spec/db/*.sqlite3").each {|f| FileUtils.rm f }
   Dir.glob("micro_sessions-*.gem").each {|f| FileUtils.rm f }
 end
 

data/lib/micro_sessions.rb

@@ -5,11 +5,11 @@ require "action_view"
 module MicroSessions
   extend ActiveSupport::Concern
   extend ActiveSupport::Autoload
-  
+
   autoload :Controller
   autoload :Helpers
   autoload :MicroSession
-  
+
   included do
     include MicroSessions::Controller
   end

data/lib/micro_sessions/controller.rb

@@ -1,26 +1,26 @@
 module MicroSessions
   module Controller
     extend ActiveSupport::Concern
-  
+
     module ClassMethods
       def micro_sessions(options = {})
         options.stringify_keys!
         options.assert_valid_keys(:param, :param_type, :key, :length, :counter)
-        
+
         options[:param] ||= "_msid"
         options[:key] ||= "_micro_sessions"
         options[:param_type] ||= :hash
         options[:length] ||= 10
         options[:counter] ||= 1
-        
+
         class_attribute :micro_session_options
         self.micro_session_options = options
-        
+
         class_eval do
           def micro_session
             @micro_session ||= MicroSessions::MicroSession.new(self)
           end
-          
+
           helper_method :micro_session
           helper_method :micro_session_options
         end

data/lib/micro_sessions/helpers.rb

@@ -3,18 +3,32 @@ module MicroSessions
     module UrlHelper
       extend ActiveSupport::Concern
 
-      def url_for(options = {})
+      def link_to(name = nil, options = nil, html_options = nil, &block)
+        options = add_micro_session(options)
+
+        super
+      end
+
+      def url_for(options = nil)
+        options = add_micro_session(options)
+
+        super
+      end
+
+      private
+
+      def add_micro_session(options)
         if options.is_a?(Hash) && ms_value = options.delete(:micro_sessions) && !micro_session.empty?
           options[micro_session.options[:param]] = (ms_value == true ? micro_session.id : ms_value)
         end
-      
-        super
+
+        options
       end
     end
-    
+
     module FormTagHelper
       extend ActiveSupport::Concern
-      
+
       def micro_session_hidden_field
         hidden_field_tag controller.class.micro_session_options[:param], micro_session.id
       end

data/lib/micro_sessions/micro_session.rb

@@ -3,16 +3,17 @@ module MicroSessions
     def initialize(controller)
       @controller = controller
     end
-    
+
     def options
       @controller.class.micro_session_options
     end
-    
+
     def data
       @controller.session[options[:key]] ||= {}
       @controller.session[options[:key]][id] ||= {}
+      @controller.session[options[:key]][id].symbolize_keys!
     end
-    
+
     def url_options
       if empty?
         {}
@@ -20,20 +21,19 @@ module MicroSessions
         {options[:param] => id}
       end
     end
-    
+
     delegate :empty?, :[], :[]=, :to_h, :to_hash, :inspect, :to => :data
-    
+
     def id
       @id ||= id_from_params || generate_id
     end
-    
-    
+
     protected
-    
+
     def id_from_params
       @controller.params[options[:param]] if @controller.params
     end
-    
+
     def generate_id
       case options[:param_type]
       when :hash

data/lib/micro_sessions/railtie.rb

@@ -1,18 +1,18 @@
 module MicroSessions
   class Railtie < Rails::Railtie
-    initializer "micro_sessions.insert" do
+    initializer "micro_sessions.configure_view_controller" do
       ActiveSupport.on_load(:action_controller) do
-        MicroSessions::Railtie.insert_controller
+        include MicroSessions::Controller
       end
 
       ActiveSupport.on_load(:action_view) do
-        MicroSessions::Railtie.insert_view
+        include MicroSessions::Helpers::FormTagHelper
+        include MicroSessions::Helpers::UrlHelper
       end
     end
 
     def self.insert_controller
       ActionController::Base.send(:include, MicroSessions::Controller)
-      ActionController::Base.send(:include, MicroSessions::Helpers::UrlHelper)
     end
 
     def self.insert_view
@@ -29,4 +29,3 @@ module MicroSessions
     end
   end
 end
-

data/lib/micro_sessions/version.rb

@@ -1,3 +1,3 @@
 module MicroSessions
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/controller_spec.rb

@@ -8,70 +8,70 @@ describe MicroSessions::Controller do
         self
       end
     end
-    
+
     it "should default param to _msid" do
-      @controller_class.micro_session_options[:param].should == "_msid"
+      expect(@controller_class.micro_session_options[:param]).to eq("_msid")
     end
-    
+
     it "should default key to _micro_sessions" do
-      @controller_class.micro_session_options[:key].should == "_micro_sessions"
+      expect(@controller_class.micro_session_options[:key]).to eq("_micro_sessions")
     end
-    
+
     it "should default length to 10" do
-      @controller_class.micro_session_options[:length].should == 10
+      expect(@controller_class.micro_session_options[:length]).to eq(10)
     end
-    
+
     it "should default counter to 1" do
-      @controller_class.micro_session_options[:counter].should == 1
+      expect(@controller_class.micro_session_options[:counter]).to eq(1)
     end
-    
+
     context "an instance of the controller" do
       before do
         @controller = @controller_class.new
-        @controller.stub(:params).and_return({})
+
+        allow(@controller).to receive(:params).and_return({})
       end
-      
+
       it "should expose #micro_session as a method" do
-        @controller.micro_session.should be_an_instance_of(MicroSessions::MicroSession)
+        expect(@controller.micro_session).to be_kind_of(MicroSessions::MicroSession)
       end
-      
+
       it "should generate a 10-character hash id" do
-        @controller.micro_session.id.should be_a(String)
-        @controller.micro_session.id.size.should == 10
+        expect(@controller.micro_session.id).to be_a(String)
+        expect(@controller.micro_session.id.size).to eq(10)
       end
-      
+
       context "with micro session data and another controller" do
         before do
-          @micro_session_data = {
-            :integer => 1,
-            :string => "String"
-          }
-          
+          @micro_session_data = { integer: 1, string: "String" }
+
           @another_controller = @controller_class.new
-          @another_controller.stub(:params).and_return({})
-          @another_controller.stub(:session).and_return({
+
+          allow(@another_controller).to receive(:params).and_return({})
+          allow(@another_controller).to receive(:session).and_return({
             "_micro_sessions" => {@controller.micro_session.id => @micro_session_data}
           })
         end
-        
+
         context "without passing id" do
           subject do
             @another_controller.micro_session
           end
-          
+
           it "should not have data" do
-            subject.data.should == {}
+            expect(subject.data).to be_empty
           end
         end
-      
+
         context "when passing id" do
           subject do
-            @another_controller.stub(:params).and_return({"_msid" => @controller.micro_session.id})
+            allow(@another_controller).to receive(:params).and_return({"_msid" => @controller.micro_session.id})
+
             @another_controller.micro_session
           end
-          
+
           it "should have data" do
-            subject.data.should == @micro_session_data
+            expect(subject.data).to eq(@micro_session_data)
           end
         end
       end

data/spec/spec_helper.rb

@@ -4,6 +4,6 @@ require "active_support"
 require "action_pack"
 require "micro_sessions"
 
-RSpec.configure do |c|
-  
+RSpec.configure do |config|
+  config.raise_errors_for_deprecations!
 end

metadata

@@ -1,118 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: micro_sessions
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Ben Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70336143584920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - <
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70336143584920
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70336143557720 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: *70336143557720
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: &70336143555180 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-  type: :development
-  prerelease: false
-  version_requirements: *70336143555180
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: &70336143551280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: *70336143551280
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70336143541440 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.4
-  type: :development
-  prerelease: false
-  version_requirements: *70336143541440
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: &70336143535060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :development
-  prerelease: false
-  version_requirements: *70336143535060
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70336143527080 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: *70336143527080
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70336143474400 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70336143474400
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: &70336143470060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+        version: 3.0.0
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70336143470060
+        version: 4.1.1
 description: Provides 'micro-sessions' within the global sessions object keyed off
   an identifier.
 email: ben@railsgarden.com
@@ -120,43 +37,42 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Appraisals
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.rdoc
+- Rakefile
+- lib/micro_sessions.rb
 - lib/micro_sessions/controller.rb
 - lib/micro_sessions/helpers.rb
 - lib/micro_sessions/micro_session.rb
 - lib/micro_sessions/railtie.rb
 - lib/micro_sessions/version.rb
-- lib/micro_sessions.rb
 - spec/controller_spec.rb
 - spec/helpers_spec.rb
 - spec/spec_helper.rb
-- Appraisals
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- Rakefile
-- README.rdoc
 homepage: http://github.com/rubiety/micro_sessions
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.4
+      version: 1.3.5
 requirements: []
-rubyforge_project: micro_sessions
-rubygems_version: 1.8.10
+rubyforge_project: 
+rubygems_version: 2.6.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Keyed sessions within the global sessions object.
 test_files: []