omniauth-tapjoy 1.4.2 → 1.4.3

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2@tapjoy
+rvm 1.9.3@tapjoy

data/README.md

@@ -4,6 +4,47 @@ Status](https://secure.travis-ci.org/Tapjoy/omniauth-tapjoy.png)](http://travis-
 
 This is an omniauth plugin that can be used to connect to Tapjoy.
 
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'omniauth-tapjoy'
+```
+
+And then execute:
+
+    $ bundle
+
+Create `config/initializers/omniauth.rb`:
+
+```ruby
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :tapjoy, TAPJOY_KEY, TAPJOY_SECRET
+end
+```
+
+Now when you hit the `/auth/tapjoy` on your server, it will redirect to `oauth.tapjoy.com` then back to `/auth/tapjoy/callback` with credentials.
+We will now setup this callback route
+
+Add this line to `config/routes.rb`:
+
+```ruby
+match '/auth/tapjoy/callback' => 'user_sessions#create'
+```
+
+Create the `app/controllers/user_sessions_controller.rb`
+
+```ruby
+class UserSessionsController < ApplicationController
+  def create
+    # This likely needs more logic to do things such as creating new users
+    user = User.find(request.env['omniauth.auth']['uid'])
+    session[:user_id] = user.id # or however you log a user in
+  end
+end
+```
+
 ## Installation with Devise
 
 If you are using Devise, this is how you can use Tapjoy as your OAUTH provider.
@@ -18,6 +59,7 @@ And then execute:
 
     $ bundle
 
+
 Add this line to `config/intializers/devise.rb`:
 
 ```ruby
@@ -48,9 +90,34 @@ Set the route to use the callback you just created:
 devise_for :users, controllers: { omniauth_callbacks: "users/omniauth_callbacks" }
 ```
 
+Environment settings passed in at application start will always be respected, but if you wish to automatically use the staging environment in development, you may add the following lines to your `config/environments/development.rb`
+
+```ruby
+
+ENV['TAPJOY_AUTH_ENV'] ||= "staging"
+OmniAuth::Strategies::Tapjoy.reconfigure
+
+```
+
 If you aren't using Devise, you can either connect to the oauth server directly,
 or directly use omniauth: [https://github.com/intridea/omniauth](https://github.com/intridea/omniauth)
 
+## Information available
+
+```json
+{
+  "id": "63be812b-706d-44c9-9e47-742511c6f939",
+  "email": "jeff@tapjoy.com",
+  "first_name": "Jeff",
+  "last_name": "Dickey",
+  "created_at": "2012-02-08T05:36:09Z",
+  "facebook_id": "42004440",
+  "country": "United States",
+  "time_zone": "Pacific Time (US & Canada)",
+  "is_employee": true
+}
+```
+
 ## Example
 
 For an example of this in use, check the wheeler board: [https://github.com/Tapjoy/wheeler_board](https://github.com/Tapjoy/wheeler_board)

data/lib/omniauth/strategies/tapjoy.rb

@@ -5,10 +5,37 @@ module OmniAuth
     class Tapjoy < OmniAuth::Strategies::OAuth2
       option :name, :tapjoy
 
-      option :client_options, {
-        :site => "https://oauth.tapjoy.com",
-        :authorize_path => "/oauth/authorize"
-      }
+      # If you overwrite ENV settings in your application, for example in a rails environment setup, you 
+      # will have to call OmniAuth::Strategies::Tapjoy.reconfigure to propagate your changes.
+      def self.reconfigure
+        option :client_options, {
+          :site => site,
+          :authorize_path => authorize_path
+        }
+      end
+
+      def self.site
+        if ENV['TAPJOY_AUTH_SITE']
+          ENV['TAPJOY_AUTH_SITE']
+        elsif ENV['TAPJOY_AUTH_ENV'] == 'staging'
+          'https://mystique-staging.herokuapp.com'
+        else
+          "https://oauth.tapjoy.com"
+        end
+      end
+
+      def self.authorize_path
+        if ENV['TAPJOY_AUTH_PATH']
+          ENV['TAPJOY_AUTH_PATH'] 
+        elsif ENV['TAPJOY_AUTH_ENV'] == 'staging'
+          # Staging path is currently the same as production
+          "/oauth/authorize"
+        else
+          "/oauth/authorize"
+        end
+      end
+
+      reconfigure
 
       uid { raw_info["id"] }
 

data/lib/omniauth/tapjoy.rb

@@ -1,2 +1 @@
-require 'omniauth/tapjoy/version'
 require 'omniauth/strategies/tapjoy'

data/omniauth-tapjoy.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "omniauth/tapjoy"
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Jeff Dickey"]
@@ -14,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "omniauth-tapjoy"
   gem.require_paths = ["lib"]
-  gem.version       = OmniAuth::Tapjoy::VERSION
+  gem.version       = '1.4.3'
 
   gem.add_dependency 'omniauth', '~> 1.0'
   gem.add_runtime_dependency 'omniauth-oauth2'

data/spec/omniauth/strategies/tapjoy_spec.rb

@@ -10,12 +10,42 @@ describe OmniAuth::Strategies::Tapjoy do
       subject.options.name.should eq(:tapjoy)
     end
 
-    it 'should have correct site' do
+    it 'should have the correct default production site' do
       subject.options.client_options.site.should eq('https://oauth.tapjoy.com')
+      OmniAuth::Strategies::Tapjoy.site.should eq('https://oauth.tapjoy.com')
     end
 
-    it 'should have correct authorize url' do
+    it 'should use the correct environment site override' do
+      stub_const("ENV", { 'TAPJOY_AUTH_SITE' => 'https://test.tapjoy.com' })
+      # Can't test the subject directly here as the site was set on class load, but you could still overwrite
+      # it via an options hash if you wanted to
+      OmniAuth::Strategies::Tapjoy.site.should eq('https://test.tapjoy.com')
+    end
+
+    it 'should use the correct staging site' do
+      stub_const("ENV", { 'TAPJOY_AUTH_ENV' => 'staging' })
+      # Can't test the subject directly here as the site was set on class load, but you could still overwrite
+      # it via an options hash if you wanted to
+      OmniAuth::Strategies::Tapjoy.site.should eq('https://mystique-staging.herokuapp.com')
+    end
+
+    it 'should have the correct default authorize url' do
       subject.options.client_options.authorize_path.should eq('/oauth/authorize')
+      OmniAuth::Strategies::Tapjoy.authorize_path.should eq('/oauth/authorize')
+    end
+
+    it 'should use the correct authorize url override' do
+      stub_const("ENV", { 'TAPJOY_AUTH_PATH' => '/a/different/path' })
+      # Can't test the subject directly here as the url was set on class load, but you could still overwrite
+      # it via an options hash if you wanted to
+      OmniAuth::Strategies::Tapjoy.authorize_path.should eq('/a/different/path')
+    end
+
+    it 'should use the correct staging authorize url' do
+      stub_const("ENV", { 'TAPJOY_AUTH_ENV' => 'staging' })
+      # Can't test the subject directly here as the url was set on class load, but you could still overwrite
+      # it via an options hash if you wanted to
+      OmniAuth::Strategies::Tapjoy.authorize_path.should eq('/oauth/authorize')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-tapjoy
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -139,7 +139,6 @@ files:
 - Rakefile
 - lib/omniauth/strategies/tapjoy.rb
 - lib/omniauth/tapjoy.rb
-- lib/omniauth/tapjoy/version.rb
 - omniauth-tapjoy.gemspec
 - spec/omniauth/strategies/tapjoy_spec.rb
 - spec/spec_helper.rb
@@ -163,10 +162,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: An omniauth provider to connect to Tapjoy
 test_files:
 - spec/omniauth/strategies/tapjoy_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/lib/omniauth/tapjoy/version.rb

@@ -1,5 +0,0 @@
-module OmniAuth
-  module Tapjoy
-    VERSION = "1.4.2"
-  end
-end