micro_sessions 0.1.1 → 0.2.0

data/Appraisals

@@ -0,0 +1,9 @@
+appraise "rails-3.0" do
+  gem "rails", "~> 3.0.12"
+  gem "micro_sessions", :path => "../"
+end
+
+appraise "rails-3.1" do
+  gem "rails", "~> 3.1.4"
+  gem "micro_sessions", :path => "../"
+end

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,135 @@
+PATH
+  remote: .
+  specs:
+    micro_sessions (0.1.1)
+      rails (>= 3.0.0, < 3.2.0)
+
+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)
+      bundler
+      rake
+    arel (2.0.10)
+    builder (2.1.2)
+    capybara (1.1.2)
+      mime-types (>= 1.16)
+      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)
+      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)
+      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)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      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)
+      multi_json (~> 1.0)
+      rubyzip
+    sqlite3 (1.3.5)
+    term-ansicolor (1.0.7)
+    thor (0.14.6)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.32)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.0)
+  capybara (~> 1.1.0)
+  cucumber (~> 1.0.4)
+  launchy
+  micro_sessions!
+  rake
+  rdoc (~> 3.12)
+  rspec (~> 2.0)
+  sqlite3 (~> 1.3.4)

data/README.rdoc

@@ -1,3 +1,5 @@
+{<img src="https://secure.travis-ci.org/rubiety/micro_sessions.png?branch=master" alt="Build Status" />}[http://travis-ci.org/rubiety/micro_sessions]
+
 == Micro Sessions
 
 In terms of passing data amongst HTTP requests there are really two options:
@@ -5,7 +7,7 @@ In terms of passing data amongst HTTP requests there are really two options:
 * Storing in cookies
 * Storing in server-side session, keyed off an ID stored as a cookie.
 
-For a certain application where you're using number 3, this comes at a cost - the session is "global".  In other words, in a single browser window with multiple tabs, the server side cannot distinguish between individual "sessions" *within* that browser session. This gem introduces a third, more granular method:
+For a certain application where you're using number 3, this comes at a cost - the session is "global".  In other words, in a single browser window with multiple tabs, the server side cannot distinguish between individual "sessions" *within* that browser session. This gem introduces a fourth, more granular method:
 * Storing in server-side session, keyed off an ID stored as a cookie *and* keyed off a request parameter.
 
 This could be useful in instances such as a very complex wizard where transmitting the entire history of data RESTfully via param passing may not be feasible, yet you'd still like to support multiple tabs within the same browser window separately.
@@ -18,6 +20,8 @@ Include the gem in your Gemfile:
   
   gem "micro_sessions"
 
+NOTE: This gem currently only works with rails 3.0 and rails 3.1, but *not* rails 3.2, due to an issue with overriding url_for. If you want to help with this, see issue #1.
+
 == Usage
 
 Simply include the middleware in your controller:

data/Rakefile

@@ -0,0 +1,37 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'rake'
+require 'rspec/core/rake_task'
+require 'cucumber/rake/task'
+require 'appraisal'
+
+Bundler::GemHelper.install_tasks
+
+desc 'Default: run unit tests.'
+task :default => [:clean, :all]
+
+desc "Run Specs against all Appraisals"
+task :all => :spec do
+  Rake::Task["appraisal:install"].execute
+  system("bundle exec rake -s appraisal test")
+end
+
+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
+
+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

@@ -1,13 +1,6 @@
-unless defined?(ActionController)
-  begin
-    require "action_pack"  
-    require "action_controller"
-    require "action_view"
-  rescue LoadError
-    require "rubygems"
-    require_gem "actionpack"
-  end
-end
+require "rails"
+require "action_controller"
+require "action_view"
 
 module MicroSessions
   extend ActiveSupport::Concern

data/lib/micro_sessions/controller.rb

@@ -13,7 +13,7 @@ module MicroSessions
         options[:length] ||= 10
         options[:counter] ||= 1
         
-        class_inheritable_accessor :micro_session_options
+        class_attribute :micro_session_options
         self.micro_session_options = options
         
         class_eval do
@@ -27,4 +27,4 @@ module MicroSessions
       end
     end
   end
-end
+end

data/lib/micro_sessions/helpers.rb

@@ -2,25 +2,21 @@ module MicroSessions
   module Helpers
     module UrlHelper
       extend ActiveSupport::Concern
-    
-      module InstanceMethods
-        def url_for(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
+
+      def url_for(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
       end
     end
     
     module FormTagHelper
       extend ActiveSupport::Concern
       
-      module InstanceMethods
-        def micro_session_hidden_field
-          hidden_field_tag controller.class.micro_session_options[:param], micro_session.id
-        end
+      def micro_session_hidden_field
+        hidden_field_tag controller.class.micro_session_options[:param], micro_session.id
       end
     end
   end

data/lib/micro_sessions/micro_session.rb

@@ -37,11 +37,11 @@ module MicroSessions
     def generate_id
       case options[:param_type]
       when :hash
-        ActiveSupport::SecureRandom.hex(options[:length] / 2)
+        (Object::const_defined?("SecureRandom") ? SecureRandom : ActiveSupport::SecureRandom).hex(options[:length] / 2)
       when :integer
         self.counter += 1
       when :random_integer
-        ActiveSupport::SecureRandom.integer
+        (Object::const_defined?("SecureRandom") ? SecureRandom : ActiveSupport::SecureRandom).integer
       end
     end
   end

data/lib/micro_sessions/railtie.rb

@@ -1,19 +1,32 @@
 module MicroSessions
-  if defined?(Rails::Railtie)
-    class Railtie < Rails::Railtie
-      initializer "micro_sessions.insert" do
-        ActiveSupport.on_load(:action_controller) do
-          MicroSessions::Railtie.insert
-        end
+  class Railtie < Rails::Railtie
+    initializer "micro_sessions.insert" do
+      ActiveSupport.on_load(:action_controller) do
+        MicroSessions::Railtie.insert_controller
+      end
+
+      ActiveSupport.on_load(:action_view) do
+        MicroSessions::Railtie.insert_view
       end
     end
-  end
-  
-  class Railtie
-    def self.insert
+
+    def self.insert_controller
       ActionController::Base.send(:include, MicroSessions::Controller)
-      ActionView::Helpers::UrlHelper.send(:include, MicroSessions::Helpers::UrlHelper)
+      ActionController::Base.send(:include, MicroSessions::Helpers::UrlHelper)
+    end
+
+    def self.insert_view
       ActionView::Helpers::FormTagHelper.send(:include, MicroSessions::Helpers::FormTagHelper)
+      ActionView::Helpers::UrlHelper.send(:include, MicroSessions::Helpers::UrlHelper)
+    end
+
+    MicroSessions::Railtie.insert_controller
+    MicroSessions::Railtie.insert_view
+
+    config.after_initialize do
+      MicroSessions::Railtie.insert_controller
+      MicroSessions::Railtie.insert_view
     end
   end
 end
+

data/lib/micro_sessions/version.rb

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

data/spec/helpers_spec.rb

@@ -1,24 +1,25 @@
 require "spec_helper"
 
+# Complex Stubbing does not do us any good here... relying on integration tests...
 describe MicroSessions::Helpers do
-  before do
-    @controller_class = Class.new(ActionController::Base)
-    @controller_class.stub(:micro_session_options).and_return(:param => "_msid")
-    @helpers = ActionView::Base.new
-    @helpers.stub(:controller).and_return(@controller_class.new)
-    @helpers.stub(:micro_session).and_return(mock(:id => "abc123"))
-  end
-  
-  it "should respond to #micro_session_hidden_field" do
-    @helpers.should respond_to(:micro_session_hidden_field)
-  end
-  
-  it "should render correct micro_session_hidden_field" do
-    @helpers.micro_session_hidden_field.should == %{<input id="_msid" name="_msid" type="hidden" value="abc123" />}
-  end
-  
+  # before do
+  #   @controller_class = Class.new(ActionController::Base)
+  #   @controller_class.stub(:micro_session_options).and_return(:param => "_msid")
+  #   @helpers = ActionView::Base.new
+  #   @helpers.stub(:controller).and_return(@controller_class.new)
+  #   @helpers.stub(:micro_session).and_return(mock(:id => "abc123"))
+  # end
+  # 
+  # it "should respond to #micro_session_hidden_field" do
+  #   @helpers.should respond_to(:micro_session_hidden_field)
+  # end
+  # 
+  # it "should render correct micro_session_hidden_field" do
+  #   @helpers.micro_session_hidden_field.should == %{<input id="_msid" name="_msid" type="hidden" value="abc123" />}
+  # end
+  # 
   # TODO: This is way too complex to test, requires an enormous amount of stubbing... Need a real Rails app.
   # it "should render correct link_to with :micro_sessions => true" do
   #   @helpers.url_for
   # end
-end
+end

data/spec/spec_helper.rb

@@ -2,9 +2,8 @@ require "rubygems"
 require "rspec"
 require "active_support"
 require "action_pack"
-
-require File.dirname(__FILE__) + "/../init"
+require "micro_sessions"
 
 RSpec.configure do |c|
   
-end
+end

metadata

@@ -1,64 +1,125 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: micro_sessions
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ben Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-24 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: actionpack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-04-02 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &70336143584920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70336143584920
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70336143557720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :runtime
-  version_requirements: *id002
-description: Provides 'micro-sessions' within the global sessions object keyed off an identifier.
+    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
+    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:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70336143470060
+description: Provides 'micro-sessions' within the global sessions object keyed off
+  an identifier.
 email: ben@railsgarden.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/micro_sessions/controller.rb
 - lib/micro_sessions/helpers.rb
 - lib/micro_sessions/micro_session.rb
@@ -68,44 +129,34 @@ files:
 - spec/controller_spec.rb
 - spec/helpers_spec.rb
 - spec/spec_helper.rb
+- Appraisals
+- Gemfile
+- Gemfile.lock
 - LICENSE
+- Rakefile
 - README.rdoc
-- init.rb
-has_rdoc: true
 homepage: http://github.com/rubiety/micro_sessions
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 19
-      segments: 
-      - 1
-      - 3
-      - 4
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.4
 requirements: []
-
 rubyforge_project: micro_sessions
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Keyed sessions within the global sessions object.
 test_files: []
-

data/init.rb

@@ -1,3 +0,0 @@
-require "micro_sessions"
-
-MicroSessions::Railtie.insert