rpx_now 0.6.1 → 0.6.4

data/.gitignore

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

data/README.markdown

@@ -111,6 +111,7 @@ Author
  - [dbalatero](http://github.com/dbalatero)
  - [jackdempsey](http://jackndempsey.blogspot.com)
  - [Patrick Reagan (reagent)](http://sneaq.net)
+ - [Joris Trooster (trooster)](http://www.interstroom.nl)
 
 [Michael Grosser](http://pragmatig.wordpress.com)  
 grosser.michael@gmail.com  

data/Rakefile

@@ -18,8 +18,7 @@ begin
     gem.email = "grosser.michael@gmail.com"
     gem.homepage = "http://github.com/grosser/#{project_name}"
     gem.authors = ["Michael Grosser"]
-    gem.add_dependency ['activesupport']
-    gem.files = ['**/*']
+    gem.add_dependency ['json']
     gem.rubyforge_project = 'rpx-now'
   end
 

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.4

data/lib/rpx_now.rb

@@ -2,7 +2,7 @@ require 'net/http'
 require 'net/https'
 require 'json'
 
-require 'rpx_now/request'
+require 'rpx_now/api'
 require 'rpx_now/contacts_collection'
 require 'rpx_now/user_integration'
 require 'rpx_now/user_proxy'
@@ -22,7 +22,7 @@ module RPXNow
   # - nil when token was invalid / data was not found
   def user_data(token, options={})
     begin
-      data = Request.post("auth_info", options.merge(:token => token))
+      data = Api.call("auth_info", options.merge(:token => token))
       if block_given? then yield(data) else parse_user_data(data) end
     rescue ServerError
       return nil if $!.to_s=~/Data not found/
@@ -33,7 +33,7 @@ module RPXNow
   # set the users status
   def set_status(identifier, status, options={})
     options = options.merge(:identifier => identifier, :status => status)
-    data = Request.post("set_status", options)
+    data = Api.call("set_status", options)
   rescue ServerError
     return nil if $!.to_s=~/Data not found/
     raise
@@ -41,25 +41,25 @@ module RPXNow
 
   # maps an identifier to an primary-key (e.g. user.id)
   def map(identifier, primary_key, options={})
-    Request.post("map", options.merge(:identifier => identifier, :primaryKey => primary_key))
+    Api.call("map", options.merge(:identifier => identifier, :primaryKey => primary_key))
   end
 
   # un-maps an identifier to an primary-key (e.g. user.id)
   def unmap(identifier, primary_key, options={})
-    Request.post("unmap", options.merge(:identifier => identifier, :primaryKey => primary_key))
+    Api.call("unmap", options.merge(:identifier => identifier, :primaryKey => primary_key))
   end
 
   # returns an array of identifiers which are mapped to one of your primary-keys (e.g. user.id)
   def mappings(primary_key, options={})
-    Request.post("mappings", options.merge(:primaryKey => primary_key))['identifiers']
+    Api.call("mappings", options.merge(:primaryKey => primary_key))['identifiers']
   end
 
   def all_mappings(options={})
-    Request.post("all_mappings", options)['mappings']
+    Api.call("all_mappings", options)['mappings']
   end
 
   def contacts(identifier, options={})
-    data = Request.post("get_contacts", options.merge(:identifier => identifier))
+    data = Api.call("get_contacts", options.merge(:identifier => identifier))
     RPXNow::ContactsCollection.new(data['response'])
   end
   alias get_contacts contacts
@@ -67,13 +67,15 @@ module RPXNow
   def embed_code(subdomain,url,options={})
     options = {:width => '400', :height => '240', :language => 'en'}.merge(options)
     <<-EOF
-      <iframe src="https://#{subdomain}.#{Request::HOST}/openid/embed?token_url=#{url}&language_preference=#{options[:language]}"
+      <iframe src="https://#{subdomain}.#{Api::HOST}/openid/embed?token_url=#{url}&language_preference=#{options[:language]}"
         scrolling="no" frameBorder="no" style="width:#{options[:width]}px;height:#{options[:height]}px;">
       </iframe>
     EOF
   end
 
   def popup_code(text, subdomain, url, options = {})
+    options = options.dup
+    options[:language] ||= 'en'
     if options[:unobtrusive]
       unobtrusive_popup_code(text, subdomain, url, options)
     else
@@ -100,23 +102,23 @@ module RPXNow
 
   def unobtrusive_popup_code(text, subdomain, url, options={})
     version = extract_version! options
-    "<a class=\"rpxnow\" href=\"https://#{subdomain}.#{Request::HOST}/openid/v#{version}/signin?token_url=#{url}\">#{text}</a>"
+    %Q(<a class="rpxnow" href="https://#{subdomain}.#{Api::HOST}/openid/v#{version}/signin?token_url=#{url}&language_preference=#{options[:language]}">#{text}</a>)
   end
 
   def obtrusive_popup_code(text, subdomain, url, options = {})
     version = extract_version! options
     <<-EOF
-      <a class="rpxnow" onclick="return false;" href="https://#{subdomain}.#{Request::HOST}/openid/v#{version}/signin?token_url=#{url}">
+      <a class="rpxnow" onclick="return false;" href="https://#{subdomain}.#{Api::HOST}/openid/v#{version}/signin?token_url=#{url}">
         #{text}
       </a>
-      <script src="https://#{Request::HOST}/openid/v#{version}/widget" type="text/javascript"></script>
+      <script src="https://#{Api::HOST}/openid/v#{version}/widget" type="text/javascript"></script>
       <script type="text/javascript">
         //<![CDATA[
         RPXNOW.token_url = "#{url}";
 
         RPXNOW.realm = "#{subdomain}";
         RPXNOW.overlay = true;
-        RPXNOW.language_preference = '#{options[:language]||'en'}';
+        RPXNOW.language_preference = '#{options[:language]}';
         //]]>
       </script>
     EOF

data/lib/rpx_now/{request.rb → api.rb}

@@ -1,9 +1,13 @@
 module RPXNow
-  class Request
+  # low-level interaction with rpxnow.com api
+  # - send requests
+  # - parse response
+  # - handle server errors
+  class Api
     HOST = 'rpxnow.com'
     SSL_CERT = File.join(File.dirname(__FILE__), '..', '..', 'certs', 'ssl_cert.pem')
 
-    def self.post(method, data)
+    def self.call(method, data)
       version = RPXNow.extract_version! data
       path = "/api/v#{version}/#{method}"
       response = request(path, {:apiKey => RPXNow.api_key}.merge(data))
@@ -13,18 +17,29 @@ module RPXNow
     private
 
     def self.request(path, data)
+      client.request(request_object(path, data))
+    end
+
+    def self.request_object(path, data)
       request = Net::HTTP::Post.new(path)
-      request.form_data = data.map{|k,v| [k.to_s,v]}#symbol keys -> string because of ruby 1.9.x bug http://redmine.ruby-lang.org/issues/show/1351
-      make_request(request)
+      request.form_data = stringify_keys(data)
+      request
+    end
+
+    # symbol keys -> string keys
+    # because of ruby 1.9.x bug in Net::HTTP
+    # http://redmine.ruby-lang.org/issues/show/1351
+    def self.stringify_keys(hash)
+      hash.map{|k,v| [k.to_s,v]}
     end
 
-    def self.make_request(request)
-      http = Net::HTTP.new(HOST, 443)
-      http.use_ssl = true
-      http.ca_file = SSL_CERT
-      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      http.verify_depth = 5
-      http.request(request)
+    def self.client
+      client = Net::HTTP.new(HOST, 443)
+      client.use_ssl = true
+      client.ca_file = SSL_CERT
+      client.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      client.verify_depth = 5
+      client
     end
 
     def self.parse_response(response)

data/rpx_now.gemspec

@@ -5,17 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rpx_now}
-  s.version = "0.6.1"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2009-10-07}
+  s.date = %q{2009-10-09}
   s.email = %q{grosser.michael@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
-    "CHANGELOG",
+    ".gitignore",
+     "CHANGELOG",
      "MIGRATION",
      "README.markdown",
      "Rakefile",
@@ -23,17 +24,16 @@ Gem::Specification.new do |s|
      "certs/ssl_cert.pem",
      "init.rb",
      "lib/rpx_now.rb",
+     "lib/rpx_now/api.rb",
      "lib/rpx_now/contacts_collection.rb",
-     "lib/rpx_now/request.rb",
      "lib/rpx_now/user_integration.rb",
      "lib/rpx_now/user_proxy.rb",
-     "pkg/rpx_now-0.5.10.gem",
-     "pkg/rpx_now-0.5.11.gem",
      "rdoc/README.rdoc",
      "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/request_spec.rb",
      "spec/rpx_now/user_proxy_spec.rb",
      "spec/rpx_now_spec.rb",
      "spec/spec_helper.rb"
@@ -48,8 +48,9 @@ Gem::Specification.new do |s|
     "spec/rpx_now_spec.rb",
      "spec/rpx_now/contacts_collection_spec.rb",
      "spec/rpx_now/user_proxy_spec.rb",
-     "spec/rpx_now/request_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/rpx_now/api_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/integration/mapping_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -57,11 +58,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
     else
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
   end
 end

data/spec/integration/mapping_spec.rb

@@ -0,0 +1,40 @@
+require 'spec/spec_helper'
+
+describe RPXNow do
+  describe :mapping_integration do
+    before do
+      @k1 = 'http://test.myopenid.com'
+      RPXNow.unmap(@k1, 1)
+      @k2 = 'http://test-2.myopenid.com'
+      RPXNow.unmap(@k2, 1)
+    end
+
+    it "has no mappings when nothing was mapped" do
+      RPXNow.mappings(1).should == []
+    end
+
+    it "unmaps mapped keys" do
+      RPXNow.map(@k2, 1)
+      RPXNow.unmap(@k2, 1)
+      RPXNow.mappings(1).should == []
+    end
+
+    it "maps keys to a primary key and then retrieves them" do
+      RPXNow.map(@k1, 1)
+      RPXNow.map(@k2, 1)
+      RPXNow.mappings(1).sort.should == [@k2,@k1]
+    end
+
+    it "does not add duplicate mappings" do
+      RPXNow.map(@k1, 1)
+      RPXNow.map(@k1, 1)
+      RPXNow.mappings(1).should == [@k1]
+    end
+
+    it "finds all mappings" do
+      RPXNow.map(@k1, 1)
+      RPXNow.map(@k2, 2)
+      RPXNow.all_mappings.sort.should == [["1", ["http://test.myopenid.com"]], ["2", ["http://test-2.myopenid.com"]]]
+    end
+  end
+end

data/spec/rpx_now/{request_spec.rb → api_spec.rb}

@@ -1,41 +1,50 @@
 require 'spec/spec_helper'
 
-describe RPXNow::Request do
+describe RPXNow::Api do
   describe 'ssl cert' do
     it "has an absolute path" do
-      RPXNow::Request::SSL_CERT[0..0].should == '/' #start with '/'
+      RPXNow::Api::SSL_CERT[0..0].should == '/' #start with '/'
     end
 
     it "exists" do
-      File.read(RPXNow::Request::SSL_CERT).to_s.should_not be_empty
+      File.read(RPXNow::Api::SSL_CERT).to_s.should_not be_empty
     end
   end
 
   describe :parse_response do
     it "parses json when status is ok" do
       response = mock(:code=>'200', :body=>%Q({"stat":"ok","data":"xx"}))
-      RPXNow::Request.send(:parse_response, response)['data'].should == "xx"
+      RPXNow::Api.send(:parse_response, response)['data'].should == "xx"
     end
 
     it "raises when there is a communication error" do
       response = stub(:code=>'200', :body=>%Q({"err":"wtf","stat":"ok"}))
       lambda{
-        RPXNow::Request.send(:parse_response,response)
+        RPXNow::Api.send(:parse_response,response)
       }.should raise_error(RPXNow::ApiError)
     end
 
     it "raises when service has downtime" do
       response = stub(:code=>'200', :body=>%Q({"err":{"code":-1},"stat":"ok"}))
       lambda{
-        RPXNow::Request.send(:parse_response,response)
+        RPXNow::Api.send(:parse_response,response)
       }.should raise_error(RPXNow::ServiceUnavailableError)
     end
 
     it "raises when service is down" do
       response = stub(:code=>'400',:body=>%Q({"stat":"err"}))
       lambda{
-        RPXNow::Request.send(:parse_response,response)
+        RPXNow::Api.send(:parse_response,response)
       }.should raise_error(RPXNow::ServiceUnavailableError)
     end
   end
+
+  describe :request_object do
+    it "converts symbols to string keys" do
+      mock = ''
+      mock.should_receive(:form_data=).with([['symbol', 'value']])
+      Net::HTTP::Post.should_receive(:new).and_return(mock)
+      RPXNow::Api.send(:request_object, 'something', :symbol=>'value')
+    end
+  end
 end

data/spec/rpx_now/user_proxy_spec.rb

@@ -9,23 +9,24 @@ class User
 end
 
 describe RPXNow::UserProxy do
-  before do
-    RPXNow.unmap('http://test.myopenid.com', 5)
+  before { @user = User.new }
+
+  it "has a proxy" do
+    @user.rpx.class.should == RPXNow::UserProxy
   end
 
   it "has identifiers" do
-    RPXNow.map('http://test.myopenid.com', 5)
-    User.new.rpx.identifiers.should == ['http://test.myopenid.com']
+    RPXNow.should_receive(:mappings).with(@user.id).and_return(['identifiers'])
+    @user.rpx.identifiers.should == ['identifiers']
   end
 
   it "can map" do
-    User.new.rpx.map('http://test.myopenid.com')
-    User.new.rpx.identifiers.should == ['http://test.myopenid.com']
+    RPXNow.should_receive(:map).with('identifier', @user.id)
+    @user.rpx.map('identifier')
   end
 
   it "can unmap" do
-    RPXNow.map('http://test.myopenid.com', 5)
-    User.new.rpx.unmap('http://test.myopenid.com')
-    User.new.rpx.identifiers.should == []
+    RPXNow.should_receive(:unmap).with('identifier', @user.id)
+    @user.rpx.unmap('identifier')
   end
 end

data/spec/rpx_now_spec.rb

@@ -7,17 +7,63 @@ describe RPXNow do
   end
 
   describe :api_key= do
-    it "stores the api key, so i do not have to supply everytime" do
+    before do
       RPXNow.api_key='XX'
-      RPXNow::Request.should_receive(:request).with{|x,data|data[:apiKey]=='XX'}.and_return mock(:code=>'200', :body=>%Q({"stat":"ok"}))
+    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')).
+        and_return fake_response
+      RPXNow.mappings(1, :apiKey => 'YY')
+      RPXNow.api_key.should == 'XX'
+    end
   end
   
   describe :api_version= do
-    it "can be set to a api_version globally" do
-      RPXNow.api_version = 5
-      RPXNow.popup_code('x','y','z').should =~ %r(/openid/v5/signin)
+    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).
+        with('/api/vXX/mappings', anything).
+        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).
+        with('/api/vYY/mappings', anything).
+        and_return fake_response
+      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).
+        with(anything, hash_not_including(:api_version => 'YY')).
+        and_return fake_response
+      RPXNow.mappings(1, :api_version => 'YY')
     end
   end
 
@@ -59,12 +105,29 @@ describe RPXNow do
     it "defaults to obtrusive output" do
       RPXNow.popup_code('sign on', 'subdomain', 'http://fake.domain.com/').should =~ /script src=/
     end
-    
-    it "can build an unobtrusive widget with specific version" do
-      expected = %Q(<a class="rpxnow" href="https://subdomain.rpxnow.com/openid/v300/signin?token_url=http://fake.domain.com/">sign on</a>)
-      RPXNow.popup_code('sign on', 'subdomain', 'http://fake.domain.com/', { :unobtrusive => true, :api_version => 300 }).should == expected
+
+    it "does not change supplied options" do
+      options = {:xxx => 1}
+      RPXNow.popup_code('a','b','c', options)
+      options.should == {:xxx => 1}
     end
-    
+
+    describe 'unobstrusive' do
+      it "can build an unobtrusive widget" do
+        expected = %Q(<a class="rpxnow" href="https://subdomain.rpxnow.com/openid/v2/signin?token_url=http://fake.domain.com/&language_preference=en">sign on</a>)
+        actual = RPXNow.popup_code('sign on', 'subdomain', 'http://fake.domain.com/', :unobtrusive => true)
+        expected.should == actual
+      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
+    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
@@ -114,26 +177,26 @@ describe RPXNow do
         :identifier => 'https://www.google.com/accounts/o8/id?id=AItOawmaOlyYezg_WfbgP_qjaUyHjmqZD9qNIVM',
         :username   => 'grosser.michael',
       }
-      RPXNow::Request.should_receive(:request).and_return @response
+      RPXNow::Api.should_receive(:request).and_return @response
       RPXNow.user_data('').should == expected
     end
     
     it "adds a :id when primaryKey was returned" do
       @response_body['profile']['primaryKey'] = "2"
       response = fake_response(@response_body)
-      RPXNow::Request.should_receive(:request).and_return response
+      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::Request.should_receive(:request).and_return response
+      RPXNow::Api.should_receive(:request).and_return response
       RPXNow.user_data('')[:id].should == 'dbalatero'
     end
     
     it "hands JSON response to supplied block" do
-      RPXNow::Request.should_receive(:request).and_return @response
+      RPXNow::Api.should_receive(:request).and_return @response
       response = nil
       RPXNow.user_data(''){|data| response = data}
       response.delete('stat') # dunno why it happens, but is not important...
@@ -141,34 +204,42 @@ describe RPXNow do
     end
     
     it "returns what the supplied block returned" do
-      RPXNow::Request.should_receive(:request).and_return @response
+      RPXNow::Api.should_receive(:request).and_return @response
       RPXNow.user_data(''){|data| "x"}.should == 'x'
     end
     
     it "can send additional parameters" do
-      RPXNow::Request.should_receive(:request).with{|url,data|
-        data[:extended].should == 'true'
-      }.and_return @response
+      RPXNow::Api.should_receive(:request).
+        with(anything, hash_including(:extended => 'true')).
+        and_return @response
       RPXNow.user_data('',:extended=>'true')
     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
-      RPXNow::Request.should_receive(:request).with('/api/v123/auth_info', :apiKey=>API_KEY, :token=>'id', :extended=>'abc').and_return @response
+      RPXNow::Api.should_receive(:request).
+        with('/api/v123/auth_info', anything).
+        and_return @response
       RPXNow.user_data('id', :extended=>'abc', :api_version=>123)
       RPXNow.api_version.should == API_VERSION
     end
 
     it "works with apiKey as option" do
-      RPXNow::Request.should_receive(:request).with('/api/v2/auth_info', :apiKey=>'THE KEY', :token=>'id', :extended=>'abc').and_return @response
+      RPXNow::Api.should_receive(:request).
+        with('/api/v2/auth_info', hash_including(:apiKey=>'THE KEY')).
+        and_return @response
       RPXNow.user_data('id', :extended=>'abc', :apiKey=>'THE KEY')
       RPXNow.api_key.should == API_KEY
     end
   end
 
   describe :set_status do
-    it "parses JSON response to result hash" do
-      RPXNow::Request.should_receive(:request).and_return fake_response
-      RPXNow.set_status('identifier', 'Chillen...').should == {'stat' => 'ok'}
+    it "sets the status" do
+      RPXNow::Api.should_receive(:request).
+        with("/api/v2/set_status", :identifier=>"identifier", :status=>"Chillen...", :apiKey=>API_KEY).
+        and_return fake_response
+      RPXNow.set_status('identifier', 'Chillen...')
     end
   end
 
@@ -185,73 +256,38 @@ describe RPXNow do
   describe :contacts do
     it "finds all contacts" do
       response = fake_response(JSON.parse(File.read('spec/fixtures/get_contacts_response.json')))
-      RPXNow::Request.should_receive(:request).with('/api/v2/get_contacts',:identifier=>'xx', :apiKey=>API_KEY).and_return response
+      RPXNow::Api.should_receive(:request).
+        with('/api/v2/get_contacts',:identifier=>'xx', :apiKey=>API_KEY).
+        and_return response
       RPXNow.contacts('xx').size.should == 5
     end
   end
 
   describe :mappings do
-    it "parses JSON response to unmap data" do
-
-      RPXNow::Request.should_receive(:request).and_return fake_response("identifiers"  =>  ["http://test.myopenid.com/"])
+    it "shows all mappings" do
+      RPXNow::Api.should_receive(:request).
+        with("/api/v2/mappings", :apiKey=>API_KEY, :primaryKey=>1).
+        and_return fake_response("identifiers" => ["http://test.myopenid.com/"])
       RPXNow.mappings(1).should == ["http://test.myopenid.com/"]
     end
   end
 
   describe :map do
-    it "adds a mapping" do
-      RPXNow::Request.should_receive(:request).and_return fake_response
+    it "maps a identifier" do
+      RPXNow::Api.should_receive(:request).
+        with("/api/v2/map", :apiKey=>API_KEY, :primaryKey=>1, :identifier=>"http://test.myopenid.com").
+        and_return fake_response
       RPXNow.map('http://test.myopenid.com',1)
     end
   end
 
   describe :unmap do
     it "unmaps a indentifier" do
-      RPXNow::Request.should_receive(:request).and_return fake_response
+      RPXNow::Api.should_receive(:request).
+        with("/api/v2/unmap", :apiKey=>API_KEY, :primaryKey=>1, :identifier=>"http://test.myopenid.com").
+        and_return fake_response
       RPXNow.unmap('http://test.myopenid.com', 1)
     end
-
-    it "can be called with a specific version" do
-      RPXNow::Request.should_receive(:request).with{|a,b|a == "/api/v300/unmap"}.and_return fake_response
-      RPXNow.unmap('http://test.myopenid.com', 1, :api_key=>'xxx', :api_version=>300)
-    end
-  end
-
-  describe :mapping_integration do
-    before do
-      @k1 = 'http://test.myopenid.com'
-      RPXNow.unmap(@k1, 1)
-      @k2 = 'http://test-2.myopenid.com'
-      RPXNow.unmap(@k2, 1)
-    end
-
-    it "has no mappings when nothing was mapped" do
-      RPXNow.mappings(1).should == []
-    end
-
-    it "unmaps mapped keys" do
-      RPXNow.map(@k2, 1)
-      RPXNow.unmap(@k2, 1)
-      RPXNow.mappings(1).should == []
-    end
-
-    it "maps keys to a primary key and then retrieves them" do
-      RPXNow.map(@k1, 1)
-      RPXNow.map(@k2, 1)
-      RPXNow.mappings(1).sort.should == [@k2,@k1]
-    end
-
-    it "does not add duplicate mappings" do
-      RPXNow.map(@k1, 1)
-      RPXNow.map(@k1, 1)
-      RPXNow.mappings(1).should == [@k1]
-    end
-
-    it "finds all mappings" do
-      RPXNow.map(@k1, 1)
-      RPXNow.map(@k2, 2)
-      RPXNow.all_mappings.sort.should == [["1", ["http://test.myopenid.com"]], ["2", ["http://test-2.myopenid.com"]]]
-    end
   end
 
   it "has a VERSION" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rpx_now
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.4
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 +02:00
+date: 2009-10-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: json
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -31,6 +31,7 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
+- .gitignore
 - CHANGELOG
 - MIGRATION
 - README.markdown
@@ -39,17 +40,16 @@ files:
 - certs/ssl_cert.pem
 - init.rb
 - lib/rpx_now.rb
+- lib/rpx_now/api.rb
 - lib/rpx_now/contacts_collection.rb
-- lib/rpx_now/request.rb
 - lib/rpx_now/user_integration.rb
 - lib/rpx_now/user_proxy.rb
-- pkg/rpx_now-0.5.10.gem
-- pkg/rpx_now-0.5.11.gem
 - rdoc/README.rdoc
 - 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/request_spec.rb
 - spec/rpx_now/user_proxy_spec.rb
 - spec/rpx_now_spec.rb
 - spec/spec_helper.rb
@@ -85,5 +85,6 @@ test_files:
 - spec/rpx_now_spec.rb
 - spec/rpx_now/contacts_collection_spec.rb
 - spec/rpx_now/user_proxy_spec.rb
-- spec/rpx_now/request_spec.rb
+- spec/rpx_now/api_spec.rb
 - spec/spec_helper.rb
+- spec/integration/mapping_spec.rb