dailycred 0.1.41 → 0.1.42

data/README.md

@@ -56,7 +56,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 +160,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/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.41"
+  gem.version       = "0.1.42"
 end

data/dummy/config/initializers/omniauth.rb

@@ -1,13 +1,2 @@
 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
-}

data/lib/dailycred/acts_as_dailycred.rb

@@ -7,6 +7,7 @@ module ActsAsDailycred
     serialize :tags, Array
     serialize :referred, Array
     serialize :access_tokens, Hash
+    serialize :idenitities, Hash
 
     extend ActsAsDailycred::SingletonMethods
     include ActsAsDailycred::InstanceMethods
@@ -42,15 +43,11 @@ module ActsAsDailycred
 
     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
@@ -65,6 +62,7 @@ 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)
       end

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/generators/dailycred_generator.rb

@@ -72,7 +72,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,7 +5,7 @@ class CreateUsers < ActiveRecord::Migration
         t.string :provider
         t.string :uid
         t.string :email
-        t.integer :created
+        t.bigint :created
         t.string :username
         t.boolean :verified
         t.boolean :admin
@@ -20,6 +20,7 @@ class CreateUsers < ActiveRecord::Migration
         t.text :access_tokens
         t.boolean :subscribed
         t.string :display
+        t.text :identities
 
         t.timestamps
       end
@@ -42,6 +43,7 @@ class CreateUsers < ActiveRecord::Migration
       safe_column :users, :access_tokens, :text
       safe_column :users, :display, :string
       safe_column :users, :subscribed, :boolean
+      safe_column :users, :identities, :text
     end
   end
 

data/spec/omniauth/strategies/dailycred_spec.rb

@@ -23,7 +23,7 @@ describe OmniAuth::Strategies::Dailycred 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dailycred
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.42
   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-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth