rack-session-php 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c2b5683aa9c160817926b29992bef4aa5af5af5
-  data.tar.gz: 65f9df10b4e7eb6ce171e8d84651f2e41f47e16d
+  metadata.gz: 251a6ca14b9a709813406bd23de34e270c47e6ae
+  data.tar.gz: 01692dcc518570209b1a39b69c62cd31d481ce09
 SHA512:
-  metadata.gz: 41575b42d4687f439cac1c1926b706d219f7918ebd24bf976960d421d095ca9616d8536055ca44199fb71b4992e76e240c43e70ec20dd5c7bb5fbe26b583bbde
-  data.tar.gz: 8a4cf5c6c6d232656d57cc4a7f2c9aaac9759c8f56be82d408914fe2ea1d911f8485cb07835140405d0272dbeed45b28582fd00113c54a8a8aa65697369c4dd7
+  metadata.gz: 7d28f914fc64fb902ba140dc506ba286c0101da7de344c0817992b9942c3689778f88e1a3c8d6b259a91136164c55d143b71030e54f85ad4d8839e2e15322875
+  data.tar.gz: 11efa839b8d973e8a1104145b649b914cc307a500002c3c67bd7aeef81c1e4064d230680768c02aaa9e6145c2bed50e711623e835ee67e5d8e530a06121ca0b5

data/README.md

@@ -25,14 +25,14 @@ In your config.ru
 require 'rack/session/php'
 
 use Rack::Session::PHP, {
-  :session_file_dir => "/path/to/your/session_files"
-  :file_options => {
-    :internal_encoding => 'UTF-8', # encoding in ruby is utf-8
-    :external_encoding => 'EUC-JP',# encoding in session file is euc-jp
-    :encoding_option => {:undef => :replace}, # option passed to String#encode
-  }
-  :expire_after => 10,
+  # options are passed to php_session gem
+  :session_file_dir => "/path/to/your/session_files",
+  :internal_encoding => 'UTF-8',
+  :external_encoding => 'EUC-JP',
+  :encoding_option => {:undef => :replace},
+
   # and you can pass Rack::Session options.
+  :expire_after => 10,
 }
 
 run your_awsome_rack_application

data/lib/rack/session/php.rb

@@ -5,13 +5,7 @@ module Rack
   module Session
     class PHP < Rack::Session::Abstract::ID
       def initialize(app, options = {})
-        @session_file_dir = options.delete(:session_file_dir)
-        raise "session file dir must be defined" unless @session_file_dir
-
-        file_options = options.delete(:file_options)
-        file_options ||= {}
-
-        @session = PHPSession.new(@session_file_dir, file_options)
+        @session = PHPSession.new(options)
         @mutex = Mutex.new
 
         super(app, options)
@@ -20,7 +14,7 @@ module Rack
       def generate_sid
         loop do
           sid = super
-          break sid unless ::File.exists?(::File.join(@session_file_dir, "sess_#{sid}"))
+          break sid if ! @session.exists?(sid)
         end
       end
 

data/rack-session-php.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rack-session-php"
-  spec.version       = "0.0.2"
+  spec.version       = "0.1.0"
   spec.authors       = ["Shinpei Maruyama"]
   spec.email         = ["shinpeim@gmail.com"]
   spec.description   = %q{rack middleware which provides php compatible sessions}
@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "php_session", "0.3.1"
-  spec.add_dependency "rack", "~> 1.5.2"
+  spec.add_dependency "php_session", "= 0.4.1"
+  spec.add_dependency "rack", "~> 1.5"
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rake", "~> 10.3"
+  spec.add_development_dependency "rspec", "~> 3.0"
 end

data/spec/rack/session/php_spec.rb

@@ -31,7 +31,7 @@ describe Rack::Session::PHP do
   end)
   incrementor = Rack::Lint.new(incrementor)
 
-  let(:session_file_dir) {File.join(File.dirname(__FILE__), "..", "..", "session_files")}
+  let(:session_file_dir) {File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "session_files"))}
   let(:pool) {
     Rack::Session::PHP.new(incrementor, :session_file_dir => session_file_dir)
   }
@@ -187,10 +187,9 @@ describe Rack::Session::PHP do
     }
     pool = Rack::Session::PHP.new(multibyte_app, {
       :session_file_dir => session_file_dir,
-      :file_options => {
-        :internal_encoding => "UTF-8",
-        :external_encoding => "EUC-JP",
-      }
+
+      :internal_encoding => "UTF-8",
+      :external_encoding => "EUC-JP",
     })
 
     req = Rack::MockRequest.new(pool)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-session-php
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Shinpei Maruyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: php_session
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,30 +56,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: rack middleware which provides php compatible sessions
 email:
 - shinpeim@gmail.com