multipass 1.2.1 → 1.2.2

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 2
-:patch: 1
+:patch: 2
 :build: 

data/lib/multipass.rb

@@ -44,10 +44,8 @@ class MultiPass
   # options:
   #   :url_safe => true
   def initialize(site_key, api_key, options = {})
-    @site_key   = site_key
-    @api_key    = api_key
     @url_safe   = !options.key?(:url_safe) || options[:url_safe]
-    @crypto_key = EzCrypto::Key.with_password(@site_key, @api_key)
+    @crypto_key = EzCrypto::Key.with_password(site_key, api_key)
   end
 
   def url_safe?
@@ -81,7 +79,7 @@ class MultiPass
     end
 
     options.keys.each do |key|
-      options[key.to_sym] = options.delete(key)
+      options[key.to_sym] = unencode_javascript_unicode_escape(options.delete(key))
     end
 
     if options[:expires].nil? || Time.now.utc > Time.parse(options[:expires])
@@ -101,6 +99,20 @@ class MultiPass
     require 'base64'
   end
 
+  # converts unicode (\u003c) to the actual character
+  # http://rishida.net/tools/conversion/
+  def unencode_javascript_unicode_escape(str)
+    str.gsub!(/\\u([0-9a-fA-F]{4})/) do |s| 
+      int = $1.to_i(16)
+      if int.zero? && s != "0000"
+        s
+      else
+        [int].pack("U")
+      end
+    end
+    str
+  end
+
   def self.encode_64(s, url_safe = true)
     b = Base64.encode64(s)
     b.gsub! /\n/, ''

data/multipass.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multipass}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["rick"]
-  s.date = %q{2010-01-01}
+  s.date = %q{2010-01-05}
   s.email = %q{technoweenie@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/test/multipass_test.rb

@@ -20,6 +20,13 @@ module MultiPassTests
     assert_equal @input, MultiPass.decode('example', 'abc', encoded)
   end
 
+  def test_decodes_unicode
+    @input[:name] = "Bj\\u00f8rn"
+    encoded = @mp.encode(@input)
+    decoded = @mp.decode(encoded)
+    assert_equal "Bjørn", decoded[:name]
+  end
+
   def test_invalidates_bad_string
     assert_raises MultiPass::DecryptError do
       @mp.decode("abc")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: multipass
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - rick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-01 00:00:00 -08:00
+date: 2010-01-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency