k-php-serialize 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ca2fe3387bf53ef734923627612458e40617b53
-  data.tar.gz: 641a388382641c7ecafa503366f8df96632ef99a
+  metadata.gz: 09dd982fb92ae4337a82442855f5b54c94c6fbeb
+  data.tar.gz: 06d11823f6271c88036f71f408c82f5ef2af48fa
 SHA512:
-  metadata.gz: b1d1089a746f1b44b17d9ad1610efdb9baa629c93832fbf591354c3b9d0da2d185c24fd0e2463acf2721545eefcb9b6dbe1e15b43f00d1c993848af1e0fc9d44
-  data.tar.gz: b9a5a79f1e2cf93e9eb36977971acebad374e51903a026efdb3b26f4d8322f003bf1add2f59105e87478c274f43b04966cd1dc6350d03b5f074679184cc2e8fc
+  metadata.gz: d0a0c45b0e12441ce2fc65e1a03e3138f4a351b3d6785748f11a30dc06afa8c46d518dbac781a095be0e23f5647bef7c1f6110f3016fb16406c542046fa16b42
+  data.tar.gz: ac0b7a07f168a32d6d61e66c6398eca3cab4715bd104bbc86e429cacbe75090291fc3d17946a4c5d8cefb5374ed6ec32ea417ed72d1ca4a7d2a52ba415d9ad7d

data/lib/php_serialize.rb

@@ -199,8 +199,8 @@ module PHP
 		classmap ||= {}
 
 		ret = nil
-		original_encoding = string.encoding
-		string = StringIOReader.new(string.force_encoding('BINARY'))
+		original_encoding = string.encoding if string.respond_to?(:encoding)
+		string = StringIOReader.new(string.respond_to?(:force_encoding) ? string.force_encoding('BINARY') : string)
 		while string.string[string.pos, 32] =~ /^(\w+)\|/ # session_name|serialized_data
 			ret ||= {}
 			string.pos += $&.size
@@ -238,7 +238,11 @@ private
 
 				if array
 					vals.collect! do |key,value|
-						value.kind_of?(String) ? value.force_encoding(original_encoding) : value
+						if value.respond_to? :force_encoding
+							value.kind_of?(String) ? value.force_encoding(original_encoding) : value
+						else
+							value
+						end
 					end
 				else
 					if assoc
@@ -246,8 +250,12 @@ private
 					else
 						val = Hash.new
 						vals.each do |key,value|
-							key = key.force_encoding(original_encoding) if key.kind_of?(String)
-							value = value.force_encoding(original_encoding) if value.kind_of?(String)
+
+							if value.respond_to? :force_encoding
+								key = key.force_encoding(original_encoding) if key.kind_of?(String)
+								value = value.force_encoding(original_encoding) if value.kind_of?(String)
+							end
+
 							val[key] = value
 						end
 					end
@@ -292,7 +300,8 @@ private
 
 			when 's' # string, s:length:"data";
 				len = string.read_until(':').to_i + 3 # quotes, separator
-				val = string.read(len)[1...-2].force_encoding(original_encoding) # read it, kill useless quotes
+				val = string.read(len)[1...-2] # read it, kill useless quotes
+				val = val.force_encoding(original_encoding) if val.respond_to?(:force_encoding)
 
 			when 'i' # integer, i:123
 				val = string.read_until(';').to_i

data/test.rb

@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 # encoding: utf-8
 
 require 'test/unit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k-php-serialize
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Keitaroh Kobayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies: []
 description: "\tThis module provides two methods: PHP.serialize() and PHP.unserialize(),
   both\n\tof which should be compatible with the similarly named functions in PHP.\n\n\tIt