dailycred 0.1.45 → 0.1.46

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:

data/Rakefile

@@ -2,33 +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
 
-# desc 'docs'
-#   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/ruby.html", 'w') {|f| f.write doc.to_html}
-#   rescue LoadError
-#     warn "#$! -- rocco tasks not loaded."
-#     task :rocco
-#   end
-# end
+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/ruby.html", 'w') {|f| f.write doc.to_html}
+  rescue LoadError
+    warn "#$! -- rocco tasks not loaded."
+    task :rocco
+  end
+end

data/lib/dailycred/acts_as_dailycred.rb

@@ -15,7 +15,8 @@ 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
+      ap model
+      @user = User.find_by_provider_and_uid(model['provider'], model['uid']) || User.new
       @user.update_from_dailycred model[:info]
       @user
     end

data/lib/dailycred/helper.rb

@@ -42,7 +42,7 @@ module Dailycred
       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={}

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

@@ -1,3 +1,3 @@
 module Dailycred
-  VERSION = "0.1.45"
+  VERSION = "0.1.46"
 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

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/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.45
+  version: 0.1.46
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-13 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