rpx_now 0.6.23 → 0.6.24

data/Gemfile

@@ -1,10 +1,12 @@
 # not used, just for hardcore-bundlers
-source :gemcutter
+source :rubygems
 
-gem "rake"
-gem "json"
-gem "jeweler"
+group :dev do
+  gem "rake"
+  gem "json"
+  gem "jeweler"
+end
 
 group :test do
-  gem "rspec"
+  gem "rspec", "~>2"
 end

data/Gemfile.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    git (1.2.5)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    json (1.4.6)
+    rake (0.8.7)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler
+  json
+  rake
+  rspec (~> 2)

data/Rakefile

@@ -1,21 +1,22 @@
 task :default => :spec
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color']}
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = '--backtrace --color'
+end
 
 begin
   require 'jeweler'
-  project_name = 'rpx_now'
 
   Jeweler::Tasks.new do |gem|
-    gem.name = project_name
+    gem.name = 'rpx_now'
     gem.summary = "Helper to simplify RPX Now user login/creation"
     gem.email = "grosser.michael@gmail.com"
-    gem.homepage = "http://github.com/grosser/#{project_name}"
+    gem.homepage = "http://github.com/grosser/#{gem.name}"
     gem.authors = ["Michael Grosser"]
     gem.add_dependency ['json_pure']
   end
 
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
 end

data/Readme.md

@@ -26,23 +26,6 @@ Examples
 
 [Example application](http://github.com/grosser/rpx_now_example), go play around!
 
-View
-----
-    <%=RPXNow.embed_code('My-Rpx-Domain', url_for(:controller=>:session, :action=>:rpx_token, :only_path => false))%>
-    OR
-    <%=RPXNow.popup_code('Login here...', 'My-Rpx-Domain', url_for(:controller=>:session, :action=>:rpx_token, :only_path => false), options)%>
-
-###Options
-`:language=>'en'` rpx tries to detect the users language, but you may overwrite it [possible languages](https://rpxnow.com/docs#sign-in_localization)  
-`:default_provider=>'google'` [possible default providers](https://rpxnow.com/docs#sign-in_default_provider)  
-`:flags=>'show_provider_list'` [possible flags](https://rpxnow.com/docs#sign-in_interface)  
-`:html => {:id => 'xxx'}` is added to the popup link (popup_code only)
-
-###Unobtrusive / JS-last
-`popup_code` can also be called with `:unobtrusive=>true` ( --> just link without javascript include).  
-To still get the normal popup add `RPXNow.popup_source('My-Rpx-Domain', url_for(:controller=>:session, :action=>:rpx_token, :only_path => false), [options])`.  
-Options like :language / :flags should be given for both.
-
 environment.rb
 --------------
     Rails::Initializer.run do |config|
@@ -56,6 +39,8 @@ environment.rb
 
 Controller
 ----------
+This example uses the SessionsController, if you dont have one built it and add routes(rpx_token is a post request)
+
     skip_before_filter :verify_authenticity_token, :only => [:rpx_token] # RPX does not pass Rails form tokens...
 
     # user_data
@@ -80,21 +65,42 @@ Controller
     # with extended info like friends, accessCredentials, portable contacts. (most Providers do not supply them)
     RPXNow.user_data(params[:token], :extended => true)[:extended]['friends'][...have a look at the RPX API DOCS...]
 
+View
+----
+
+    <%=RPXNow.embed_code('My-Rpx-Domain', url_for(:controller=>:session, :action=>:rpx_token, :only_path => false))%>
+    OR
+    <%=RPXNow.popup_code('Login here...', 'My-Rpx-Domain', url_for(:controller=>:session, :action=>:rpx_token, :only_path => false), options)%>
+
+###Options
+`:language=>'en'` rpx tries to detect the users language, but you may overwrite it [possible languages](https://rpxnow.com/docs#sign-in_localization)
+`:default_provider=>'google'` [possible default providers](https://rpxnow.com/docs#sign-in_default_provider)
+`:flags=>'show_provider_list'` [possible flags](https://rpxnow.com/docs#sign-in_interface)
+`:html => {:id => 'xxx'}` is added to the popup link (popup_code only)
+
+###Unobtrusive / JS-last
+`popup_code` can also be called with `:unobtrusive=>true` ( --> just link without javascript include).
+To still get the normal popup add `RPXNow.popup_source('My-Rpx-Domain', url_for(:controller=>:session, :action=>:rpx_token, :only_path => false), [options])`.
+Options like :language / :flags should be given for both.
+
 Advanced
 --------
 ### Versions
     RPXNow.api_version = 2
 
+### Custom domain (PRX Plus/Pro)
+    RPXNow.domain = 'other-domain.com'
+
 ### Mappings (PRX Plus/Pro)
-You can map your primary keys (e.g. user.id) to identifiers, so that  
+You can map your primary keys (e.g. user.id) to identifiers, so that<br/>
 users can login to the same account with multiple identifiers.
     RPXNow.map(identifier, primary_key) #add a mapping
     RPXNow.unmap(identifier, primary_key) #remove a mapping
     RPXNow.mappings(primary_key) # [identifier1,identifier2,...]
     RPXNow.all_mappings # [["1",['google.com/dsdas','yahoo.com/asdas']], ["2",[...]], ... ]
 
-After a primary key is mapped to an identifier, when a user logs in with this identifier,  
-`RPXNow.user_data` will contain his `primaryKey` as `:id`.  
+After a primary key is mapped to an identifier, when a user logs in with this identifier,
+`RPXNow.user_data` will contain his `primaryKey` as `:id`.
 A identifyer can only belong to one user (in doubt the last one it was mapped to)
 
 ### User integration (e.g. ActiveRecord)
@@ -124,7 +130,7 @@ Post a users activity, on their e.g. Facebook profile, complete with images, tit
     }
 
 ### Offline user data access (RPX Plus/Pro)
-Same response as auth_info but can be called with a identifier at any time.
+Same response as auth_info but can be called with a identifier at any time.<br/>
 Offline Profile Access must be enabled.
     RPXNow.get_user_data(identifier, :extended => true)
 
@@ -138,7 +144,7 @@ Author
 __[rpx_now_gem mailing list](http://groups.google.com/group/rpx_now_gem)__
 
 
-###Contributors
+### [Contributors](http://github.com/grosser/rpx_now/contributors)
  - [Amunds](http://github.com/Amunds)
  - [Bob Groeneveld](http://metathoughtfacility.blogspot.com)
  - [DBA](http://github.com/DBA)
@@ -153,7 +159,8 @@ __[rpx_now_gem mailing list](http://groups.google.com/group/rpx_now_gem)__
  - [Ladislav Martincik](http://martincik.com)
  - [Ben Aldred](http://github.com/benaldred)
  - [Casper Fabricius](http://casperfabricius.com)
+ - [Avi Flombaum](http://www.aviflombaum.com)
 
-[Michael Grosser](http://pragmatig.wordpress.com)  
-grosser.michael@gmail.com  
+[Michael Grosser](http://grosser.it)<br/>
+michael@grosser.it<br/>
 Hereby placed under public domain, do what you want, just do not hold me accountable...

data/VERSION

@@ -1 +1 @@
-0.6.23
+0.6.24

data/lib/rpx_now.rb

@@ -7,8 +7,11 @@ module RPXNow
 
   attr_accessor :api_key
   attr_accessor :api_version
+  attr_accessor :domain
+  
   self.api_version = 2
-
+  self.domain = 'rpxnow.com'
+  
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
 
   # retrieve the users data

data/lib/rpx_now/api.rb

@@ -8,7 +8,6 @@ module RPXNow
   # - parse response
   # - handle server errors
   class Api
-    HOST = 'rpxnow.com'
     SSL_CERT = File.join(File.dirname(__FILE__), '..', '..', 'certs', 'ssl_cert.pem')
 
     def self.call(method, data)
@@ -23,9 +22,9 @@ module RPXNow
 
     def self.host(subdomain=nil)
       if subdomain
-        "https://#{subdomain}.#{Api::HOST}"
+        "https://#{subdomain}.#{RPXNow.domain}"
       else
-        "https://#{Api::HOST}"
+        "https://#{RPXNow.domain}"
       end
     end
 
@@ -49,7 +48,7 @@ module RPXNow
     end
 
     def self.client
-      client = Net::HTTP.new(HOST, 443)
+      client = Net::HTTP.new(RPXNow.domain, 443)
       client.use_ssl = true
       client.ca_file = SSL_CERT
       client.verify_mode = OpenSSL::SSL::VERIFY_PEER

data/rpx_now.gemspec

@@ -1,59 +1,57 @@
 # 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{rpx_now}
-  s.version = "0.6.23"
+  s.version = "0.6.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-07-21}
+  s.date = %q{2011-02-21}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
-    ".gitignore",
-     "CHANGELOG",
-     "Gemfile",
-     "MIGRATION",
-     "Rakefile",
-     "Readme.md",
-     "VERSION",
-     "certs/ssl_cert.pem",
-     "init.rb",
-     "lib/rpx_now.rb",
-     "lib/rpx_now/api.rb",
-     "lib/rpx_now/contacts_collection.rb",
-     "lib/rpx_now/user_integration.rb",
-     "lib/rpx_now/user_proxy.rb",
-     "rpx_now.gemspec",
-     "spec/fixtures/get_contacts_response.json",
-     "spec/integration/mapping_spec.rb",
-     "spec/rpx_now/api_spec.rb",
-     "spec/rpx_now/contacts_collection_spec.rb",
-     "spec/rpx_now/user_proxy_spec.rb",
-     "spec/rpx_now_spec.rb",
-     "spec/spec_helper.rb"
+    "CHANGELOG",
+    "Gemfile",
+    "Gemfile.lock",
+    "MIGRATION",
+    "Rakefile",
+    "Readme.md",
+    "VERSION",
+    "certs/ssl_cert.pem",
+    "init.rb",
+    "lib/rpx_now.rb",
+    "lib/rpx_now/api.rb",
+    "lib/rpx_now/contacts_collection.rb",
+    "lib/rpx_now/user_integration.rb",
+    "lib/rpx_now/user_proxy.rb",
+    "rpx_now.gemspec",
+    "spec/fixtures/get_contacts_response.json",
+    "spec/integration/mapping_spec.rb",
+    "spec/rpx_now/api_spec.rb",
+    "spec/rpx_now/contacts_collection_spec.rb",
+    "spec/rpx_now/user_proxy_spec.rb",
+    "spec/rpx_now_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/grosser/rpx_now}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Helper to simplify RPX Now user login/creation}
   s.test_files = [
+    "spec/integration/mapping_spec.rb",
+    "spec/rpx_now/api_spec.rb",
     "spec/rpx_now/contacts_collection_spec.rb",
-     "spec/rpx_now/api_spec.rb",
-     "spec/rpx_now/user_proxy_spec.rb",
-     "spec/integration/mapping_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/rpx_now_spec.rb"
+    "spec/rpx_now/user_proxy_spec.rb",
+    "spec/rpx_now_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   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<json_pure>, [">= 0"])
     else
       s.add_dependency(%q<json_pure>, [">= 0"])

data/spec/rpx_now_spec.rb

@@ -5,23 +5,36 @@ describe RPXNow do
     body = {'stat' => 'ok'}.merge(replace)
     mock({:code => "200", :body => body.to_json})
   end
-
+  
+  describe :domain do  
+    it 'defaults to rpxnow.com' do
+      RPXNow.domain.should == 'rpxnow.com'
+    end
+  end
+  
+  describe :domain= do
+    it "is stored" do
+      RPXNow.domain = 'domain.com'
+      RPXNow.domain.should == 'domain.com'
+    end
+  end
+      
   describe :api_key= do
     before do
       RPXNow.api_key='XX'
     end
-
+  
     it "is stored" do
       RPXNow.api_key.should == 'XX'
     end
-
+  
     it "stores the api key, so i do not have to supply everytime" do
       RPXNow::Api.should_receive(:request).
         with(anything, hash_including(:apiKey => 'XX')).
         and_return fake_response
       RPXNow.mappings(1)
     end
-
+  
     it "is not overwritten when overwriting for a single request" do
       RPXNow::Api.should_receive(:request).
         with(anything, hash_including(:apiKey => 'YY')).
@@ -35,12 +48,12 @@ describe RPXNow do
     it "is 2 by default" do
       RPXNow.api_version.should == 2
     end
-
+  
     it "is stored" do
       RPXNow.api_version='XX'
       RPXNow.api_version.should == 'XX'
     end
-
+  
     it "used for every request" do
       RPXNow.api_version='XX'
       RPXNow::Api.should_receive(:request).
@@ -48,7 +61,7 @@ describe RPXNow do
         and_return fake_response
       RPXNow.mappings(1)
     end
-
+  
     it "is not overwritten when overwriting for a single request" do
       RPXNow.api_version='XX'
       RPXNow::Api.should_receive(:request).
@@ -57,7 +70,7 @@ describe RPXNow do
       RPXNow.mappings(1, :api_version => 'YY')
       RPXNow.api_version.should == 'XX'
     end
-
+  
     it "is not passed in data for request" do
       RPXNow.api_version='XX'
       RPXNow::Api.should_receive(:request).
@@ -66,7 +79,7 @@ describe RPXNow do
       RPXNow.mappings(1, :api_version => 'YY')
     end
   end
-
+  
   describe :embed_code do
     it "contains the subdomain" do
       RPXNow.embed_code('xxx','my_url').should =~ /xxx/
@@ -79,7 +92,7 @@ describe RPXNow do
     it "defaults to no language" do
       RPXNow.embed_code('xxx', 'my_url').should_not =~ /language_preference/
     end
-
+  
     it "has a changeable language" do
       RPXNow.embed_code('xxx', 'my_url', :language => 'es').should =~ /language_preference=es/
     end
@@ -104,28 +117,28 @@ describe RPXNow do
       RPXNow.embed_code('xxx','my_url').should =~ /id=\"rpx_now_embed\"/
     end
   end
-
+  
   describe :popup_code do
     it "defaults to obtrusive output" do
       RPXNow.popup_code('sign on', 'subdomain', 'http://fake.domain.com/').should =~ /script src=/
     end
-
+  
     it "does not change supplied options" do
       options = {:xxx => 1}
       RPXNow.popup_code('a','b','c', options)
       options.should == {:xxx => 1}
     end
-
+  
     it "adds html params to link" do
       options = {:html => {:id => "xxxx"}}
       RPXNow.popup_code('a','b','c', options).should =~ /id="xxxx"/
     end
-
+  
     it "adds rpxnow to given html class" do
       options = {:html => {:class => "c1 c2"}}
       RPXNow.popup_code('a','b','c', options).should =~ /class="rpxnow c1 c2"/
     end
-
+  
     describe 'obstrusive' do
       it "does not encode token_url for popup" do
         expected = %Q(RPXNOW.token_url = 'http://fake.domain.com/')
@@ -143,24 +156,24 @@ describe RPXNow do
         actual = RPXNow.popup_code('sign on', 'subdomain', 'http://fake.domain.com/', :unobtrusive => true)
         actual.should == expected
       end
-
+  
       it "can change api version" do
         RPXNow.popup_code('x', 'y', 'z', :unobtrusive => true, :api_version => 'XX').should include("openid/vXX/signin?")
       end
-
+  
       it "can change language" do
         RPXNow.popup_code('x', 'y', 'z', :unobtrusive => true, :language => 'XX').should include("language_preference=XX")
       end
-
+  
       it "can add flags" do
         RPXNow.popup_code('x', 'y', 'z', :unobtrusive => true, :flags => 'test').should include("flags=test")
       end
-
+  
       it "can add default_provider" do
         RPXNow.popup_code('x', 'y', 'z', :unobtrusive => true, :default_provider => 'test').should include("default_provider=test")
       end
     end
-
+  
     it "allows to specify the version of the widget" do
       RPXNow.popup_code('x','y','z', :api_version => 300).should =~ %r(/openid/v300/signin)
     end
@@ -168,38 +181,38 @@ describe RPXNow do
     it "defaults to widget version 2" do
       RPXNow.popup_code('x','y','z').should =~ %r(/openid/v2/signin)
     end
-
+  
     describe 'language' do
       it "defaults to no language" do
         RPXNow.popup_code('x','y','z').should_not =~ /RPXNOW.language_preference/
       end
-
+  
       it "has a changeable language" do
         RPXNow.popup_code('x','y','z', :language=>'de').should =~ /RPXNOW.language_preference = 'de'/
       end
     end
-
+  
     describe 'flags' do
       it "defaults to no language" do
         RPXNow.popup_code('x','y','z').should_not =~ /RPXNOW.flags/
       end
-
+  
       it "can have flags" do
         RPXNow.popup_code('x','y','z', :flags=>'test').should =~ /RPXNOW.flags = 'test'/
       end
     end
-
+  
     describe 'default_provider' do
       it "defaults to no provider" do
         RPXNow.popup_code('x','y','z').should_not =~ /RPXNOW.default_provider/
       end
-
+  
       it "can have default_provider" do
         RPXNow.popup_code('x','y','z', :default_provider=>'test').should =~ /RPXNOW.default_provider = 'test'/
       end
     end
   end
-
+  
   describe :user_data do
     before do
       @response_body = {
@@ -214,7 +227,7 @@ describe RPXNow do
       @response = fake_response(@response_body)
       @fake_user_data = {'profile'=>{}}
     end
-
+  
     it "raises ApiError when used with an invalid token" do
       lambda{
         RPXNow.user_data('xxxx')
@@ -235,13 +248,13 @@ describe RPXNow do
       RPXNow::Api.should_receive(:request).and_return @response
       RPXNow.user_data('').should == expected
     end
-
+  
     it "deprecated: adds raw profile data if i want it" do
       RPXNow::Api.should_receive(:request).and_return @response
       RPXNow.should_receive(:warn)
       RPXNow.user_data('',:additional => [:raw])[:raw]["verifiedEmail"].should == "grosser.michael@googlemail.com"
     end
-
+  
     it "adds raw data if i want it" do
       RPXNow::Api.should_receive(:request).and_return @response
       RPXNow.user_data('',:additional => [:raw_response])[:raw_response]['profile']["verifiedEmail"].should == "grosser.michael@googlemail.com"
@@ -253,14 +266,14 @@ describe RPXNow do
       RPXNow::Api.should_receive(:request).and_return response
       RPXNow.user_data('')[:id].should == '2'
     end
-
+  
     it "handles primaryKeys that are not numeric" do
       @response_body['profile']['primaryKey'] = "dbalatero"
       response = fake_response(@response_body)
       RPXNow::Api.should_receive(:request).and_return response
       RPXNow.user_data('')[:id].should == 'dbalatero'
     end
-
+  
     it "can fetch additional fields" do
       @response_body['profile']['xxxy'] = "test"
       response = fake_response(@response_body)
@@ -287,7 +300,7 @@ describe RPXNow do
         and_return @response
       RPXNow.user_data('', :extended=>true)
     end
-
+  
     it "returns extended data as an additional field" do
       @response_body['friends'] = {'x' => 1}
       @response = fake_response(@response_body)
@@ -295,19 +308,19 @@ describe RPXNow do
       RPXNow::Api.should_receive(:request).and_return @response
       RPXNow.user_data('', :extended=>true)[:extended].should == {'friends' => {'x' => 1}}
     end
-
+  
     it "does not pass raw_response to RPX" do
       RPXNow::Api.should_receive(:request).
         with(anything, hash_not_including(:raw_response => true)).
         and_return @response
       RPXNow.user_data('', :raw_response=>true)
     end
-
+  
     it "can return a raw_response" do
       RPXNow::Api.should_receive(:request).and_return @response
       RPXNow.user_data('', :raw_response=>true).should == @response_body.merge('stat' => 'ok')
     end
-
+  
     # these 2 tests are kind of duplicates of the api_version/key tests,
     # but i want to be extra-sure user_data works
     it "works with api version as option" do
@@ -317,7 +330,7 @@ describe RPXNow do
       RPXNow.user_data('id', :extended=>'abc', :api_version=>123)
       RPXNow.api_version.should == API_VERSION
     end
-
+  
     it "works with apiKey as option" do
       RPXNow::Api.should_receive(:request).
         with('/api/v2/auth_info', hash_including(:apiKey=>'THE KEY')).
@@ -326,7 +339,7 @@ describe RPXNow do
       RPXNow.api_key.should == API_KEY
     end
   end
-
+  
   describe :set_status do
     it "sets the status" do
       RPXNow::Api.should_receive(:request).
@@ -335,19 +348,19 @@ describe RPXNow do
       RPXNow.set_status('identifier', 'Chillen...')
     end
   end
-
+  
   describe :activity do
     it "does a api call with the right arguments" do
       RPXNow::Api.should_receive(:request).with("/api/v2/activity", :identifier=>"identifier", :activity=>'{"test":"something"}', :apiKey=>API_KEY).and_return fake_response 
       RPXNow.activity('identifier', :test => 'something')
     end
-
+  
     it "can pass identifier/apiKey" do
       RPXNow::Api.should_receive(:request).with("/api/v66666/activity", hash_including(:apiKey=>'MYKEY')).and_return fake_response
       RPXNow.activity('identifier', {:test => 'something'}, :apiKey => 'MYKEY', :api_version => '66666')
     end
   end
-
+  
   describe :parse_user_data do
     it "reads secondary names" do
       RPXNow.send(:parse_user_data,{'profile'=>{'preferredUsername'=>'1'}}, {})[:name].should == '1'
@@ -357,7 +370,7 @@ describe RPXNow do
       RPXNow.send(:parse_user_data,{'profile'=>{'email'=>'1@xxx.com'}}, {})[:name].should == '1'
     end
   end
-
+  
   describe :contacts do
     it "finds all contacts" do
       response = fake_response(JSON.parse(File.read('spec/fixtures/get_contacts_response.json')))
@@ -367,7 +380,7 @@ describe RPXNow do
       RPXNow.contacts('xx').size.should == 5
     end
   end
-
+  
   describe :mappings do
     it "shows all mappings" do
       RPXNow::Api.should_receive(:request).
@@ -376,7 +389,7 @@ describe RPXNow do
       RPXNow.mappings(1).should == ["http://test.myopenid.com/"]
     end
   end
-
+  
   describe :map do
     it "maps a identifier" do
       RPXNow::Api.should_receive(:request).
@@ -385,7 +398,7 @@ describe RPXNow do
       RPXNow.map('http://test.myopenid.com',1)
     end
   end
-
+  
   describe :unmap do
     it "unmaps a indentifier" do
       RPXNow::Api.should_receive(:request).
@@ -394,7 +407,7 @@ describe RPXNow do
       RPXNow.unmap('http://test.myopenid.com', 1)
     end
   end
-
+  
   it "has a VERSION" do
     RPXNow::VERSION.should =~ /^\d+\.\d+\.\d+$/
   end

data/spec/spec_helper.rb

@@ -1,18 +1,16 @@
-# ---- requirements
-require 'rubygems'
-require 'spec'
-
 $LOAD_PATH << File.expand_path("../lib", File.dirname(__FILE__))
 
 # ---- setup environment/plugin
 require File.expand_path("../init", File.dirname(__FILE__))
 API_KEY = '4b339169026742245b754fa338b9b0aebbd0a733'
 API_VERSION = RPXNow.api_version
+DOMAIN = RPXNow.domain
 
 # ---- rspec
-Spec::Runner.configure do |config|
-  config.before :each do
+RSpec.configure do |config|
+  config.before do
     RPXNow.api_key = API_KEY
     RPXNow.api_version = API_VERSION
+    RPXNow.domain = DOMAIN
   end
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rpx_now
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 55
+  prerelease: 
   segments: 
   - 0
   - 6
-  - 23
-  version: 0.6.23
+  - 24
+  version: 0.6.24
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,21 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 +02:00
+date: 2011-02-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json_pure
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  prerelease: false
   version_requirements: *id001
+  type: :runtime
+  name: json_pure
 description: 
 email: grosser.michael@gmail.com
 executables: []
@@ -38,9 +41,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gitignore
 - CHANGELOG
 - Gemfile
+- Gemfile.lock
 - MIGRATION
 - Rakefile
 - Readme.md
@@ -65,35 +68,39 @@ homepage: http://github.com/grosser/rpx_now
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Helper to simplify RPX Now user login/creation
 test_files: 
-- spec/rpx_now/contacts_collection_spec.rb
+- spec/integration/mapping_spec.rb
 - spec/rpx_now/api_spec.rb
+- spec/rpx_now/contacts_collection_spec.rb
 - spec/rpx_now/user_proxy_spec.rb
-- spec/integration/mapping_spec.rb
-- spec/spec_helper.rb
 - spec/rpx_now_spec.rb
+- spec/spec_helper.rb

data/.gitignore

@@ -1,6 +0,0 @@
-Manifest
-pkg
-.*.swp
-.*.swo
-*.autotest
-.bundle