happy_seed 0.0.19 → 0.0.21

data/lib/generators/happy_seed/base/base_generator.rb

@@ -22,31 +22,35 @@ module HappySeed
         gem 'haml-rails'
 
         gem_group :development, :test do
-          gem "sqlite3"
-          gem "rspec"
-          gem "rspec-rails"
-          gem "factory_girl_rails"
-          gem "capybara"
-          gem "cucumber-rails", :require => false
-          gem "guard-rspec"
-          gem "guard-cucumber"
-          gem "database_cleaner"
-          gem "spring-commands-rspec"
+          gem 'sqlite3'
+          gem 'rspec', '~> 3.5.0'
+          gem 'rspec-rails', '~> 3.5.0'
+          gem 'factory_girl_rails'
+          gem 'capybara'
+          gem 'cucumber-rails', branch: 'rails-5', require: false
+          gem 'guard-rspec', '~> 4.6.4', require: false
+          gem 'guard-cucumber'
+          gem 'database_cleaner'
+          gem 'spring-commands-rspec'
           gem 'spring-commands-cucumber'
-          gem "quiet_assets"
-          gem "launchy"
-          gem "vcr"
-          gem "faker"
+          gem 'launchy'
+          gem 'vcr'
+          gem 'faker'
           gem 'dotenv-rails'
           gem 'rdiscount'
+          gem 'rails-controller-testing'
+          gem 'better_errors'
+          gem 'binding_of_caller'
         end
 
         gem_group :test do
-          gem "webmock"
+          gem 'webmock'
+          gem 'fakeredis', require: 'fakeredis/rspec'
         end
 
         gem_group :production do
           gem 'pg'
+          gem 'lograge'
         end
 
         Bundler.with_clean_env do
@@ -70,16 +74,33 @@ module HappySeed
 
         # Use the spring version and also run everything on startup
         gsub_file "Guardfile", 'cmd: "bundle exec rspec"', 'cmd: "bin/rspec", all_on_start: true'
-        gsub_file "Guardfile", 'guard "cucumber"', 'guard "cucumber", cli: "--color --strict"'
+        # gsub_file "Guardfile", 'guard "cucumber"', 'guard "cucumber", cli: "--color --strict"'
 
         directory '.'
         append_to_file '.gitignore', ".env\n"
 
         remove_file "application_controller.rb"
+        remove_file "test"
 
-        inject_into_file 'app/controllers/application_controller.rb', File.read( find_in_source_paths('application_controller.rb') ), :after=>/protect_from_forgery.*\n/
-        inject_into_class 'config/application.rb', :Application, "    config.assets.paths << Rails.root.join('vendor', 'assets', 'bower_components')"
-        inject_into_file 'config/environments/test.rb', "  config.log_level = :error\n", before: "end\n"
+        inject_into_file 'app/controllers/application_controller.rb', 
+          File.read( find_in_source_paths('application_controller.rb') ), 
+          after: /protect_from_forgery.*\n/
+
+        inject_into_class 'config/application.rb', 
+          :Application, 
+          "    config.assets.paths << Rails.root.join('vendor', 'assets', 'bower_components')"
+
+        inject_into_file 'config/environments/test.rb', 
+          "  config.log_level = :error\n", 
+          before: "end\n"
+
+        inject_into_file 'config/environments/development.rb', 
+          "  config.assets.quiet = true\n", 
+          before: "end\n"
+
+        inject_into_file 'config/environments/production.rb', 
+          "  config.lograge.enabled = true\n  config.assets.quiet = true\n", 
+          before: "end\n"
 
         begin
           inject_into_file 'spec/rails_helper.rb', "require 'webmock/rspec'\n", after: "'rspec/rails'\n"
@@ -89,11 +110,18 @@ module HappySeed
 
         begin
           inject_into_file 'spec/rails_helper.rb', "\n  config.include FactoryGirl::Syntax::Methods\n", :before => "\nend\n"
+          inject_into_file 'spec/rails_helper.rb', "\n  [:controller, :view, :request].each do |type|\n    config.include ::Rails::Controller::Testing::TestProcess, :type => type\n    config.include ::Rails::Controller::Testing::TemplateAssertions, :type => type\n    config.include ::Rails::Controller::Testing::Integration, :type => type\n  end", :before => "\nend\n"
           append_to_file 'spec/rails_helper.rb', "\nVCR.configure do |c|\n  c.cassette_library_dir  = Rails.root.join('spec', 'vcr')\n  c.hook_into :webmock\nend\n"
         rescue
           say_status :spec, "Unable to add factory girl and VCR to rails_helper.rb", :red
         end
 
+        begin
+          inject_into_file 'Rakefile', "module TempFixForRakeLastComment\n  def last_comment\n    last_description\n  end\nend\nRake::Application.send :include, TempFixForRakeLastComment\n", before: "Rails.application.load_tasks"
+        rescue 
+          say_status :spec, "Unable to add Rake workaround for last_comment"
+        end
+
         route "get '/setup' => 'setup#index'"
         route "root 'setup#index'"
       end

data/lib/generators/happy_seed/base/templates/app/controllers/setup_controller.rb

@@ -1,5 +1,5 @@
 class SetupController < ApplicationController
-  before_filter :require_local!
+  before_action :require_local!
   layout :false
 
   def index

data/lib/generators/happy_seed/base/templates/app/views/setup/index.html.haml

@@ -2,8 +2,10 @@
 %html
   %head
     %title HappySeed Generator setup page
-    %script{:src=>"https://code.jquery.com/jquery-2.1.3.min.js"}
-    %script{:src=>"//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"}
+    = javascript_include_tag 'application'
+    = csrf_meta_tags 
+    / %script{:src=>"https://code.jquery.com/jquery-2.1.3.min.js"}
+    / %script{:src=>"//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"}
     %link{:href=>"//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css", :rel=>"stylesheet"}
     :css
       #nav { margin-top: 25px; }
@@ -19,7 +21,8 @@
         .col-sm-3
           .panel.panel-default.affix#nav
             .panel-heading
-              Nav
+              %h3.panel-title
+                Nav
             .panel-body
               %ul.list-unstyled
                 %li

data/lib/generators/happy_seed/base/templates/application_controller.rb

@@ -1,5 +1,5 @@
 
-  before_filter :authenticate
+  before_action :authenticate
 
   def authenticate
     unless ENV['HTTP_AUTH_USERNAME'].blank? or ENV['HTTP_AUTH_PASSWORD'].blank?

data/lib/generators/happy_seed/base/templates/docs/README.00.base.rdoc

@@ -17,13 +17,13 @@ The `happy_seed:base` generator installs `dotenv-rails`, `puma`, http site authe
 
 ### Why do you want this?
 
-Haml is great and we like it better than balancing out closing tags.  meta-tags makes it easy to flesh out SEO.
+Haml is great and we like it better than balancing out closing tags.  The meta-tags gem makes it easy to flesh out SEO.
 
 Turbolinks tend to be more trouble than they are worth.  Outside of making web site analytics slightly more cumbersome, we end up having trouble with debugging and testing.  Turbolinks work by having all of the javascript of the page loaded and resident and only replacing the body of the page when the user loads up a new page.  When everything works correctly this makes things faster; when it doesn't work correctly, you end up tracking down issues where DOM event handlers aren't correctly attached.
 
 dotenv-rails mimics the way that heroku starts up the application even when using "rails s", rather than foreman.  This pulls in data from the .env file.  In the case where you only have the web application in the Procfile, its easier to read through the log file when you use rails s rather than foreman.  .env is also a good way to make sure that none of your configuration stuff is stuck away in code somewhere.
 
-Assuming that you aren't hemmoraging memory, using unicorn is a great way to get more out of your dynos.  This setup gives you 3 workers for every dyno.  (We have nothing against Puma.)
+This setups puma and foreman (a Procfile) which mirrors the default setup of heroku.
 
 Finally we setup some basic HTTP auth and a simple setup controller to help navigate what seed has generated for you.  By default the HTTP auth stuff is off (i.e. no user/pass set) but the basic idea is that before you open things up to the world you can share your app to a limited group of people.
 
@@ -46,4 +46,4 @@ If the `HTTP_AUTH_*` variables are set, `application_controller` will force them
 
 ### What needs to be done?
 
-Even though the setup controller only works locally, you should plan on removing the `setup_controller` since it shows the configuration variables.
+Even though the setup controller only works locally, you should plan on removing the `setup_controller` since it shows the configuration variables.

data/lib/generators/happy_seed/bootstrap/bootstrap_generator.rb

@@ -17,9 +17,11 @@ module HappySeed
         gem 'meta-tags', :require => 'meta_tags'
         gem 'responders', '~> 2.0'
         gem 'bh'
+        gem 'simple_form'
 
         Bundler.with_clean_env do
           run "bundle install --without production"
+          run "rails generate simple_form:install --bootstrap"
         end
 
         remove_file 'app/views/layouts/application.html.erb'
@@ -36,11 +38,12 @@ module HappySeed
 HAML
         end
 
-        inject_into_file 'config/application.rb', before: "end\nend\n" do <<-'RUBY'
-  config.action_view.field_error_proc = Proc.new { |html_tag, instance| html_tag }
+        inject_into_file 'config/application.rb', before: "  end\nend\n" do <<-'RUBY'
+    config.action_view.field_error_proc = Proc.new { |html_tag, instance| html_tag }
     config.generators do |g|
       g.stylesheets = false
       g.scaffold_controller "scaffold_controller"
+      g.test_framework :rspec, fixture: true, fixture_replacement: :factory_girl, helper_specs: false, view_specs: false, routing_specs: false, controller_specs: false
     end
   
 RUBY

data/lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/application.scss

@@ -20,6 +20,9 @@
 @import 'bootstrap-sprockets';
 @import 'bootstrap';
 
+// Uncomment if you want to use the default bootstrap theme
+// @import 'bootstrap/theme';
+
 
 // --------------Global definitions--------------------
 // For example (add your own!!):
@@ -35,9 +38,10 @@
 // --------------Components----------------------------
 // Create your own and modify/extend Bootstrap's. For example:
 @import 'components/panel';
+@import 'components/profile_panels';
 
 
 // --------------Sections------------------------------
 // Page-specific styles. These should *only* be used as a last
 // resort if you really truly can't style your content more generally.
-@import 'sections/profile_page';
+// @import 'sections/profile_page';

data/lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/components/_profile_panels.scss

@@ -0,0 +1,62 @@
+// This is used by the devise generated views.
+// --------------Profile page section--------------------
+//
+// Styles specific to a single page. These should only be  used as
+// a LAST resort unless you're taking the symatic approach and
+// actually using this to describe the parts of your document.
+//
+// .profile-page {
+//   The less here the better!!
+// }
+
+// This is used by the devise generated views.
+.small_screen_flush {
+  @media (max-width: $screen-xs-max) {
+    padding-left: 0;
+    padding-right: 0;
+
+    .panel {
+      border-radius: 0;
+      border: none;
+      .panel-heading {
+        border-radius: 0;
+      }
+    }
+  }
+}
+
+.profile {
+  border: 0;
+  &.large_panel {
+    @extend .col-sm-9;
+    @extend .small_screen_flush;
+  }
+  &.sidebar {
+    @extend .col-sm-3;
+    @extend .small_screen_flush;
+  }
+
+  &.center {
+    @extend .col-lg-6;
+    @extend .col-lg-offset-3;
+
+    @extend .col-md-6;
+    @extend .col-md-offset-3;
+
+    @extend .col-sm-8;
+    @extend .col-sm-offset-2;
+
+    @extend .small_screen_flush;
+
+    .panel-footer {
+      @include clearfix;
+      .buttons {
+        float: right;
+      }
+
+      .links {
+        float: left;
+      }
+    }
+  }
+}

data/lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/components/_slideup_header.scss

@@ -0,0 +1,51 @@
+$slideup-navbar-height: $navbar-height !default;
+
+header.slideup {
+  position: static;
+
+  height: $slideup-navbar-height;
+
+  .navbar {
+    border:none;
+    @include box-shadow( 0 0 4px rgba(0, 0, 0, .14), 0 4px 8px rgba(0, 0, 0, .28) );
+    transition: background-color .2s, height .5s, box-shadow .5s;
+
+    .navbar-brand {
+      transition: all .2s;
+      transition-timing-function: ease-out;
+
+
+      text-transform: uppercase;
+      letter-spacing: 1px;
+    }
+
+    li > a {
+      transition: all .2s;
+      transition-timing-function: ease-out;
+
+      font-size: 10px;
+      text-transform: uppercase;
+      letter-spacing: 1px;
+    }
+  }
+
+  &.affix-top {
+    .navbar {
+      height: $slideup-navbar-height;
+      @include box-shadow( none );
+    }
+    .navbar-brand {
+      padding:  (($slideup-navbar-height - 20)/2) 15px;
+    }
+
+    .navbar-toggle {
+      margin-top: (($slideup-navbar-height - 20)/2);
+    }
+
+    li > a {
+      padding-top: (($slideup-navbar-height - 20)/2);
+      padding-bottom: (($slideup-navbar-height - 20)/2);
+      font-size: 12px;
+    }
+  }
+}

data/lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/shared/_grid.scss

@@ -1,14 +1,2 @@
 // --------------Grid------------------------------------------
 //
-
-// This is used by the devise generated views.
-.center-panel {
-  @extend .col-lg-6;
-  @extend .col-lg-offset-3;
-
-  @extend .col-md-6;
-  @extend .col-md-offset-3;
-
-  @extend .col-sm-8;
-  @extend .col-sm-offset-2;
-}

data/lib/generators/happy_seed/bootstrap/templates/app/views/application/_javascripts.html.haml

@@ -6,7 +6,10 @@
 -# Google Analytics
 - if !ENV['GOOGLE_ANALYTICS_SITE_ID'].blank?
   :javascript
-    var _gaq=[['_setAccount','#{ ENV['GOOGLE_ANALYTICS_SITE_ID'] }'],['_trackPageview']];
-    (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
-    g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
-    s.parentNode.insertBefore(g,s)}(document,'script'));
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', '#{ ENV['GOOGLE_ANALYTICS_SITE_ID'] }', 'auto');
+    ga('send', 'pageview');

data/lib/generators/happy_seed/bootstrap/templates/docs/README.01.bootstrap.rdoc

@@ -7,6 +7,7 @@ The happy_seed bootstrap generator
 
 * Installs bootstrap-sass
 * Installs modernizr-rails
+* Installs and configures simple_form
 * Organizes the app/assets directory
 * Organizes the app/views/layouts and app/views/application directories
 * Sets up some application_helper methods to make working with forms easier
@@ -20,6 +21,8 @@ Bootstrap should be the base of all our projects going forward.  This creates a
 
 The splash generator builds on this, but doesn't use the main "application.css" stylesheets or javascripts.  The layout here should be used for the application proper.
 
+Easier forms with simple_form.
+
 Better scaffolding means that it's easier to just whip up things to get started.  While you will obviously eventually rewrite all of this code, it's good to have working stuff to start with that doesn't look painful.
 
 ### Environment Variables

data/lib/generators/happy_seed/ckeditor/ckeditor_generator.rb

@@ -0,0 +1,31 @@
+require 'generators/happy_seed/happy_seed_generator'
+require 'generators/happy_seed/bootstrap/bootstrap_generator'
+
+module HappySeed
+  module Generators
+    class CkeditorGenerator < HappySeedGenerator
+      source_root File.expand_path('../templates', __FILE__)
+
+      def self.fingerprint
+        gem_available? 'ckeditor'
+      end
+
+      def install_html_email
+        return if already_installed
+
+        require_generator BootstrapGenerator
+
+        gem 'ckeditor'
+
+        Bundler.with_clean_env do
+          run "bundle install --without production"
+        end
+
+        inject_into_file "config/environments/production.rb", "  config.assets.precompile += Ckeditor.assets\n  config.assets.precompile += ['ckeditor/*']\n", before: "end\n"
+        inject_into_file "app/assets/javascripts/application.js", "\n//= require ckeditor/init", after: "//= require bootstrap-sprockets"
+
+        directory "."
+      end
+    end
+  end
+end

data/lib/generators/happy_seed/ckeditor/templates/docs/README.01.ckeditor.rdoc

@@ -0,0 +1,35 @@
+HappySeed Ckeditor Email Install
+=================
+
+### What does this do?
+
+* Includes ckeditor, a WYSIWYG editor for adding html to your documents. For a detailed explanation of everything you can do with ckeditor see the documentation for the gem [here.](https://github.com/galetahub/ckeditor)
+
+
+### Why do you want this?
+
+Easy html body editor for when you need to add html content through your admin panel/form/etc. Ckeditor is a great solution for this and makes it very easy.
+
+### Environment Variables
+
+n/a
+
+### What needs to be done?
+
+Pass in :ckeditor to simple_form.
+
+```
+$ rails g scaffold post title:string body:text 
+```
+
+```
+= simple_form_for(@post) do |f|
+  = f.error_notification
+
+  .form-inputs
+    = f.input :title
+    = f.input :body, as: :ckeditor
+
+  .form-actions
+    = f.button :submit
+```