clj 0.0.4.1 → 0.0.4.2

data/lib/clj/parser.rb

@@ -147,20 +147,34 @@ class Parser < StringScanner
 		?u  => nil,
 	})
 
+	EMPTY_8BIT_STRING = ''
+
+	if EMPTY_8BIT_STRING.respond_to? :force_encoding
+		EMPTY_8BIT_STRING.force_encoding Encoding::ASCII_8BIT
+	end
+
 	def parse_string
 		return '' if self[1].empty?
 
 		self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n) do |c|
 			if u = UNESCAPE_MAP[$&[1]]
-				u
-			else # \uXXXX
-				bytes = EMPTY_8BIT_STRING.dup
-				i = 0
-				while c[6 * i] == ?\\ && c[6 * i + 1] == ?u
-					bytes << c[6 * i + 2, 2].to_i(16) << c[6 * i + 4, 2].to_i(16)
-					i += 1
-				end
-				JSON.iconv('utf-8', 'utf-16be', bytes)
+				next u
+			end
+
+			bytes = EMPTY_8BIT_STRING.dup
+
+			i = 0
+			while c[6 * i] == ?\\ && c[6 * i + 1] == ?u
+				bytes << c[6 * i + 2, 2].to_i(16) << c[6 * i + 4, 2].to_i(16)
+
+				i += 1
+			end
+
+			if bytes.respond_to? :force_encoding
+				bytes.force_encoding 'UTF-16be'
+				bytes.encode 'UTF-8'
+			else
+				bytes
 			end
 		end
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clj
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1
+  version: 0.0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000 Z
+date: 2012-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15412780 !ruby/object:Gem::Requirement
+  requirement: &15415840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15412780
+  version_requirements: *15415840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15412180 !ruby/object:Gem::Requirement
+  requirement: &15414800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15412180
+  version_requirements: *15414800
 description: 
 email: meh@paranoici.org
 executables: []