entp-multipass 1.1.1 → 1.1.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 1
-:patch: 1
+:patch: 2

data/lib/multipass.rb

@@ -43,13 +43,13 @@ class MultiPass
       when Time, DateTime, Date then options[:expires].to_s
       else options[:expires].to_s
     end
-    escape_value @crypto_key.encrypt64(options.to_json)
+    @crypto_key.encrypt64(options.to_json)
   end
 
   # Decrypts the given multipass string and parses it as JSON.  Then, it checks
   # for a valid expiration date.
   def decode(data)
-    json = @crypto_key.decrypt64(unescape_value(data))
+    json = @crypto_key.decrypt64(data)
     
     if json.nil?
       raise MultiPass::DecryptError
@@ -89,23 +89,4 @@ private
       raise MultiPass::JSONError
     end
   end
-
-  if Object.const_defined?(:Rack)
-    def escape_value(s)
-      Rack::Utils.escape(s)
-    end
-
-    def unescape_value(s)
-      Rack::Utils.unescape(s)
-    end
-  else
-    require 'cgi'
-    def escape_value(s)
-      CGI.escape(s)
-    end
-
-    def unescape_value(s)
-      CGI.unescape(s)
-    end
-  end
 end

data/test/multipass_test.rb

@@ -14,12 +14,12 @@ class MultiPassTest < Test::Unit::TestCase
 
   def test_encodes_multipass
     expected = @key.encrypt64(@output.to_json)
-    assert_equal CGI.escape(expected), @mp.encode(@input)
+    assert_equal expected, @mp.encode(@input)
   end
 
   def test_encodes_multipass_with_class_method
     expected = @key.encrypt64(@output.to_json)
-    assert_equal CGI.escape(expected), MultiPass.encode('example', 'abc', @input)
+    assert_equal expected, MultiPass.encode('example', 'abc', @input)
   end
 
   def test_decodes_multipass
@@ -40,15 +40,15 @@ class MultiPassTest < Test::Unit::TestCase
 
   def test_invalidates_bad_json
     assert_raises MultiPass::JSONError do
-      @mp.decode(CGI.escape(@key.encrypt64("abc")))
+      @mp.decode(@key.encrypt64("abc"))
     end
     assert_raises MultiPass::JSONError do
-      @mp.decode(CGI.escape(@key.encrypt64("{a")))
+      @mp.decode(@key.encrypt64("{a"))
     end
   end
 
   def test_invalidates_old_expiration
-    encrypted = CGI.escape @key.encrypt64(@input.merge(:expires => (Time.now - 1)).to_json)
+    encrypted = @key.encrypt64(@input.merge(:expires => (Time.now - 1)).to_json)
     assert_raises MultiPass::ExpiredError do
       @mp.decode(encrypted)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: entp-multipass
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - rick