happy_seed 0.0.11 → 0.0.12

data/lib/generators/happy_seed/bootstrap/templates/lib/templates/haml/scaffold/_form.html.haml

@@ -1,19 +1,5 @@
-= form_for @<%= singular_table_name %>, :html => { :class => "form-horizontal" } do |f|
-  -if @<%= singular_table_name %>.errors.any?
-    .alert.alert-danger.alert-dismissable
-      %button.close{"aria-hidden" => "true", "data-dismiss" => "alert", :type => "button"} &times;
-      %h4= "#{pluralize(@<%= singular_table_name %>.errors.count, "error")} prohibited this <%= singular_table_name %> from being saved:"
-
-      %ul
-        - @<%= singular_table_name %>.errors.full_messages.each do |msg|
-          %li= msg
-
+= form_for @<%= singular_table_name %>, layout: :horizontal do |f|
 <% for attribute in attributes -%>
-  .form-group{ :class => error_for( @<%= singular_table_name %>, :<%= attribute.name %>, "has-error" ) }
-    = f.label :<%= attribute.name %>, :class => 'col-sm-2 control-label'
-    .col-sm-10
-      = f.<%= attribute.field_type %> :<%= attribute.name %>, :class => 'form-control'
+  = f.<%= attribute.field_type %> :<%= attribute.name %>, :class => 'form-control'
 <% end -%>
-  .form-group
-    .col-sm-offset-2.col-sm-10
-      = f.submit :class => 'btn btn-primary'
+  = f.submit :class => 'btn btn-primary'

data/lib/generators/happy_seed/devise/devise_generator.rb

@@ -10,10 +10,10 @@ module HappySeed
           end
         end
 
-        gem 'devise'
+        gem 'devise', '~> 3.4'
 
         Bundler.with_clean_env do
-          run "bundle install"
+          run "bundle install > /dev/null"
         end
 
         run 'rails generate devise:install'
@@ -22,6 +22,7 @@ module HappySeed
         
         if gem_available?( "haml-rails" )
           remove_file 'app/views/devise/registrations/new.html.erb'
+          remove_file 'app/views/devise/registrations/edit.html.erb'
           remove_file 'app/views/devise/sessions/new.html.erb'
           remove_file 'app/views/devise/passwords/edit.html.erb'
           remove_file 'app/views/devise/passwords/new.html.erb'
@@ -29,6 +30,13 @@ module HappySeed
 
         remove_file "spec/factories/users.rb"
         
+        begin
+          prepend_to_file 'spec/spec_helper.rb', "require 'devise'\n"
+          inject_into_file 'spec/spec_helper.rb', "\n  config.include Devise::TestHelpers, type: :controller\n", :before => "\nend\n"
+        rescue
+          say_status :spec, "Unable to add devise helpers to spec_helper.rb", :red
+        end
+
         directory 'app'
         directory 'docs'
         directory 'test'
@@ -43,16 +51,7 @@ module HappySeed
         end
 
         if File.exists?( File.join( destination_root, 'app/views/application/_header.html.haml' ) )
-          gsub_file 'app/views/application/_header.html.haml', "/ USER NAV", <<-'RUBY'
-
-        %ul.nav.navbar-nav.navbar-right
-          - if user_signed_in?
-            %li= link_to 'Sign Out', destroy_user_session_path, :method=>:delete
-          - else
-            / CONNECT
-            %li= link_to 'Sign In', new_user_session_path
-            %li= link_to 'Sign Up', new_user_registration_path
-  RUBY
+          gsub_file 'app/views/application/_header.html.haml', "/ USER NAV", '= render partial: "application/account_dropdown"'
         else
           say_status :gsub_file, "Can't find application/_header.html.haml, skipping"
         end

data/lib/generators/happy_seed/devise/templates/app/views/application/_account_dropdown.html.haml

@@ -0,0 +1,11 @@
+%li.dropdown
+  %a.dropdown-toggle{ "href" => "#", "data-toggle"=>"dropdown", "role" => "button", "aria-expanded"=>"false"}
+    Account <span class="caret"></span>
+  %ul.dropdown-menu
+    - if user_signed_in?
+      = link_to 'Profile', edit_user_registration_path
+      = link_to 'Sign Out', destroy_user_session_path, :method=>:delete
+    - else
+      / CONNECT
+      = link_to 'Sign In', new_user_session_path
+      = link_to 'Sign Up', new_user_registration_path

data/lib/generators/happy_seed/devise/templates/app/views/devise/passwords/edit.html.haml

@@ -1,6 +1,6 @@
 .container
   .row
-    .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3.col-sm-8.col-sm-offset-2
+    .center_panel
       .panel.panel-default.only
 
         .panel-heading
@@ -8,25 +8,12 @@
 
         .panel-body
 
-          = form_for(resource, as: resource_name, url: password_path(resource_name), :html=>{:role=>:form, :class=>'form-horizontal', method: 'put'}) do |f|
+          = form_for(resource, as: resource_name, url: password_path(resource_name), layout: :horizontal, method: 'put') do |f|
 
-            = devise_error_messages!
+            / = devise_error_messages!
             = f.hidden_field :reset_password_token
 
-            .form-group
-              = f.label :password, :class=>'control-label col-lg-3'
-              .col-lg-9= f.password_field :password, autocomplete: "off", autofocus: true, :class=>'form-control', :placeholder=>'Password'
+            = f.password_field :password, autocomplete: "off", autofocus: true
+            = f.password_field :password_confirmation, autocomplete: "off"
 
-            .form-group
-              = f.label :password_confirmation, :class=>'control-label col-lg-3'
-              .col-lg-9= f.password_field :password_confirmation, autocomplete: "off", :class=>'form-control', :placeholder=>'Confirm password'
-
-            .form-group
-              .col-lg-9.col-lg-offset-3
-                = f.submit "Change my password", :class=>'btn btn-primary form-control'
-
-            .form-group
-              .col-lg-9.col-lg-offset-3.text-right
-                = link_to 'Sign in',  new_user_session_path
-                %br
-                = link_to 'Sign up',  new_user_registration_path
+            = f.submit "Change my password", :class=>'btn btn-primary form-control'

data/lib/generators/happy_seed/devise/templates/app/views/devise/passwords/new.html.haml

@@ -1,6 +1,6 @@
 .container
   .row
-    .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3.col-sm-8.col-sm-offset-2
+    .center_panel
       .panel.panel-default.only
 
         .panel-heading
@@ -8,20 +8,13 @@
 
         .panel-body
 
-          = form_for(resource, as: resource_name, url: password_path(resource_name), :html=>{:role=>:form, :class=>'form-horizontal'}) do |f|
+          = form_for(resource, as: resource_name, url: password_path(resource_name), layout: :horizontal) do |f|
 
-            = devise_error_messages!
+            / = devise_error_messages!
 
-            .form-group
-              = f.label :email, :class=>'control-label col-lg-3'
-              .col-lg-9= f.email_field :email, autofocus: true, :class=>'form-control', :placeholder=>'Email'
+            = f.email_field :email, autofocus: true
 
-            .form-group
-              .col-lg-9.col-lg-offset-3
-                = f.submit "Send me reset password instructions", :class=>'btn btn-primary form-control'
+            = f.submit "Send me reset password instructions"
 
-            .form-group
-              .col-lg-9.col-lg-offset-3.text-right
-                = link_to 'Sign in',  new_user_session_path
-                %br
-                = link_to 'Sign up',  new_user_registration_path
+          %p.text-right
+            = render partial: "devise/shared/links"

data/lib/generators/happy_seed/devise/templates/app/views/devise/registrations/edit.html.haml

@@ -0,0 +1,50 @@
+- @title = "Edit #{resource_name.to_s.humanize}"
+.container
+  .row
+    .center_panel
+      .panel.panel-default.only
+
+        .panel-heading
+          = @title
+
+        .panel-body
+
+          = form_for resource, as: resource_name, url: registration_path(resource_name), layout: :horizontal do |f|
+
+            / = devise_error_messages!
+
+            = f.email_field :email, autofocus: true
+
+            - if devise_mapping.confirmable? && resource.pending_reconfirmation?
+              %p
+                Currently waiting confirmation for: 
+                = resource.unconfirmed_email
+
+            = f.password_field :current_password
+            = f.password_field :password, autocomplete: "off"
+            = f.password_field :password_confirmation, autocomplete: "off"
+
+            = f.submit "Update"
+
+      - if devise_mapping.omniauthable?
+        .panel.panel-default.only
+          .panel-header
+            Connect your accounts
+
+          .panel-body
+            %ul
+              - resource_class.omniauth_providers.each do |provider|
+                - if resource.identities.where( :provider => provider ).first
+                  %li= link_to "Reconnect with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
+                - else
+                  %li= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
+
+      .panel.panel-default.only
+
+        .panel-heading
+          Cancel my account
+
+        .panel-body
+          %p
+            Unhappy? 
+            = button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class: "btn btn-danger"

data/lib/generators/happy_seed/devise/templates/app/views/devise/registrations/new.html.haml

@@ -1,7 +1,7 @@
 - @title = "Sign Up"
 .container
   .row
-    .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3.col-sm-8.col-sm-offset-2
+    .center_panel
       .panel.panel-default.only
 
         .panel-heading
@@ -9,27 +9,18 @@
 
         .panel-body
 
-          = form_for(resource, as: resource_name, url: registration_path(resource_name), :html=>{:role=>:form, :class=>'form-horizontal'}) do |f|
+          = form_for resource, as: resource_name, url: registration_path(resource_name), layout: :horizontal do |f|
 
-            = devise_error_messages!
+            / = devise_error_messages!
 
-            .form-group
-              = f.label :email, :class=>'control-label col-lg-3'
-              .col-lg-9= f.email_field :email, autofocus: true, :class=>'form-control', :placeholder=>'Email'
+            = f.email_field :email, autofocus: true
+            = f.password_field :password, autocomplete: "off"
+            = f.password_field :password_confirmation, autocomplete: "off"
 
-            .form-group
-              = f.label :password, :class=>'control-label col-lg-3'
-              .col-lg-9= f.password_field :password, autocomplete: "off", :class=>'form-control', :placeholder=>'Password'
+            - if devise_mapping.rememberable?
+              = f.check_box :remember_me
 
-            .form-group
-              = f.label :password_confirmation, :class=>'control-label col-lg-3'
-              .col-lg-9= f.password_field :password_confirmation, autocomplete: "off", :class=>'form-control', :placeholder=>'Confirm password'
+            = f.submit "Sign Up"
 
-            .form-group
-              .col-lg-9.col-lg-offset-3
-                = f.submit "Sign up", :class=>'btn btn-primary form-control'
-
-            .form-group
-              .col-lg-9.col-lg-offset-3.text-right
-                / CONNECT
-                = link_to 'Sign in',  new_user_session_path
+          %p.text-right
+            = render partial: "devise/shared/links"

data/lib/generators/happy_seed/devise/templates/app/views/devise/sessions/new.html.haml

@@ -1,39 +1,22 @@
 - @title = "Sign In"
 .container
   .row
-    .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3.col-sm-8.col-sm-offset-2
+    .center_panel
       .panel.panel-default.only
-
         .panel-heading
           Sign in
 
         .panel-body
 
-          = form_for(resource, as: resource_name, url: session_path(resource_name), :html=>{:role=>:form, :class=>'form-horizontal'}) do |f|
-
-            .form-group
-              = f.label :email, :class=>'control-label col-sm-3'
-              .col-sm-9= f.email_field :email, autofocus: true, :class=>'form-control'
+          = form_for resource, as: resource_name, url: session_path(resource_name), layout: :horizontal do |f|
 
-            .form-group
-              = f.label :password, :class=>'control-label col-sm-3'
-              .col-sm-9= f.password_field :password, autocomplete: "off", :class=>'form-control'
+            = f.email_field :email, autofocus: true
+            = f.password_field :password, autocomplete: "off"
 
             - if devise_mapping.rememberable?
-              .form-group
-                .col-sm-9.col-sm-offset-3
-                  .checkbox
-                    = f.label :remember_me do
-                      = f.check_box :remember_me
-                      Remember me
+              = f.check_box :remember_me
 
-            .form-group
-              .col-lg-9.col-lg-offset-3
-                = f.submit "Sign in", :class=>'btn btn-primary form-control'
+            = f.submit "Sign in", :class=>'btn btn-primary form-control'
 
-            .form-group
-              .col-lg-9.col-lg-offset-3.text-right
-                / CONNECT
-                = link_to 'Sign up',  new_user_registration_path
-                %br
-                = link_to 'Forgot your password?', new_user_password_path
+          %p.text-right
+            = render partial: "devise/shared/links"

data/lib/generators/happy_seed/devise/templates/spec/features/forgot_password_spec.rb

@@ -32,7 +32,7 @@ feature "ForgotPasswords", :type => :feature do
 
     expect( page.body ).to_not include( "Email can't be blank" )
 
-    visit user_path
+    visit edit_user_registration_path
 
     expect( page.body ).to include( "Sign Out")
 

data/lib/generators/happy_seed/facebook/facebook_generator.rb

@@ -11,12 +11,12 @@ module HappySeed
         gem 'omniauth-facebook'
 
         Bundler.with_clean_env do
-          run "bundle install"
+          run "bundle install > /dev/null"
         end
 
         directory 'docs'
 
-        add_omniauth :facebook, "offline_access,read_insights,manage_pages"
+        add_omniauth :facebook, "email"
       end
     end
   end

data/lib/generators/happy_seed/happy_seed_generator.rb

@@ -26,31 +26,15 @@ module HappySeed
   RUBY
           end
           begin
-            append_to_file ".env", "#{provider.upcase}_APP_ID=\n#{provider.upcase}_APP_SECRET=\n"
+            add_env "#{provider.upcase}_APP_ID"
+            add_env "#{provider.upcase}_APP_SECRET"
           rescue
             say_status :env, "Unable to add template variables to .env", :red
           end
 
-          begin
-            inject_into_file 'app/views/application/_header.html.haml', "            %li= link_to 'sign in with #{provider}', user_omniauth_authorize_path(:#{provider})\n", after: "/ CONNECT\n"
-          rescue
-            say_status :header_links, "Unable to add links to the nav bar header", :red
-          end
-
-          begin
-            inject_into_file 'app/views/devise/sessions/new.html.haml', "                = link_to 'sign in with #{provider}', user_omniauth_authorize_path(:#{provider})\n                %br\n", after: "/ CONNECT\n"
-          rescue
-            say_status :sign_links, "Unable to add sign in links to app/views/devise/sessions/new.html.haml", :red
-          end
-
-          begin
-            inject_into_file 'app/views/devise/registrations/new.html.haml', "                = link_to 'sign in with #{provider}', user_omniauth_authorize_path(:#{provider})\n                %br\n", after: "/ CONNECT\n"
-          rescue
-            say_status :sign_up_links, "Unable to add sign in links to app/views/devise/registrations/new.html.haml"
-          end
-
           inject_into_file 'app/controllers/omniauth_callbacks_controller.rb', "\n  def #{provider}\n    generic_callback( '#{provider}' )\n  end\n", before: /\s*def generic_callback/
           inject_into_file 'app/models/user.rb', :before => "\nend" do <<-"RUBY"
+
   def #{provider}
     identities.where( :provider => "#{provider}" ).first
   end
@@ -69,6 +53,15 @@ RUBY
         rescue
           Gem.available?(name)
         end
+
+        def add_env( key )
+          defaults_file = File.expand_path ".seed_defaults", ENV['HOME']
+          value = "#{key}=\n"
+          if File.exists? defaults_file
+            value = File.readlines( defaults_file ).grep( /#{key}=/ ).first || value
+          end
+          append_to_file ".env", value
+        end
     end
   end
 end

data/lib/generators/happy_seed/instagram/instagram_generator.rb

@@ -12,7 +12,7 @@ module HappySeed
         gem 'instagram'
 
         Bundler.with_clean_env do
-          run "bundle install"
+          run "bundle install > /dev/null"
         end
 
         directory "docs"

data/lib/generators/happy_seed/jazz_hands/jazz_hands_generator.rb

@@ -5,26 +5,19 @@ module HappySeed
 
       def install_jazz_hands
 
-        gem 'jazz_hands', :github => 'nixme/jazz_hands', :branch => 'bring-your-own-debugger', :groups => [:development, :test]
+        # gem 'jazz_hands', :github => 'nixme/jazz_hands', :branch => 'bring-your-own-debugger', :groups => [:development, :test]
+        gem 'jazz_hands', :github => 'danrabinowitz/jazz_hands', :branch => 'use-newer-version-of-pry', :groups => [:development, :test]
 
         ruby_major_version = RUBY_VERSION.split('.')[0]
 
-        if ruby_major_version == '1'
-          gem 'debugger', :groups => [:development, :test]
-        else
-          gem 'byebug', :groups => [:development, :test]
-        end
-
         inside 'config/initializers' do
           copy_file 'jazz_hands.rb'
         end
 
         Bundler.with_clean_env do
-          run "bundle install"
+          run "bundle install > /dev/null"
         end
-
       end
-
     end
   end
 end

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

@@ -1,6 +1,7 @@
 module HappySeed
   module Generators
     class OmniauthGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
       source_root File.expand_path('../templates', __FILE__)
 
       def install_omniauth
@@ -9,6 +10,8 @@ module HappySeed
         #   return
         # end
 
+        migration_template("make_email_nullable.rb", "db/migrate/make_email_nullable.rb" )
+
         unless gem_available?( "devise" )
           puts "The omniauth generator requires devise"
 
@@ -22,7 +25,7 @@ module HappySeed
         gem 'omniauth'
 
         Bundler.with_clean_env do
-          run "bundle install"
+          run "bundle install > /dev/null"
         end
 
         generate 'model identity user:references provider:string accesstoken:string uid:string name:string email:string nickname:string image:string phone:string urls:string'
@@ -30,23 +33,19 @@ module HappySeed
         remove_file 'spec/models/identity_spec.rb'
         directory 'app'
         directory 'spec'
-        route "match '/profile/:id/finish_signup' => 'users#finish_signup', via: [:get, :patch], :as => :finish_signup"
-        route "get '/account' => 'users#show', as: 'user'"
+        # route "match '/profile/:id/finish_signup' => 'users#finish_signup', via: [:get, :patch], :as => :finish_signup"
+        # route "get '/account' => 'users#show', as: 'user'"
 
         begin
           gsub_file "app/models/user.rb", "devise :", "devise :omniauthable, :"
-          insert_into_file "app/models/user.rb", File.read( find_in_source_paths( "user.rb" ) ), :before => "\nend\n"
+          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"
         rescue
           say_status :user_model, "Unable to add omniauthable to app/models/users.rb", :red
         end
 
-        begin
-          insert_into_file "app/views/application/_header.html.haml", "            %li= link_to 'Account', user_path\n", after: "        - if user_signed_in?\n"
-        rescue
-          say_status :header_links, "Unable to add user accounts links to the nav bar", :red
-        end
-
-        gsub_file 'config/routes.rb', "devise_for :users\n", "devise_for :users, :controllers => { omniauth_callbacks: 'omniauth_callbacks' }\n"
+        gsub_file 'config/routes.rb', "devise_for :users\n", "devise_for :users, class_name: 'FormUser', :controllers => { omniauth_callbacks: 'omniauth_callbacks', registrations: 'registrations' }\n"
 
         directory "docs"
       end
@@ -59,6 +58,10 @@ module HappySeed
         rescue
            Gem.available?(name)
         end
+
+        def self.next_migration_number(dir)
+          Time.now.utc.strftime("%Y%m%d%H%M%S")
+        end
     end
   end
 end