dailycred 0.1.461 → 0.2.0

data/lib/dailycred/helper.rb

@@ -30,12 +30,12 @@ module Dailycred
 
     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

data/lib/dailycred/middleware.rb

@@ -25,7 +25,7 @@ module Dailycred
           @response = [body]
         end
       end
-
+      @env['rack.session']['omniauth.state'] ||= SecureRandom.hex(24)
       [@status, @headers, @response]
     end
 
@@ -34,13 +34,16 @@ module Dailycred
     def render_dailycred_scripts
       str =<<-EOT
       <!-- dailycred -->
+      #{'<script src="https://login.persona.org/include.js"></script>' if @opts[:persona_audience]}
       <script type="text/javascript">
       (function() {
         var dc, url;
         window.dc_opts = {
           clientId: "#{@client_id}",
-          home: "#{@opts[:url]}"
+          home: "#{@opts[:url]}", 
+          state: "#{@env['rack.session']['omniauth.state']}"
           #{", type: \"#{@status.to_s}\"" if @status == 500 || @status == 400}
+          #{", personaAudience: \"#{@opts[:persona_audience]}\"" if @opts[:persona_audience]}
         };
         dc = document.createElement("script");
         url = dc_opts.home + "/public/js/cred.coffee";

data/lib/dailycred/version.rb

@@ -1,3 +1,3 @@
 module Dailycred
-  VERSION = "0.1.461"
+  VERSION = "0.2.0"
 end

data/lib/generators/dailycred_generator.rb

@@ -10,6 +10,11 @@ class DailycredGenerator < Rails::Generators::Base
 
   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'
+  class_option :bootstrap, :type => :boolean, :default => true, 
+    :description => "Indicates whether you want to generate the user model (with migration)
+    and mount the engine's sessions_controller.
+    Use --skip-bootstrap if you want are adding this to project that aleady has authentication."
+  
 
   APP_ROUTES_LINES =<<-EOS
   mount Dailycred::Engine => '/auth', :as => 'dailycred_engine'
@@ -35,14 +40,18 @@ class DailycredGenerator < Rails::Generators::Base
     template "omniauth.rb", "config/initializers/omniauth.rb"
     # get client info from login if they didnt specify info
     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
-    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"
-    # config/routes
-    inject_into_file "config/routes.rb", APP_ROUTES_LINES, :after => ".draw do\n"
+    if options.bootstrap?
+      # application controller
+      insert_into_file "app/controllers/application_controller.rb", APP_CONTROLLER_LINES, :after => /class ApplicationController\n|class ApplicationController .*\n/
+      # user model
+      copy_file "user.rb", "app/models/user.rb"
+      # user migration
+      copy_file "migration_create_user.rb", "db/migrate/#{Time.now.strftime('%Y%m%d%H%M%S')}_create_users.rb"
+      # confiffg/routes
+      inject_into_file "config/routes.rb", APP_ROUTES_LINES, :after => ".draw do\n"
+    else
+      puts "Make sure you implement your omniauth callback. For directions visit https://github.com/intridea/omniauth#integrating-omniauth-into-your-application"
+    end
   end
 
   private

data/lib/generators/templates/migration_create_user.rb

@@ -10,16 +10,13 @@ class CreateUsers < ActiveRecord::Migration
         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
@@ -28,20 +25,17 @@ class CreateUsers < ActiveRecord::Migration
       safe_column :users, :uid, :string
       safe_column :users, :email, :string
       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

@@ -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

@@ -3,14 +3,12 @@
 require 'simplecov'
 SimpleCov.start
 require 'rspec'
-require 'rack/test'
+# require 'rack/test'
 require 'omniauth'
 require 'dailycred'
 
 Dir[File.expand_path('../support/**/*', __FILE__)].each { |f| require f }
 
-require 'omniauth/strategies/dailycred_spec'
-
 RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy

data/test/generator_test.rb

@@ -45,6 +45,10 @@ class GeneratorTest < Rails::Generators::TestCase
     assert_credentials "aaa", "bbb"
   end
 
+  test "generator works when skipping bootstrap" do
+    test_generator ["aaa", "bbb", "--skip-bootstrap"]
+  end
+
   # test "generator works with login" do
   #   generator_class.any_instance.stubs(:get_input).returns(["localtest@dailycred.com","password"])
   #   test_generator
@@ -70,9 +74,6 @@ class GeneratorTest < Rails::Generators::TestCase
     end
 
     assert_migration "db/migrate/create_users.rb" do |migration|
-      assert migration.include? ":twitter"
-      assert migration.include? ":github"
-      assert migration.include? ":google"
     end
   end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: dailycred
 version: !ruby/object:Gem::Version
-  version: 0.1.461
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Hank Stoever
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,31 +73,101 @@ files:
 - docs/lib/omniauth-dailycred/version.html
 - docs/lib/omniauth/strategies/dailycred.html
 - docs/lib/user/user.html
+- dummy-preauth/.gitignore
+- dummy-preauth/Gemfile
+- dummy-preauth/README.rdoc
+- dummy-preauth/Rakefile
+- dummy-preauth/app/assets/images/rails.png
+- dummy-preauth/app/assets/javascripts/application.js
+- dummy-preauth/app/assets/javascripts/welcome.js.coffee
+- dummy-preauth/app/assets/stylesheets/application.css
+- dummy-preauth/app/assets/stylesheets/welcome.css.scss
+- dummy-preauth/app/controllers/application_controller.rb
+- dummy-preauth/app/controllers/concerns/.keep
+- dummy-preauth/app/controllers/sessions_controller.rb
+- dummy-preauth/app/controllers/users_controller.rb
+- dummy-preauth/app/controllers/welcome_controller.rb
+- dummy-preauth/app/helpers/application_helper.rb
+- dummy-preauth/app/helpers/sessions_helper.rb
+- dummy-preauth/app/helpers/users_helper.rb
+- dummy-preauth/app/helpers/welcome_helper.rb
+- dummy-preauth/app/mailers/.keep
+- dummy-preauth/app/models/.keep
+- dummy-preauth/app/models/concerns/.keep
+- dummy-preauth/app/models/user.rb
+- dummy-preauth/app/views/layouts/application.html.erb
+- dummy-preauth/app/views/sessions/new.html.erb
+- dummy-preauth/app/views/users/_form.html.erb
+- dummy-preauth/app/views/users/edit.html.erb
+- dummy-preauth/app/views/users/new.html.erb
+- dummy-preauth/app/views/welcome/index.html.erb
+- dummy-preauth/bin/bundle
+- dummy-preauth/bin/rails
+- dummy-preauth/bin/rake
+- dummy-preauth/config.ru
+- dummy-preauth/config/application.rb
+- dummy-preauth/config/boot.rb
+- dummy-preauth/config/database.yml
+- dummy-preauth/config/environment.rb
+- dummy-preauth/config/environments/development.rb
+- dummy-preauth/config/environments/production.rb
+- dummy-preauth/config/environments/test.rb
+- dummy-preauth/config/initializers/backtrace_silencers.rb
+- dummy-preauth/config/initializers/filter_parameter_logging.rb
+- dummy-preauth/config/initializers/inflections.rb
+- dummy-preauth/config/initializers/mime_types.rb
+- dummy-preauth/config/initializers/omniauth.rb
+- dummy-preauth/config/initializers/secret_token.rb
+- dummy-preauth/config/initializers/session_store.rb
+- dummy-preauth/config/initializers/wrap_parameters.rb
+- dummy-preauth/config/locales/en.yml
+- dummy-preauth/config/routes.rb
+- dummy-preauth/db/migrate/20130423011519_create_users.rb
+- dummy-preauth/db/migrate/20130423011738_add_uuid_to_users.rb
+- dummy-preauth/db/schema.rb
+- dummy-preauth/db/seeds.rb
+- dummy-preauth/lib/assets/.keep
+- dummy-preauth/lib/controller_authentication.rb
+- dummy-preauth/lib/tasks/.keep
+- dummy-preauth/log/.keep
+- dummy-preauth/public/404.html
+- dummy-preauth/public/422.html
+- dummy-preauth/public/500.html
+- dummy-preauth/public/favicon.ico
+- dummy-preauth/public/robots.txt
+- dummy-preauth/test/controllers/.keep
+- dummy-preauth/test/controllers/welcome_controller_test.rb
+- dummy-preauth/test/fixtures/.keep
+- dummy-preauth/test/fixtures/users.yml
+- dummy-preauth/test/functional/sessions_controller_test.rb
+- dummy-preauth/test/functional/users_controller_test.rb
+- dummy-preauth/test/helpers/.keep
+- dummy-preauth/test/helpers/welcome_helper_test.rb
+- dummy-preauth/test/integration/.keep
+- dummy-preauth/test/mailers/.keep
+- dummy-preauth/test/models/.keep
+- dummy-preauth/test/test_helper.rb
+- dummy-preauth/test/unit/user_test.rb
+- dummy-preauth/vendor/assets/javascripts/.keep
+- dummy-preauth/vendor/assets/stylesheets/.keep
 - dummy/.gitignore
 - dummy/Gemfile
-- dummy/Guardfile
 - dummy/README.rdoc
 - dummy/Rakefile
 - dummy/app/assets/images/rails.png
 - dummy/app/assets/javascripts/application.js
-- dummy/app/assets/javascripts/posts.js.coffee
 - dummy/app/assets/stylesheets/application.css
-- dummy/app/assets/stylesheets/posts.css.scss
-- dummy/app/assets/stylesheets/scaffolds.css.scss
 - dummy/app/controllers/application_controller.rb
-- dummy/app/controllers/posts_controller.rb
+- dummy/app/controllers/concerns/.keep
 - dummy/app/helpers/application_helper.rb
-- dummy/app/helpers/posts_helper.rb
-- dummy/app/mailers/.gitkeep
-- dummy/app/models/.gitkeep
-- dummy/app/models/post.rb
+- dummy/app/mailers/.keep
+- dummy/app/models/.keep
+- dummy/app/models/concerns/.keep
 - dummy/app/models/user.rb
 - dummy/app/views/layouts/application.html.erb
-- dummy/app/views/posts/_form.html.erb
-- dummy/app/views/posts/edit.html.erb
-- dummy/app/views/posts/index.html.erb
-- dummy/app/views/posts/new.html.erb
-- dummy/app/views/posts/show.html.erb
+- dummy/bin/bundle
+- dummy/bin/rails
+- dummy/bin/rake
 - dummy/config.ru
 - dummy/config/application.rb
 - dummy/config/boot.rb
@@ -112,6 +177,7 @@ files:
 - dummy/config/environments/production.rb
 - dummy/config/environments/test.rb
 - dummy/config/initializers/backtrace_silencers.rb
+- dummy/config/initializers/filter_parameter_logging.rb
 - dummy/config/initializers/inflections.rb
 - dummy/config/initializers/mime_types.rb
 - dummy/config/initializers/omniauth.rb
@@ -120,37 +186,26 @@ 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/20130417131939_create_users.rb
 - dummy/db/schema.rb
 - dummy/db/seeds.rb
-- dummy/lib/assets/.gitkeep
-- dummy/lib/tasks/.gitkeep
-- dummy/log/.gitkeep
+- dummy/lib/assets/.keep
+- dummy/lib/tasks/.keep
+- dummy/log/.keep
 - dummy/public/404.html
 - 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
-- dummy/test/fixtures/posts.yml
-- dummy/test/fixtures/users.yml
-- dummy/test/functional/.gitkeep
-- dummy/test/functional/posts_controller_test.rb
-- dummy/test/integration/.gitkeep
-- dummy/test/performance/browsing_test.rb
+- dummy/test/controllers/.keep
+- dummy/test/fixtures/.keep
+- dummy/test/helpers/.keep
+- dummy/test/integration/.keep
+- dummy/test/mailers/.keep
+- dummy/test/models/.keep
 - dummy/test/test_helper.rb
-- dummy/test/unit/.gitkeep
-- dummy/test/unit/helpers/posts_helper_test.rb
-- dummy/test/unit/post_test.rb
-- dummy/test/unit/user_test.rb
-- dummy/vendor/assets/javascripts/.gitkeep
-- dummy/vendor/assets/stylesheets/.gitkeep
-- dummy/vendor/plugins/.gitkeep
+- dummy/vendor/assets/javascripts/.keep
+- dummy/vendor/assets/stylesheets/.keep
 - lib/dailycred.rb
 - lib/dailycred/acts_as_dailycred.rb
 - lib/dailycred/client.rb
@@ -171,40 +226,36 @@ files:
 - lib/omniauth/strategies/dailycred.rb
 - script/download_info.rb
 - spec/helper_spec.rb
-- spec/omniauth/strategies/dailycred_spec.rb
 - spec/support/dailycred_spec.rb
 - spec/support/shared_examples.rb
 - test/generator_test.rb
 - test/test_helper.rb
-homepage: https://www.dailycred.com
+homepage: https://github.com/dailycred/dailycred
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ''
 test_files:
 - spec/helper_spec.rb
-- spec/omniauth/strategies/dailycred_spec.rb
 - spec/support/dailycred_spec.rb
 - spec/support/shared_examples.rb
 - test/generator_test.rb
 - test/test_helper.rb
-has_rdoc: 

data/dummy/Guardfile

@@ -1,31 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard :test do
-  watch(%r{^lib/(.+)\.rb$})     { |m| "test/#{m[1]}_test.rb" }
-  watch(%r{^test/.+_test\.rb$})
-  watch('test/test_helper.rb')  { "test" }
-  watch(%r{/test\/unit\/(.+)_test.rb/})
-  watch('../lib/dailycred/acts_as_dailycred.rb') { "test/unit/user_test.rb"}
-  Dir[File.expand_path('../../lib/dailycred/*.rb', __FILE__)].each do |f|
-    watch(f) {"test/unit/user_test.rb"}
-  end
-
-  # Rails example
-  watch(%r{^app/models/(.+)\.rb$})                   { |m| "test/unit/#{m[1]}_test.rb" }
-  watch(%r{^app/controllers/(.+)\.rb$})              { |m| "test/functional/#{m[1]}_test.rb" }
-  watch(%r{^app/views/.+\.rb$})                      { "test/integration" }
-  watch('app/controllers/application_controller.rb') { ["test/functional", "test/integration"] }
-end
-
-guard 'spork', :cucumber_env => { 'RAILS_ENV' => 'test' }, :rspec_env => { 'RAILS_ENV' => 'test' } do
-  watch('config/application.rb')
-  watch('config/environment.rb')
-  watch('config/environments/test.rb')
-  watch(%r{^config/initializers/.+\.rb$})
-  watch('Gemfile')
-  watch('Gemfile.lock')
-  watch('spec/spec_helper.rb') { :rspec }
-  watch('test/test_helper.rb') { :test_unit }
-  watch(%r{features/support/}) { :cucumber }
-end