dailycred 0.1.36 → 0.1.41

data/README.md

@@ -28,12 +28,85 @@ While this is enough to get off the ground running with user authentication, thi
 
 ## Authenticating
 
+#### login_path
+
+A helper for linking to the authentication url.
+
+    <%= link_to 'sign up', login_path %>
+    # => <a href="/auth/dailycred">sign up</a>
+
+#### logout_path
+
+To logout a user, simply send them to `/auth/logout`.
+
+    <%= link_to 'logout', logout_path %>
+    # => <a href="/auth/logout">logout</a>
+    
+#### authenticate
+
 To protect a controller method from unauthorized users, use the 'authorize' helper method as a `before_filter`.
 
     #before_filter :authenticate, :except => [:index] #don't authenticate some
     #before_filter :authenticate, :only => [:create, :new] #only authenticate some
     before_filter :authenticate #all methods
 
+## Social Connect
+
+To use a social sign-in service instead of email, and password, use `connect_path.`
+
+    <%= link_to 'sign in with facebook', connect_path(:identity_provider => :facebook) %>
+
+The `identity_provider` can be one of `facebook`, `google`, or `twitter.`
+
+After a user has social connected, their social data is serialized into individual fields in the user model. The serialized object is the exact same as what the social provider's graph response returns. For example:
+
+    p current_user.facebook
+    # =>
+    {
+        "video_upload_limits" => {
+            "length" => 1200.0,
+            "size" => 1073741824.0
+        },
+        "locale" => "en_US",
+        "link" => "http://www.facebook.com/joe.smith",
+        "updated_time" => "2012-09-27T19:04:38+0000",
+        "currency" => {
+            "user_currency" => "USD",
+            "currency_exchange" => 10.0,
+            "currency_exchange_inverse" => 0.1,
+            "currency_offset" => 100.0
+        },
+        "picture" => {
+            "data" => {
+                "url" => "http://profile.ak.fbcdn.net/hprofile-ak-ash4/370570_1039690812_2022945351_q.jpg",
+                "is_silhouette" => false
+            }
+        },
+        "id" => "1092609812",
+        "third_party_id" => "cBLDKnqlfYlReV7Jo4yRAFB1a4I",
+        "first_name" => "Joe",
+        "username" => "jsmitty",
+        "bio" => "shred the gnar.",
+        "email" => "jsmitty@dailycred.com",
+        "verified" => true,
+        "name" => "Joe Smith",
+        "last_name" => "Stoever",
+        "gender" => "male",
+        "access_token" =>"AAAFHsZAi9ddUBAKPMOKPDrmJlclwCoVHCfwflF5ZCyLZC70SOo0MPvj62lhHZAnV6jk8DEfBSjLtfcyC7Bx25a9CLphzoayv3EtvbE2tAQZDZD"
+    }
+
+You can also connect additional social accounts to an existing user:
+
+    <%= link_to 'connect with facebook', connect_user(:facebook) %>
+
+`connect_user` defaults to connecting the `current_user`, but you can explicitly connect any user:
+
+    <%= link_to 'connect with google', connect_user(:google, @user) %>
+
+---
+
+##Helpers
+
 There are a few other helper methods available:
 
 #### current_user
@@ -62,20 +135,6 @@ or just as a helper
         dailycred.event(current_user.uid, "New Task", @task.name)
     end
 
-#### login_path
-
-A helper for linking to the authentication url. Usage:
-
-    <%= link_to 'sign up', login_path %>
-    # => <a href="/auth/dailycred">sign up</a>
-
-#### Logging out
-
-To logout a user, simply send them to `/auth/logout`.
-
-    <%= link_to 'logout', logout_path %>
-    # => <a href="/auth/logout">logout</a>
-
 #### Tagging a User
 
 Dailycred provides the ability to 'tag' users, whether for reference in analytics or any other reason. Note that this is a very simple 'tagging' system, and not something you should use for dynamic tagging situations in your application.
@@ -90,6 +149,12 @@ You can also fire events tied to a specific user - this is helpful for goal trac
     # user#fire_event(key, value)
     @user.fire_event 'task added', @task.name
 
+#### Building Referral URLs
+
+To easily build referral URLs to track sharing amongst your users, use `referral_link(my_site)`, where *my_site* is the url that you wish referred users to be sent to.
+
+    current_user.referral_link("http://www.mysite.com")
+
 #### Testing Controllers
 
 Testing controllers that have the `authenticate` before filter is easy:

data/app/controllers/sessions_controller.rb

@@ -1,6 +1,7 @@
 class SessionsController < ApplicationController
   before_filter :authenticate, :only => [:destroy]
   before_filter :current_user
+  include Dailycred::Helpers
 
   # Callback Route for OAuth flow
   def create

data/app/views/sessions/info.html.erb

@@ -1,7 +1,13 @@
 <% if current_user %>
   <p>Hello <%= current_user.email %> <br>
     <%= link_to 'Logout', dailycred_engine.logout_path %>
+    <br><%= link_to 'connect with facebook', connect_user(:facebook) %>
+    <br><%= link_to 'connect with google', connect_user(:google) %>
+    <br><%= link_to 'connect with twitter', connect_user(:twitter) %>
   </p>
 <% else %>
   <%= link_to 'Log In', login_path() %>
+  <br><%= link_to 'connect with facebook', connect_path(:identity_provider => :facebook) %>
+  <br><%= link_to 'connect with google', connect_path(:identity_provider => :google) %>
+  <br><%= link_to 'connect with twitter', current_user.connect_path(:twitter) %>
 <% end %>

data/dailycred.gemspec

@@ -15,5 +15,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "dailycred"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.36"
+  gem.version       = "0.1.41"
 end

data/dummy/Gemfile

@@ -7,6 +7,7 @@ gem 'rails', '3.2.8'
 
 gem 'sqlite3'
 gem 'dailycred', :path => '../'
+gem 'awesome_print'
 
 
 # Gems used only for assets and not required
@@ -24,6 +25,8 @@ end
 gem 'jquery-rails'
 gem 'factory_girl'
 
+gem 'quiet_assets', :group => :development
+
 group :test, :development do
   gem 'guard-test'
   gem 'rb-fsevent', '~> 0.9.1'

data/dummy/app/controllers/application_controller.rb

@@ -1,12 +1,13 @@
 class ApplicationController < ActionController::Base
   helper_method :current_user
-
   private
 
   # helper method for getting the current signed in user
   def current_user
     begin
-      @current_user || User.find(session[:user_id]) if session[:user_id]
+      @current_user ||= User.find(session[:user_id]) if session[:user_id]
+      ap @current_user
+      @current_user
     rescue
       nil
     end

data/dummy/config/initializers/omniauth.rb

@@ -2,8 +2,12 @@ Rails.configuration.DAILYCRED_CLIENT_ID = "4133a23f-b9c3-47e4-8989-cfb30510079d"
 Rails.configuration.DAILYCRED_SECRET_KEY = "a1c21e72-98d8-47c2-9e9a-1e2dcd363b2f-f353b2af-1f51-416c-ad4c-59e70721dfab"
 
 # configure where users should be redirected after authentication
-#
-# Rails.configuration.DAILYCRED_OPTIONS = {
-#   :after_auth => '/hello', #after login
-#   :after_unauth => '/goodbye' #after logout
-# }
+
+Rails.configuration.DAILYCRED_OPTIONS = {
+  :client_options => {
+    :site => 'http://ec2-72-44-40-55.compute-1.amazonaws.com:9000',
+    :verbose => true
+  }
+  # :after_auth => '/hello', #after login
+  # :after_unauth => '/goodbye' #after logout
+}

data/dummy/db/migrate/20121002192037_update_users_2.rb

@@ -0,0 +1,70 @@
+class UpdateUsers2 < ActiveRecord::Migration
+  def self.up
+    if !table_exists? :users
+      create_table :users do |t|
+        t.string :provider
+        t.string :uid
+        t.string :email
+        t.integer :created
+        t.string :username
+        t.boolean :verified
+        t.boolean :admin
+        t.string :referred_by
+        t.string :token
+        t.text :facebook
+        t.text :tags
+        t.text :referred
+        t.text :google
+        t.text :twitter
+        t.text :github
+        t.text :access_tokens
+        t.boolean :subscribed
+        t.string :display
+
+        t.timestamps
+      end
+    else
+      safe_column :users, :provider, :string
+      safe_column :users, :uid, :string
+      safe_column :users, :email, :string
+      safe_column :users, :created, :integer
+      safe_column :users, :username, :string
+      safe_column :users, :verified, :booleanied
+      safe_column :users, :admin, :boolean
+      safe_column :users, :referred, :string
+      safe_column :users, :token, :string
+      safe_column :users, :facebook, :text
+      safe_column :users, :tags, :text
+      safe_column :users, :referred, :text
+      safe_column :users, :google, :text
+      safe_column :users, :twitter, :text
+      safe_column :users, :github, :text
+      safe_column :users, :access_tokens, :text
+      safe_column :users, :display, :string
+      safe_column :users, :subscribed, :boolean
+    end
+  end
+
+  def self.down
+    drop_table :users
+  end
+
+  private
+
+  def table_exists? table
+    ActiveRecord::Base.connection.table_exists?(table.to_s)
+  end
+
+  def column_exists?(table, column)
+    begin
+      ActiveRecord::Base.connection.columns(table.to_s).map(&:name).include?(column.to_s)
+    rescue NoMethodError #actual_columns is empty and it doesn't respond to the map method
+      false
+    end
+  end
+
+  def safe_column table, name, type
+    add_column table.to_sym, name.to_sym, type.to_sym unless column_exists? table, name
+  end
+
+end

data/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120926012555) do
+ActiveRecord::Schema.define(:version => 20121002192037) do
 
   create_table "posts", :force => true do |t|
     t.string   "title"
@@ -23,7 +23,7 @@ ActiveRecord::Schema.define(:version => 20120926012555) do
     t.string   "provider"
     t.string   "uid"
     t.string   "email"
-    t.integer  "created",     :limit => 8
+    t.integer  "created",       :limit => 8
     t.string   "username"
     t.boolean  "verified"
     t.boolean  "admin"
@@ -35,10 +35,11 @@ ActiveRecord::Schema.define(:version => 20120926012555) do
     t.text     "google"
     t.text     "twitter"
     t.text     "github"
-    t.datetime "created_at",               :null => false
-    t.datetime "updated_at",               :null => false
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
     t.string   "display"
     t.boolean  "subscribed"
+    t.text     "access_tokens"
   end
 
 end

data/dummy/test/unit/user_test.rb

@@ -58,6 +58,11 @@ class UserTest < ActiveSupport::TestCase
     assert_true json_response(@user.fire_event 'got tested')['worked']
   end
 
+  test 'making a referral link' do
+    id = @user.uid
+    assert_equal @user.referral_link('http://me.com'), "https://www.dailycred.com/r/#{id}?redirect_uri=http://me.com"
+  end
+
   def json_response response
     JSON.parse response.body
   end

data/lib/dailycred/acts_as_dailycred.rb

@@ -6,9 +6,11 @@ module ActsAsDailycred
     serialize :github, Hash
     serialize :tags, Array
     serialize :referred, Array
+    serialize :access_tokens, Hash
 
     extend ActsAsDailycred::SingletonMethods
     include ActsAsDailycred::InstanceMethods
+    include Dailycred::Helpers
   end
   module SingletonMethods
     def find_or_create_with_omniauth(model)
@@ -38,13 +40,33 @@ module ActsAsDailycred
       end
     end
 
+    def display_name
+      display = self.email || ""
+      p '1'
+      if self.facebook != {}
+        p '2'
+        return self.facebook["name"]
+      elsif self.google != {}
+        p '3'
+        return self.google["name"]
+      elsif self.twitter != {}
+        p '4'
+        return "@"+self.twitter["screen_name"]
+      end
+      display
+    end
+
+    def referral_link url
+      "https://www.dailycred.com/r/#{self.uid}?redirect_uri=#{url}"
+    end
     def reset_password
       get_client.reset_password self.email
     end
 
     def update_from_dailycred dc
+      bad = ['updated_at', 'created_at']
       dc.each do |k,v|
-        self[k] = v if self[k] != v
+        self[k] = v if self.respond_to?(k) and !bad.include?(k.to_s)
       end
       save!
     end
@@ -56,6 +78,10 @@ module ActsAsDailycred
     def get_client
       @dailycred ||= Dailycred::Client.new Rails.configuration.DAILYCRED_CLIENT_ID, Rails.configuration.DAILYCRED_SECRET_KEY
     end
+
+    def connect_path provider
+      "/auth/dailycred?identity_provider=#{provider.to_s}"
+    end
   end
 end
 require 'active_record'

data/lib/dailycred/helper.rb

@@ -28,6 +28,23 @@ module Dailycred
       "/auth/dailycred"
     end
 
+    def connect_path(params)
+      url = "#{request.protocol}#{request.host_with_port}/auth/dailycred"
+      p = []
+      params.each do |k,v|
+        p << "#{k}=#{v.to_s}"
+      end
+      url += "?" if p.size > 0
+      url += p.join("&")
+    end
+
+    def connect_user provider, user=nil
+      if user.nil?
+        user = current_user
+      end
+      connect_path(access_token: user.token, identity_provider: provider)
+    end
+
     def redirect_to_auth opts={}
       conf = Rails.configuration.DAILYCRED_OPTIONS
       path = !conf[:after_auth].nil? ? conf[:after_auth] : dailycred_engine.auth_info_path
@@ -39,10 +56,5 @@ module Dailycred
       path = !conf[:after_unauth].nil? ? conf[:after_unauth] : dailycred_engine.auth_info_path
       redirect_to path, opts
     end
-
-
-    ActiveSupport.on_load(:action_controller) do
-      helper_method :current_user, :login_path, :set_state, :dailycred, :authenticate
-    end
   end
 end

data/lib/dailycred/middleware.rb

@@ -50,7 +50,7 @@ module Dailycred
       </script>
       EOT
       str2 =<<-EOT
-      <script src="#{@opts[:url]}/public/js/dailycred.coffee"></script>
+      <script src="https://s3.amazonaws.com/file.dailycred.com/js/dailycred.js"></script>
       <script>
       DC.init({
           "showModal" : #{@opts[:modal]}

data/lib/generators/templates/migration_create_user.rb

@@ -17,6 +17,7 @@ class CreateUsers < ActiveRecord::Migration
         t.text :google
         t.text :twitter
         t.text :github
+        t.text :access_tokens
         t.boolean :subscribed
         t.string :display
 
@@ -38,6 +39,7 @@ class CreateUsers < ActiveRecord::Migration
       safe_column :users, :google, :text
       safe_column :users, :twitter, :text
       safe_column :users, :github, :text
+      safe_column :users, :access_tokens, :text
       safe_column :users, :display, :string
       safe_column :users, :subscribed, :boolean
     end

data/lib/omniauth/strategies/dailycred.rb

@@ -12,12 +12,12 @@ module OmniAuth
       # default options
       option :client_options, {
         :site => "https://www.dailycred.com",
-        :authorize_url => '/oauth/authorize',
+        :authorize_url => '/connect',
         :token_url => '/oauth/access_token'
       }
 
       # allows parameters to be passed through
-      AUTH_PARAMS = ["action","identity_provider","referrer"]
+      AUTH_PARAMS = ["action","identity_provider","referrer", "access_token"]
 
       option :authorize_options, OmniAuth::Strategies::Dailycred::AUTH_PARAMS
 
@@ -57,7 +57,7 @@ module OmniAuth
         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)
-        # pp json
+        pp json if options[:verbose]
         @duser = {'token' => access_token.token}
         @duser['provider'] = 'dailycred'
         @duser['uid'] =  json['id'] || json['user_id']
@@ -68,7 +68,8 @@ module OmniAuth
           @duser[k] = v
           @duser[k][:access_token] = json["access_tokens"][k]
         end if !json["identities"].nil?
-        # pp @duser
+        pp @duser if options[:verbose]
+        @duser.delete("id")
 
         @duser
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dailycred
 version: !ruby/object:Gem::Version
-  version: 0.1.36
+  version: 0.1.41
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -121,6 +121,7 @@ files:
 - 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