dailycred 0.1.461 → 0.2.0

data/dummy/config/initializers/wrap_parameters.rb

@@ -1,14 +1,14 @@
 # Be sure to restart your server when you modify this file.
-#
+
 # This file contains settings for ActionController::ParamsWrapper which
 # is enabled by default.
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
 end
 
-# Disable root element in JSON by default.
-ActiveSupport.on_load(:active_record) do
-  self.include_root_in_json = false
-end
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+#  self.include_root_in_json = true
+# end

data/dummy/config/locales/en.yml

@@ -1,5 +1,23 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
 
 en:
   hello: "Hello world"

data/dummy/config/routes.rb

@@ -1,22 +1,21 @@
 Dummy::Application.routes.draw do
-  resources :posts
+  #mount Dailycred::Engine => '/auth', :as => 'dailycred_engine'
+  # The priority is based upon order of creation: first created -> highest priority.
+  # See how all your routes lay out with "rake routes".
 
-  mount Dailycred::Engine => '/auth', :as => 'dailycred_engine'
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
+  # You can have the root of your site routed with "root"
+  # root to: 'welcome#index'
 
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
+  # Example of regular route:
+  #   get 'products/:id' => 'catalog#view'
 
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
+  # Example of named route that can be invoked with purchase_url(id: product.id)
+  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
 
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  # Example resource route (maps HTTP verbs to controller actions automatically):
   #   resources :products
 
-  # Sample resource route with options:
+  # Example resource route with options:
   #   resources :products do
   #     member do
   #       get 'short'
@@ -28,34 +27,24 @@ Dummy::Application.routes.draw do
   #     end
   #   end
 
-  # Sample resource route with sub-resources:
+  # Example resource route with sub-resources:
   #   resources :products do
   #     resources :comments, :sales
   #     resource :seller
   #   end
 
-  # Sample resource route with more complex sub-resources
+  # Example resource route with more complex sub-resources:
   #   resources :products do
   #     resources :comments
   #     resources :sales do
-  #       get 'recent', :on => :collection
+  #       get 'recent', on: :collection
   #     end
   #   end
 
-  # Sample resource route within a namespace:
+  # Example resource route within a namespace:
   #   namespace :admin do
   #     # Directs /admin/products/* to Admin::ProductsController
   #     # (app/controllers/admin/products_controller.rb)
   #     resources :products
   #   end
-
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => 'welcome#index'
-
-  # See how all your routes lay out with "rake routes"
-
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id))(.:format)'
 end

data/dummy/db/migrate/{20120925172903_create_users.rb → 20130417131939_create_users.rb}

@@ -5,20 +5,18 @@ class CreateUsers < ActiveRecord::Migration
         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.text :identities
+        t.datetime :created
 
         t.timestamps
       end
@@ -26,20 +24,18 @@ class CreateUsers < ActiveRecord::Migration
       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, :verified, :boolean
       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
+      safe_column :users, :identities, :text
+      safe_column :users, :created, :datetime
     end
   end
 

data/dummy/db/schema.rb

@@ -9,38 +9,28 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121108192739) do
+ActiveRecord::Schema.define(version: 20130417131939) do
 
-  create_table "posts", :force => true do |t|
-    t.string   "title"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.datetime "created"
-  end
-
-  create_table "users", :force => true do |t|
+  create_table "users", force: true do |t|
     t.string   "provider"
     t.string   "uid"
     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.text     "google"
-    t.text     "twitter"
-    t.text     "github"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-    t.string   "display"
-    t.boolean  "subscribed"
     t.text     "access_tokens"
+    t.boolean  "subscribed"
+    t.string   "display"
+    t.text     "identities"
+    t.datetime "created"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
 end

data/dummy/public/404.html

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>The page you were looking for doesn't exist (404)</title>
-  <style type="text/css">
+  <style>
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
     div.dialog {
       width: 25em;
@@ -22,5 +22,6 @@
     <h1>The page you were looking for doesn't exist.</h1>
     <p>You may have mistyped the address or the page may have moved.</p>
   </div>
+  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>

data/dummy/public/422.html

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>The change you wanted was rejected (422)</title>
-  <style type="text/css">
+  <style>
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
     div.dialog {
       width: 25em;

data/dummy/public/500.html

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>We're sorry, but something went wrong (500)</title>
-  <style type="text/css">
+  <style>
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
     div.dialog {
       width: 25em;
@@ -21,5 +21,6 @@
   <div class="dialog">
     <h1>We're sorry, but something went wrong.</h1>
   </div>
+  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>

data/dummy/public/robots.txt

@@ -1,5 +1,5 @@
 # See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
 #
 # To ban all spiders from the entire site uncomment the next two lines:
-# User-Agent: *
+# User-agent: *
 # Disallow: /

data/dummy/test/test_helper.rb

@@ -1,62 +1,15 @@
-require 'rubygems'
-require 'spork'
-#uncomment the following line to use spork with the debugger
-#require 'spork/ext/ruby-debug'
+ENV["RAILS_ENV"] = "test"
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
 
-Spork.prefork do
-  # Loading more in this block will cause your tests to run faster. However,
-  # if you change any configuration or code from libraries loaded here, you'll
-  # need to restart spork for it take effect.
-  ENV["RAILS_ENV"] = "test"
-  require File.expand_path('../../config/environment', __FILE__)
-  require 'rails/test_help'
+class ActiveSupport::TestCase
+  ActiveRecord::Migration.check_pending!
 
-  class ActiveSupport::TestCase
-    # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-    #
-    # Note: You'll currently still have to declare fixtures explicitly in integration tests
-    # -- they do not yet inherit this setting
-    fixtures :all
+  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
 
-    # Add more helper methods to be used by all tests here...
-  end
-
-end
-
-Spork.each_run do
-  # This code will be run each time you run your specs.
+  # Add more helper methods to be used by all tests here...
 end
-
-# --- Instructions ---
-# Sort the contents of this file into a Spork.prefork and a Spork.each_run
-# block.
-#
-# The Spork.prefork block is run only once when the spork server is started.
-# You typically want to place most of your (slow) initializer code in here, in
-# particular, require'ing any 3rd-party gems that you don't normally modify
-# during development.
-#
-# The Spork.each_run block is run each time you run your specs.  In case you
-# need to load files that tend to change during development, require them here.
-# With Rails, your application modules are loaded automatically, so sometimes
-# this block can remain empty.
-#
-# Note: You can modify files loaded *from* the Spork.each_run block without
-# restarting the spork server.  However, this file itself will not be reloaded,
-# so if you change any of the code inside the each_run block, you still need to
-# restart the server.  In general, if you have non-trivial code in this file,
-# it's advisable to move it into a separate file so you can easily edit it
-# without restarting spork.  (For example, with RSpec, you could move
-# non-trivial code into a file spec/support/my_helper.rb, making sure that the
-# spec/support/* files are require'd from inside the each_run block.)
-#
-# Any code that is left outside the two blocks will be run during preforking
-# *and* during each_run -- that's probably not what you want.
-#
-# These instructions should self-destruct in 10 seconds.  If they don't, feel
-# free to delete them.
-
-
-
-
-

data/lib/dailycred.rb

@@ -1,2 +1,2 @@
-require "omniauth/strategies/dailycred"
-Dir[File.expand_path('../dailycred/*', __FILE__)].each { |f| require f }
+Dir[File.expand_path('../dailycred/*', __FILE__)].each { |f| require f }
+require "omniauth/strategies/dailycred"

data/lib/dailycred/acts_as_dailycred.rb

@@ -1,13 +1,9 @@
 module ActsAsDailycred
   def acts_as_dailycred
-    serialize :facebook, Hash
-    serialize :twitter, Hash
-    serialize :google, Hash
-    serialize :github, Hash
     serialize :tags, Array
     serialize :referred, Array
     serialize :access_tokens, Hash
-    serialize :idenitities, Hash
+    serialize :identities, Hash
 
     extend ActsAsDailycred::SingletonMethods
     include ActsAsDailycred::InstanceMethods
@@ -15,7 +11,6 @@ module ActsAsDailycred
   end
   module SingletonMethods
     def find_or_create_with_omniauth(model)
-      ap model
       @user = User.find_by_provider_and_uid(model['provider'], model['uid']) || User.new
       @user.update_from_dailycred model[:info]
       @user
@@ -42,16 +37,9 @@ module ActsAsDailycred
       end
     end
 
+    #deprecated, use @user.display
     def display_name
-      display = self.email || ""
-      if self.facebook != {}
-        return self.facebook["name"]
-      elsif self.google != {}
-        return self.google["name"]
-      elsif self.twitter != {}
-        return "@"+self.twitter["screen_name"]
-      end
-      display
+      self.display
     end
 
     def referral_link url
@@ -63,9 +51,8 @@ module ActsAsDailycred
 
     def update_from_dailycred dc
       bad = ['updated_at', 'created_at']
-      p dc
       dc.each do |k,v|
-        self[k] = v if self.respond_to?(k) and !bad.include?(k.to_s)
+        self.send("#{k}=", v) if self.respond_to?(k) and !bad.include?(k.to_s)
       end
       save!
     end

data/lib/dailycred/client.rb

@@ -1,5 +1,6 @@
 module Dailycred
   class Client
+    require 'faraday'
     attr_accessor :client_id, :secret_key, :options, :url
 
     URL = "https://www.dailycred.com"

data/lib/dailycred/engine.rb

@@ -1,4 +1,5 @@
 require 'rails'
+require 'omniauth'
 module Dailycred
 
   class Engine < Rails::Engine
@@ -37,8 +38,8 @@ module Dailycred
         Rails.application.config.middleware.use OmniAuth::Builder do
           provider :dailycred, id, secret, opts
         end
-
-        Rails.application.config.middleware.use "Dailycred::Middleware", id
+        opts[:middleware] ||= {}
+        Rails.application.config.middleware.use "Dailycred::Middleware", id, opts[:middleware]
 
         ActiveSupport.on_load(:action_controller) do
           include Dailycred::Helpers