happy_seed 0.0.19 → 0.0.21

data/lib/generators/happy_seed/omniauth/omniauth_generator.rb

@@ -7,7 +7,7 @@ module HappySeed
       source_root File.expand_path('../templates', __FILE__)
 
       def self.fingerprint
-        gem_available?( 'omniauth')
+        gem_available?( 'omniauth' )
       end
 
       def install_omniauth
@@ -18,6 +18,7 @@ module HappySeed
         migration_template("make_email_nullable.rb", "db/migrate/make_email_nullable.rb" )
 
         gem 'omniauth'
+        gem 'omniauth-oauth2', '1.3.1'
 
         Bundler.with_clean_env do
           run "bundle install --without production"
@@ -36,11 +37,12 @@ module HappySeed
           gsub_file "app/models/user.rb", ", :validatable", ""
           inject_into_class "app/models/user.rb", "User", "  has_many :identities, dependent: :destroy\n"
           # insert_into_file "app/models/user.rb", File.read( find_in_source_paths( "user.rb" ) ), :before => "\nend\n"
+          inject_into_class "app/models/user.rb", "User", File.read( find_in_source_paths( "user.rb" ) )
         rescue
           say_status :user_model, "Unable to add omniauthable to app/models/users.rb", :red
         end
 
-        gsub_file 'config/routes.rb', "devise_for :users\n", "devise_for :users, class_name: 'FormUser', :controllers => { omniauth_callbacks: 'omniauth_callbacks', registrations: 'registrations' }\n"
+        gsub_file 'config/routes.rb', "devise_for :users, :controllers => {", "devise_for :users, :controllers => { omniauth_callbacks: 'omniauth_callbacks', registrations: 'registrations', "
 
         directory "docs"
       end

data/lib/generators/happy_seed/omniauth/templates/app/controllers/omniauth_callbacks_controller.rb

@@ -1,18 +1,11 @@
 class OmniauthCallbacksController < Devise::OmniauthCallbacksController
-  def instagram
-    generic_callback( 'instagram' )
-  end
-  def facebook
-    generic_callback( 'facebook' )
-  end
-
-
   def generic_callback( provider )
-    @identity = Identity.find_for_oauth env["omniauth.auth"]
+    @identity = Identity.find_for_oauth request.env["omniauth.auth"]
 
     @user = @identity.user || current_user
+
     if @user.nil?
-      @user = User.create( email: @identity.email || "" )
+      @user = User.create( email: @identity.email, oauth_callback: true )
       @identity.update_attribute( :user_id, @user.id )
     end
 
@@ -22,9 +15,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
     if @user.persisted?
       @identity.update_attribute( :user_id, @user.id )
-      # This is because we've created the user manually, and Device expects a
-      # FormUser class (with the validations)
-      @user = FormUser.find @user.id
       sign_in_and_redirect @user, event: :authentication
       set_flash_message(:notice, :success, kind: provider.capitalize) if is_navigational_format?
     else

data/lib/generators/happy_seed/omniauth/templates/app/models/identity.rb

@@ -1,18 +1,22 @@
 class Identity < ActiveRecord::Base
-  belongs_to :user
+  belongs_to :user, required: false
   validates_presence_of :uid, :provider
-  validates_uniqueness_of :uid, :scope => :provider
+  validates_uniqueness_of :uid, scope: :provider
 
   def self.find_for_oauth(auth)
     identity = find_by(provider: auth.provider, uid: auth.uid)
     identity = create(uid: auth.uid, provider: auth.provider) if identity.nil?
-    identity.accesstoken = auth.credentials.token
-    identity.name = auth.info.name
-    identity.email = auth.info.email
-    identity.nickname = auth.info.nickname
-    identity.image = auth.info.image
-    identity.phone = auth.info.phone
-    identity.urls = (auth.info.urls || "").to_json
+    if auth.credentials
+      identity.accesstoken = auth.credentials.token
+    end
+    if auth.info
+      identity.name = auth.info.name
+      identity.email = auth.info.email
+      identity.nickname = auth.info.nickname
+      identity.image = auth.info.image
+      identity.phone = auth.info.phone
+      identity.urls = (auth.info.urls || "").to_json
+    end
     identity.save
     identity
   end

data/lib/generators/happy_seed/omniauth/templates/docs/README.04.omniauth.rdoc

@@ -5,24 +5,24 @@ HappySeed Omniauth Install
 
 The `happy_seed:omniauth` generator depends upon `happy_seed:devise` and
 
-* Generates an Intentity model, linked to user
+* Generates an Indentity model, linked to User
 * Installs omniauth
 * Installs an omniauth_controller
 * Updates devise configuration
 * Adds routes
 * Removes devise email/password validations, updates database
-* Adds FormUser < User model for validations
+* Removes the :validatable option for devise and moves the login in class.
 * Adds a registration controller to allow the user to add email and password for auth strategies that don't support it.
 
 ### Why do you want this?
 
-This lets you easily add oauth authentication for 3rd party sites to you application, the main ones being facebook and twitter.  This sets up the infrastructure to make everything work with devise.
+This lets you easily add oauth authentication for 3rd party sites to your application; the main ones being facebook and twitter.  This sets up the infrastructure to make everything work with devise.
 
 The Identity model is used to link up the user with the remote information.  What information is given is stored, though you could go deeper with this.  Additionally, the access token for the user is store in the Identity model for interacting with the remote service on behalf of the user.
 
 It also creates the omniauth_callback controller.  Devise as it's setup out of the box has the user's email address as the login, but not all services will give you the user's email address.  (Twitter for example.)  The controller in this case will check only set the email address if one is returned.
 
-It also creates a registration controller to allow a user to set an email.  If the user hasn't set a password, they can change email without it.  If they set an password, then it is required to change things in the future.
+It also creates a registration controller to allow a user to set an email.  If the user hasn't set a password, they can change email without it.  If they set an password, then it is required to change things in the future.  This is done using conditional validators rather than a seperate model for the user.
 
 Documented in spec/features/registration_spec.rb
 
@@ -33,4 +33,4 @@ Set up a $HOME/.seed_defaults file which contains development application keys.
 
 ### What needs to be done?
 
-This is a base module which is used by `happy_seed:twitter`, `happy_seed:facebook` and `happy_seed:instagram`.
+This is a base module which is used by `happy_seed:twitter`, `happy_seed:facebook` and `happy_seed:instagram` and more.

data/lib/generators/happy_seed/omniauth/templates/spec/factories/oauth.rb

@@ -1,5 +1,10 @@
 FactoryGirl.define do
   factory :oauth_user, :class => 'User' do
-    
+    before(:create) do |user, evaluator|
+      user.oauth_callback = true
+    end
+    if User.devise_modules.include? :confirmable
+      confirmed_at Time.now
+    end
   end
 end

data/lib/generators/happy_seed/omniauth/templates/spec/features/oauth_registration_spec.rb

@@ -0,0 +1,80 @@
+require 'rails_helper'
+
+feature "OAuthRegistrations", :type => :feature do
+  include Warden::Test::Helpers
+
+  after{ Warden.test_reset! }
+
+  it "should require you to be logged in" do
+    visit edit_user_registration_path
+
+    expect( page.body ).to include( "You need to sign in or sign up before continuing." )
+  end
+
+  describe "oauth users" do
+    it "should let you change add an email address without a password the don't have a password" do
+      login_as create( :oauth_user ), scope: :user
+
+      visit edit_user_registration_path
+
+      expect( page.body ).to_not include( "You need to sign in or sign up before continuing." )
+
+      within "#edit_user" do
+        fill_in "user[email]", with: "email@example.com"
+      end
+
+      click_button "Update"
+
+      expect( page.body ).to include( "Your account has been updated successfully")
+    end
+
+    it "should let you set your password initially" do
+      login_as create( :oauth_user ), scope: :user
+
+      visit edit_user_registration_path
+
+      within "#edit_user" do
+        fill_in "user[email]", with: "email@example.com"
+        fill_in "user[password]", with: "password"
+        fill_in "user[password_confirmation]", with: "password"
+      end
+
+      click_button "Update"
+
+      expect( page.body ).to include( "Your account has been updated successfully")
+
+      logout
+
+      visit edit_user_registration_path
+
+      expect( page.body ).to include( "You need to sign in or sign up before continuing." )
+
+      within "#new_user" do
+        fill_in "user[email]", with: "email@example.com"
+        fill_in "user[password]", with: "password"
+      end
+
+      click_button "Log in"
+
+      expect( page.body ).to include( "Signed in successfully." )
+    end
+  end
+
+  describe "users with passwords" do
+    it "should require your current password if you have one set" do
+      login_as create( :user ), scope: :user
+
+      visit edit_user_registration_path
+
+      expect( page.body ).to_not include( "You need to sign in or sign up before continuing." )
+
+      within "#edit_user" do
+        fill_in "user[email]", with: "email@example.com"
+      end
+
+      click_button "Update"
+
+      expect( page.body ).to_not include( "Your account has been updated successfully")
+    end
+  end
+end

data/lib/generators/happy_seed/omniauth/templates/spec/models/identity_spec.rb

@@ -1,22 +1,49 @@
 require 'rails_helper'
 
 RSpec.describe Identity, :type => :model do
-  it "should always have a provider and uid" do
-    i = Identity.create
-    expect( i ).to_not be_valid
+  describe "validations" do
+    before( :each ) do
+      @user = build :user
+    end
 
-    i = Identity.create( :provider => "test" )
-    expect( i ).to_not be_valid
+    it "should always have a provider and uid" do
+      i = Identity.create user: @user
+      expect( i ).to_not be_valid
 
-    i = Identity.create( :provider => "test", :uid => "1" )
-    expect( i ).to be_valid
+      i = Identity.create user: @user, provider: "test"
+      expect( i ).to_not be_valid
+
+      i = Identity.create user: @user, provider: "test", uid: "1"
+
+      expect( i ).to be_valid
+    end
+
+    it "should have a unique uid per provider" do
+      i = Identity.create user: @user, provider: "test", uid: "1"
+      expect( i ).to be_valid
+
+      i = Identity.create user: @user, provider: "other test", uid: "1"
+      expect( i ).to be_valid
+
+      i = Identity.create user: @user, provider: "test", uid: "1"
+      expect( i ).to_not be_valid
+    end
   end
 
-  it "should have a unique uid" do
-    i = Identity.create( :provider => "test", :uid => "1" )
-    expect( i ).to be_valid
+  describe "construction" do
+    it "should create an identity from a hash" do
+      data = OmniAuth::AuthHash.new({
+        :provider => 'twitter',
+        :uid => '123545'
+      })
+
+      i = Identity.find_for_oauth data
+
+      expect( i ).to be_valid
+
+      i2 = Identity.find_for_oauth data
 
-    i = Identity.create( :provider => "test", :uid => "1" )
-    expect( i ).to_not be_valid
+      expect( i.id ).to eq(i2.id)
+    end
   end
 end

data/lib/generators/happy_seed/omniauth/templates/{app/models/form_user.rb → user.rb}

@@ -1,6 +1,6 @@
-class FormUser < User
+  attr_accessor :oauth_callback
   attr_accessor :current_password
-  
+    
   validates_presence_of   :email, if: :email_required?
   validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
   validates_format_of     :email, with: Devise.email_regexp, allow_blank: true, if: :email_changed?
@@ -10,11 +10,10 @@ class FormUser < User
   validates_length_of       :password, within: Devise.password_length, allow_blank: true
 
   def password_required?
-    return false if email.blank?
+    return false if email.blank? || !email_required?
     !persisted? || !password.nil? || !password_confirmation.nil?
   end
 
   def email_required?
-    true
+    @oauth_callback != true
   end
-end

data/lib/generators/happy_seed/plugin/plugin_generator.rb

@@ -14,20 +14,22 @@ module HappySeed
 
         insert_into_file "#{app_name}/#{app_name}.gemspec", File.read( "#{source_root}/gemspec" ), :before => "\nend\n"
 
-        system( "cd #{app_name} && bundle" )
+        Bundler.with_clean_env do
+          system( "cd #{app_name} && bundle" )
 
-        system( "cd #{app_name}/spec/dummy && rails g rspec:install")
+          system( "cd #{app_name}/spec/dummy && rails g rspec:install")
 
-        gsub_file "#{app_name}/spec/dummy/.rspec", "--warnings\n", ""
-        append_to_file "#{app_name}/spec/dummy/.rspec", "--format documentation\n"
+          gsub_file "#{app_name}/spec/dummy/.rspec", "--warnings\n", ""
+          append_to_file "#{app_name}/spec/dummy/.rspec", "--format documentation\n"
 
-        self.destination_root = app_name
-        
-    		remove_file "Rakefile"
-        copy_file "Rakefile"
-        copy_file ".rspec"
-        copy_file ".autotest"
-        directory "spec"
+          self.destination_root = app_name
+          
+      		remove_file "Rakefile"
+          copy_file "Rakefile"
+          copy_file ".rspec"
+          copy_file ".autotest"
+          directory "spec"
+        end
       end
     end
   end

data/lib/generators/happy_seed/react/react_generator.rb

@@ -0,0 +1,36 @@
+require 'generators/happy_seed/happy_seed_generator'
+
+module HappySeed
+  module Generators
+    class ReactGenerator < HappySeedGenerator
+      source_root File.expand_path('../templates', __FILE__)
+
+      def self.fingerprint
+        gem_available?( 'react_on_rails' )
+      end
+
+      def install_react
+        return if already_installed
+
+        gem 'react_on_rails'
+
+        Bundler.with_clean_env do
+          run "bundle install --without production"
+        end
+
+        say_status :react, "Adding files to git", :green
+
+        git add: "."
+        git commit: "-a -m 'Adding react_on_rails'"
+
+        generate 'react_on_rails:install'
+
+        system "npm install"
+
+        directory  "."
+
+        say_status :react, "Now run: foreman start -f Procfile.dev", :green
+      end
+    end
+  end
+end

data/lib/generators/happy_seed/react/templates/docs/README.10.react.rdoc

@@ -0,0 +1,20 @@
+HappySeed React Install
+=========================
+
+### What does this do?
+
+The happy_seed react generator
+
+* Installs `react_on_rails` as well as npm.
+
+### Why do you want this?
+
+You want to be able to use react within your rails project and `react_on_rails` is great. Consult the docs for this gem [here.](https://github.com/shakacode/react_on_rails). Check out the Hello World react app at `http://localhost:3000/hello_world`. Reference the react_on_rails docs for a detailed explanation. You can start by looking in the `client` folder to see how the Hello World app was built.
+
+### Environment Variables
+
+na
+
+### What needs to be done?
+
+When running the generator, if you notice npm throwing errors like `npmERR! Error: EACCES: permission denied, mkdir`. Run `sudo chown -R $USER:$GROUP ~/.npm`. 

data/lib/generators/happy_seed/roles/roles_generator.rb

@@ -0,0 +1,38 @@
+require 'generators/happy_seed/happy_seed_generator'
+require 'generators/happy_seed/devise/devise_generator'
+
+module HappySeed
+  module Generators
+    class RolesGenerator < HappySeedGenerator
+      source_root File.expand_path('../templates', __FILE__)
+
+      def self.fingerprint
+        gem_available? 'cancancan'
+      end
+
+      def install_roles
+        return if already_installed
+
+        require_generator DeviseGenerator
+
+        gem 'cancancan'
+
+        Bundler.with_clean_env do
+          run "bundle install --without production"
+          run 'rake db:migrate'
+        end
+
+        template "ability.rb", "app/models/ability.rb"
+        directory "docs"
+
+        generate 'migration add_role_to_users role:integer'
+
+        inject_into_class "app/models/user.rb", "User", "  enum role: [:user, :admin]\n"
+
+        inject_into_file 'app/controllers/application_controller.rb', 
+          "\n\n  def access_denied(exception)\n    redirect_to root_path, alert: exception.message\n  end\n",
+          before: /\nend/
+      end
+    end
+  end
+end

data/lib/generators/happy_seed/roles/templates/ability.rb

@@ -0,0 +1,9 @@
+class Ability
+  include CanCan::Ability
+
+  def initialize(user)
+    if user && user.admin?
+      can :manage, :all
+    end
+  end
+end