dailycred 0.1.4 → 0.1.5

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 1.9.3

data/Gemfile

@@ -11,7 +11,7 @@ gem 'spork'
 gem 'guard'
 gem 'guard-test'
 gem 'guard-rspec'
-gem 'mocha'
+gem "mocha", '0.12.1', :require => false
 gem 'fl-rocco'
 gem 'redcarpet', '~> 1.17'
 gem 'markdown'

data/README.md

@@ -1,5 +1,7 @@
 # Dailycred
 
+[![Build Status](https://secure.travis-ci.org/dailycred/dailycred.png?branch=master)](https://travis-ci.org/dailycred/dailycred)
+
 ## Introduction
 
 The Dailycred ruby gem is everything you need to get off the ground running with robust authentication. It includes an [omniauth](https://github.com/intridea/omniauth) provider and a generator to create necessary models and controllers. The generated authentication structure is inspired by [nifty-generators](https://github.com/ryanb/nifty-generators). To get started using Dailycred with Ruby on Rails, the first thing you need to do is add the dailycred gem to your gemfile:
@@ -56,7 +58,7 @@ To use a social sign-in service instead of email, and password, use `connect_pat
 
     <%= link_to 'sign in with facebook', connect_path(:identity_provider => :facebook) %>
 
-The `identity_provider` can be one of `facebook`, `google`, or `twitter.`
+The `identity_provider` can be one of `facebook`, `google`, `twitter`, `disqus`, or `instagram`.
 
 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:
 
@@ -160,7 +162,7 @@ To easily build referral URLs to track sharing amongst your users, use `referral
 Testing controllers that have the `authenticate` before filter is easy:
 
     # with mocha
-    @controller.expects(:current_user).returns(@user)
+    @controller.stubs(:current_user).returns(@user)
 
 See `dummy/test/functional/post_controller_test.rb` for an example.
 

data/Rakefile

@@ -2,31 +2,42 @@
 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
 
-begin
-  require 'rocco'
-  require 'rocco/tasks'
-  require 'fileutils'
-  require 'maruku'
-  Rocco::make 'docs/'
-  FileUtils.cp_r "docs/lib/", "/Users/hank/rails/dailycred/public/docs/ruby/", :verbose => true
-  md = ""
-  File.open("README.md", "r") do |infile|
-    while (line = infile.gets)
-      md += line
+desc "run travis"
+task :travis do
+  ["rake spec","ruby test/test_helper.rb"].each do |cmd|
+    puts "Starting to run #{cmd}..."
+    system("export DISPLAY=:99.0 && bundle exec #{cmd}")
+    raise "#{cmd} failed!" unless $?.exitstatus == 0
+  end
+end
+
+task :default => :travis
+
+desc 'docs'
+task :docs do
+  begin
+    require 'rocco'
+    require 'rocco/tasks'
+    require 'fileutils'
+    require 'maruku'
+    Rocco::make 'docs/'
+    FileUtils.cp_r "docs/lib/", "/Users/hank/rails/dailycred/public/docs/ruby/", :verbose => true
+    md = ""
+    File.open("README.md", "r") do |infile|
+      while (line = infile.gets)
+        md += line
+      end
     end
+    doc = Maruku.new(md)
+    File.open("/Users/hank/rails/dailycred/app/views/tags/docs/rubyonrails.html", 'w') {|f| f.write doc.to_html}
+  rescue LoadError
+    warn "#$! -- rocco tasks not loaded."
+    task :rocco
   end
-  doc = Maruku.new(md)
-  File.open("/Users/hank/rails/dailycred/app/views/tags/ruby.html", 'w') {|f| f.write doc.to_html}
-rescue LoadError
-  warn "#$! -- rocco tasks not loaded."
-  task :rocco
 end

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

@@ -9,5 +9,5 @@
   <%= 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 %>
+  <br><%= link_to 'connect with twitter',connect_path(:identity_provider => :twitter) %>
+<% end %>

data/dailycred.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-=
+require File.expand_path('../lib/dailycred/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Hank Stoever"]
@@ -15,5 +16,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.4"
+  gem.version       = Dailycred::VERSION
 end

data/dummy/app/controllers/application_controller.rb

@@ -1,5 +1,17 @@
 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]
+    rescue
+      nil
+    end
+  end
+  helper_method :current_user
   private
 
   # helper method for getting the current signed in user

data/dummy/app/controllers/posts_controller.rb

@@ -1,10 +1,11 @@
 class PostsController < ApplicationController
+  before_filter :authenticate
   # GET /posts
   # GET /posts.json
-
-  before_filter :authenticate
+  
   def index
     @posts = Post.all
+    ap current_user.created.utc
 
     respond_to do |format|
       format.html # index.html.erb

data/dummy/app/views/layouts/application.html.erb

@@ -9,6 +9,10 @@
 <body>
 
 <%= yield %>
+<%= link_to 'login', connect_path %>
+<% if !current_user.nil? %>
+  <%= debug current_user %>
+<% end %>
 
 </body>
 </html>

data/dummy/config/initializers/omniauth.rb

@@ -1,13 +1,5 @@
-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"
+# 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 = {
-  :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
-}
+Rails.configuration.DAILYCRED_CLIENT_ID = "9be01b69-b9b9-4376-ab88-ace42033f241"
+Rails.configuration.DAILYCRED_SECRET_KEY = "33e355d1-9e39-465e-b8d6-fcc734ce6e37-ee05ae3d-9bbe-4996-b6fd-04fa0341fc7f"

data/dummy/config/routes.rb

@@ -51,7 +51,7 @@ Dummy::Application.routes.draw do
 
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
-  # root :to => 'welcome#index'
+  root :to => 'posts#index'
 
   # See how all your routes lay out with "rake routes"
 

data/dummy/db/migrate/20121108192739_add_column_to_posts.rb

@@ -0,0 +1,5 @@
+class AddColumnToPosts < ActiveRecord::Migration
+  def change
+    add_column :posts, :created, :timestamp
+  end
+end

data/dummy/db/migrate/{20120925172903_create_users.rb → 20121218124721_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.string :access_token
         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.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, :access_token, :string
       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
     end
   end
 

data/dummy/db/migrate/20121218205329_change_created_column.rb

@@ -0,0 +1,5 @@
+class ChangeCreatedColumn < ActiveRecord::Migration
+  def change
+    change_column :users, :created, :datetime
+  end
+end

data/dummy/db/schema.rb

@@ -11,19 +11,20 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121002192037) do
+ActiveRecord::Schema.define(:version => 20121218205329) 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|
     t.string   "provider"
     t.string   "uid"
     t.string   "email"
-    t.integer  "created",       :limit => 8
+    t.datetime "created",       :limit => 8
     t.string   "username"
     t.boolean  "verified"
     t.boolean  "admin"
@@ -40,6 +41,8 @@ ActiveRecord::Schema.define(:version => 20121002192037) do
     t.string   "display"
     t.boolean  "subscribed"
     t.text     "access_tokens"
+    t.string   "access_token"
+    t.text     "identities"
   end
 
 end

data/dummy/test/functional/posts_controller_test.rb

@@ -4,7 +4,7 @@ class PostsControllerTest < ActionController::TestCase
   setup do
     @post = posts(:one)
     @user = users(:basic)
-    @controller.expects(:current_user).returns(@user)
+    @controller.stubs(:current_user).returns(@user)
   end
 
   test "should get index" do

data/lib/dailycred/acts_as_dailycred.rb

@@ -1,12 +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
 
     extend ActsAsDailycred::SingletonMethods
     include ActsAsDailycred::InstanceMethods
@@ -14,7 +11,7 @@ module ActsAsDailycred
   end
   module SingletonMethods
     def find_or_create_with_omniauth(model)
-      @user = User.find_by_provider_and_uid(model[:provider], model[:uid]) || User.new
+      @user = User.find_by_provider_and_uid(model['provider'], model['uid']) || User.new
       @user.update_from_dailycred model[:info]
       @user
     end
@@ -40,20 +37,9 @@ module ActsAsDailycred
       end
     end
 
+    #deprecated, use @user.display
     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
+      self.display
     end
 
     def referral_link url
@@ -64,8 +50,9 @@ module ActsAsDailycred
     end
 
     def update_from_dailycred dc
+      bad = ['updated_at', 'created_at']
       dc.each do |k,v|
-        self[k] = v if self.respond_to?(k)
+        self[k] = v if self.respond_to?(k) and !bad.include?(k.to_s)
       end
       save!
     end

data/lib/dailycred/engine.rb

@@ -42,6 +42,7 @@ module Dailycred
 
         ActiveSupport.on_load(:action_controller) do
           include Dailycred::Helpers
+          helper Dailycred::Helpers
         end
       end
     end

data/lib/dailycred/helper.rb

@@ -25,27 +25,28 @@ module Dailycred
     end
 
     def login_path(params={})
-      "/auth/dailycred"
+      connect_path params
     end
 
-    def connect_path(params)
+    def connect_path(params={})
       url = "#{request.protocol}#{request.host_with_port}/auth/dailycred"
-      p = []
+      params_array = []
       params.each do |k,v|
-        p << "#{k}=#{v.to_s}"
+        params_array << "#{k}=#{v.to_s}"
       end
-      url += "?" if p.size > 0
-      url += p.join("&")
+      url += "?" if params_array.size > 0
+      url += params_array.join("&")
     end
 
     def connect_user provider, user=nil
       if user.nil?
         user = current_user
       end
-      connect_path(access_token: user.token, identity_provider: provider)
+      connect_path(:access_token => user.token, :identity_provider => provider)
     end
 
     def redirect_to_auth opts={}
+      p 'redirecting to auth'
       conf = Rails.configuration.DAILYCRED_OPTIONS
       path = !conf[:after_auth].nil? ? conf[:after_auth] : dailycred_engine.auth_info_path
       redirect_to path, opts

data/lib/dailycred/middleware.rb

@@ -15,7 +15,6 @@ module Dailycred
     def call(env)
       @env = env
       @status, @headers, @response = @app.call(env)
-
       if @headers["Content-Type"] =~ /text\/html|application\/xhtml\+xml/
         body = ""
         @response.each { |part| body << part }
@@ -41,6 +40,7 @@ module Dailycred
         window.dc_opts = {
           clientId: "#{@client_id}",
           home: "#{@opts[:url]}"
+          #{", type: \"#{@status.to_s}\"" if @status == 500 || @status == 400}
         };
         dc = document.createElement("script");
         url = dc_opts.home + "/public/js/cred.coffee";

data/lib/dailycred/user.rb

@@ -1,63 +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
+# 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/version.rb

@@ -0,0 +1,3 @@
+module Dailycred
+  VERSION = "0.1.5"
+end

data/lib/generators/dailycred_generator.rb

@@ -34,9 +34,7 @@ class DailycredGenerator < Rails::Generators::Base
     # 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_info
-    end
+    puts "Please manually configure your API keys in config/initializers/omniauth.rb"
     # application controller
     insert_into_file "app/controllers/application_controller.rb", APP_CONTROLLER_LINES, :after => /class ApplicationController\n|class ApplicationController .*\n/
     # add user_model
@@ -72,7 +70,7 @@ class DailycredGenerator < Rails::Generators::Base
     # 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"
+    url = "https://www.dailycred.com"
     connection = Faraday::Connection.new url, :ssl => ssl_opts
     params = {
       :login => email,

data/lib/generators/templates/migration_create_user.rb

@@ -5,21 +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
@@ -27,21 +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/lib/omniauth/strategies/dailycred.rb

@@ -21,7 +21,7 @@ module OmniAuth
 
       option :authorize_options, OmniAuth::Strategies::Dailycred::AUTH_PARAMS
 
-      uid { user['id'] }
+      uid { user['uid'] }
 
       info do
         user
@@ -69,6 +69,8 @@ module OmniAuth
           @duser[k][:access_token] = json["access_tokens"][k]
         end if !json["identities"].nil?
         pp @duser if options[:verbose]
+        created = json['created'] / 1000
+        @duser['created'] = DateTime.strptime(created.to_s, '%s')
         @duser.delete("id")
 
         @duser

data/spec/helper_spec.rb

@@ -9,7 +9,7 @@ require 'dailycred'
 
 Dir[File.expand_path('../support/**/*', __FILE__)].each { |f| require f }
 
-# require 'omniauth/strategies/dailycred_spec'
+require 'omniauth/strategies/dailycred_spec'
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods

data/spec/omniauth/strategies/dailycred_spec.rb

@@ -17,13 +17,19 @@ describe OmniAuth::Strategies::Dailycred do
 
   it_should_behave_like 'an oauth2 strategy'
 
+  context "general" do
+    it "should be called dailycred" do
+      subject.options.name.should eq('dailycred')
+    end
+  end
+
 
   describe '#client' do
       it 'should have the correct dailycred site' 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("/oauth/authorize")
+        subject.client.options[:authorize_url].should eq("/connect")
       end
 
       it 'should have the correct token url' do

data/test/generator_test.rb

@@ -1,4 +1,5 @@
 require 'rails/generators'
+require 'test/unit'
 # require 'mocha'
 require_relative "../lib/generators/dailycred_generator.rb"
 class GeneratorTest < Rails::Generators::TestCase
@@ -44,41 +45,41 @@ class GeneratorTest < Rails::Generators::TestCase
     assert_credentials "aaa", "bbb"
   end
 
-  test "generator works with login" do
-    generator_class.any_instance.stubs(:get_input).returns(["localtest@dailycred.com","password"])
-    test_generator
-    assert_credentials "e92e20bf-e0a4-49b4-8a82-ff1b65d80017", "9adf81a8-ce97-4bcb-9c1f-c09f5fc7b6b8-0d1a4553-496d-450e-80fd-9e8d0552a920"
-  end
+  # test "generator works with login" do
+  #   generator_class.any_instance.stubs(:get_input).returns(["localtest@dailycred.com","password"])
+  #   test_generator
+  #   assert_credentials "e92e20bf-e0a4-49b4-8a82-ff1b65d80017", "9adf81a8-ce97-4bcb-9c1f-c09f5fc7b6b8-0d1a4553-496d-450e-80fd-9e8d0552a920"
+  # end
 
   private
 
   def test_generator args=[]
     run_generator args
     assert_file "config/initializers/omniauth.rb" do |config|
-      assert_true config.include? 'Rails.configuration.DAILYCRED_CLIENT_ID ='
-      assert_true config.include? 'Rails.configuration.DAILYCRED_SECRET_KEY ='
+      assert config.include? 'Rails.configuration.DAILYCRED_CLIENT_ID ='
+      assert config.include? 'Rails.configuration.DAILYCRED_SECRET_KEY ='
     end
 
     assert_file "config/routes.rb", /(#{Regexp.escape("mount Dailycred::Engine => '/auth', :as => 'dailycred_engine'")})/
 
     assert_file "app/models/user.rb" do |model|
-      assert_true model.include? "acts_as_dailycred"
+      assert model.include? "acts_as_dailycred"
     end
 
     assert_file "app/controllers/application_controller.rb" do |controller|
     end
 
     assert_migration "db/migrate/create_users.rb" do |migration|
-      assert_true migration.include? ":twitter"
-      assert_true migration.include? ":github"
-      assert_true migration.include? ":google"
+      assert migration.include? ":twitter"
+      assert migration.include? ":github"
+      assert migration.include? ":google"
     end
   end
 
   def assert_credentials client_id, client_secret
     assert_file "config/initializers/omniauth.rb" do |config|
-      assert_true config.include? "Rails.configuration.DAILYCRED_CLIENT_ID = \"#{client_id}\""
-      assert_true config.include? "Rails.configuration.DAILYCRED_SECRET_KEY = \"#{client_secret}\""
+      assert config.include? "Rails.configuration.DAILYCRED_CLIENT_ID = \"#{client_id}\""
+      assert config.include? "Rails.configuration.DAILYCRED_SECRET_KEY = \"#{client_secret}\""
     end
   end
 

data/test/test_helper.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-
+# require 'mocha/setup'
 
 
 require_relative './generator_test.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dailycred
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -51,6 +51,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE
@@ -119,9 +120,11 @@ files:
 - dummy/config/initializers/wrap_parameters.rb
 - dummy/config/locales/en.yml
 - 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/migrate/20121108192739_add_column_to_posts.rb
+- dummy/db/migrate/20121218124721_create_users.rb
+- dummy/db/migrate/20121218205329_change_created_column.rb
 - dummy/db/schema.rb
 - dummy/db/seeds.rb
 - dummy/lib/assets/.gitkeep
@@ -131,7 +134,6 @@ files:
 - dummy/public/422.html
 - dummy/public/500.html
 - dummy/public/favicon.ico
-- dummy/public/index.html
 - dummy/public/robots.txt
 - dummy/script/rails
 - dummy/test/fixtures/.gitkeep
@@ -157,6 +159,7 @@ files:
 - lib/dailycred/middleware.rb
 - lib/dailycred/tests_helper.rb
 - lib/dailycred/user.rb
+- lib/dailycred/version.rb
 - lib/generators/USAGE
 - lib/generators/dailycred_generator.rb
 - lib/generators/templates/info.html.erb
@@ -185,12 +188,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3809456229440668056
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3809456229440668056
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -204,4 +213,3 @@ test_files:
 - spec/support/shared_examples.rb
 - test/generator_test.rb
 - test/test_helper.rb
-has_rdoc: 

data/dummy/public/index.html

@@ -1,241 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Ruby on Rails: Welcome aboard</title>
-    <style type="text/css" media="screen">
-      body {
-        margin: 0;
-        margin-bottom: 25px;
-        padding: 0;
-        background-color: #f0f0f0;
-        font-family: "Lucida Grande", "Bitstream Vera Sans", "Verdana";
-        font-size: 13px;
-        color: #333;
-      }
-
-      h1 {
-        font-size: 28px;
-        color: #000;
-      }
-
-      a  {color: #03c}
-      a:hover {
-        background-color: #03c;
-        color: white;
-        text-decoration: none;
-      }
-
-
-      #page {
-        background-color: #f0f0f0;
-        width: 750px;
-        margin: 0;
-        margin-left: auto;
-        margin-right: auto;
-      }
-
-      #content {
-        float: left;
-        background-color: white;
-        border: 3px solid #aaa;
-        border-top: none;
-        padding: 25px;
-        width: 500px;
-      }
-
-      #sidebar {
-        float: right;
-        width: 175px;
-      }
-
-      #footer {
-        clear: both;
-      }
-
-      #header, #about, #getting-started {
-        padding-left: 75px;
-        padding-right: 30px;
-      }
-
-
-      #header {
-        background-image: url("assets/rails.png");
-        background-repeat: no-repeat;
-        background-position: top left;
-        height: 64px;
-      }
-      #header h1, #header h2 {margin: 0}
-      #header h2 {
-        color: #888;
-        font-weight: normal;
-        font-size: 16px;
-      }
-
-
-      #about h3 {
-        margin: 0;
-        margin-bottom: 10px;
-        font-size: 14px;
-      }
-
-      #about-content {
-        background-color: #ffd;
-        border: 1px solid #fc0;
-        margin-left: -55px;
-        margin-right: -10px;
-      }
-      #about-content table {
-        margin-top: 10px;
-        margin-bottom: 10px;
-        font-size: 11px;
-        border-collapse: collapse;
-      }
-      #about-content td {
-        padding: 10px;
-        padding-top: 3px;
-        padding-bottom: 3px;
-      }
-      #about-content td.name  {color: #555}
-      #about-content td.value {color: #000}
-
-      #about-content ul {
-        padding: 0;
-        list-style-type: none;
-      }
-
-      #about-content.failure {
-        background-color: #fcc;
-        border: 1px solid #f00;
-      }
-      #about-content.failure p {
-        margin: 0;
-        padding: 10px;
-      }
-
-
-      #getting-started {
-        border-top: 1px solid #ccc;
-        margin-top: 25px;
-        padding-top: 15px;
-      }
-      #getting-started h1 {
-        margin: 0;
-        font-size: 20px;
-      }
-      #getting-started h2 {
-        margin: 0;
-        font-size: 14px;
-        font-weight: normal;
-        color: #333;
-        margin-bottom: 25px;
-      }
-      #getting-started ol {
-        margin-left: 0;
-        padding-left: 0;
-      }
-      #getting-started li {
-        font-size: 18px;
-        color: #888;
-        margin-bottom: 25px;
-      }
-      #getting-started li h2 {
-        margin: 0;
-        font-weight: normal;
-        font-size: 18px;
-        color: #333;
-      }
-      #getting-started li p {
-        color: #555;
-        font-size: 13px;
-      }
-
-
-      #sidebar ul {
-        margin-left: 0;
-        padding-left: 0;
-      }
-      #sidebar ul h3 {
-        margin-top: 25px;
-        font-size: 16px;
-        padding-bottom: 10px;
-        border-bottom: 1px solid #ccc;
-      }
-      #sidebar li {
-        list-style-type: none;
-      }
-      #sidebar ul.links li {
-        margin-bottom: 5px;
-      }
-
-      .filename {
-        font-style: italic;
-      }
-    </style>
-    <script type="text/javascript">
-      function about() {
-        info = document.getElementById('about-content');
-        if (window.XMLHttpRequest)
-          { xhr = new XMLHttpRequest(); }
-        else
-          { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
-        xhr.open("GET","rails/info/properties",false);
-        xhr.send("");
-        info.innerHTML = xhr.responseText;
-        info.style.display = 'block'
-      }
-    </script>
-  </head>
-  <body>
-    <div id="page">
-      <div id="sidebar">
-        <ul id="sidebar-items">
-          <li>
-            <h3>Browse the documentation</h3>
-            <ul class="links">
-              <li><a href="http://guides.rubyonrails.org/">Rails Guides</a></li>
-              <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
-              <li><a href="http://www.ruby-doc.org/core/">Ruby core</a></li>
-              <li><a href="http://www.ruby-doc.org/stdlib/">Ruby standard library</a></li>
-            </ul>
-          </li>
-        </ul>
-      </div>
-
-      <div id="content">
-        <div id="header">
-          <h1>Welcome aboard</h1>
-          <h2>You&rsquo;re riding Ruby on Rails!</h2>
-        </div>
-
-        <div id="about">
-          <h3><a href="rails/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
-          <div id="about-content" style="display: none"></div>
-        </div>
-
-        <div id="getting-started">
-          <h1>Getting started</h1>
-          <h2>Here&rsquo;s how to get rolling:</h2>
-
-          <ol>
-            <li>
-              <h2>Use <code>rails generate</code> to create your models and controllers</h2>
-              <p>To see all available options, run it without parameters.</p>
-            </li>
-
-            <li>
-              <h2>Set up a default route and remove <span class="filename">public/index.html</span></h2>
-              <p>Routes are set up in <span class="filename">config/routes.rb</span>.</p>
-            </li>
-
-            <li>
-              <h2>Create your database</h2>
-              <p>Run <code>rake db:create</code> to create your database. If you're not using SQLite (the default), edit <span class="filename">config/database.yml</span> with your username and password.</p>
-            </li>
-          </ol>
-        </div>
-      </div>
-
-      <div id="footer">&nbsp;</div>
-    </div>
-  </body>
-</html>