dailycred 0.1.21 → 0.1.22

data/.gitignore

@@ -15,3 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+localtest/
+twooter/
+examples/tester/

data/Rakefile

@@ -1,2 +1,12 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  # Put spec opts in a file named .rspec in root
+end

data/dailycred.gemspec

@@ -14,5 +14,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.21"
+  gem.version       = "0.1.22"
 end

data/lib/dailycred.rb

@@ -4,7 +4,14 @@ require "middleware/middleware"
 
 class Dailycred
 
-  attr_accessor :client_id, :secret_key, :options
+  attr_accessor :client_id, :secret_key, :options, :url
+
+  URL = "https://www.dailycred.com"
+
+  ROUTES = {
+    :signup => "/user/api/signup.json",
+    :login  => "/user/api/signin.json"
+  }
 
   # Initializes a dailycred object
   # @param [String] client_id the client's daiycred client id
@@ -14,10 +21,10 @@ class Dailycred
     @client_id = client_id
     @secret_key = secret_key
     @options = opts
+    opts[:client_options] ||= {}
+    @url = opts[:client_options][:site] || Dailycred::URL
   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
@@ -42,7 +49,7 @@ class Dailycred
     post "/admin/api/user/tag.json", opts
   end
 
-  # Untag a user in dailycred 
+  # Untag a user in dailycred
   # (see #tag)
   def untag(user_id, tag)
     opts = {
@@ -52,23 +59,18 @@ class Dailycred
     post "/admin/api/user/untag.json", opts
   end
 
-  private
-
   def post(url, opts)
     opts.merge! base_opts
-    p opts
     response = get_conn.post url, opts
-    p response.body
   end
 
+  private
+
   def ssl_opts
     opts = {}
-    p @options
-    p " ^^^^ @options "
     if @options[:client_options] && @options[:client_options][:ssl]
       opts[:ssl] = @options[:client_options][:ssl]
     end
-    p opts
     opts
   end
 
@@ -80,7 +82,6 @@ class Dailycred
   end
 
   def get_conn
-    p ssl_opts
-    Faraday::Connection.new Dailycred::URL, ssl_opts
+    Faraday::Connection.new @url, ssl_opts
   end
 end

data/lib/generators/dailycred_generator.rb

@@ -17,6 +17,7 @@ class DailycredGenerator < Rails::Generators::Base
 
   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]
@@ -25,21 +26,31 @@ class DailycredGenerator < Rails::Generators::Base
     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
 
+  # link to sign up
   def signup_path
     "/auth/dailycred"
   end
 
+  # link to login
   def login_path
     "/auth/dailycred?action=signin"
   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_client_opts)
+    @dailycred ||= Dailycred.new(config.DAILYCRED_CLIENT_ID, config.DAILYCRED_SECRET_KEY, config.dc_options)
   end
   EOS
 

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

@@ -3,12 +3,16 @@ class CreateUsers < ActiveRecord::Migration
     create_table :users do |t|
       t.string :provider, null: false
       t.string :uid, null: false
-      t.string :email, null: false, uniq: true
+      t.string :email
       t.integer :created, :limit => 8
       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.timestamps
     end

data/lib/generators/templates/omniauth.rb

@@ -4,7 +4,11 @@ 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 => {} }
+dc_options = { :client_options => {
+        :site => "http://localhost:9000",
+        :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'}

data/lib/generators/templates/sessions_controller.rb

@@ -2,22 +2,24 @@ 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
+    redirect_to "/auth"
   end
 
+  #GET /logout
   def destroy
     session[:user_id] = nil
     redirect_to auth_path
   end
 
   def info
-
   end
 
   private
+
   def auth_hash
     request.env['omniauth.auth']
   end

data/lib/generators/templates/user.rb

@@ -1,25 +1,14 @@
 class User < ActiveRecord::Base
+  serialize :facebook, Hash
+  serialize :tags, Array
+  serialize :referred, Array
 
-  def self.create_with_omniauth(model)
-    if model[:provider] == "dailycred"
-      create_with_dailycred model
-    end
-  end
-
-  private
+  attr_accessible :email, :id, :username, :created, :verified, :admin, :referred_by, :referred, :facebook, :tags, :provider, :uid, :token
 
-  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
+  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
 
 end

data/lib/middleware/middleware.rb

@@ -2,8 +2,12 @@ class 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[:triggers] ||= []
+      @app = app
       @client_id = client_id
     end
 
@@ -35,20 +39,27 @@ class Dailycred
         var dc, dlh, home, id, page, referrer, title, url;
         window.dc_opts = {
           clientId: "#{@client_id}",
-          home: "https://www.dailycred.com"
+          home: "#{@opts[:url]}"
         };
         id = dc_opts.clientId;
-        home = "https://www.dailycred.com";
+        home = window.dc_opts.home || "https://www.dailycred.com";
         dlh = document.location.href;
-        page = dlh.indexOf('#') > -1 ? dlh.substring(0, dlh.indexOf("#")) : dlh;
+        page = encodeURIComponent(dlh);
         title = document.title ? document.title : "";
-        referrer = document.referrer ? document.referrer : "";
+        referrer = document.referrer ? encodeURIComponent(document.referrer) : "";
         dc = document.createElement("img");
-        url = "" + home + "/dc.gif?page=" + page + "&title=" + title + "&client_id=" + window.dc_opts.clientId + "&referrer=" + referrer;
+        url = "" + home + "/dc.gif?url=" + page + "&title=" + title + "&client_id=" + window.dc_opts.clientId + "&referrer=" + referrer;
         dc.src = url;
         document.body.appendChild(dc);
       }).call(this);
       </script>
+      <script src="#{@opts[:url]}/public/js/dailycred.coffee"></script>
+      <script>
+      DC.init({
+          "showModal" : #{@opts[:modal]},
+          "triggers"  : #{@opts[:triggers].to_s}
+        });
+      </script>
       <!-- end dailycred -->
       EOT
     end

data/lib/omniauth/strategies/dailycred.rb

@@ -2,34 +2,39 @@ require 'omniauth-oauth2'
 require 'faraday'
 require 'net/https'
 require 'json'
+require 'pp'
 
 module OmniAuth
   module Strategies
     class Dailycred < OmniAuth::Strategies::OAuth2
+
       option :client_options, {
-        :site => 'https://www.dailycred.com',
+        :site => "https://www.dailycred.com",
         :authorize_url => '/oauth/authorize',
         :token_url => '/oauth/access_token'
       }
 
-      ATTRIBUTES = ["email", "id", "username", "created", "verified", "admin", "referred_by", "tags", "referred"]
+      ATTRIBUTES = ["email", "username", "created", "verified", "admin", "referred_by", "tags", "referred"]
       AUTH_PARAMS = ["action"]
 
       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
+
+      def request_phase
         OmniAuth::Strategies::Dailycred::AUTH_PARAMS.each do |param|
           val = session['omniauth.params'][param]
           if val && !val.empty?
@@ -44,19 +49,26 @@ module OmniAuth
 
       def user
         return @duser if !@duser.nil?
-        connection = Faraday::Connection.new 'https://www.dailycred.com', :ssl => {
+        connection = Faraday::Connection.new options.client_options[:site], :ssl => {
           :ca_file => "/opt/local/share/curl/curl-ca-bundle.crt"
         }
         response = connection.get("/graph/me.json?access_token=#{access_token.token}")
         json = JSON.parse(response.body)
-        @duser = {}
+        pp json
+        @duser = {'token' => access_token.token}
+        @duser['provider'] = 'dailycred'
+        @duser['uid'] =  json['id'] || json['user_id']
         OmniAuth::Strategies::Dailycred::ATTRIBUTES.each do |attr|
           @duser[attr] = json[attr]
         end
+        if !json["FACEBOOK"].nil?
+          @duser['facebook'] = json["FACEBOOK"]["members"]
+        end
+        pp @duser
 
         @duser
       end
-        
+
     end
   end
 end

data/lib/user/user.rb

@@ -0,0 +1,63 @@
+class Dailycred
+  class Auth
+    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/localtest/.gitignore

@@ -0,0 +1,15 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+
+# Ignore bundler config
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp

data/localtest/Gemfile

@@ -0,0 +1,39 @@
+source 'https://rubygems.org'
+
+gem 'rails', '3.2.8'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'sqlite3'
+gem 'dailycred', :path => "../"
+
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  # gem 'therubyracer', :platforms => :ruby
+
+  gem 'uglifier', '>= 1.0.3'
+end
+
+gem 'jquery-rails'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
+
+# Use unicorn as the app server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'debugger'