multipass 1.2.3 → 1.3.2

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'yaml'
 require 'rake'
 
 begin
@@ -7,14 +8,14 @@ begin
     gem.name = "multipass"
     gem.summary = 'Bare bones implementation of encoding and decoding MultiPass values for SSO.'
     gem.email = "technoweenie@gmail.com"
-    gem.homepage = "http://github.com/entp/multipass"
+    gem.homepage = "https://github.com/entp/multipass"
     gem.authors = ["rick"]
     gem.add_dependency 'ezcrypto'
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: gem install jeweler"
 end
 
 require 'rake/testtask'

data/VERSION.yml

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

data/lib/multipass.rb

@@ -67,13 +67,13 @@ class MultiPass
   def decode(data)
     json = options = nil
     json = @crypto_key.decrypt(self.class.decode_64(data, @url_safe))
-    
+
     if json.nil?
       raise MultiPass::DecryptError.new(data)
     end
 
     options = decode_json(data, json)
-    
+
     if !options.is_a?(Hash)
       raise MultiPass::JSONError.new(data, json, options)
     end
@@ -82,7 +82,13 @@ class MultiPass
       options[key.to_sym] = unencode_javascript_unicode_escape(options.delete(key))
     end
 
-    if options[:expires].nil? || Time.now.utc > Time.parse(options[:expires])
+    # Force everything coming out of json into a Time object if it isn't already
+    # with YAJL, it parses dates for us (ugh)
+    if options.has_key?(:expires) && options[:expires].is_a?(String) && !options[:expires].empty?
+      options[:expires] = Time.parse(options[:expires])
+    end
+
+    if options[:expires].nil? || (options[:expires] != '' && Time.now.utc > options[:expires])
       raise MultiPass::ExpiredError.new(data, json, options)
     end
 
@@ -150,4 +156,4 @@ class MultiPass
       raise MultiPass::JSONError.new(data, s)
     end
   end
-end
+end

data/multipass.gemspec

@@ -1,44 +1,38 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{multipass}
-  s.version = "1.2.3"
+  s.name = "multipass"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["rick"]
-  s.date = %q{2010-01-05}
-  s.email = %q{technoweenie@gmail.com}
+  s.date = "2012-08-09"
+  s.email = "technoweenie@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README"
+    "README"
   ]
   s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README",
-     "Rakefile",
-     "VERSION.yml",
-     "lib/multipass.rb",
-     "multipass.gemspec",
-     "test/multipass_test.rb"
-  ]
-  s.homepage = %q{http://github.com/entp/multipass}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Bare bones implementation of encoding and decoding MultiPass values for SSO.}
-  s.test_files = [
+    "LICENSE",
+    "README",
+    "Rakefile",
+    "VERSION.yml",
+    "lib/multipass.rb",
+    "multipass.gemspec",
     "test/multipass_test.rb"
   ]
+  s.homepage = "https://github.com/entp/multipass"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "Bare bones implementation of encoding and decoding MultiPass values for SSO."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ezcrypto>, [">= 0"])
     else
       s.add_dependency(%q<ezcrypto>, [">= 0"])

data/test/multipass_test.rb

@@ -1,10 +1,21 @@
+# encoding: UTF-8
+
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'rubygems'
 require 'test/unit'
 require 'multipass'
 #require 'active_support'
 
+module MultiPassTestHelper
+  def assert_multipass(expected, actual)
+    assert_equal expected[:email], actual[:email]
+    assert_equal expected[:expires].to_s, actual[:expires].to_s
+  end
+end
+
 module MultiPassTests
+  include MultiPassTestHelper
+
   def test_encodes_multipass
     expected = MultiPass.encode_64(@key.encrypt(@output.to_json), @mp.url_safe?)
     assert_equal expected, @mp.encode(@input)
@@ -12,12 +23,12 @@ module MultiPassTests
 
   def test_decodes_multipass
     encoded = @mp.encode(@input)
-    assert_equal @input, @mp.decode(encoded)
+    assert_multipass @input, @mp.decode(encoded)
   end
 
   def test_decodes_multipass_with_class_method
     encoded = @mp.encode(@input)
-    assert_equal @input, MultiPass.decode('example', 'abc', encoded)
+    assert_multipass @input, MultiPass.decode('example', 'abc', encoded)
   end
 
   def test_decodes_unicode
@@ -80,6 +91,8 @@ class UrlSafeMultiPassTest < Test::Unit::TestCase
 end
 
 class ErrorTest < Test::Unit::TestCase
+  include MultiPassTestHelper
+
   def setup
     @key = EzCrypto::Key.with_password('example', 'abc')
     @mp  = MultiPass.new('example', 'abc')
@@ -133,12 +146,12 @@ class ErrorTest < Test::Unit::TestCase
 
   def test_expiration_error_stores_options
     begin
-      opt  = {:expires => (Time.now - 5).to_s, :email => 'ricky@bobby.com'}
+      opt  = {:expires => Time.now - 5, :email => 'ricky@bobby.com'}
       json = opt.to_json
       data = @key.encrypt64(json)
       @mp.decode data
     rescue MultiPass::ExpiredError => e
-      assert_equal opt, e.options
+      assert_multipass opt, e.options
     end
   end
-end
+end

metadata

@@ -1,38 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: multipass
-version: !ruby/object:Gem::Version 
-  version: 1.2.3
+version: !ruby/object:Gem::Version
+  version: 1.3.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - rick
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-01-05 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ezcrypto
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: technoweenie@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README
-files: 
-- .gitignore
+files:
 - LICENSE
 - README
 - Rakefile
@@ -40,33 +42,28 @@ files:
 - lib/multipass.rb
 - multipass.gemspec
 - test/multipass_test.rb
-has_rdoc: true
-homepage: http://github.com/entp/multipass
+homepage: https://github.com/entp/multipass
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+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.8.23
 signing_key: 
 specification_version: 3
 summary: Bare bones implementation of encoding and decoding MultiPass values for SSO.
-test_files: 
-- test/multipass_test.rb
+test_files: []

data/.gitignore

@@ -1,2 +0,0 @@
-.rake_tasks
-pkg