php_session 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b17d2e471e2fc62c4c3681598183b9ce7551a277
-  data.tar.gz: 45400c08a847f2ef18c8e0241648542fa01bc1ab
+  metadata.gz: f64dc34ff5c36c8bce6e5a9b402eb25f01285cbd
+  data.tar.gz: ac9b9f04c37483983660f4ac73a8a62eb93ac9a3
 SHA512:
-  metadata.gz: 890cec71b4f562a2ac591099a36ea7371c190403546fb216749a72dc7dfc883ff520d72b77d87295d097a446a93ad97a625457f9067954d8ccbd4efc4ae6e869
-  data.tar.gz: 608e598aabacdf55c0d1c834057ff1befe09ea8898e3438b9b3b4048a1a99eb76f10eb74072d401e8c4e73b301308a42bc39063443a7958a7eba3770d5f3c145
+  metadata.gz: 38e564743257d37ada276eca63b3648269d06e58ff9bb4805ff6085bcac48f76f44b9318144b379ba1aaf1c71aabf308de25feb2e5b63a6e77ebd9285384d4d7
+  data.tar.gz: 258ff69f3b9db0f348d126827a5f746a1a4f947d05ab9f342eb23773393b62f5e684278dc0e96dec9785ba170c96c4e684c6dab28879ddb34791f66e5e360401

data/README.md

@@ -1,6 +1,6 @@
 # PHPSession
 [![Build Status](https://travis-ci.org/Shinpeim/ruby_php_session.png?branch=master)](https://travis-ci.org/Shinpeim/ruby_php_session)
-
+[![Code Climate](https://codeclimate.com/github/Shinpeim/ruby_php_session.png)](https://codeclimate.com/github/Shinpeim/ruby_php_session)
 ## Description
 PHPSession is a php session file reader/writer. Multibyte string and exclusive control are supported.
 
@@ -23,25 +23,25 @@ Passing option to PHPSession.new, you can handle encodings.
 Options are:
 
 * :internal_encoding
-    
+
     When this value is not nil, Session decoder tries to
     encode string values into this encoding.
-    
+
     For a instance, if your php session file written in EUC-JP and you
     like to handle string as UTF-8 in Ruby, you should set :internal_encoding
     as "UTF-8" and :external_encoding as "EUC-JP".
 
     Default value is Encoding.default_internal.
-    
+
 * :external_encoding
-    
+
     This value should be same as php session file's encoding.
     Encoder tries to encode string values into this encoding.
-    
+
     Default value is Encoding.default_external.
-    
+
 * :encoding_option
-    
+
     This value is passed to String#encode.
 
 
@@ -66,16 +66,16 @@ Or install it yourself as:
         :external_encoding => "EUC-JP", # encoding of sesion file is EUC-JP
         :encoding_option   => {:undef => :replace} # passed to String#encode
     }
-    # option's default values are 
+    # option's default values are
     # :internal_encoding => Encoding.default_internal_encoding
     # :external_encoding => Encoding.default_external_encoding
     # :encoding_option   => {}
-    session = PHPSession.new(session_file_dir, session_id, option)
+    session = PHPSession.new(session_file_dir, option)
 
     begin
       # load session data from file and obtain a lock
-      data = session.load
-      
+      data = session.load(session_id)
+
       data.is_a? Hash # => true
 
       # save session and release the lock

data/lib/php_session.rb

@@ -6,7 +6,7 @@ require "php_session/encoder"
 
 class PHPSession
   attr_reader :data
-  def initialize(session_dir, session_id, option = {})
+  def initialize(session_dir, option = {})
     default_option = {
       :internal_encoding => Encoding.default_internal,
       :external_encoding => Encoding.default_external,
@@ -14,12 +14,12 @@ class PHPSession
     }
     @option = default_option.merge(option)
     @session_dir = File.expand_path(session_dir)
-    set_session_id(session_id)
 
     @file = nil
   end
 
-  def load
+  def load(session_id)
+    set_session_id(session_id)
     @file = File.open(file_path, File::CREAT|File::RDWR)
 
     unless @file.flock(File::LOCK_EX)

data/lib/php_session/version.rb

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 class PHPSession
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/php_session_spec.rb

@@ -12,9 +12,9 @@ describe PHPSession do
           :internal_encoding => nil,
           :external_encoding => "UTF-8",
         }
-        session = PHPSession.new(@session_file[:dir_name], @session_file[:session_id], option)
+        session = PHPSession.new(@session_file[:dir_name], option)
         begin
-          data = session.load
+          data = session.load(@session_file[:session_id])
           expect(data).to eq({"key" => "テスト🍺"})
         ensure
           session.ensure_file_closed
@@ -25,9 +25,9 @@ describe PHPSession do
           :internal_encoding => "UTF-8",
           :external_encoding => "UTF-8",
         }
-        session = PHPSession.new(@session_file[:dir_name], @session_file[:session_id], option)
+        session = PHPSession.new(@session_file[:dir_name], option)
         begin
-          data = session.load
+          data = session.load(@session_file[:session_id])
           expect(data).to eq({"key" => "テスト🍺"})
         ensure
           session.ensure_file_closed
@@ -41,9 +41,9 @@ describe PHPSession do
             :undef => :replace
           }
         }
-        session = PHPSession.new(@session_file[:dir_name], @session_file[:session_id], option)
+        session = PHPSession.new(@session_file[:dir_name], option)
         begin
-          data = session.load
+          data = session.load(@session_file[:session_id])
           expect(data).to eq({"key" => "テスト🍺".encode("EUC-JP", {:undef => :replace})})
         ensure
           session.ensure_file_closed
@@ -59,9 +59,9 @@ describe PHPSession do
       end
 
       it "should return session data" do
-        session = PHPSession.new(@session_file[:dir_name], @session_file[:session_id])
+        session = PHPSession.new(@session_file[:dir_name])
         begin
-          data = session.load
+          data = session.load(@session_file[:session_id])
           expect(data).to eq({"key" => "a"})
         ensure
           session.ensure_file_closed
@@ -75,9 +75,9 @@ describe PHPSession do
 
     context "when session file dosen't exist" do
       it "should return new session data" do
-        session = PHPSession.new(Dir.tmpdir,"session_id")
+        session = PHPSession.new(Dir.tmpdir)
         begin
-          data = session.load
+          data = session.load("session_id")
           expect(data).to eq({})
         ensure
           session.ensure_file_closed
@@ -97,8 +97,8 @@ describe PHPSession do
         :internal_encoding => "UTF-8",
         :encoding_option   => {:undef => :replace}
       }
-      session = PHPSession.new(@session_file[:dir_name], @session_file[:session_id], option)
-      data = session.load
+      session = PHPSession.new(@session_file[:dir_name], option)
+      data = session.load(@session_file[:session_id])
       data["key"] = "テスト🍣"
       session.commit(data)
 
@@ -116,20 +116,8 @@ describe PHPSession do
     context "when session file exists and loaded" do
       before do
         @session_file = create_dummy_session_file('key|s:1:"a";')
-        @session = PHPSession.new(@session_file[:dir_name], @session_file[:session_id])
-        @session.load
-      end
-
-      it "should delete session file" do
-        @session.destroy
-        expect(File.exists?(@session_file[:file_path])).to eq(false)
-      end
-    end
-
-    context "when session file exists and not loaded" do
-      before do
-        @session_file = create_dummy_session_file('key|s:1:"a";')
-        @session = PHPSession.new(@session_file[:dir_name], @session_file[:session_id])
+        @session = PHPSession.new(@session_file[:dir_name])
+        @session.load(@session_file[:session_id])
       end
 
       it "should delete session file" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: php_session
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Shinpei Maruyama