happy_seed 0.0.11 → 0.0.12

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

@@ -1,8 +1,30 @@
 class OmniauthCallbacksController < Devise::OmniauthCallbacksController
+  def instagram
+    generic_callback( 'instagram' )
+  end
+  def facebook
+    generic_callback( 'facebook' )
+  end
+
+
   def generic_callback( provider )
-    @user = User.find_for_oauth(env["omniauth.auth"], current_user)
+    @identity = Identity.find_for_oauth env["omniauth.auth"]
+
+    @user = @identity.user || current_user
+    if @user.nil?
+      @user = User.create( email: @identity.email || "" )
+      @identity.update_attribute( :user_id, @user.id )
+    end
+
+    if @user.email.blank? && @identity.email
+      @user.update_attribute( :email, @identity.email)
+    end
 
     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
@@ -10,13 +32,4 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
       redirect_to new_user_registration_url
     end
   end
-
-  def after_sign_in_path_for(resource)
-    if resource.email_verified?
-      root_url
-      # super resource
-    else
-      finish_signup_path(resource)
-    end
-  end
 end

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

@@ -0,0 +1,17 @@
+class RegistrationsController < Devise::RegistrationsController
+  def update_resource(resource, params)
+    if resource.encrypted_password.blank? # || params[:password].blank?
+      resource.email = params[:email] if params[:email]
+      if !params[:password].blank? && params[:password] == params[:password_confirmation]
+        logger.info "Updating password"
+        resource.password = params[:password]
+        resource.save
+      end
+      if resource.valid?
+        resource.update_without_password(params)
+      end
+    else
+      resource.update_with_password(params)
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+class FormUser < User
+  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?
+
+  validates_presence_of     :password, if: :password_required?
+  validates_confirmation_of :password, if: :password_required?
+  validates_length_of       :password, within: Devise.password_length, allow_blank: true
+
+  def password_required?
+    return false if email.blank?
+    !persisted? || !password.nil? || !password_confirmation.nil?
+  end
+
+  def email_required?
+    true
+  end
+end

data/lib/generators/happy_seed/omniauth/templates/make_email_nullable.rb

@@ -0,0 +1,7 @@
+class MakeEmailNullable < ActiveRecord::Migration
+  def change
+    change_column_null :users, :email, true
+    remove_index :users, :email
+    add_index :users, :email
+  end
+end

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

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :oauth_user, :class => 'User' do
+    
+  end
+end

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

@@ -0,0 +1,81 @@
+require 'rails_helper'
+
+feature "Registrations", :type => :feature do
+  include Warden::Test::Helpers
+
+  after{ Warden.test_reset! }
+
+  def login_with( symbol )
+    @user = create symbol
+    login_as @user, scope: :user
+  end
+
+  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
+
+  it "should let you change add an email address without a password if you don't already have one" do
+    login_with :oauth_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 require your current password if you have one set" do
+    login_with :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
+
+  it "should let you set your password initially" do
+    login_with :oauth_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 "Sign in"
+
+    expect( page.body ).to include( "Signed in successfully." )
+  end
+end

data/lib/generators/happy_seed/splash/splash_generator.rb

@@ -1,6 +1,8 @@
+require 'generators/happy_seed/happy_seed_generator'
+
 module HappySeed
   module Generators
-    class SplashGenerator < Rails::Generators::Base
+    class SplashGenerator < HappySeedGenerator
       source_root File.expand_path('../templates', __FILE__)
 
       def install_landing_page
@@ -17,7 +19,7 @@ module HappySeed
         gem 'gibbon'
 
         Bundler.with_clean_env do
-          run "bundle install"
+          run "bundle install > /dev/null"
         end
 
         remove_file 'public/index.html'
@@ -34,7 +36,8 @@ module HappySeed
         append_to_file "config/initializers/assets.rb", "Rails.application.config.assets.precompile += %w( splash.css scrollReveal.js )\n"
 
         begin
-          append_to_file ".env", "MAILCHIMP_API_KEY=\nMAILCHIMP_SPLASH_SIGNUP_LIST_ID=\n"
+          add_env "MAILCHIMP_API_KEY"
+          add_env "MAILCHIMP_SPLASH_SIGNUP_LIST_ID"
         rescue
           say_status :env, "Unable to add template .env files", :red
         end

data/lib/generators/happy_seed/static/templates/Gemfile.lock

@@ -0,0 +1,162 @@
+GIT
+  remote: git://github.com/happyfuncode/middleman-meta-tags.git
+  revision: fd6d03f84216def82b684693aefb234af6534980
+  branch: develop
+  specs:
+    middleman-meta-tags (0.0.1)
+      middleman-core (>= 3.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.1.7)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    bootstrap-navbar (2.2.2)
+      gem_config (~> 0.3)
+    bootstrap-sass (3.3.1.0)
+      sass (~> 3.2)
+    builder (3.2.2)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    chunky_png (1.3.3)
+    coffee-script (2.3.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.8.0)
+    compass (1.0.1)
+      chunky_png (~> 1.2)
+      compass-core (~> 1.0.1)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.1)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    erubis (2.7.0)
+    eventmachine (1.0.3)
+    execjs (2.2.2)
+    ffi (1.9.6)
+    gem_config (0.3.1)
+    haml (4.0.5)
+      tilt
+    hike (1.2.3)
+    hitimes (1.2.2)
+    hooks (0.4.0)
+      uber (~> 0.0.4)
+    http_parser.rb (0.6.0)
+    i18n (0.6.11)
+    jquery-middleman (3.0.4)
+      thor (>= 0.14, < 2.0)
+    json (1.8.1)
+    kramdown (1.5.0)
+    listen (2.8.0)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    middleman (3.3.7)
+      coffee-script (~> 2.2)
+      compass (>= 1.0.0, < 2.0.0)
+      compass-import-once (= 1.0.5)
+      execjs (~> 2.0)
+      haml (>= 4.0.5)
+      kramdown (~> 1.2)
+      middleman-core (= 3.3.7)
+      middleman-sprockets (>= 3.1.2)
+      sass (>= 3.4.0, < 4.0)
+      uglifier (~> 2.5)
+    middleman-bootstrap-navbar (2.0.0)
+      bootstrap-navbar (~> 2.0)
+      middleman-core (>= 3.0)
+    middleman-core (3.3.7)
+      activesupport (~> 4.1.0)
+      bundler (~> 1.1)
+      erubis
+      hooks (~> 0.3)
+      i18n (~> 0.6.9)
+      listen (>= 2.7.9, < 3.0)
+      padrino-helpers (~> 0.12.3)
+      rack (>= 1.4.5, < 2.0)
+      rack-test (~> 0.6.2)
+      thor (>= 0.15.2, < 2.0)
+      tilt (~> 1.4.1, < 2.0)
+    middleman-deploy (0.3.0)
+      middleman-core (>= 3.2)
+      net-sftp
+      ptools
+    middleman-livereload (3.1.1)
+      em-websocket (>= 0.2.0)
+      middleman-core (>= 3.0.2)
+      multi_json (~> 1.0)
+      rack-livereload
+    middleman-sprockets (3.3.10)
+      middleman-core (~> 3.3)
+      sprockets (~> 2.12.1)
+      sprockets-helpers (~> 1.1.0)
+      sprockets-sass (~> 1.2.0)
+    minitest (5.4.3)
+    multi_json (1.10.1)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.1)
+    padrino-helpers (0.12.4)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.12.4)
+      tilt (~> 1.4.1)
+    padrino-support (0.12.4)
+      activesupport (>= 3.1)
+    ptools (1.2.6)
+    rack (1.5.2)
+    rack-livereload (0.3.15)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    sass (3.4.8)
+    sprockets (2.12.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-helpers (1.1.0)
+      sprockets (~> 2.0)
+    sprockets-sass (1.2.0)
+      sprockets (~> 2.0)
+      tilt (~> 1.1)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    timers (4.0.1)
+      hitimes
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uber (0.0.11)
+    uglifier (2.5.3)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bootstrap-sass
+  builder (~> 3.0)
+  jquery-middleman
+  middleman (~> 3.3.7)
+  middleman-bootstrap-navbar
+  middleman-deploy
+  middleman-livereload (~> 3.1.0)
+  middleman-meta-tags!
+  tzinfo-data
+  wdm (~> 0.1.0)

data/lib/generators/happy_seed/static_blog/templates/Gemfile.lock

@@ -40,7 +40,7 @@ GEM
     execjs (2.2.2)
     ffi (1.9.6)
     gem_config (0.3.1)
-    haml (4.0.5)
+    haml (4.0.6)
       tilt
     hike (1.2.3)
     hitimes (1.2.2)
@@ -52,7 +52,7 @@ GEM
       thor (>= 0.14, < 2.0)
     json (1.8.1)
     kramdown (1.5.0)
-    listen (2.8.2)
+    listen (2.8.3)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -67,7 +67,7 @@ GEM
       middleman-sprockets (>= 3.1.2)
       sass (>= 3.4.0, < 4.0)
       uglifier (~> 2.5)
-    middleman-autometatags (0.0.1)
+    middleman-autometatags (0.0.2)
       middleman-core (>= 3.0.0)
     middleman-blog (3.5.3)
       addressable (~> 2.3.5)
@@ -105,7 +105,7 @@ GEM
       sprockets (~> 2.12.1)
       sprockets-helpers (~> 1.1.0)
       sprockets-sass (~> 1.2.0)
-    minitest (5.4.3)
+    minitest (5.5.0)
     multi_json (1.10.1)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
@@ -116,7 +116,7 @@ GEM
       tilt (~> 1.4.1)
     padrino-support (0.12.4)
       activesupport (>= 3.1)
-    ptools (1.2.6)
+    ptools (1.3.2)
     rack (1.5.2)
     rack-livereload (0.3.15)
       rack
@@ -144,7 +144,7 @@ GEM
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uber (0.0.11)
-    uglifier (2.5.3)
+    uglifier (2.6.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 

data/lib/generators/happy_seed/twitter/twitter_generator.rb

@@ -12,7 +12,7 @@ module HappySeed
         gem 'twitter'
 
         Bundler.with_clean_env do
-          run "bundle install"
+          run "bundle install > /dev/null"
         end
 
         add_omniauth :twitter

data/lib/happy_seed/cli.rb

@@ -5,7 +5,7 @@ module HappySeed
     desc "rails APPNAME", "Generate a new rails application"
     def rails( *args )
       file = gem_file_path( "happy_seed.rb")
-      system( "rails new -m #{file} #{args.join( " " )}" )
+      system( "rails new -m #{file} #{args.join( " " )} --skip-turbolinks" )
     end
 
     desc "plugin NAME", "Generate a new rails plugin"
@@ -29,7 +29,7 @@ module HappySeed
 
     desc "static_blog NAME", "Generate a new middleman static blog project"
     def static_blog( name )
-      require 'generators/happy_seed/static/static_blog_generator'
+      require 'generators/happy_seed/static_blog/static_blog_generator'
       HappySeed::Generators::StaticBlogGenerator.start
     end