php_serialize 1.1.3 → 1.2

data/lib/php_serialize.rb

@@ -86,10 +86,11 @@ module PHP
 				s << '}'
 
 			when String, Symbol
-				s << "s:#{var.to_s.length}:\"#{var.to_s}\";"
+				s << "s:#{var.to_s.bytesize}:\"#{var.to_s}\";"
 
-			when Fixnum # PHP doesn't have bignums
-				s << "i:#{var};"
+			when Integer
+			  raise RangeError, "value too  big to serialize as integer: #{var}" unless (-2147483648..2147483647).include? var
+        s << "i:#{var};"
 
 			when Float
 				s << "d:#{var};"
@@ -191,7 +192,8 @@ module PHP
 		string = StringIO.new(string)
 		def string.read_until(char)
 			val = ''
-			while (c = self.read(1)) != char
+			# readchar returns a string in 1.9 and a fixnum in 1.8
+			while (c = self.readchar) != char[0]
 				val << c
 			end
 			val
@@ -215,6 +217,7 @@ module PHP
 
 private
 	def PHP.do_unserialize(string, classmap, assoc)
+	  encoding = string.external_encoding rescue 'UTF-8'
 		val = nil
 		# determine a type
 		type = string.read(2)[0,1]
@@ -292,8 +295,10 @@ private
 
 			when 's' # string, s:length:"data";
 				len = string.read_until(':').to_i + 3 # quotes, separator
-				val = string.read(len)[1...-2] # read it, kill useless quotes
-
+				val = string.read(len)
+				val = val.force_encoding(encoding) if val.respond_to?(:force_encoding)
+				val = val[1...-2] # read it, kill useless quotes
+				
 			when 'i' # integer, i:123
 				val = string.read_until(';').to_i
 

data/test.rb

@@ -1,4 +1,5 @@
 #!/usr/local/bin/ruby
+# encoding: UTF-8
 
 require 'test/unit'
 
@@ -62,6 +63,7 @@ class TestPhpSerialize < Test::Unit::TestCase
 	test -2147483648, "i:-2147483648;", :name => 'Min Fixnum'
 	test 4.2, 'd:4.2;'
 	test 'test', 's:4:"test";'
+	test 'ümläut_test', 's:13:"ümläut_test";'
 	test :test, 's:4:"test";', :name => 'Symbol'
 	test "\"\n\t\"", "s:4:\"\"\n\t\"\";", :name => 'Complex string'
 	test [nil, true, false, 42, 4.2, 'test'], 'a:6:{i:0;N;i:1;b:1;i:2;b:0;i:3;i:42;i:4;d:4.2;i:5;s:4:"test";}',
@@ -72,6 +74,13 @@ class TestPhpSerialize < Test::Unit::TestCase
 	test TestClass.new("Foo", 65), 'O:9:"testclass":2:{s:4:"name";s:3:"Foo";s:5:"value";i:65;}',
 		:name => 'Class'
 
+  def test_unserialize_unknown_class
+    php = 'O:12:"unknownclass":2:{s:4:"name";s:3:"Foo";s:5:"value";i:65;}'
+    ruby = OpenStruct.new('name' => "Foo", 'value' => 65);
+    unserialized = PHP.unserialize(php);
+    assert_equal ruby, unserialized
+  end
+  
 	# Verify assoc is passed down calls.
 	# Slightly awkward because hashes don't guarantee order.
 	def test_assoc
@@ -104,6 +113,11 @@ class TestPhpSerialize < Test::Unit::TestCase
 	end
 end
 
-require 'test/unit/ui/console/testrunner'
-Test::Unit::UI::Console::TestRunner.run(TestPhpSerialize)
-
+if RUBY_VERSION =~ /1.9/
+  require 'test/unit/diff'
+  require 'test/unit/autorunner'
+  Test::Unit::AutoRunner.default_runner = "console"
+else
+  require 'test/unit/ui/console/testrunner'
+  Test::Unit::UI::Console::TestRunner.run(TestPhpSerialize)
+end

metadata

@@ -1,57 +1,51 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: php_serialize
-version: !ruby/object:Gem::Version 
-  version: 1.1.3
+version: !ruby/object:Gem::Version
+  version: '1.2'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Thomas Hurst
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-11-29 00:00:00 +01:00
+date: 2011-06-17 00:00:00.000000000 +02:00
 default_executable: 
 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 can also serialize and unserialize PHP sessions.\n"
+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
+  can also serialize and unserialize PHP sessions.\n"
 email: tom@hur.st
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/php_serialize.rb
+- test.rb
 has_rdoc: true
 homepage: http://www.aagh.net/projects/ruby-php-serialize
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib/
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby analogs to PHP's serialize() and unserialize() functions
-test_files: 
+test_files:
 - test.rb