dailycred 0.1.2 → 0.1.4

data/lib/omniauth/strategies/dailycred.rb

@@ -2,34 +2,43 @@ require 'omniauth-oauth2'
 require 'faraday'
 require 'net/https'
 require 'json'
+require 'pp'
 
+# #The Dailycred Omniauth Strategy
 module OmniAuth
   module Strategies
     class Dailycred < OmniAuth::Strategies::OAuth2
+
+      # default options
       option :client_options, {
-        :site => 'https://www.dailycred.com',
-        :authorize_url => '/oauth/authorize',
+        :site => "https://www.dailycred.com",
+        :authorize_url => '/connect',
         :token_url => '/oauth/access_token'
       }
 
-      ATTRIBUTES = ["email", "id", "username", "created", "verified", "admin", "referred_by", "tags", "referred"]
-      AUTH_PARAMS = ["action"]
+      # allows parameters to be passed through
+      AUTH_PARAMS = ["action","identity_provider","referrer", "access_token"]
 
       option :authorize_options, OmniAuth::Strategies::Dailycred::AUTH_PARAMS
-      
+
       uid { user['id'] }
-      
+
       info do
-        infos = {}
-        OmniAuth::Strategies::Dailycred::ATTRIBUTES.each do |attribute|
-          infos[attribute] = user[attribute]
-        end
-        infos
+        user
       end
-      
+
       alias :old_request_phase :request_phase
 
-      def request_phase 
+
+      def authorize_params
+        super.tap do |params|
+          params[:state] ||= {}
+        end
+      end
+
+      # this step allows auth_params to be added to the url
+      def request_phase
+        p session['omniauth.state']
         OmniAuth::Strategies::Dailycred::AUTH_PARAMS.each do |param|
           val = session['omniauth.params'][param]
           if val && !val.empty?
@@ -42,21 +51,29 @@ module OmniAuth
 
       private
 
+      # This is the phase where the gem calls me.json, which returns information about the user
       def user
         return @duser if !@duser.nil?
-        connection = Faraday::Connection.new 'https://www.dailycred.com', :ssl => {
-          :ca_file => "/opt/local/share/curl/curl-ca-bundle.crt"
-        }
+        connection = Faraday::Connection.new options.client_options[:site], :ssl => options.client_options[:ssl]
         response = connection.get("/graph/me.json?access_token=#{access_token.token}")
         json = JSON.parse(response.body)
-        @duser = {}
-        OmniAuth::Strategies::Dailycred::ATTRIBUTES.each do |attr|
-          @duser[attr] = json[attr]
+        pp json if options[:verbose]
+        @duser = {'token' => access_token.token}
+        @duser['provider'] = 'dailycred'
+        @duser['uid'] =  json['id'] || json['user_id']
+        json.each do |k,v|
+          @duser[k] = v
         end
+        json["identities"].each do |k, v|
+          @duser[k] = v
+          @duser[k][:access_token] = json["access_tokens"][k]
+        end if !json["identities"].nil?
+        pp @duser if options[:verbose]
+        @duser.delete("id")
 
         @duser
       end
-        
+
     end
   end
 end

data/script/download_info.rb

@@ -0,0 +1,11 @@
+require 'gems'
+require 'pp'
+total = 0
+Gems.versions('dailycred').reverse.each_with_index do |v,i|
+  p "version: #{v['number']}"
+  p "downloads: #{v['downloads_count']}"
+  total += v['downloads_count']
+  p "total: #{total}"
+  p "release date: #{Date.parse(v['built_at']).to_time.strftime('%m/%d/%Y')}"
+  p "----------"
+end

data/spec/{spec_helper.rb → helper_spec.rb}

@@ -1,5 +1,5 @@
-$:.unshift File.expand_path('..', __FILE__)
-$:.unshift File.expand_path('../../lib', __FILE__)
+# $:.unshift File.expand_path('..', __FILE__)
+# $:.unshift File.expand_path('../../lib', __FILE__)
 require 'simplecov'
 SimpleCov.start
 require 'rspec'
@@ -9,6 +9,8 @@ require 'dailycred'
 
 Dir[File.expand_path('../support/**/*', __FILE__)].each { |f| require f }
 
+# require 'omniauth/strategies/dailycred_spec'
+
 RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy

data/spec/omniauth/strategies/dailycred_spec.rb

@@ -1,22 +1,64 @@
-require 'spec_helper'
-
+require_relative '../../helper_spec.rb'
+require 'omniauth'
+require 'dailycred'
 describe OmniAuth::Strategies::Dailycred do
   subject do
     OmniAuth::Strategies::Dailycred.new(nil, @options || {})
   end
-  
-  
+
+  OmniAuth.config.test_mode = true
+  OmniAuth.config.add_mock(:dailycred, {:id => '12345',
+                              :email => 'Test@test.com',
+                              :username => 'test',
+                              :created => 45678,
+                              :verified => false,
+                              :admin => true,
+                              :referred_by => 'dave' })
+
+  it_should_behave_like 'an oauth2 strategy'
+
+
   describe '#client' do
-      it 'should have the correct dwolla site' do
-        subject.client.site.should eq("https://auth.dailycred.com")
+      it 'should have the correct dailycred site' 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("https://auth.dailycred.com/oauth/authorize")
+        subject.client.options[:authorize_url].should eq("/oauth/authorize")
       end
-      
+
       it 'should have the correct token url' do
-        subject.client.options[:token_url].should eq('https://auth.dailycred.com/oauth/tokeninfo')
+        subject.client.options[:token_url].should eq('/oauth/access_token')
       end
   end
-  
+
+  # describe 'getting info' do
+  #   before do
+  #     @access_token = double("token" => 'test_token')
+  #     @dailycred_user  = double(  :id => '12345',
+  #                                 :email => 'test@test.com',
+  #                                 :username => 'test',
+  #                                 :id => 45678,
+  #                                 :verified => false,
+  #                                 :admin => true,
+  #                                 :referred_by => 'dave' )
+
+  #     subject.stub(:access_token) { @access_token }
+
+  #     @dailycred_user.should_receive(:fetch).and_return(@dailycred_user)
+  #   end
+
+  #   it 'should set the correct info based on user' do
+  #     subject.info.should == {:id => '12345',
+  #                             :email => 'test@test.com',
+  #                             :username => 'test',
+  #                             :created => 45678,
+  #                             :verified => false,
+  #                             :admin => true,
+  #                             :referred_by => 'dave' }
+  #   end
+
+  #   it 'set the correct uid based on user' do
+  #     subject.id.should == '12345'
+  #   end
+  # end
 end

data/spec/support/dailycred_spec.rb

@@ -0,0 +1,72 @@
+require 'json'
+require 'pp'
+require 'dailycred'
+describe Dailycred::Client do
+  subject do
+
+  end
+
+  before(:each) do
+    site = "https://www.dailycred.com"
+    client_id = "f1fd998c-bc48-4e1b-bc88-98f9373ba60f"
+    secret = "6925d89e-d04d-469e-8fc9-3782af57bc29-c2340f1e-25a0-40af-b638-7429947a6cd7"
+    @user_id = "0c19c355-2a71-4c8e-805e-f7a6087ea84c"
+
+    # dev settings
+    # site = "http://localhost:9000"
+    # client_id = "4337ed55-aaca-4e38-8824-6c016c59dd5b"
+    # secret = "34f2ecc3-f955-4292-9747-39b876d91d8b-a4f7ad8e-f8a4-4573-b23d-686f6e28a820"
+    # @user_id = "97a85558-c5a6-47de-ab89-4e7de02c99bd"
+
+    dc_options = { :client_options => {
+        :site => site,
+        :authorize_url => '/oauth/authorize',
+        :token_url => '/oauth/access_token'
+      } }
+
+    if File.exists?('/etc/ssl/certs')
+      dc_options[:client_options][:ssl] = { :ca_path => '/etc/ssl/certs'}
+    end
+
+    if File.exists?('/opt/local/share/curl/curl-ca-bundle.crt')
+      dc_options[:client_options][:ssl] = { :ca_file => '/opt/local/share/curl/curl-ca-bundle.crt' }
+    end
+
+    @dc = Dailycred::Client.new client_id, secret, dc_options
+  end
+
+  it "tags a user" 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
+  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
+  end
+
+  it "fires an event" do
+    json = json_response @dc.event(@user_id, "became a loser")
+    json["worked"].should == true
+  end
+
+  it "resets a password" do
+    json = json_response @dc.reset_password("useruseruseruser@gmail.com")
+    json["worked"].should == true
+  end
+
+  # it "changes a password" do
+  #   json = json_response @dc.changePass("0c19c355-2a71-4c8e-805e-f7a6087ea84c", "wrongPass", "newPass")
+  #   json["worked"].should == false
+  #   json["message"].should != nil
+  # end
+
+
+  def json_response response
+    JSON.parse response.body
+  end
+end

data/spec/support/shared_examples.rb

@@ -0,0 +1,40 @@
+# NOTE it would be useful if this lived in omniauth-oauth2 eventually
+# Thanks to Josh Ellithorpe for this file -Will
+
+shared_examples 'an oauth2 strategy' do
+  describe '#client' do
+    it 'should be initialized with symbolized client_options' do
+      @options = { :client_options => { 'authorize_url' => 'https://example.com' } }
+      subject.client.options[:authorize_url].should == 'https://example.com'
+    end
+  end
+
+  describe '#authorize_params' do
+    # it 'should include any authorize params passed in the :authorize_params option' do
+    #   @options = { :authorize_params => { :foo => 'bar', :baz => 'zip' } }
+    #   p subject.authorize_params
+    #   subject.authorize_params['foo'].should eq('bar')
+    #   subject.authorize_params['baz'].should eq('zip')
+    # end
+
+    it 'should include top-level options that are marked as :authorize_options' do
+      @options = { :authorize_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
+      subject.authorize_params['scope'].should eq('bar')
+      subject.authorize_params['foo'].should eq('baz')
+    end
+  end
+
+  describe '#token_params' do
+    it 'should include any token params passed in the :token_params option' do
+      @options = { :token_params => { :foo => 'bar', :baz => 'zip' } }
+      subject.token_params['foo'].should eq('bar')
+      subject.token_params['baz'].should eq('zip')
+    end
+
+    it 'should include top-level options that are marked as :token_options' do
+      @options = { :token_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
+      subject.token_params['scope'].should eq('bar')
+      subject.token_params['foo'].should eq('baz')
+    end
+  end
+end

data/test/generator_test.rb

@@ -0,0 +1,85 @@
+require 'rails/generators'
+# require 'mocha'
+require_relative "../lib/generators/dailycred_generator.rb"
+class GeneratorTest < Rails::Generators::TestCase
+  tests DailycredGenerator
+  destination File.expand_path("./tmp/myproject", File.dirname(__FILE__))
+
+  setup :prepare_destination
+
+  setup do
+    # Must set before requiring generator libs.
+    TMP_ROOT = File.dirname(__FILE__) + "/tmp" unless defined?(TMP_ROOT)
+    PROJECT_NAME = "myproject" unless defined?(PROJECT_NAME)
+    app_root = File.join(TMP_ROOT, PROJECT_NAME)
+    if defined?(APP_ROOT)
+      APP_ROOT.replace(app_root)
+    else
+      APP_ROOT = app_root
+    end
+    if defined?(RAILS_ROOT)
+      RAILS_ROOT.replace(app_root)
+    else
+      RAILS_ROOT = app_root
+    end
+    Dir.mkdir("#{RAILS_ROOT}/config") unless File.exists?("#{RAILS_ROOT}/config")
+    File.open("#{RAILS_ROOT}/config/routes.rb", 'w') do |f|
+      f.puts "ActionController::Routing::Routes.draw do\n\nend"
+    end
+    Dir.mkdir("#{RAILS_ROOT}/app") unless File.exists?("#{RAILS_ROOT}/app")
+    Dir.mkdir("#{RAILS_ROOT}/app/controllers") unless File.exists?("#{RAILS_ROOT}/app/controllers")
+    File.open("#{RAILS_ROOT}/app/controllers/application_controller.rb", 'w') do |f|
+      f.puts "class ApplicationController < ActionController::Base\n\nend"
+    end
+  end
+
+  teardown do
+    FileUtils.rm_rf "#{RAILS_ROOT}/app"
+    FileUtils.rm_rf "#{RAILS_ROOT}/config"
+    FileUtils.rm_rf "#{RAILS_ROOT}/db"
+  end
+
+  test "generator works with input" do
+    test_generator ["aaa","bbb"]
+    assert_credentials "aaa", "bbb"
+  end
+
+  test "generator works with login" do
+    generator_class.any_instance.stubs(:get_input).returns(["localtest@dailycred.com","password"])
+    test_generator
+    assert_credentials "e92e20bf-e0a4-49b4-8a82-ff1b65d80017", "9adf81a8-ce97-4bcb-9c1f-c09f5fc7b6b8-0d1a4553-496d-450e-80fd-9e8d0552a920"
+  end
+
+  private
+
+  def test_generator args=[]
+    run_generator args
+    assert_file "config/initializers/omniauth.rb" do |config|
+      assert_true config.include? 'Rails.configuration.DAILYCRED_CLIENT_ID ='
+      assert_true config.include? 'Rails.configuration.DAILYCRED_SECRET_KEY ='
+    end
+
+    assert_file "config/routes.rb", /(#{Regexp.escape("mount Dailycred::Engine => '/auth', :as => 'dailycred_engine'")})/
+
+    assert_file "app/models/user.rb" do |model|
+      assert_true model.include? "acts_as_dailycred"
+    end
+
+    assert_file "app/controllers/application_controller.rb" do |controller|
+    end
+
+    assert_migration "db/migrate/create_users.rb" do |migration|
+      assert_true migration.include? ":twitter"
+      assert_true migration.include? ":github"
+      assert_true migration.include? ":google"
+    end
+  end
+
+  def assert_credentials client_id, client_secret
+    assert_file "config/initializers/omniauth.rb" do |config|
+      assert_true config.include? "Rails.configuration.DAILYCRED_CLIENT_ID = \"#{client_id}\""
+      assert_true config.include? "Rails.configuration.DAILYCRED_SECRET_KEY = \"#{client_secret}\""
+    end
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,6 @@
+require 'test/unit'
+
+
+
+require_relative './generator_test.rb'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dailycred
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -43,7 +43,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: descript
+description: A Ruby on Rails engine for authentication with Dailycred.
 email:
 - hstove@gmail.com
 executables: []
@@ -52,23 +52,127 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/sessions_controller.rb
+- app/views/sessions/info.html.erb
+- config/routes.rb
 - dailycred.gemspec
+- docs/lib/dailycred.html
+- docs/lib/dailycred/acts_as_dailycred.html
+- docs/lib/dailycred/client.html
+- docs/lib/dailycred/engine.html
+- docs/lib/dailycred/helper.html
+- docs/lib/dailycred/middleware.html
+- docs/lib/dailycred/tests_helper.html
+- docs/lib/dailycred/user.html
+- docs/lib/generators/dailycred_generator.html
+- docs/lib/generators/templates/migration_create_user.html
+- docs/lib/generators/templates/omniauth.html
+- docs/lib/generators/templates/sessions_controller.html
+- docs/lib/generators/templates/user.html
+- docs/lib/middleware/middleware.html
+- docs/lib/omniauth-dailycred/version.html
+- docs/lib/omniauth/strategies/dailycred.html
+- docs/lib/user/user.html
+- dummy/.gitignore
+- dummy/Gemfile
+- dummy/Guardfile
+- dummy/README.rdoc
+- dummy/Rakefile
+- dummy/app/assets/images/rails.png
+- dummy/app/assets/javascripts/application.js
+- dummy/app/assets/javascripts/posts.js.coffee
+- dummy/app/assets/stylesheets/application.css
+- dummy/app/assets/stylesheets/posts.css.scss
+- dummy/app/assets/stylesheets/scaffolds.css.scss
+- dummy/app/controllers/application_controller.rb
+- dummy/app/controllers/posts_controller.rb
+- dummy/app/helpers/application_helper.rb
+- dummy/app/helpers/posts_helper.rb
+- dummy/app/mailers/.gitkeep
+- dummy/app/models/.gitkeep
+- dummy/app/models/post.rb
+- dummy/app/models/user.rb
+- dummy/app/views/layouts/application.html.erb
+- dummy/app/views/posts/_form.html.erb
+- dummy/app/views/posts/edit.html.erb
+- dummy/app/views/posts/index.html.erb
+- dummy/app/views/posts/new.html.erb
+- dummy/app/views/posts/show.html.erb
+- dummy/config.ru
+- dummy/config/application.rb
+- dummy/config/boot.rb
+- dummy/config/database.yml
+- dummy/config/environment.rb
+- dummy/config/environments/development.rb
+- dummy/config/environments/production.rb
+- dummy/config/environments/test.rb
+- dummy/config/initializers/backtrace_silencers.rb
+- dummy/config/initializers/inflections.rb
+- dummy/config/initializers/mime_types.rb
+- dummy/config/initializers/omniauth.rb
+- dummy/config/initializers/secret_token.rb
+- dummy/config/initializers/session_store.rb
+- dummy/config/initializers/wrap_parameters.rb
+- dummy/config/locales/en.yml
+- dummy/config/routes.rb
+- dummy/db/migrate/20120925172903_create_users.rb
+- dummy/db/migrate/20120926012555_create_posts.rb
+- dummy/db/migrate/20121002192037_update_users_2.rb
+- dummy/db/schema.rb
+- dummy/db/seeds.rb
+- dummy/lib/assets/.gitkeep
+- dummy/lib/tasks/.gitkeep
+- dummy/log/.gitkeep
+- dummy/public/404.html
+- dummy/public/422.html
+- dummy/public/500.html
+- dummy/public/favicon.ico
+- dummy/public/index.html
+- dummy/public/robots.txt
+- dummy/script/rails
+- dummy/test/fixtures/.gitkeep
+- dummy/test/fixtures/posts.yml
+- dummy/test/fixtures/users.yml
+- dummy/test/functional/.gitkeep
+- dummy/test/functional/posts_controller_test.rb
+- dummy/test/integration/.gitkeep
+- dummy/test/performance/browsing_test.rb
+- dummy/test/test_helper.rb
+- dummy/test/unit/.gitkeep
+- dummy/test/unit/helpers/posts_helper_test.rb
+- dummy/test/unit/post_test.rb
+- dummy/test/unit/user_test.rb
+- dummy/vendor/assets/javascripts/.gitkeep
+- dummy/vendor/assets/stylesheets/.gitkeep
+- dummy/vendor/plugins/.gitkeep
 - lib/dailycred.rb
+- lib/dailycred/acts_as_dailycred.rb
+- lib/dailycred/client.rb
+- lib/dailycred/engine.rb
+- lib/dailycred/helper.rb
+- lib/dailycred/middleware.rb
+- lib/dailycred/tests_helper.rb
+- lib/dailycred/user.rb
 - lib/generators/USAGE
 - lib/generators/dailycred_generator.rb
 - lib/generators/templates/info.html.erb
+- lib/generators/templates/login.html.erb
 - lib/generators/templates/migration_create_user.rb
 - lib/generators/templates/omniauth.rb
 - lib/generators/templates/sessions_controller.rb
 - lib/generators/templates/user.rb
-- lib/middleware/middleware.rb
-- lib/omniauth-dailycred/version.rb
 - lib/omniauth/strategies/dailycred.rb
+- script/download_info.rb
+- spec/helper_spec.rb
 - spec/omniauth/strategies/dailycred_spec.rb
-- spec/spec_helper.rb
+- spec/support/dailycred_spec.rb
+- spec/support/shared_examples.rb
+- test/generator_test.rb
+- test/test_helper.rb
 homepage: https://www.dailycred.com
 licenses: []
 post_install_message: 
@@ -92,8 +196,12 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: summary
+summary: ''
 test_files:
+- spec/helper_spec.rb
 - spec/omniauth/strategies/dailycred_spec.rb
-- spec/spec_helper.rb
+- spec/support/dailycred_spec.rb
+- spec/support/shared_examples.rb
+- test/generator_test.rb
+- test/test_helper.rb
 has_rdoc: 

data/lib/omniauth-dailycred/version.rb

@@ -1,5 +0,0 @@
-module Omniauth
-  module Dailycred
-    VERSION = "0.0.2"
-  end
-end