dailycred 0.1.27 → 0.1.28

data/dailycred.gemspec

@@ -8,11 +8,12 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://www.dailycred.com"
   gem.add_dependency("omniauth")
   gem.add_dependency("omniauth-oauth2")
+  gem.add_dependency("securerandom")
 
   gem.files         = `git ls-files`.split("\n")
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "dailycred"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.27"
+  gem.version       = "0.1.28"
 end

data/lib/dailycred/helper.rb

@@ -0,0 +1,4 @@
+class DailycredHelper
+
+
+end

data/lib/dailycred.rb

@@ -1,6 +1,8 @@
 require "omniauth-dailycred/version"
 require "omniauth/strategies/dailycred"
 require "middleware/middleware"
+# require "dailycred/helper"
+# require "dailycred/user"
 
 class Dailycred
 

data/lib/generators/dailycred_generator.rb

@@ -9,8 +9,9 @@ class DailycredGenerator < Rails::Generators::Base
   APP_ROUTES_LINES =<<-EOS
   match '/auth/:provider/callback' => 'sessions#create'
   match "/logout" => "sessions#destroy", :as => :logout
-  match "/auth" => "sessions#info", :as => :auth
-  match "/auth/dailycred"
+  match "/auth" => "sessions#info", :as => :auth_info
+  match "/auth/dailycred", :as => :auth
+  match "/auth/failure" => "sessions#failure"
   EOS
 
   APP_CONTROLLER_LINES =<<-EOS
@@ -43,6 +44,12 @@ class DailycredGenerator < Rails::Generators::Base
     config = Rails.configuration
     @dailycred ||= Dailycred.new(config.DAILYCRED_CLIENT_ID, config.DAILYCRED_SECRET_KEY, config.dc_options)
   end
+
+  # when making oauth calls, we may need to redirect to our oauth callback url
+  # make sure we have the correct state passed back and forth
+  def set_state
+    @state = session["omniauth.state"] = SecureRandom.uuid
+  end
   EOS
 
   APP_HELPER_LINES = <<-EOS

data/lib/generators/templates/sessions_controller.rb

@@ -6,13 +6,17 @@ class SessionsController < ApplicationController
   def create
     @user = User.find_or_create_with_omniauth auth_hash
     session[:user_id] = @user.id
-    redirect_to "/auth"
+    redirect_to auth_info_path
   end
 
   #GET /logout
   def destroy
     session[:user_id] = nil
-    redirect_to auth_path
+    redirect_to auth_info_path
+  end
+
+  def failure
+    redirect_to auth_info_path, notice: params[:message]
   end
 
   def info

data/lib/omniauth/strategies/dailycred.rb

@@ -12,7 +12,7 @@ module OmniAuth
       # default options
       option :client_options, {
         :site => "https://www.dailycred.com",
-        :authorize_url => '/oauth/authorize',
+        :authorize_url => '/connect',
         :token_url => '/oauth/access_token'
       }
 

data/spec/omniauth/strategies/dailycred_spec.rb

@@ -23,7 +23,7 @@ describe OmniAuth::Strategies::Dailycred do
         subject.client.site.should eq("https://www.dailycred.com")
       end
       it 'should have the correct authorization url' do
-        subject.client.options[:authorize_url].should eq("/oauth/authorize")
+        subject.client.options[:authorize_url].should eq("/connect")
       end
 
       it 'should have the correct token url' do

data/spec/support/dailycred_spec.rb

@@ -38,14 +38,14 @@ describe Dailycred do
     json = json_response @dc.tag(@user_id, "loser")
     json["worked"].should == true
     user = json["user"]
-    # user["tags"].should include('loser') #will work in next push
+    user["tags"].should include('loser') #will work in next push
   end
 
   it "untags a user" do
     json = json_response @dc.untag(@user_id, "loser")
     json["worked"].should == true
     user = json["user"]
-    # user["tags"].should == nil #will work in next push
+    user["tags"].should == nil #will work in next push
   end
 
   it "fires an event" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dailycred
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: securerandom
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: descript
 email:
 - hstove@gmail.com
@@ -67,6 +83,8 @@ files:
 - docs/lib/omniauth/strategies/dailycred.html
 - docs/lib/user/user.html
 - lib/dailycred.rb
+- lib/dailycred/helper.rb
+- lib/dailycred/user.rb
 - lib/generators/USAGE
 - lib/generators/dailycred_generator.rb
 - lib/generators/templates/info.html.erb
@@ -78,7 +96,6 @@ files:
 - lib/middleware/middleware.rb
 - lib/omniauth-dailycred/version.rb
 - lib/omniauth/strategies/dailycred.rb
-- lib/user/user.rb
 - localtest/.gitignore
 - localtest/Gemfile
 - localtest/README.rdoc