dailycred 0.1.2 → 0.1.4

data/lib/dailycred/engine.rb

@@ -0,0 +1,52 @@
+require 'rails'
+module Dailycred
+
+  class Engine < Rails::Engine
+
+    initializer 'dailycred.setup', :after=>"dailycred" do |app|
+      conf = Rails.configuration# alias for configuration
+      if conf.respond_to? 'DAILYCRED_CLIENT_ID'
+        id = conf.DAILYCRED_CLIENT_ID
+        secret = conf.DAILYCRED_SECRET_KEY
+
+        # setup omniauth options, can be overridden. ex:
+        # Rails.application.DAILYCRED_OPTIONS = {
+        #   :client_options => {
+        #     :site => 'https://www.dailycred.com',
+        #     :authorize_url => '/connect',
+        #     :token_url => '/oauth/access_token'
+        #   }
+        # }
+        if conf.respond_to? 'DAILYCRED_OPTIONS'
+          opts = conf.DAILYCRED_OPTIONS
+          opts[:client_options] ||= {}
+          opts[:client_options][:ssl] = {}
+        else
+          opts = {:client_options => {:ssl => {}}}
+        end
+
+        if File.exists?('/etc/ssl/certs')
+          opts[:client_options][:ssl][:ca_path] = '/etc/ssl/certs'
+        end
+        if File.exists?('/opt/local/share/curl/curl-ca-bundle.crt')
+          opts[:client_options][:ssl][:ca_file] = '/opt/local/share/curl/curl-ca-bundle.crt'
+        end
+
+        conf.DAILYCRED_OPTIONS = opts
+
+        Rails.application.config.middleware.use OmniAuth::Builder do
+          provider :dailycred, id, secret, opts
+        end
+
+        Rails.application.config.middleware.use "Dailycred::Middleware", id
+
+        ActiveSupport.on_load(:action_controller) do
+          include Dailycred::Helpers
+        end
+      end
+    end
+
+
+  end
+
+end

data/lib/dailycred/helper.rb

@@ -0,0 +1,60 @@
+module Dailycred
+  module Helpers
+
+    # use as a before_filter to only allow signed in users
+    # example:
+    #   before_filter :authenticate
+    def authenticate
+      redirect_to_unauth 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::Client.new(config.DAILYCRED_CLIENT_ID, config.DAILYCRED_SECRET_KEY, config.DAILYCRED_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.hex(24)
+    end
+
+    def login_path(params={})
+      "/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
+      redirect_to path, opts
+    end
+
+    def redirect_to_unauth opts = {}
+      conf = Rails.configuration.DAILYCRED_OPTIONS
+      path = !conf[:after_unauth].nil? ? conf[:after_unauth] : dailycred_engine.auth_info_path
+      redirect_to path, opts
+    end
+  end
+end

data/lib/{middleware → dailycred}/middleware.rb

@@ -1,9 +1,14 @@
-class Dailycred
+module Dailycred
   class Middleware
     attr_accessor :client_id
 
-    def initialize(app, client_id)
-      @app = app 
+    def initialize(app, client_id, opts={})
+      @opts = opts
+      @opts[:url] ||= "https://www.dailycred.com"
+      @opts[:modal] ||= false
+      @opts[:sdk] ||= false
+      @opts[:triggers] ||= []
+      @app = app
       @client_id = client_id
     end
 
@@ -28,29 +33,34 @@ class Dailycred
     private
 
     def render_dailycred_scripts
-      <<-EOT
+      str =<<-EOT
       <!-- dailycred -->
       <script type="text/javascript">
       (function() {
-        var dc, dlh, home, id, page, referrer, title, url;
+        var dc, url;
         window.dc_opts = {
           clientId: "#{@client_id}",
-          home: "https://www.dailycred.com"
+          home: "#{@opts[:url]}"
         };
-        id = dc_opts.clientId;
-        home = "https://www.dailycred.com";
-        dlh = document.location.href;
-        page = dlh.indexOf('#') > -1 ? dlh.substring(0, dlh.indexOf("#")) : dlh;
-        title = document.title ? document.title : "";
-        referrer = document.referrer ? document.referrer : "";
-        dc = document.createElement("img");
-        url = "" + home + "/dc.gif?page=" + page + "&title=" + title + "&client_id=" + window.dc_opts.clientId + "&referrer=" + referrer;
+        dc = document.createElement("script");
+        url = dc_opts.home + "/public/js/cred.coffee";
         dc.src = url;
         document.body.appendChild(dc);
       }).call(this);
       </script>
-      <!-- end dailycred -->
       EOT
+      str2 =<<-EOT
+      <script src="https://s3.amazonaws.com/file.dailycred.com/js/dailycred.js"></script>
+      <script>
+      DC.init({
+          "showModal" : #{@opts[:modal]}
+          #{',"modal":{"triggers":'+@opts[:triggers].to_s+'}' if @opts[:modal]}
+        });
+      </script>
+      EOT
+      str += str2 if @opts[:sdk]
+      str += "\n<!-- end dailycred -->"
+      str
     end
 
   end

data/lib/dailycred/tests_helper.rb

@@ -0,0 +1,5 @@
+module Dailycred
+  module TestHelper
+
+  end
+end

data/lib/dailycred/user.rb

@@ -0,0 +1,63 @@
+module Dailycred
+  class User
+    include ActiveModel::Validations
+    include ActiveModel::Serialization
+
+    validates_presence_of :email, :pass
+
+    attr_accessor :client, :email, :pass, :authorized
+
+    def initialize client, user = {}
+      self.client = client
+      self.authorized = false
+      user.each do |k,v|
+        self[k] = v if self.respond_to(k)
+      end
+    end
+
+    def login
+      if !self.valid?
+        #it didn't work already, return false
+        return false
+      end
+
+      response = JSON.parse client.login(self.to_hash)
+      err_parser response
+
+      return false if !self.valid?
+      true
+    end
+
+    def to_hash
+      {
+        :email => self.email,
+        :pass => self.pass
+      }
+    end
+
+    private
+
+    #response is a hash, which is
+    #a json-parsed http response body
+    def err_parser response
+      if !response["worked"]
+        self.authorized = false
+        response["errors"].each do |err|
+          attrib = err["attribute"]
+          message = err["message"]
+          if attrib == "form"
+            self.errors.add_to_base message
+          else
+            if attrib == "user"
+              self.errors.add :email, message
+            elsif self.respond_to attrib
+              self.errors.add attrib, message
+            end
+          end
+        end
+      end
+    end
+
+  end
+
+end

data/lib/dailycred.rb

@@ -1,80 +1,2 @@
-require "omniauth-dailycred/version"
 require "omniauth/strategies/dailycred"
-require "middleware/middleware"
-
-class Dailycred
-
-  attr_accessor :client_id, :secret_key, :options
-
-  # Initializes a dailycred object
-  # @param [String] client_id the client's daiycred client id
-  # @param [String] secret_key the clients secret key
-  # @param [Hash] opts a hash of options
-  def initialize(client_id, secret_key="", opts={})
-    @client_id = client_id
-    @secret_key = secret_key
-    @options = opts
-  end
-
-  URL = "https://www.dailycred.com"
-
-  # Generates a Dailycred event
-  # @param [String] user_id the user's dailycred user id
-  # @param [String] key the name of the event type
-  # @param [String] val the value of the event (optional)
-  def event(user_id, key, val="")
-    opts = {
-      :key => key,
-      :valuestring => val,
-      :user_id => user_id
-    }
-    post "/admin/api/customevent.json", opts
-  end
-
-  # Tag a user in dailycred
-  # @param [String] user_id the user's dailycred user id
-  # @param [String] tag the desired tag to add
-  def tag(user_id, tag)
-    opts = {
-      :user_id => user_id,
-      :tag => tag
-    }
-    post "/admin/api/user/tag.json", opts
-  end
-
-  # Untag a user in dailycred 
-  # (see #tag)
-  def untag(user_id, tag)
-    opts = {
-      :user_id => user_id,
-      :tag => tag
-    }
-    post "/admin/api/user/untag.json", opts
-  end
-
-  private
-
-  def post(url, opts)
-    opts.merge! base_opts
-    get_conn.post url, opts
-  end
-
-  def ssl_opts
-    opts = {}
-    if @options[:client_options] && @options[:client_options][:ssl]
-      opts[:ssl] = @options[:client_options][:ssl]
-    end
-    opts
-  end
-
-  def base_opts
-    {
-      :client_id => @client_id,
-      :client_secret => @client_secret
-    }
-  end
-
-  def get_conn
-    Faraday::Connection.new Dailycred::URL, ssl_opts
-  end
-end
+Dir[File.expand_path('../dailycred/*', __FILE__)].each { |f| require f }

data/lib/generators/dailycred_generator.rb

@@ -1,22 +1,26 @@
+require 'rails/generators'
+require 'pp'
+require 'json'
+require 'faraday'
 class DailycredGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :client_id, :type => :string, :default => 'YOUR_CLIENT_ID', :banner => 'dailycred_client_id'
-  argument :secret_key, :type => :string, :default => 'YOUR_SECRET_KEY', :banner => 'dailycred_secret_key'
+  CLIENT_ID_DEFAULT = 'YOUR_CLIENT_ID'
+  CLIENT_SECRET_DEFAULT = 'YOUR_SECRET_KEY'
 
-  APP_NAME = Rails.application.class.parent.name
+  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'
 
   APP_ROUTES_LINES =<<-EOS
-  match '/auth/:provider/callback' => 'sessions#create'
-  match "/logout" => "sessions#destroy", :as => :logout
-  match "/auth" => "sessions#info", :as => :auth
+  mount Dailycred::Engine => '/auth', :as => 'dailycred_engine'
   EOS
 
   APP_CONTROLLER_LINES =<<-EOS
-  helper_method :current_user, :login_path, :dailycred, :signup_path
+  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]
@@ -24,53 +28,99 @@ class DailycredGenerator < Rails::Generators::Base
       nil
     end
   end
-
-  def authenticate
-    redirect_to auth_path unless current_user
-  end
-
-  def signup_path
-    "/auth/dailycred"
-  end
-
-  def login_path
-    "/auth/dailycred?action=signin"
-  end
-
-  def dailycred
-    config = Rails.configuration
-    @dailycred ||= Dailycred.new(config.DAILYCRED_CLIENT_ID, config.DAILYCRED_SECRET_KEY)
-  end
   EOS
 
   def install
-    dailycred_ascii =<<-EOS
-    *****
-    *****
-    *****
-    *****
-    *****
-    *****    Thanks for using dailycred!
-    *****
-    *****
-    *****
-    *****
-    *****
-    EOS
-    print dailycred_ascii
     # copy initializer
     template "omniauth.rb", "config/initializers/omniauth.rb"
-    # session_controller
-    copy_file "sessions_controller.rb", "app/controllers/sessions_controller.rb"
+    # get client info from login if they didnt specify info
+    if @client_id == CLIENT_ID_DEFAULT
+      get_info
+    end
     # application controller
-    inject_into_class "app/controllers/application_controller.rb", ApplicationController, APP_CONTROLLER_LINES
+    insert_into_file "app/controllers/application_controller.rb", APP_CONTROLLER_LINES, :after => /class ApplicationController\n|class ApplicationController .*\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"
     # config/routes
-    inject_into_file "config/routes.rb", APP_ROUTES_LINES, :after => "#{APP_NAME}::Application.routes.draw do\n"
+    inject_into_file "config/routes.rb", APP_ROUTES_LINES, :after => ".draw do\n"
   end
+
+  private
+
+  def get_info first=true
+    if first
+      puts "Please insert your dailycred credentials. You must sign up for a free account at "+
+        "http://www.dailycred.com. This is to automatically configure your api keys. If you wish to skip, enter 'n' as your email."
+    else
+      puts "Invalid email and password. Try again or type 'n' to skip."
+    end
+    #ssl opts
+    # $stderr.puts 'getting input'
+    input = get_input
+    email, password = input[0], input[1]
+    # $stderr.puts 'got input'
+    return if email == "n"
+    ssl_opts = {}
+    if File.exists?('/etc/ssl/certs')
+      ssl_opts = { :ca_path => '/etc/ssl/certs'}
+    end
+    if File.exists?('/opt/local/share/curl/curl-ca-bundle.crt')
+      ssl_opts = { :ca_file => '/opt/local/share/curl/curl-ca-bundle.crt' }
+    end
+    # url = "https://www.dailycred.com"
+    # url = "http://localhost:9000"
+    # staging server for a very short time
+    url = "http://ec2-72-44-40-55.compute-1.amazonaws.com:9000"
+    connection = Faraday::Connection.new url, :ssl => ssl_opts
+    params = {
+      :login => email,
+      :pass => password,
+      :client_id => "dailycred"
+    }
+    response = connection.post("user/api/signin.json", params)
+    json = JSON.parse(response.body)
+    if !json["worked"]
+      # wrong password
+      p ''
+      get_info false
+    end
+    access_token = json["access_token"]
+    response = connection.post("graph/clientinfo.json", :access_token => access_token)
+    json = JSON.parse(response.body)
+    if !json["worked"]
+      p "There was an error retrieving your account information. Please manually configure your API keys in config/initializers/omniauth.rb"
+      return
+    end
+    @client_id = json["clientId"]
+    @secret_key = json["clientSecret"]
+    gsub_file("config/initializers/omniauth.rb", /YOUR_CLIENT_ID/, @client_id) if @client_id
+    gsub_file("config/initializers/omniauth.rb", /YOUR_SECRET_KEY/, @secret_key) if @secret_key
+  end
+
+  def get_input
+    puts ''
+    print "Email:"
+    email = gets.chomp
+    return email, nil if email == "n"
+    stty_settings = %x[stty -g]
+    print 'Password: '
+    begin
+      %x[stty -echo]
+      password = gets.chomp
+    ensure
+      %x[stty #{stty_settings}]
+    end
+    p ''
+    return email, password
+  end
+
+  private
+
+  def show obj
+    $stderr.puts obj
+  end
+
+
 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 %> or <%= link_to 'Sign Up', signup_path %>
+  <%= link_to 'Login In', login_path(:action => 'signin') %> or <%= link_to 'Sign Up', login_path() %>
 <% end %>

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

@@ -0,0 +1,13 @@
+<%= form_for(@user) do |f| %>
+  <p>
+    <%= f.label :email %>
+    <%= f.text_field :email%>
+  </p>
+  <p>
+    <%= f.label :password %>
+    <%= f.password_field :password %>
+  </p>
+  <p>
+    <%= f.submit "Log in" %>
+  </p>
+<% end %>

data/lib/generators/templates/migration_create_user.rb

@@ -1,20 +1,70 @@
 class CreateUsers < ActiveRecord::Migration
   def self.up
-    create_table :users do |t|
-      t.string :provider, null: false
-      t.string :uid, null: false
-      t.string :email, null: false, uniq: true
-      t.integer :created, :limit => 8
-      t.string :username
-      t.boolean :verified
-      t.boolean :admin
-      t.string :referred_by
+    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
+        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/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/sessions_controller.rb

@@ -2,22 +2,28 @@ class SessionsController < ApplicationController
   before_filter :authenticate, :only => [:destroy]
   before_filter :current_user
 
+  # Callback Route for OAuth flow
   def create
-    @user = User.find_by_provider_and_uid(auth_hash['provider'], auth_hash['uid']) || User.create_with_omniauth(auth_hash)
+    @user = User.find_or_create_with_omniauth auth_hash
     session[:user_id] = @user.id
     redirect_to auth_path
   end
 
+  #GET /logout
   def destroy
     session[:user_id] = nil
     redirect_to auth_path
   end
 
-  def info
+  def failure
+    redirect_to auth_path, notice: params[:message]
+  end
 
+  def info
   end
 
   private
+
   def auth_hash
     request.env['omniauth.auth']
   end

data/lib/generators/templates/user.rb

@@ -1,25 +1,3 @@
 class User < ActiveRecord::Base
-
-  def self.create_with_omniauth(model)
-    if model[:provider] == "dailycred"
-      create_with_dailycred model
-    end
-  end
-
-  private
-
-  def self.create_with_dailycred(model)
-    info = model[:info]
-    create! do |user|
-      user.provider = model[:provider]
-      user.uid = model[:uid]
-      user.email =info[:email]
-      user.username = info[:username]
-      user.created = info[:created]
-      user.verified = info[:verified]
-      user.admin = info[:admin]
-      user.referred_by = info[:referred_by]
-    end
-  end
-
+  acts_as_dailycred
 end