php_session 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16cf738d413f25164e6bee9698592671dd1cc6af
-  data.tar.gz: f32cf9dd832e3c66f1c7755ae0c2581c890a5d2e
+  metadata.gz: 8550806b73142b48e0e82596af2e4f1b8e8ab363
+  data.tar.gz: 80ad0853de0fea1c9e22c460d65bb60bdae9c3fd
 SHA512:
-  metadata.gz: b93e0e6d6a2e334e4a3bc0ed1e1054c0486021f4bf2bf761db49c8685cf2b0030dca809e4e76602d4717e4708f1c60b830ef7446b65a4345e17510223335f5d6
-  data.tar.gz: 6fbe2cc80a4ea1977b6dae82f5a1d68ad2516f15439b6d82a97f2b8c46e8824c614ff01ce0922dd61d692630db5b14977419e246370adc023da2da9ccb594a5f
+  metadata.gz: 92cfdb1e5126e6d8a7819e3d03467586bd3c0aa39b779586d900d6ae46d01dfb233353dcd909b0d4a6945c8cccecb804c0c70d1ba19b69462dcf63cc54c857b8
+  data.tar.gz: c0416ce6aee7827f08a5f041f24893ba16bed74f4b29e97f46cb5e41937d335c456be45bf88c5de36169998e7553ec3233b9d8fcecbbc21f815a719d95dc6de4

data/lib/php_session/decoder.rb

@@ -5,6 +5,10 @@ class PHPSession
     attr_reader :encoding, :encoding_option
 
     def self.decode(string, encoding = nil, encoding_option = {})
+      if string.nil?
+        string = ""
+      end
+      string.chomp!
       self.new(string, encoding, encoding_option).decode
     end
 
@@ -118,7 +122,7 @@ class PHPSession
     module State
       class VarName
         def self.parse(decoder)
-          matches = /^(.*?)\|(.*)$/.match(decoder.buffer)
+          matches = /\A(.*?)\|(.*)\Z/m.match(decoder.buffer)
           raise Errors::ParseError, "invalid format" if matches.nil?
           varName = matches[1]
           decoder.buffer = matches[2]
@@ -131,35 +135,35 @@ class PHPSession
       class VarType
         def self.parse(decoder)
           case decoder.buffer
-          when /^s:(\d+):(.*)/ # string
+          when /\As:(\d+):(.*)\Z/m # string
             decoder.buffer = $2
             decoder.stack.push($1.to_i)
             decoder.state = String
-          when /^i:(-?\d+);(.*)/ #int
+          when /\Ai:(-?\d+);(.*)\Z/m #int
             decoder.buffer = $2
             decoder.process_value($1.to_i)
-          when /^d:(-?\d+(?:\.\d+)?);(.*)/ # double
+          when /\Ad:(-?\d+(?:\.\d+)?);(.*)\Z/m # double
             decoder.buffer = $2
             decoder.process_value($1.to_f)
-          when /^a:(\d+):(.*)/ # array
+          when /\Aa:(\d+):(.*)\Z/m # array
             decoder.buffer = $2
             decoder.start_array($1.to_i)
             decoder.state = ArrayStart
-          when /^(N);(.*)/ # null
+          when /\A(N);(.*)\Z/m # null
             decoder.buffer = $2
             decoder.process_value(nil)
-          when /^b:([01]);(.*)/ # boolean
+          when /\Ab:([01]);(.*)\Z/m # boolean
             decoder.buffer = $2
             bool = case $1
                    when "0" then false
                    when "1" then true
                    end
             decoder.process_value(bool)
-          when /^O:(\d+):(.*)/ # object
+          when /\AO:(\d+):(.*)\Z/m # object
             decoder.buffer = $2
             decoder.stack.push($1.to_i);
             decoder.state = ClassName
-          when /^[Rr]:(\d+);(.*)/ # reference count?
+          when /\A[Rr]:(\d+);(.*)\Z/m # reference count?
             decoder.buffer = $2
             decoder.process_value($1)
           else
@@ -174,7 +178,7 @@ class PHPSession
           length_include_quotes = length + 3
 
           value_include_quotes = decoder.buffer.byteslice(0, length_include_quotes)
-          value = value_include_quotes.gsub(/^"/,'').gsub(/";$/, '')
+          value = value_include_quotes.gsub(/\A"/,'').gsub(/";\Z/, '')
 
           value = value.encode(decoder.encoding, decoder.encoding_option) if decoder.encoding
           decoder.buffer = decoder.buffer.byteslice(length_include_quotes .. -1)
@@ -185,7 +189,7 @@ class PHPSession
 
       class ArrayStart
         def self.parse(decoder)
-          raise Errors::ParseError, "invalid array format" unless decoder.buffer =~ /^{/
+          raise Errors::ParseError, "invalid array format" unless decoder.buffer =~ /\A{/
             decoder.buffer = decoder.buffer[1..-1]
           if decoder.elements_count > 0
             decoder.state = VarType
@@ -197,7 +201,7 @@ class PHPSession
 
       class ArrayEnd
         def self.parse(decoder)
-          raise Errors::ParseError, "invalid array format" unless decoder.buffer =~ /^}/
+          raise Errors::ParseError, "invalid array format" unless decoder.buffer =~ /\A}/
             decoder.buffer = decoder.buffer[1..-1]
           next_state = decoder.in_array ? VarType : VarName;
           decoder.state = next_state
@@ -210,11 +214,11 @@ class PHPSession
           length_include_quotes = length + 3
 
           value_include_quotes = decoder.buffer[0, length_include_quotes]
-          klass = value_include_quotes.gsub(/^"/,'').gsub(/":$/,'')
+          klass = value_include_quotes.gsub(/\A"/,'').gsub(/":\Z/,'')
 
           decoder.buffer = decoder.buffer[length_include_quotes..-1]
 
-          raise Errors::ParseError, "invalid class format" unless decoder.buffer =~ /^(\d+):(.*)/
+          raise Errors::ParseError, "invalid class format" unless decoder.buffer =~ /\A(\d+):(.*)/m
           decoder.buffer = $2
           decoder.start_array($1.to_i, klass)
           decoder.state = ArrayStart

data/lib/php_session/version.rb

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

data/spec/php_session/decoder_spec.rb

@@ -178,6 +178,23 @@ EOS
           }
         })
       end
+      context 'when given nil' do
+        it "should return {}" do
+          expect(PHPSession::Decoder.decode(nil)).to eq({})
+        end
+      end
+
+      context 'when given string including \n' do
+        it 'shoud return valid session_data' do
+          session_text = %Q!key|a:2:{s:2:\"k1\";s:3:\"v\n1";s:2:"k2";s:2:"v2";}!
+          expect(PHPSession::Decoder.decode(session_text)).to eq({
+            "key" => {
+              "k1" => "v\n1",
+              "k2" => "v2"
+            }
+          })
+        end
+      end
     end
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: php_session
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Shinpei Maruyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: php session reader/writer
@@ -59,9 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -86,17 +86,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: php_session is a php session file reader/writer. Multibyte string and exclusive
@@ -106,3 +106,4 @@ test_files:
 - spec/php_session/encoder_spec.rb
 - spec/php_session_spec.rb
 - spec/spec_helper.rb
+has_rdoc: