rpx_now 0.6.24 → 0.7.0

data/lib/rpx_now.rb

@@ -1,3 +1,4 @@
+require 'rpx_now/version'
 require 'rpx_now/api'
 require 'rpx_now/contacts_collection'
 require 'cgi'
@@ -8,11 +9,9 @@ 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
   # - cleaned Hash
@@ -101,7 +100,8 @@ module RPXNow
   # popup window for rpx login
   # options: :language, :flags, :unobtrusive, :api_version, :default_provider, :html
   def popup_code(text, subdomain, url, options = {})
-    if options[:unobtrusive]
+    options = options.dup
+    if options.delete(:unobtrusive)
       unobtrusive_popup_code(text, subdomain, url, options)
     else
       obtrusive_popup_code(text, subdomain, url, options)
@@ -129,7 +129,14 @@ module RPXNow
   # url for unobtrusive popup window
   # options: :language, :flags, :api_version, :default_provider
   def popup_url(subdomain, url, options={})
-    "#{Api.host(subdomain)}/openid/v#{extract_version(options)}/signin?#{embed_params(url, options)}"
+    case options.delete(:fallback_url)
+    when :legacy
+      "#{Api.host(subdomain)}/openid/v#{extract_version(options)}/signin?#{embed_params(url, options)}"
+    when :disable
+      "javacsript:void(0)"
+    else
+      "#{Api.host(subdomain)}/openid/embed?#{embed_params(url, options)}"
+    end
   end
 
   def extract_version(options)
@@ -175,7 +182,6 @@ module RPXNow
   end
 
   def unobtrusive_popup_code(text, subdomain, url, options={})
-    options = options.dup
     html_options = options.delete(:html) || {}
     html_options[:class] = "rpxnow #{html_options[:class]}".strip
     html_options[:href] ||= popup_url(subdomain, url, options)
@@ -196,4 +202,4 @@ module RPXNow
   class ServerError < RuntimeError; end #backwards compatibility / catch all
   class ApiError < ServerError; end
   class ServiceUnavailableError < ServerError; end
-end
+end

data/lib/rpx_now/version.rb

@@ -0,0 +1,3 @@
+module RPXNow
+  VERSION = "0.7.0"
+end

metadata

@@ -1,106 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rpx_now
-version: !ruby/object:Gem::Version 
-  hash: 55
+version: !ruby/object:Gem::Version
+  version: 0.7.0
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 24
-  version: 0.6.24
 platform: ruby
-authors: 
+authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-21 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-06-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  version_requirements: *id001
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: json_pure
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: grosser.michael@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- CHANGELOG
-- Gemfile
-- Gemfile.lock
-- MIGRATION
-- Rakefile
-- Readme.md
-- VERSION
+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/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
-has_rdoc: true
-homepage: http://github.com/grosser/rpx_now
+- lib/rpx_now/version.rb
+homepage: https://github.com/grosser/rpx_now
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2533672090780588692
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Helper to simplify RPX Now user login/creation
-test_files: 
-- 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
+test_files: []

data/CHANGELOG

@@ -1,38 +0,0 @@
-0.6.13
-------
- * return an indifferent hash from user_data when possible
-
-0.6.12
------
- * url encode obstrusive popup code token-url
-0.6.0
------
- * removed optional api key as parameter: RPXNow.user_data(token, api_key, options) --> RPXNow.user_data(token, options), you may use :apiKey=>... instead
-
-0.5.9
------
-  * Switched from Get to Post requests
-
-0.5.0
-----
-  * ApiError is raised when API KEY was invalid (before did only return nil)
-  * ServerError is now seperated into ApiError and ServiceUnavailableError
-
-0.4.2
-----
-  * default IDs are strings, not integers, since RPX supports both
-  * Added username field to standart parameters
-
-0.4
-----
-  * The RPXNow.api_version= can be set globally
-  * Most methods now support :api_version=>'123', so you can specify the api_version on each call
-	* Added support for unobtrusive code generation. This will make the gem play nicely with developers creating unobtrusive pages with frameworks such as jQuery;
-	* The RPXNOW JSON responses are now parsed by Florian Frank JSON gem (http://json.rubyforge.org/);
-	* Removed the dependency of ActiveSupport. However, if present, ActiveSupport will be used due to its convenience methods Array#to_query and Hash#to_query.
-	* Added support for multiple versions of the widget. By default, everything will point to version 2;
-	* The specs have been updated.
-
-0.3
-----
-	* RPXNow::ServerError will be thrown when something is invalid/goes wrong, so watch out (not for invalid tokens in user_data)...

data/Gemfile

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

data/Gemfile.lock

@@ -1,28 +0,0 @@
-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/MIGRATION

@@ -1,9 +0,0 @@
-class AddIdentifierToUsers < ActiveRecord::Migration
-  def self.up
-    add_column :users, :identifier, :string
-  end
-
-  def self.down
-    remove_column :users, :identifier
-  end
-end

data/Rakefile

@@ -1,22 +0,0 @@
-task :default => :spec
-require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = '--backtrace --color'
-end
-
-begin
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |gem|
-    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/#{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 jeweler"
-end

data/Readme.md

@@ -1,166 +0,0 @@
-[RPX](http://rpxnow.com) allows users to login to your page through Facebook / Twitter / Myspace / Google / OpenId / MS-LiveId / AOL / ...
-
- - Simpler then OpenId/OAuth/xxx for developers AND users
- - Publish user activity to facebook/twitter/myspace/.../-stream
- - Returning users are greeted by their provider
-
-![Single Interface for all providers](https://s3.amazonaws.com/static.rpxnow.com/rel/img/a481ed2afccd255350cccd738050f873.png)
-![Share comments and activities](https://s3.amazonaws.com/static.rpxnow.com/rel/img/50bdccdb32b6ae68d46908a531492b28.png)
-![Visitors choose from providers they already have](https://s3.amazonaws.com/static.rpxnow.com/rel/img/f4a6e65808eefcf8754588c71f84c142.png)
-
-Usage
-=====
- - Get an API key @ [RPX](http://rpxnow.com)
- - run [MIGRATION](http://github.com/grosser/rpx_now/raw/master/MIGRATION)
- - Build login view
- - Receive user-data from RPX to create or login User
- - for more advanced features have a look at the [RPX API Docs](https://rpxnow.com/docs)
-
-Install
-=======
- - As Rails plugin: `script/plugin install git://github.com/grosser/rpx_now.git `
- - As gem: `sudo gem install rpx_now`
-
-Examples
-========
-
-[Example application](http://github.com/grosser/rpx_now_example), go play around!
-
-environment.rb
---------------
-    Rails::Initializer.run do |config|
-      config.gem "rpx_now"
-      ...
-
-      config.after_initialize do # so rake gems:install works
-        RPXNow.api_key = "YOU RPX API KEY"
-      end
-    end
-
-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
-    # found: {:name=>'John Doe', :username => 'john', :email=>'john@doe.com', :identifier=>'blug.google.com/openid/dsdfsdfs3f3'}
-    # not found: nil (can happen with e.g. invalid tokens)
-    def rpx_token
-      raise "hackers?" unless data = RPXNow.user_data(params[:token])
-      self.current_user = User.find_by_identifier(data[:identifier]) || User.create!(data)
-      redirect_to '/'
-    end
-
-    # getting additional profile fields (these fields are rarely filled)
-    # all possibilities: https://rpxnow.com/docs#profile_data
-    data = RPXNow.user_data(params[:token], :additional => [:gender, :birthday, :photo, :providerName, ...])
-
-    # normal + raw data
-    RPXNow.user_data(params[:token], :additional => [:raw_response])[:raw_response]['profile]['verifiedEmail']
-
-    # only raw data
-    email = RPXNow.user_data(params[:token], :raw_response => true)['profile']['verifiedEmail']
-
-    # 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<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`.
-A identifyer can only belong to one user (in doubt the last one it was mapped to)
-
-### User integration (e.g. ActiveRecord)
-    class User < ActiveRecord::Base
-      include RPXNow::UserIntegration
-    end
-
-    user.rpx.identifiers == RPXNow.mappings(user.id)
-    user.rpx.map(identifier) == RPXNow.map(identifier, user.id)
-    user.rpx.unmap(identifier) == RPXNow.unmap(identifier, user.id)
-
-### Contacts (PRX Pro)
-Retrieve all contacts for a given user:
-    RPXNow.contacts(identifier).each {|c| puts "#{c['displayName']}: #{c['emails']}}
-
-### Status updates (PRX Plus/Pro)
-Send a status update to provider (a tweet/facebook-status/...) :
-    RPXNow.set_status(identifier, "I just registered at yourdomain.com ...")
-
-### Activity (RPX Plus/Pro)
-Post a users activity, on their e.g. Facebook profile, complete with images, titels, rating, additional media, customized links and so on ...
-    RPXNow.activity( identifier,
-      :url=>href, :action=>'Im loving my new', :user_generated_content=>'Im loving my new ... ',
-      :title=>product.title, :description=>product.description,
-      :action_links=>[{:text=>'view >>', :href=>product_url(product, :only_path => false)}],
-      :media=>[{:type=>:image, :src=>product.image_url, :href=>product_url(product, :only_path => false)}]
-    }
-
-### Offline user data access (RPX Plus/Pro)
-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)
-
-### Auth info
-Same response as user_data with :raw_response, but without any kind of failure detection or post processing.
-    RPXNow.auth_info(params[:token])
-
-Author
-======
-
-__[rpx_now_gem mailing list](http://groups.google.com/group/rpx_now_gem)__
-
-
-### [Contributors](http://github.com/grosser/rpx_now/contributors)
- - [Amunds](http://github.com/Amunds)
- - [Bob Groeneveld](http://metathoughtfacility.blogspot.com)
- - [DBA](http://github.com/DBA)
- - [dbalatero](http://github.com/dbalatero)
- - [Paul Gallagher](http://tardate.blogspot.com/)
- - [jackdempsey](http://jackndempsey.blogspot.com)
- - [Patrick Reagan (reagent)](http://sneaq.net)
- - [Joris Trooster (trooster)](http://www.interstroom.nl)
- - [Mick Staugaard (staugaard)](http://mick.staugaard.com/)
- - [Kasper Weibel](http://github.com/weibel)
- - [Nicolas Alpi](http://www.notgeeklycorrect.com)
- - [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://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 +0,0 @@
-0.6.24

data/init.rb

@@ -1,2 +0,0 @@
-#Needed to load rpx_now when used as Rails plugin
-require 'rpx_now'

data/rpx_now.gemspec

@@ -1,63 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# 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.24"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Michael Grosser"]
-  s.date = %q{2011-02-21}
-  s.email = %q{grosser.michael@gmail.com}
-  s.files = [
-    "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.require_paths = ["lib"]
-  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/user_proxy_spec.rb",
-    "spec/rpx_now_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    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"])
-    end
-  else
-    s.add_dependency(%q<json_pure>, [">= 0"])
-  end
-end
-

data/spec/fixtures/get_contacts_response.json

@@ -1,58 +0,0 @@
-{
-  "response": {
-    "itemsPerPage": 5,
-    "totalResults": 5,
-    "entry": [
-      {
-        "displayName": "Bob Johnson",
-        "emails": [
-          {
-            "type": "other",
-            "value": "bob@example.com"
-          }
-        ]
-      },
-      {
-        "displayName": "Cindy Smith",
-        "emails": [
-          {
-            "type": "other",
-            "value": "cindy.smith@example.com"
-          }
-        ]
-      },
-      {
-        "displayName": "Fred Williams",
-        "emails": [
-          {
-            "type": "other",
-            "value": "fred.williams@example.com"
-          },
-          {
-            "type": "other",
-            "value": "fred@example.com"
-          }
-        ]
-      },
-      {
-        "emails": [
-          {
-            "type": "other",
-            "value": "j.lewis@example.com"
-          }
-        ]
-      },
-      {
-        "displayName": "Mary Jones",
-        "emails": [
-          {
-            "type": "other",
-            "value": "mary.jones@example.com"
-          }
-        ]
-      }
-    ],
-    "startIndex": 1
-  },
-  "stat": "ok"
-}

data/spec/integration/mapping_spec.rb

@@ -1,40 +0,0 @@
-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/api_spec.rb

@@ -1,50 +0,0 @@
-require 'spec/spec_helper'
-
-describe RPXNow::Api do
-  describe 'ssl cert' do
-    it "has an absolute path" do
-      RPXNow::Api::SSL_CERT[0..0].should == File.expand_path( RPXNow::Api::SSL_CERT )[0..0] # start with '/' on *nix, drive letter on win
-    end
-
-    it "exists" do
-      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::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::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::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::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/contacts_collection_spec.rb

@@ -1,32 +0,0 @@
-require 'spec/spec_helper'
-
-describe RPXNow::ContactsCollection do
-  before do
-    data = JSON.parse(File.read('spec/fixtures/get_contacts_response.json'))['response']
-    @collection = RPXNow::ContactsCollection.new(data)
-  end
-
-  it "behaves like an array" do
-    @collection.size.should == 5
-    @collection[0] = "1"
-    @collection[0].should == "1"
-  end
-
-  it "parses entry to items" do
-    @collection[0]['displayName'].should == "Bob Johnson"
-  end
-
-  it "parses emails to list" do
-    @collection[0]['emails'].should == ["bob@example.com"]
-  end
-
-  it "parses emails to list with multiple emails" do
-    @collection[2]['emails'].should == ["fred.williams@example.com","fred@example.com"]
-  end
-
-  it "holds additional_info" do
-    @collection.additional_info['startIndex'].should == 1
-    @collection.additional_info['itemsPerPage'].should == 5
-    @collection.additional_info['totalResults'].should == 5
-  end
-end

data/spec/rpx_now/user_proxy_spec.rb

@@ -1,33 +0,0 @@
-require 'spec/spec_helper'
-require 'rpx_now/user_integration'
-
-class User
-  include RPXNow::UserIntegration
-
-  def id
-    5
-  end
-end
-
-describe RPXNow::UserProxy do
-  before { @user = User.new }
-
-  it "has a proxy" do
-    @user.rpx.class.should == RPXNow::UserProxy
-  end
-
-  it "has identifiers" do
-    RPXNow.should_receive(:mappings).with(@user.id).and_return(['identifiers'])
-    @user.rpx.identifiers.should == ['identifiers']
-  end
-
-  it "can map" do
-    RPXNow.should_receive(:map).with('identifier', @user.id)
-    @user.rpx.map('identifier')
-  end
-
-  it "can unmap" do
-    RPXNow.should_receive(:unmap).with('identifier', @user.id)
-    @user.rpx.unmap('identifier')
-  end
-end

data/spec/rpx_now_spec.rb

@@ -1,414 +0,0 @@
-require 'spec/spec_helper'
-
-describe RPXNow do
-  def fake_response(replace={})
-    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')).
-        and_return fake_response
-      RPXNow.mappings(1, :apiKey => 'YY')
-      RPXNow.api_key.should == 'XX'
-    end
-  end
-  
-  describe :api_version= 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).
-        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
-  
-  describe :embed_code do
-    it "contains the subdomain" do
-      RPXNow.embed_code('xxx','my_url').should =~ /xxx/
-    end
-    
-    it "contains the url" do
-      RPXNow.embed_code('xxx','my_url').should =~ /token_url=my_url/
-    end
-    
-    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
-    
-    it "defaults to 400px width" do
-      RPXNow.embed_code('xxx', 'my_url').should =~ /width:400px;/
-    end
-    
-    it "has a changeable width" do
-      RPXNow.embed_code('xxx', 'my_url', :width => '300').should =~ /width:300px;/
-    end
-    
-    it "defaults to 240px height" do
-      RPXNow.embed_code('xxx', 'my_url').should =~ /height:240px;/
-    end
-    
-    it "has a changeable height" do
-      RPXNow.embed_code('xxx', 'my_url', :height => '500').should =~ /height:500px;/
-    end
-    
-    it "has id on iframe" 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/')
-        RPXNow.popup_code('sign on', 'subdomain', 'http://fake.domain.com/').should include(expected)
-      end
-      it "encodes token_url for unobtrusive fallback link" do
-        expected = %Q(<a class="rpxnow" href="https://subdomain.rpxnow.com/openid/v2/signin?token_url=http%3A%2F%2Ffake.domain.com%2F">sign on</a>)
-        RPXNow.popup_code('sign on', 'subdomain', 'http://fake.domain.com/').should include(expected)
-      end
-    end
-    
-    describe 'unobstrusive' do
-      it "can build an unobtrusive widget with encoded token_url" do
-        expected = %Q(<a class="rpxnow" href="https://subdomain.rpxnow.com/openid/v2/signin?token_url=http%3A%2F%2Ffake.domain.com%2F">sign on</a>)
-        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
-    
-    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 = {
-        "profile" => {
-          "verifiedEmail" => "grosser.michael@googlemail.com",
-          "displayName" => "Michael Grosser",
-          "preferredUsername" => "grosser.michael",
-          "identifier" => "https:\/\/www.google.com\/accounts\/o8\/id?id=AItOawmaOlyYezg_WfbgP_qjaUyHjmqZD9qNIVM",
-          "email" => "grosser.michael@gmail.com"
-        }
-      }
-      @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')
-      }.should raise_error(RPXNow::ApiError)
-    end
-    
-    it "is empty when used with an unknown token" do
-      RPXNow.user_data('60d8c6374f4e9d290a7b55f39da7cc6435aef3d3').should == nil
-    end
-    
-    it "parses JSON response to user data" do
-      expected = {
-        :name       => 'Michael Grosser',
-        :email      => 'grosser.michael@googlemail.com',
-        :identifier => 'https://www.google.com/accounts/o8/id?id=AItOawmaOlyYezg_WfbgP_qjaUyHjmqZD9qNIVM',
-        :username   => 'grosser.michael',
-      }
-      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"
-    end
-    
-    it "adds a :id when primaryKey was returned" do
-      @response_body['profile']['primaryKey'] = "2"
-      response = fake_response(@response_body)
-      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)
-      RPXNow::Api.should_receive(:request).and_return response
-      RPXNow.user_data('', :additional => [:xxxy])[:xxxy].should == 'test'
-    end
-    
-    it "hands JSON response to supplied block" do
-      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...
-      response.should == @response_body
-    end
-    
-    it "returns what the supplied block returned" do
-      RPXNow::Api.should_receive(:request).and_return @response
-      RPXNow.user_data(''){|data| "x"}.should == 'x'
-    end
-    
-    it "can request extended data" do
-      RPXNow::Api.should_receive(:request).
-        with(anything, hash_including(:extended => true)).
-        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)
-      
-      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
-      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::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 "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
-  
-  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'
-    end
-    
-    it "parses email when no name is found" 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')))
-      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 "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 "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::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
-  end
-  
-  it "has a VERSION" do
-    RPXNow::VERSION.should =~ /^\d+\.\d+\.\d+$/
-  end
-end

data/spec/spec_helper.rb

@@ -1,16 +0,0 @@
-$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
-RSpec.configure do |config|
-  config.before do
-    RPXNow.api_key = API_KEY
-    RPXNow.api_version = API_VERSION
-    RPXNow.domain = DOMAIN
-  end
-end