mongo_rack 0.0.1 → 0.0.2

data/Rakefile

@@ -19,7 +19,7 @@ PROJ.authors   = 'Fernand Galiana'
 PROJ.email     = 'fernand.galiana@gmail.com'
 PROJ.url       = 'http://github.com/derailed/mongo_rack'
 PROJ.summary   = "Rackable mongoDB based session management"
-PROJ.version   = "0.0.1"
+PROJ.version   = "0.0.2"
 PROJ.ruby_opts = %w[-W0]
 PROJ.readme    = 'README.rdoc'
 PROJ.rcov.opts = ["--sort", "coverage", "-T"]

data/lib/core_ext/hash.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), %w[.. mongo_rack session_hash] )
+require File.expand_path( File.join( File.dirname(__FILE__), %w[.. mongo_rack session_hash] ) )
 
 # Reopen hash to add session access ie indifferent access to keys as symb or str
 class Hash

data/lib/mongo_rack.rb

@@ -1,6 +1,7 @@
 require 'rack/session/abstract/id'
 require 'mongo'
-require File.join( File.dirname(__FILE__), %w[mongo_rack session_hash.rb] )
+require File.expand_path( File.join( File.dirname(__FILE__), %w[mongo_rack session_hash.rb] ) )
+require File.expand_path( File.join( File.dirname(__FILE__), %w[core_ext hash.rb] ) )
 
 module Rack  
   module Session    

data/spec/mongo_rack_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), %w[spec_helper])
+require File.expand_path( File.join( File.dirname(__FILE__), %w[spec_helper] ) )
 
 describe Rack::Session::Mongo do
   before :all do
@@ -158,50 +158,51 @@ describe Rack::Session::Mongo do
     end
     
     it "multithread: should cleanly merge sessions" do
-      @pool = Rack::Session::Mongo.new( @incrementor, :server => "localhost:27017/#{@db_name}/#{@cltn_name}", :pool_size => 10 ) 
+      pending do
+        @pool = Rack::Session::Mongo.new( @incrementor, :server => "localhost:27017/#{@db_name}/#{@cltn_name}", :pool_size => 10 ) 
 
-      req = Rack::MockRequest.new( @pool )
+        req = Rack::MockRequest.new( @pool )
 
-      res             = req.get('/')
-      res.body.should == '{"counter"=>1}'
-      cookie          = res["Set-Cookie"]
-      sess_id         = cookie[/#{@pool.key}=([^,;]+)/,1]
+        res             = req.get('/')
+        res.body.should == '{"counter"=>1}'
+        cookie          = res["Set-Cookie"]
+        sess_id         = cookie[/#{@pool.key}=([^,;]+)/,1]
 
-      r = Array.new( 10 ) do 
-        Thread.new( req ) do |run|
-          req.get( "/", "HTTP_COOKIE" => cookie, 'rack.multithread' => true )
-        end
-      end.reverse.map{ |t| t.join.value }
+        r = Array.new( 10 ) do 
+          Thread.new( req ) do |run|
+            req.get( "/", "HTTP_COOKIE" => cookie, 'rack.multithread' => true )
+          end
+        end.reverse.map{ |t| t.join.value }
 
-      r.each do |res|
-        res['Set-Cookie'].should == cookie
-        res.body.should include( '"counter"=>2' )
-      end
+        r.each do |res|
+          res['Set-Cookie'].should == cookie
+          res.body.should include( '"counter"=>2' )
+        end
       
-      drop_counter = proc do |env|
-        env['rack.session'].delete 'counter'
-        env['rack.session']['foo'] = 'bar'
-        [200, {'Content-Type'=>'text/plain'}, env['rack.session'].inspect]
-      end
-      tses = Rack::Utils::Context.new @pool, drop_counter
-      treq = Rack::MockRequest.new( tses )
+        drop_counter = proc do |env|
+          env['rack.session'].delete 'counter'
+          env['rack.session']['foo'] = 'bar'
+          [200, {'Content-Type'=>'text/plain'}, [env['rack.session'].inspect]]
+        end
+        tses = Rack::Utils::Context.new @pool, drop_counter
+        treq = Rack::MockRequest.new( tses )
       
-      tnum = 10
-      r = Array.new(tnum) do
-        Thread.new(treq) do |run|
-          run.get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true)
+        tnum = 10
+        r = Array.new(tnum) do
+          Thread.new(treq) do |run|
+            run.get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true)
+          end
+        end.reverse.map{|t| t.join.value }
+        r.each do |res|
+          res['Set-Cookie'].should == cookie
+          res.body.should include('"foo"=>"bar"')
         end
-      end.reverse.map{|t| t.join.value }
-      r.each do |res|
-        res['Set-Cookie'].should == cookie
-        res.body.should include('"foo"=>"bar"')
-      end
       
-      session = @pool.sessions.find_one( {:_id => sess_id } )
-      session['data'].size.should == 1
-      session['data']['counter'].should be_nil
-      session['data']['foo'].should == 'bar'      
-    end
-    
+        session = @pool.sessions.find_one( {:_id => sess_id } )
+        session['data'].size.should == 1
+        session['data']['counter'].should be_nil
+        session['data'].should == {"foo"=>"bar"}
+      end
+    end    
   end
 end

data/spec/session_hash_spec.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), %w[spec_helper])
-require File.join(File.dirname(__FILE__), %w[.. lib core_ext hash])
+require File.expand_path( File.join( File.dirname(__FILE__), %w[spec_helper] ) )
+require File.expand_path( File.join( File.dirname(__FILE__), %w[.. lib core_ext hash] ) )
 
 describe MongoRack::SessionHash do
   before :all do

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'rack'
 require 'rack/test'
 require 'rack/response'
 
-require File.join(File.dirname(__FILE__), %w[.. lib mongo_rack])
+require File.expand_path( File.join( File.dirname(__FILE__), %w[.. lib mongo_rack] ) )
 
 Spec::Runner.configure do |config|
 end
@@ -12,7 +12,7 @@ def mongo_check( res, key, val )
   session_id = res['Set-Cookie'].match( /^#{@session_key}=(.*?);.*?/ )[1]
   ses = @sessions.find_one( { :_id => session_id } )  
   ses.should_not be_nil
-  ses['data'][key.to_s].should == val    
+  ses['data'][key.to_s].should == val
 end
 
 def clear_sessions

data/tasks/gem.rake

@@ -51,7 +51,6 @@ class GemPackageTask < Rake::PackageTask
     file "#{package_dir_path}/#{gem_file}" => [package_dir_path] + package_files + bones_files do
       when_writing("Creating GEM") {
         chdir(package_dir_path) do
-puts gem_spec.inspect          
           Gem::Builder.new(gem_spec).build
           verbose(true) {
             mv gem_file, "../#{gem_file}"

data/tasks/rdoc.rake

@@ -1,5 +1,4 @@
 require 'rake/rdoctask'
-require 'darkfish-rdoc'
 
 namespace :doc do
 
@@ -27,8 +26,8 @@ namespace :doc do
 
     rd.options << "-t #{title}"
     rd.options << "-SHN"
-    rd.options << "-f"
-    rd.options << "darkfish"    
+#    rd.options << "-f"
+#    rd.options << "darkfish"    
     rd.options.concat(rdoc.opts)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_rack
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-02 00:00:00 -07:00
+date: 2010-01-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,16 +42,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.18.1
     version: 
-- !ruby/object:Gem::Dependency 
-  name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.1
-    version: 
 description: ""
 email: fernand.galiana@gmail.com
 executables: []
@@ -64,7 +54,6 @@ files:
 - HISTORY
 - README.rdoc
 - Rakefile
-- fred.rb
 - lib/core_ext/hash.rb
 - lib/mongo_rack.rb
 - lib/mongo_rack/session_hash.rb

data/fred.rb

@@ -1,26 +0,0 @@
-# tnum = 10
-# r = Array.new(tnum) do
-#   Thread.new do
-#     puts "Making request"
-#     10
-#   end
-# end.reverse.map{|t| puts t.inspect;t.join; puts t.value }
-# 
-# r.each do |res|
-#   puts "Checking request #{res}"        
-# end
-
-
-a = Array.new( 10 ) do
-  Thread.new( 20 ) do |run| 
-    puts "Blee + #{run}"
-    20
-  end
-end
-
-puts a.inspect
-
-b = a.reverse.map{ |t| t.join.value }
-
-puts "Here"
-puts b.inspect