dailycred 0.1.30 → 0.1.31

data/lib/generators/dailycred_generator.rb

@@ -3,7 +3,6 @@ require 'pp'
 require 'json'
 require 'faraday'
 class DailycredGenerator < Rails::Generators::Base
-  require 'faraday'
   source_root File.expand_path('../templates', __FILE__)
 
   CLIENT_ID_DEFAULT = 'YOUR_CLIENT_ID'
@@ -11,14 +10,9 @@ class DailycredGenerator < Rails::Generators::Base
 
   argument :client_id, :type => :string, :default => CLIENT_ID_DEFAULT, :banner => 'dailycred_client_id'
   argument :secret_key, :type => :string, :default => CLIENT_SECRET_DEFAULT, :banner => 'dailycred_secret_key'
-  argument :get_input, type: :string, default: 'true', enum: ['true', 'false']
 
   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", :as => :login
-  match "/auth/failure" => "sessions#failure"
+  mount Dailycred::Engine => '/auth', :as => 'dailycred_engine'
   EOS
 
   APP_CONTROLLER_LINES =<<-EOS
@@ -34,72 +28,21 @@ class DailycredGenerator < Rails::Generators::Base
       nil
     end
   end
-
-  # use as a before_filter to only allow signed in users
-  # example:
-  #   before_filter :authenticate
-  def authenticate
-    redirect_to auth_path unless current_user
-  end
-
-  # helper method for getting an instance of dailycred
-  # example:
-  #   dailycred.tagUser "user_id", "tag"
-  #
-  # for more documentation, visit https://www.dailycred.com/api/ruby
-  def dailycred
-    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
-  def connect_path(provider)
-    url = "/auth/dailycred?identity_provider=\#{provider.to_s}"
-    url += "&referrer=\#{request.protocol}\#{request.host_with_port}\#{request.fullpath}"
-  end
   EOS
 
   def install
-    dailycred_ascii =<<-EOS
-    *****
-    *****
-    *****
-    *****
-    *****
-    *****    Thanks for using dailycred!
-    *****
-    *****
-    *****
-    *****
-    *****
-    EOS
-    puts dailycred_ascii
-    @get_input = @get_input == "true" ? true : false
     # copy initializer
     template "omniauth.rb", "config/initializers/omniauth.rb"
     # get client info from login if they didnt specify info
-    if @client_id == CLIENT_ID_DEFAULT && @get_input
+    if @client_id == CLIENT_ID_DEFAULT
       get_info
     end
-    # session_controller
-    copy_file "sessions_controller.rb", "app/controllers/sessions_controller.rb"
     # application controller
     insert_into_file "app/controllers/application_controller.rb", APP_CONTROLLER_LINES, :after => /class ApplicationController\n|class ApplicationController .*\n/
-    # application helper
-    insert_into_file "app/helpers/application_helper.rb", APP_HELPER_LINES, :after => /module ApplicationHelper\n|module ApplicationHelper .*\n/
     # add user_model
     copy_file "user.rb", "app/models/user.rb"
     # session_controller
     copy_file "migration_create_user.rb", "db/migrate/#{Time.now.strftime('%Y%m%d%H%M%S')}_create_users.rb"
-    # auth page
-    copy_file "info.html.erb", "app/views/sessions/info.html.erb"
     # config/routes
     inject_into_file "config/routes.rb", APP_ROUTES_LINES, :after => ".draw do\n"
   end
@@ -169,6 +112,7 @@ class DailycredGenerator < Rails::Generators::Base
     ensure
       %x[stty #{stty_settings}]
     end
+    p ''
     return email, password
   end
 

data/lib/generators/templates/info.html.erb

@@ -3,5 +3,5 @@
     <%= link_to 'Logout', logout_path %>
   </p>
 <% else %>
-  <%= link_to 'Login In', login_path(:action => 'signin') %> or <%= link_to 'Sign Up', login_path(:identity_provider => :facebook) %>
+  <%= link_to 'Login In', login_path(:action => 'signin') %> or <%= link_to 'Sign Up', login_path() %>
 <% end %>

data/lib/generators/templates/omniauth.rb

@@ -1,20 +1,9 @@
 Rails.configuration.DAILYCRED_CLIENT_ID = "<%= client_id %>"
 Rails.configuration.DAILYCRED_SECRET_KEY = "<%= secret_key %>"
 
-dc_id = Rails.configuration.DAILYCRED_CLIENT_ID
-dc_secret = Rails.configuration.DAILYCRED_SECRET_KEY
-
-dc_options = { :client_options => {} }
-
-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
-
-Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :dailycred, dc_id, dc_secret, dc_options
-end
-
-Rails.application.config.middleware.use "Dailycred::Middleware", dc_id
+# configure where users should be redirected after authentication
+#
+# Rails.configuration.DAILYCRED_OPTIONS = {
+#   :after_auth => '/hello', #after login
+#   :after_unauth => '/goodbye' #after logout
+# }

data/lib/generators/templates/user.rb

@@ -1,18 +1,3 @@
 class User < ActiveRecord::Base
-  serialize :facebook, Hash
-  serialize :twitter, Hash
-  serialize :google, Hash
-  serialize :github, Hash
-  serialize :tags, Array
-  serialize :referred, Array
-
-  attr_accessible :email, :username, :created, :verified, :admin, :referred_by, :referred,
-    :facebook, :tags, :provider, :uid, :token, :twitter, :google, :github
-
-  def self.find_or_create_with_omniauth(model)
-    @user = User.find_by_provider_and_uid(model[:provider], model[:uid]) || User.new
-    @user.update_attributes model[:info]
-    @user
-  end
-
+  acts_as_dailycred
 end

data/lib/omniauth/strategies/dailycred.rb

@@ -12,7 +12,7 @@ module OmniAuth
       # default options
       option :client_options, {
         :site => "https://www.dailycred.com",
-        :authorize_url => '/connect',
+        :authorize_url => '/oauth/authorize',
         :token_url => '/oauth/access_token'
       }
 
@@ -41,6 +41,7 @@ module OmniAuth
 
       # 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?
@@ -66,10 +67,10 @@ module OmniAuth
         OmniAuth::Strategies::Dailycred::ATTRIBUTES.each do |attr|
           @duser[attr] = json[attr]
         end
-        if !json["FACEBOOK"].nil?
-          @duser['facebook'] = json["FACEBOOK"]["members"]
-          @duser['facebook']['access_token'] = json["FACEBOOK"]['access_token']
-        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
 
         @duser

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/omniauth/strategies/dailycred_spec.rb

@@ -1,4 +1,4 @@
-# require 'helper_spec'
+require_relative '../../helper_spec.rb'
 require 'omniauth'
 require 'dailycred'
 describe OmniAuth::Strategies::Dailycred do
@@ -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("/connect")
+        subject.client.options[:authorize_url].should eq("/oauth/authorize")
       end
 
       it 'should have the correct token url' do

data/spec/support/dailycred_spec.rb

@@ -1,7 +1,7 @@
 require 'json'
 require 'pp'
 require 'dailycred'
-describe Dailycred do
+describe Dailycred::Client do
   subject do
 
   end
@@ -32,7 +32,7 @@ describe Dailycred do
       dc_options[:client_options][:ssl] = { :ca_file => '/opt/local/share/curl/curl-ca-bundle.crt' }
     end
 
-    @dc = Dailycred.new client_id, secret, dc_options
+    @dc = Dailycred::Client.new client_id, secret, dc_options
   end
 
   it "tags a user" do

data/test/generator_test.rb

@@ -31,10 +31,6 @@ class GeneratorTest < Rails::Generators::TestCase
     File.open("#{RAILS_ROOT}/app/controllers/application_controller.rb", 'w') do |f|
       f.puts "class ApplicationController < ActionController::Base\n\nend"
     end
-    Dir.mkdir("#{RAILS_ROOT}/app/helpers")
-    File.open("#{RAILS_ROOT}/app/helpers/application_helper.rb", 'w') do |f|
-      f.puts "module ApplicationHelper\n\nend"
-    end
   end
 
   teardown do
@@ -59,44 +55,17 @@ class GeneratorTest < Rails::Generators::TestCase
   def test_generator args=[]
     run_generator args
     assert_file "config/initializers/omniauth.rb" do |config|
-      assert_true config.include? "Rails.application.config.middleware.use"
-      # assert_true config.include? 'Rails.configuration.DAILYCRED_CLIENT_ID = "YOUR_CLIENT_ID"'
-      # assert_true config.include? 'Rails.configuration.DAILYCRED_SECRET_KEY = "YOUR_SECRET_KEY"'
+      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('match "/auth/:provider/callback" => "sessions#create"')})/
-    assert_file "config/routes.rb", /(#{Regexp.escape('match "/logout" => "sessions#destroy", :as => :logout')})/
-    assert_file "config/routes.rb", /(#{Regexp.escape('match "/auth" => "sessions#info", :as => :auth')})/
-    assert_file "config/routes.rb", /(#{Regexp.escape('match "/auth/dailycred", :as => :login')})/
-    assert_file "config/routes.rb", /(#{Regexp.escape('match "/auth/failure" => "sessions#failure"')})/
+    assert_file "config/routes.rb", /(#{Regexp.escape("mount Dailycred::Engine => '/auth', :as => 'dailycred_engine'")})/
 
-    assert_file "app/controllers/sessions_controller.rb" do |controller|
-      assert_instance_method :create, controller
-      assert_instance_method :destroy, controller
-      assert_instance_method :failure, controller
-      assert_instance_method :info, controller
+    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|
-      assert_instance_method :current_user, controller
-      assert_instance_method :set_state, controller
-      assert_instance_method :authenticate, controller
-      assert_instance_method :dailycred, controller
-    end
-
-    assert_file "app/helpers/application_helper.rb" do |helper|
-      assert_instance_method :connect_path, helper
-    end
-
-    assert_file "app/models/user.rb" do |model|
-      # assert_true model.include? "attr_accessible :email, :username, :created, :verified, :admin, :referred_by, :referred, :facebook, :tags, :provider, :uid, :token"
-      assert_class_method :find_or_create_with_omniauth, model
-      assert_true model.include? "serialize :facebook, Hash"
-      assert_true model.include? "serialize :tags, Array"
-      assert_true model.include? "serialize :referred, Array"
-      assert_true model.include? "serialize :twitter, Hash"
-      assert_true model.include? "serialize :google, Hash"
-      assert_true model.include? "serialize :github, Hash"
     end
 
     assert_migration "db/migrate/create_users.rb" do |migration|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dailycred
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-09-25 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: []
@@ -56,8 +56,18 @@ files:
 - 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
@@ -68,7 +78,12 @@ files:
 - docs/lib/omniauth/strategies/dailycred.html
 - docs/lib/user/user.html
 - 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
@@ -78,9 +93,8 @@ files:
 - 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/support/dailycred_spec.rb
@@ -110,7 +124,7 @@ 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

data/lib/omniauth-dailycred/version.rb

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