dailycred 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: ba1c79148b0ed6cfbba255f0cc520f0eee2a6bb8
-  data.tar.gz: 635fd2685f642397c15e74c64237cdcfae8595bc
+  metadata.gz: 81b10aa8f02bb721ffa76a48b1e441f2db3e17df
+  data.tar.gz: 2fe955cbbe0da7147703bf03816a2f284ac5803b
 !binary "U0hBNTEy":
-  metadata.gz: 276cb40be36dcbaa8c64e2753f8516945fd3e990cfd09c842305ca09aebdc5c4caa9655ce7f8cca6bae9199f182adc83623caa373d09ed333acf24f353abceb5
-  data.tar.gz: d2da9e81f623325dd9005a14ea1ca3d1ae5a5d1ee979bca42301de13805d9f8a538c75c05030955a1b470de16159bedecfc1bc19164c7f4c21920ac16e4663aa
+  metadata.gz: 8d017a526d064b1df42465ec955ffe3892a57d30bdd222ffd7aa46136d30319fbacd8a6c08ff1551f05163b55917bc177f9d527b19620199326647935f896602
+  data.tar.gz: b73bd13c7def3a66f36d5fe6123aeb563195a9ed855f7d9a497ba2bb208e4b370c3fe4f57f9b925263fada406393d4cc21d8b9963a7a80192d8931b53581766b

data/Gemfile

@@ -13,6 +13,11 @@ gem 'guard-rspec'
 gem "mocha", '0.12.1', :require => false
 gem 'fl-rocco'
 gem 'redcarpet', '~> 1.17'
-gem 'markdown'
+# gem 'markdown'
 gem 'maruku'
-gem 'faraday'
+gem 'faraday'
+gem 'cucumber'
+gem 'aruba'
+gem 'sqlite3'
+gem 'json', '~> 1.7.7'
+gem 'guard-cucumber'

data/Guardfile

@@ -13,3 +13,10 @@ guard 'rspec', :version => 2 do
   watch('spec/spec_helper.rb')  { "spec" }
 end
 
+
+# guard 'cucumber' do
+#   watch(%r{^features/.+\.feature$})
+#   watch(%r{^features/generator/.+\.feature$})
+#   watch(%r{^features/support/.+$})          { 'features' }
+#   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+# end

data/README.md

@@ -223,7 +223,7 @@ To specify where users should be redirected after authentication actions, setup
     
 ### Customization
 
-If you would like to customize this engine's `session_controller` or views, two generators are provided for you.
+If you would like to customize this engine's controllers or views, two generators are provided for you.
 
 	rails g dailycred:controllers
 	rails g dailycred:views

data/Rakefile

@@ -1,7 +1,10 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
+require 'rake'
 require 'rake/testtask'
+require 'rdoc/task'
+# require 'tasks/rails'
 
 desc "Run specs"
 RSpec::Core::RakeTask.new do |t|
@@ -11,7 +14,7 @@ end
 
 desc "run travis"
 task :travis do
-  ["rake spec","rake test"].each do |cmd|
+  ["rake spec","rake test", "cucumber"].each do |cmd|
     puts "Starting to run #{cmd}..."
     system("export DISPLAY=:99.0 && bundle exec #{cmd}")
     raise "#{cmd} failed!" unless $?.exitstatus == 0

data/app/controllers/dailycred/users_controller.rb

@@ -0,0 +1,43 @@
+module Dailycred
+  class UsersController < ApplicationController
+    include Dailycred::Helpers
+
+    def reset_password
+      if params[:user]
+        dailycred.reset_password(params[:user])
+        flash[:notice] = "Your password has been reset. See your email for further instructions."
+      else
+        flash[:notice] = "Please enter your email or password to continue."
+      end
+      redirect_to_auth
+    end
+
+    def login
+      response = dailycred.login params
+      if response.success?
+        @user = User.find_or_create_from_local_auth(response.user)
+        session[:user_id] = @user.id
+        flash[:notice] = "You have logged in successfully."
+      else
+        flash[:notice] = "There was a problem logging you in."
+        flash[:login_error] = response.errors["message"]
+        flash[:login_error_attribute] = response.errors["attribute"]
+      end
+      redirect_to_auth
+    end
+
+    def signup
+      response = dailycred.signup params
+      if response.success?
+        @user = User.find_or_create_from_local_auth(response.user)
+        session[:user_id] = @user.id
+        flash[:notice] = "You have signed up successfully."
+      else
+        flash[:notice] = "There was a problem logging you in."
+        flash[:signup_error] = response.errors["message"]
+        flash[:signup_error_attribute] = response.errors["attribute"]
+      end
+      redirect_to_auth
+    end
+  end
+end

data/app/views/dailycred/sessions/_login.html.erb

@@ -0,0 +1,15 @@
+<%= form_tag dailycred_engine.local_signup_path do %>
+  <% if flash[:login_error] %>
+    <div id="error_explanation">
+      <p>An error occured logging in:</p>
+      <h2><%= flash[:login_error] %></h2>
+    </div>
+  <% end %>
+  <%= label_tag :login, "Email Address" %>
+  <%= text_field_tag :login %>
+  <br>
+  <%= label_tag :password %>
+  <%= password_field_tag :password %>
+  <br>
+  <%= submit_tag "Log In" %>
+<% end %>

data/app/views/dailycred/sessions/_reset_password.html.erb

@@ -0,0 +1,6 @@
+<%= form_tag dailycred_engine.reset_password_path do %>
+  <%= label_tag :user, "Email Address" %>
+  <%= text_field_tag :user %>
+  <br>
+  <%= submit_tag "Reset My Password" %>
+<% end %>

data/app/views/dailycred/sessions/_signup.html.erb

@@ -0,0 +1,22 @@
+<% get_username = false if local_assigns[:get_username].nil? %>
+<%= form_tag dailycred_engine.local_signup_path do %>
+  <% if flash[:signup_error] %>
+    <div id="error_explanation">
+      <p>An error occured signing up:</p>
+      <h2><%= flash[:signup_error] %></h2>
+    </div>
+  <% end %>
+  <%= label_tag :email, "Email Address" %>
+  <%= text_field_tag :email %>
+  <br>
+  <% if get_username %>
+    <br>
+    <%= label_tag :username %>
+    <%= text_field_tag :username %>
+  <% end %>
+  <br>
+  <%= label_tag :password %>
+  <%= password_field_tag :password %>
+  <br>
+  <%= submit_tag "Sign Up" %>
+<% end %>

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

@@ -1,3 +1,4 @@
+<p><%= notice %><p>
 <% if current_user %>
   <p>Hello <%= current_user.email %> <br>
     <%= link_to 'Logout', dailycred_engine.logout_path %>
@@ -6,8 +7,13 @@
     <br><%= link_to 'connect with twitter', connect_user(:twitter) %>
   </p>
 <% else %>
-  <%= link_to 'Log In', login_path() %>
+  <%= 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',connect_path(:identity_provider => :twitter) %>
+  <br><br><%= render partial: "reset_password" %>
+  <br><h3>Sign Up</h3>
+  <%= render partial: "signup" %>
+  <br><h3>Log In</h3>
+  <%= render partial: "login" %>
 <% end %>

data/config/routes.rb

@@ -4,4 +4,7 @@ Dailycred::Engine.routes.draw do
   get "/" => "dailycred/sessions#info", :as => :auth_info
   # get "/dailycred", :as => :login
   get "/failure" => "dailycred/sessions#failure"
+  get "/reset_password" => "dailycred/users#reset_password"
+  post "/" => "dailycred/users#signup", as: :local_signup
+  post "/login" => "dailycred/users#login", as: :local_login
 end

data/features/generator/generator.feature

@@ -0,0 +1,91 @@
+Feature: Creating an app with the dailycred generator
+
+  Scenario: creating an app
+    Given I run `rails new tmp_app`
+    And I cd to "tmp_app"
+    And a file named "Gemfile" with:
+    """
+    source "http://rubygems.org"
+    gem 'rails'
+    gem 'sqlite3'
+    gem 'dailycred', :path => '../../../'
+    group :test, :development do
+      gem "rspec-rails", "~> 2.0"
+    end
+    group :assets do
+      gem 'sass-rails',   '~> 4.0.0.beta1'
+      gem 'coffee-rails', '~> 4.0.0.beta1'
+      gem 'uglifier', '>= 1.0.3'
+    end
+    gem 'jquery-rails'
+    gem 'turbolinks'
+    """
+    Then I successfully run `bundle install`
+    And I successfully run `rails generate dailycred:install`
+    And I successfully run `rails generate dailycred:controllers`
+    And I successfully run `rails generate rspec:install`
+    And I successfully run `rake db:migrate`
+    And a file named "config/initializers/omniauth.rb" with:
+    """
+    Rails.configuration.DAILYCRED_CLIENT_ID = "37a067dd-3fef-4efd-909a-38b8081c5867"
+    Rails.configuration.DAILYCRED_SECRET_KEY = "b622f8a7-fa92-4fe8-bb74-b5bad5db79d3-817ddff2-6fa1-4499-ae47-69ea0d4c5c44"
+    Rails.configuration.DAILYCRED_OPTIONS = {
+      :after_auth => '/auth', #after login
+      :after_unauth => '/' #after logout
+    }
+    """
+    And a file named "spec/controllers/users_controller_spec.rb" with:
+    """
+    require "spec_helper"
+
+    describe Dailycred::UsersController do
+      describe "GET #reset_password" do
+        it "responds successfully with the right parameters" do
+          get(:reset_password, :use_route => :auth, user: "test@test.com")
+          flash[:notice].should match("Your password has been reset.")
+        end
+        it "fails without the :user parameter" do
+          get(:reset_password, :use_route => :auth)
+          flash[:notice].should match("Please enter your email or password")
+        end
+      end
+
+      describe "POST login" do
+        it "works with the right parameters" do
+          post(:login, use_route: "auth", login:"test@test.com", password: "chocolate")
+          flash[:notice].should match("logged in successfully")
+          flash[:login_error].should be(nil)
+          assigns[:user].should_not be(nil)
+          assigns[:user].uid.should_not be(nil)
+          assigns[:user].email.should eq("test@test.com")
+          assigns[:user].access_tokens.should_not be(nil)
+        end
+
+        it "saves errors in the flash" do
+          post(:login, use_route: "auth", login:"test@test.com", password: "password")
+          flash[:notice].should match("problem")
+          flash[:login_error].should_not be(nil)
+          flash[:login_error_attribute].should_not be(nil)
+        end
+      end
+
+      describe "POST signup" do
+        it "works with the right parameters" do
+          random_email = "#{rand}email@test.com"
+          post(:signup, use_route: "auth", email:random_email, password: "password")
+          flash[:notice].should match("signed up successfully")
+          flash[:signup_error].should be(nil)
+          assigns[:user].should_not be(nil)
+          assigns[:user].uid.should_not be(nil)
+          assigns[:user].email.should eq(random_email)
+        end
+
+        it "saves errors in the flash" do
+          post(:signup, use_route: "auth", password: "password")
+          flash[:signup_error].should_not be(nil)
+          flash[:signup_error_attribute].should_not be(nil)
+        end
+      end
+    end
+    """
+    When I successfully run `rake spec`

data/features/support/env.rb

@@ -0,0 +1,5 @@
+require 'aruba/cucumber'
+
+Before do
+  @aruba_timeout_seconds = 30
+end

data/lib/dailycred/acts_as_dailycred.rb

@@ -15,6 +15,12 @@ module ActsAsDailycred
       @user.update_from_dailycred model[:info]
       @user
     end
+
+    def find_or_create_from_local_auth(user)
+      @user = User.find_or_create_by(provider: "dailycred", uid: user["id"])
+      @user.update_from_dailycred(user)
+      @user
+    end
   end
   module InstanceMethods
     def tag tag

data/lib/dailycred/client.rb

@@ -69,6 +69,16 @@ module Dailycred
       post "/password/api/reset", opts
     end
 
+    def login opts={}
+      opts[:pass] ||= opts[:password]
+      post "/user/api/signin.json", opts
+    end
+
+    def signup opts={}
+      opts[:pass] ||= opts[:password]
+      post "/user/api/signup.json", opts
+    end
+
     # A wildcard for making any post requests to dailycred.
     # client_id and client_secret are automatically added to the request
     #
@@ -77,7 +87,7 @@ module Dailycred
     # - @param [boolean] secure whether the client_secret should be passed. Defaults to true
     def post(url, opts, secure=true)
       opts.merge! base_opts(secure)
-      response = get_conn.post url, opts
+      Dailycred::Response.new(get_conn.post url, opts)
     end
 
     private

data/lib/dailycred/helper.rb

@@ -46,7 +46,6 @@ module Dailycred
     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/response.rb

@@ -0,0 +1,33 @@
+module Dailycred
+  class Response
+    require 'json'
+    attr_accessor :json, :body, :headers, :status
+
+    def initialize response
+      @body = response.body
+      @json = JSON.parse(@body)
+      @headers = response.headers
+      @status = response.status
+    end
+
+    def errors?
+      json["worked"] != true
+    end
+
+    def success?
+      @status == 200 && json["worked"] == true
+    end
+
+    def errors
+      begin
+        json["errors"][0]
+      rescue
+        nil
+      end
+    end
+
+    def user
+      json["user"]
+    end
+  end
+end

data/lib/dailycred/version.rb

@@ -1,3 +1,3 @@
 module Dailycred
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/generators/dailycred/install_generator.rb

@@ -1,5 +1,4 @@
 require 'rails/generators'
-require 'test_helper'
 module Dailycred
   module Generators
     class InstallGenerator < Rails::Generators::Base

data/spec/support/dailycred_spec.rb

@@ -36,31 +36,64 @@ describe Dailycred::Client do
   end
 
   it "tags a user" do
-    json = json_response @dc.tag(@user_id, "loser")
+    json = @dc.tag(@user_id, "loser").json
     json["worked"].should == true
     user = json["user"]
     user["tags"].should include('loser') #will work in next push
   end
 
   it "untags a user" do
-    json = json_response @dc.untag(@user_id, "loser")
+    json = @dc.untag(@user_id, "loser").json
     json["worked"].should == true
     user = json["user"]
     user["tags"].should == nil #will work in next push
   end
 
   it "fires an event" do
-    json = json_response @dc.event(@user_id, "became a loser")
+    json = @dc.event(@user_id, "became a loser").json
     json["worked"].should == true
   end
 
   it "resets a password" do
-    json = json_response @dc.reset_password("useruseruseruser@gmail.com")
+    json = @dc.reset_password("useruseruseruser@gmail.com").json
     json["worked"].should == true
   end
 
+  describe "#login" do
+    it "logs in successfully" do
+      response = @dc.login(login: "test@test.com", password: "password")
+      response.success?.should eq(true)
+      response.user["email"].should eq("test@test.com")
+      response.errors.should be(nil)
+    end
+
+    it "works with :pass parameter too" do
+      response = @dc.login(login: "test@test.com", pass: "password")
+      response.success?.should eq(true)
+      response.user["email"].should eq("test@test.com")
+      response.errors.should be(nil)
+    end
+
+    it "fails with wrong credentials" do
+      response = @dc.login(login: "test@test.com", password: "wrongpass")
+      response.success?.should eq(false)
+      response.errors["attribute"].should eq("form")
+      response.errors["message"].should_not be(nil)
+    end
+  end
+
+  describe "#signup" do
+    it "works with right parameters" do
+      random_email = "#{rand}test@test.com"
+      response = @dc.signup(email: random_email, password: "password")
+      response.success?.should eq(true)
+      response.user["email"].should eq(random_email)
+    end
+  end
+
+
   # it "changes a password" do
-  #   json = json_response @dc.changePass("0c19c355-2a71-4c8e-805e-f7a6087ea84c", "wrongPass", "newPass")
+  #   json = @dc.changePass("0c19c355-2a71-4c8e-805e-f7a6087ea84c", "wrongPass", "newPass").json
   #   json["worked"].should == false
   #   json["message"].should != nil
   # end

data/test/generators/controllers_generator_test.rb

@@ -8,6 +8,7 @@ class ViewsGeneratorTest < Rails::Generators::TestCase
   test "creates correct controller files" do
     run_generator
     assert_file "app/controllers/dailycred/sessions_controller.rb"
+    assert_file "app/controllers/dailycred/users_controller.rb"
   end
 
 end

data/test/generators/views_generator_test.rb

@@ -8,6 +8,9 @@ class ControllersGeneratorTest < Rails::Generators::TestCase
   test "creates correct view files" do
     run_generator
     assert_file "app/views/dailycred/sessions/info.html.erb"
+    assert_file "app/views/dailycred/sessions/_login.html.erb"
+    assert_file "app/views/dailycred/sessions/_signup.html.erb"
+    assert_file "app/views/dailycred/sessions/_reset_password.html.erb"
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dailycred
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Hank Stoever
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -55,8 +55,12 @@ files:
 - Rakefile
 - app/controllers/.DS_Store
 - app/controllers/dailycred/sessions_controller.rb
+- app/controllers/dailycred/users_controller.rb
 - app/views/.DS_Store
 - app/views/dailycred/.DS_Store
+- app/views/dailycred/sessions/_login.html.erb
+- app/views/dailycred/sessions/_reset_password.html.erb
+- app/views/dailycred/sessions/_signup.html.erb
 - app/views/dailycred/sessions/info.html.erb
 - config/routes.rb
 - dailycred.gemspec
@@ -214,12 +218,15 @@ files:
 - dummy/test/test_helper.rb
 - dummy/vendor/assets/javascripts/.keep
 - dummy/vendor/assets/stylesheets/.keep
+- features/generator/generator.feature
+- features/support/env.rb
 - lib/dailycred.rb
 - lib/dailycred/acts_as_dailycred.rb
 - lib/dailycred/client.rb
 - lib/dailycred/engine.rb
 - lib/dailycred/helper.rb
 - lib/dailycred/middleware.rb
+- lib/dailycred/response.rb
 - lib/dailycred/tests_helper.rb
 - lib/dailycred/user.rb
 - lib/dailycred/version.rb
@@ -269,6 +276,8 @@ signing_key:
 specification_version: 4
 summary: ''
 test_files:
+- features/generator/generator.feature
+- features/support/env.rb
 - spec/helper_spec.rb
 - spec/support/dailycred_spec.rb
 - spec/support/shared_examples.rb