happy_seed 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c24745a37c137a7c5bbbf197b783f85a648c2bb
-  data.tar.gz: d16da5cdce762fa346230941a7503a45dcffb363
+  metadata.gz: c7ef7ea1bc6b9e0dfddbc8f42c03cdf03a43a40d
+  data.tar.gz: 84a266a3e705dfcb617f2ce0bd716221068f862f
 SHA512:
-  metadata.gz: 048e4f10faaf60e1ffad9acdc824e570164f41e1eca9f29778a6a5f560ab63c6e92a0ae610c647c031a6c5662bb8dece54241bf6c61f8ba08c84983177a000b9
-  data.tar.gz: 18b760d9db4a4439b4d9e6ac33d6029a21ab4b7f0d750c73afdc3b865b0985b389ec74d8a25deedb1e64e6a67ce62ae143deb71ab6c1311a6074936b3e975673
+  metadata.gz: ac49c1eaf0031a4f3e82d606e1e71425797ddb325b83984b0d7ee21de3a2f1e911849e7c1364d64d1dbf3bb1aad688b653cd8f33db390f847ec1f2c0eee525fe
+  data.tar.gz: 5aedc6c9d70650e3c88b92750972a30d40636c3bbd2d8ab4f0c8567efaecef23b1a9e2beca5797ba61329bf94728b99171a3f390e3d779e4793066be8d704a02

data/happy_seed.rb

@@ -1,3 +1,5 @@
+require 'bundler'
+
 puts "Setting up basic template"
 puts
 
@@ -40,7 +42,7 @@ end
 packages = []
 
 Bundler.with_clean_env do
-  run "bundle install > /dev/null"
+  run "bundle install --without production"
 
   gsub_file "app/assets/javascripts/application.js", /= require turbolinks/, "require turbolinks"
 

data/lib/generators/happy_seed/admin/admin_generator.rb

@@ -10,7 +10,7 @@ module HappySeed
         gem 'dateslices'
 
         Bundler.with_clean_env do
-          run "bundle install > /dev/null"
+          run "bundle install --without production"
         end
 
         generate 'active_admin:install'

data/lib/generators/happy_seed/angular_install/angular_install_generator.rb

@@ -7,7 +7,7 @@ module HappySeed
         gem 'angularjs-rails'
 
         Bundler.with_clean_env do
-          run "bundle install"
+          run "bundle install --without production"
         end
 
         directory "app"

data/lib/generators/happy_seed/api/api_generator.rb

@@ -4,10 +4,10 @@ module HappySeed
       source_root File.expand_path('../templates', __FILE__)
 
       def install_device_invitable
-        unless gem_available?( "devise" )
+        unless gem_available?("devise")
           puts "The api generator requires devise"
 
-          if yes?( "Run happy_seed:devise now?" )
+          if yes?("Run happy_seed:devise now?")
             generate "happy_seed:devise"
           else
             exit
@@ -18,10 +18,10 @@ module HappySeed
         gem 'rspec_api_documentation', :groups => [:development, :test]
 
         Bundler.with_clean_env do
-          run "bundle install > /dev/null"
+          run "bundle install --without production"
         end
 
-        generate "model user_token user:belongs_to:index token installation_identifier:index push_token locked:boolean"
+        generate "model user_token user:belongs_to:index token installation_identifier:index push_token locked:boolean form_factor os"
         generate "migration add_user_tokens_count_to_users user_tokens_count:integer"
 
         directory '.'
@@ -44,10 +44,12 @@ module HappySeed
 "
         inject_into_class "app/models/user.rb", "User", "  has_many :user_tokens, dependent: :destroy\n"
 
-        gsub_file "app/models/user_token.rb", /belongs_to :user\n/,"  validates :user, presence: true
+        gsub_file "app/models/user_token.rb", /belongs_to :user\n/, "  validates :user, presence: true
   validates :token, presence: true, uniqueness: {case_sensitive: false}
   validates :installation_identifier, presence: true, uniqueness: {case_sensitive: false, scope: %w(user_id)}
   validates :push_token, allow_blank: true, uniqueness: {case_sensitive: false}
+  validates :form_factor, allow_blank: true, inclusion: {in: %w(smartphone tablet10 tablet7 desktop)}
+  validates :os, allow_blank: true, inclusion: {in: %w(ios android bb wp7)}
 
   scope :with_push_token, -> { where.not push_token: nil }
 
@@ -77,20 +79,21 @@ end"
         append_to_file 'spec/factories/users.rb', "\nFactoryGirl.define do
   factory :user_with_token, parent: :user do
     after :build do |user, evaluator|
-      user.user_tokens.build installation_identifier: Faker::Lorem.characters(10), push_token: Faker::Lorem.characters(10)
+      user.user_tokens.build installation_identifier: Faker::Lorem.characters(10), push_token: Faker::Lorem.characters(10),
+                             form_factor: %w(smartphone tablet10 tablet7 desktop).sample, os: %w(ios android bb wp7).sample
     end
   end
 end"
       end
 
       private
-        def gem_available?(name)
-          Gem::Specification.find_by_name(name)
-        rescue Gem::LoadError
-          false
-        rescue
-          Gem.available?(name)
-        end
+      def gem_available?(name)
+        Gem::Specification.find_by_name(name)
+      rescue Gem::LoadError
+        false
+      rescue
+        Gem.available?(name)
+      end
 
     end
   end

data/lib/generators/happy_seed/api/templates/app/controllers/api/v1/user_tokens_controller.rb

@@ -9,6 +9,8 @@ class Api::V1::UserTokensController < Api::V1::BaseController
           if user.active_for_authentication?
             user_token = user.user_tokens.where(installation_identifier: user_token_params[:installation_identifier]).first_or_initialize
             user_token.update push_token: user_token_params[:push_token]
+            user_token.update form_factor: user_token_params[:form_factor]
+            user_token.update os: user_token_params[:os]
             if user_token.persisted?
               format.json do
                 render json: {user_token: user_token_hash(user_token, user: true)}, status: :ok
@@ -74,6 +76,6 @@ class Api::V1::UserTokensController < Api::V1::BaseController
   private
 
   def user_token_params
-    params[:user_token].permit :email, :password, :installation_identifier, :push_token
+    params[:user_token].permit :email, :password, :installation_identifier, :push_token, :form_factor, :os
   end
 end

data/lib/generators/happy_seed/api/templates/spec/acceptance/api/v1/user_tokens_spec.rb

@@ -9,11 +9,15 @@ resource 'Token' do
     parameter :password, 'Password', required: true, scope: :user_token
     parameter :installation_identifier, 'Unique Installation Identifier', required: true, scope: :user_token
     parameter :push_token, 'Unique push token', required: true, scope: :user_token
+    parameter :form_factor, 'smartphone tablet10 tablet7 desktop', required: true, scope: :user_token
+    parameter :os, 'ios android bb wp7', required: true, scope: :user_token
 
     let(:email) { user.email }
     let(:password) { user.password }
     let(:installation_identifier) { Faker::Lorem.characters 10 }
     let(:push_token) { Faker::Lorem.characters 10 }
+    let(:form_factor) { %w(smartphone tablet10 tablet7 desktop).sample }
+    let(:os) { %w(ios android bb wp7).sample }
 
     example_request 'sign in' do
       response_json = JSON.parse response_body

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

@@ -11,7 +11,7 @@ module HappySeed
         gem 'rails_12factor'
 
         Bundler.with_clean_env do
-          run "bundle install > /dev/null"
+          run "bundle install --without production"
         end
 
         directory '.'

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

@@ -13,7 +13,7 @@ module HappySeed
         gem 'bh'
 
         Bundler.with_clean_env do
-          run "bundle install > /dev/null"
+          run "bundle install --without production"
         end
 
         remove_file 'app/views/layouts/application.html.erb'

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

@@ -0,0 +1,43 @@
+// The organization of this CSS is heavily inspired by GitHub's CSS
+// stylesheet guidelines.
+//
+//   See: https://github.com/styleguide/css
+//   See also: https://medium.com/@fat/mediums-css-is-actually-pretty-fucking-good-b8e2a6c78b06
+//
+// See Bootstrap's CSS at:
+//   https://github.com/twbs/bootstrap-sass/tree/master/assets/stylesheets/bootstrap
+// or
+//   $ bundle show bootstrap-sass
+//
+
+
+// These both need to be imported before bootstrap:
+@import 'globals/fonts';
+@import 'globals/variables';
+
+
+// --------------Bootstrap-----------------------------
+@import 'bootstrap-sprockets';
+@import 'bootstrap';
+
+
+// --------------Global definitions--------------------
+// For example (add your own!!):
+@import 'globals/mixins';
+
+
+// --------------Shared styles-------------------------
+// Common base CSS modifications. For example:
+@import 'shared/buttons';
+@import 'shared/grid';
+
+
+// --------------Components----------------------------
+// Create your own and modify/extend Bootstrap's. For example:
+@import 'components/panel';
+
+
+// --------------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';

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

@@ -0,0 +1,14 @@
+// --------------Panels------------------------------
+// If you want to chnage the look of panels, you should
+// go to http://getbootstrap.com/customize first and see
+// if there is a built-in panel variables.
+//
+// If not, then modify the look or extend panels here.
+//
+//
+// Example:
+//
+// .panel.inverted-panel {
+//   background-color: $panel-inverse-bg;
+//   color: $panel-inverse-color;
+// }

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

@@ -0,0 +1,3 @@
+// --------------Fonts------------------------------
+
+@import url(http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,700,300,600);

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

@@ -0,0 +1,7 @@
+// --------------Mixins------------------------------
+// A great place to add your own SASS mixins!
+//
+// @mixin some-effect( $var1, $var2 ) {
+//   ???
+// }
+

data/lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/{variables.css.scss → globals/_variables.scss}

@@ -1,4 +1,7 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,700,300,600);
+// --------------Variables------------------------------
+// Modify Bootstrap variables here and create your own.
+// 
+// Variable list: http://getbootstrap.com/customize/
 
 $font-family-sans-serif: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif;
 

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

@@ -0,0 +1,9 @@
+// --------------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!!
+// }

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

@@ -0,0 +1,24 @@
+// --------------Buttons---------------------------------------------------
+// This is an example of styles that modify built-in bootstrap components.
+// First of all, Bootstrap gives you six different built-in button styles.
+// Use them!
+//
+// See: http://getbootstrap.com/css/#buttons
+//
+//
+// Need to style all of your buttons? Add a shadow to ALL of your buttons:
+
+// .btn {
+//   box-shadow: 2px 2px 0 rgba(0,0,0,0.5);
+// }
+
+
+// If the built-in button types aren't enough, create your own, but DO NOT
+// style the colors by hand. I know you can. but you'll get the hover/active
+// states wrong or waste a lot of time trying.
+//
+// See: https://github.com/twbs/bootstrap-sass/blob/master/assets/stylesheets/bootstrap/_buttons.scss#L57
+
+// .btn-primary.inverse {
+//   @include button-variant($btn-primary-inverse-color, $btn-primary-inverse-bg, $btn-primary-inverse-border);
+// }

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

@@ -0,0 +1,14 @@
+// --------------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/devise/devise_generator.rb

@@ -13,7 +13,7 @@ module HappySeed
         gem 'devise', '~> 3.4'
 
         Bundler.with_clean_env do
-          run "bundle install > /dev/null"
+          run "bundle install --without production"
         end
 
         run 'rails generate devise:install'

data/lib/generators/happy_seed/devise_invitable/devise_invitable_generator.rb

@@ -17,7 +17,7 @@ module HappySeed
         gem 'devise_invitable'
 
         Bundler.with_clean_env do
-          run "bundle install > /dev/null"
+          run "bundle install --without production"
           run 'rake db:migrate'
         end
 

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

@@ -11,7 +11,7 @@ module HappySeed
         gem 'omniauth-facebook'
 
         Bundler.with_clean_env do
-          run "bundle install > /dev/null"
+          run "bundle install --without production"
         end
 
         directory 'docs'

data/lib/generators/happy_seed/github/github_generator.rb

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

data/lib/generators/happy_seed/googleoauth/googleoauth_generator.rb

@@ -13,7 +13,7 @@ module HappySeed
         gem 'google-api-client', require: "google/api_client"
 
         Bundler.with_clean_env do
-          run "bundle install > /dev/null"
+          run "bundle install --without production"
         end
 
         directory 'docs'

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 > /dev/null"
+          run "bundle install --without production"
         end
 
         directory "docs"

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

@@ -15,7 +15,7 @@ module HappySeed
         end
 
         Bundler.with_clean_env do
-          run "bundle install > /dev/null"
+          run "bundle install --without production"
         end
       end
     end

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

@@ -25,7 +25,7 @@ module HappySeed
         gem 'omniauth'
 
         Bundler.with_clean_env do
-          run "bundle install > /dev/null"
+          run "bundle install --without production"
         end
 
         generate 'model identity user:references provider:string accesstoken:string uid:string name:string email:string nickname:string image:string phone:string urls:string'

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

@@ -19,14 +19,14 @@ module HappySeed
         gem 'gibbon'
 
         Bundler.with_clean_env do
-          run "bundle install > /dev/null"
+          run "bundle install --without production"
         end
 
         remove_file 'public/index.html'
 
         gsub_file "config/routes.rb", /\s*root.*\n/, "\n"
         route "root 'splash#index'"
-        route "get '/spash' => 'splash#index'"
+        route "get '/splash' => 'splash#index'"
         route "post '/signup' => 'splash#signup', as: :splash_signup"
 
         directory 'app'

data/lib/generators/happy_seed/splash/templates/app/controllers/splash_controller.rb

@@ -25,7 +25,7 @@ class SplashController < ApplicationController
       rescue StandardError => e
         @error = true
 
-        if e.message =~ /is already subscribed to list/
+        if e.message =~ /is already subscribed to the list/
           @message = "You're already signed up to receive updates. Thanks for your enthusiasm!"
         else
           @message = "Oops! Looks like we ran into an error. How embarrassing. Please try again later!"

data/lib/generators/happy_seed/static/static_generator.rb

@@ -6,7 +6,7 @@ module HappySeed
       include Thor::Actions
       source_root File.expand_path('../templates', __FILE__)
       def generate_rails_plugin
-        source_root = File.expand_path('../templates', __FILE__)
+        # source_root = File.expand_path('../templates', __FILE__)
         args.shift
         app_name = args.shift
 

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

@@ -2,11 +2,11 @@
 # the following line to use "http://" instead
 source 'https://rubygems.org'
 
-gem "middleman", "~>3.3.7"
+gem "middleman", "~>3.3"
 gem "middleman-deploy"
 gem "middleman-autometatags"
 gem "middleman-livereload", "~> 3.1.0"
-gem 'middleman-bootstrap-navbar'
+gem "bh"
 
 gem "bootstrap-sass"
 gem "jquery-middleman"

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

@@ -0,0 +1,158 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (1.4.0)
+    activesupport (4.1.10)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    autoprefixer-rails (5.2.0)
+      execjs
+      json
+    bh (1.3.3)
+      actionpack
+      activesupport
+    bootstrap-sass (3.3.4.1)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.2.19)
+    builder (3.2.2)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    chunky_png (1.3.4)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.9.1.1)
+    compass (1.0.3)
+      chunky_png (~> 1.2)
+      compass-core (~> 1.0.2)
+      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.3)
+      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.7)
+    execjs (2.5.2)
+    ffi (1.9.8)
+    haml (4.0.6)
+      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.7.0)
+    jquery-middleman (3.0.4)
+      thor (>= 0.14, < 2.0)
+    json (1.8.2)
+    kramdown (1.7.0)
+    listen (2.10.0)
+      celluloid (~> 0.16.0)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    middleman (3.3.12)
+      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.12)
+      middleman-sprockets (>= 3.1.2)
+      sass (>= 3.4.0, < 4.0)
+      uglifier (~> 2.5)
+    middleman-autometatags (0.0.2)
+      middleman-core (>= 3.0.0)
+    middleman-core (3.3.12)
+      activesupport (~> 4.1.0)
+      bundler (~> 1.1)
+      erubis
+      hooks (~> 0.3)
+      i18n (~> 0.7.0)
+      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 (1.0.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.4.2)
+      middleman-core (>= 3.3)
+      sprockets (~> 2.12.1)
+      sprockets-helpers (~> 1.1.0)
+      sprockets-sass (~> 1.3.0)
+    minitest (5.6.1)
+    multi_json (1.11.0)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    padrino-helpers (0.12.5)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.12.5)
+      tilt (~> 1.4.1)
+    padrino-support (0.12.5)
+      activesupport (>= 3.1)
+    ptools (1.3.2)
+    rack (1.6.1)
+    rack-livereload (0.3.15)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rb-fsevent (0.9.5)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    sass (3.4.14)
+    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.3.1)
+      sprockets (~> 2.0)
+      tilt (~> 1.1)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (1.4.1)
+    timers (4.0.1)
+      hitimes
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uber (0.0.13)
+    uglifier (2.7.1)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bh
+  bootstrap-sass
+  builder (~> 3.0)
+  jquery-middleman
+  middleman (~> 3.3)
+  middleman-autometatags
+  middleman-deploy
+  middleman-livereload (~> 3.1.0)
+  tzinfo-data
+  wdm (~> 0.1.0)

data/lib/generators/happy_seed/static/templates/config.rb

@@ -17,8 +17,8 @@ activate :autometatags
 # Automatic image dimensions on image_tag helper
 # activate :automatic_image_sizes
 
-# Easier bootstrap navbars
-activate :bootstrap_navbar
+# Bootstrap helpers
+activate :bh
 
 configure :development do
   activate :livereload

data/lib/generators/happy_seed/static/templates/source/index.html.haml

@@ -22,11 +22,11 @@ title: Welcome to Happy Seeds Static Site
         The following middleman components are installed
 
         %ul
-          %li middleman
-          %li middleman-deploy
-          %li middleman-meta-tags
-          %li middleman-livereload
-          %li middleman-bootstrap-navbar
+          %li= link_to "middleman", "https://middlemanapp.com"
+          %li= link_to "middleman-deploy", "https://github.com/middleman-contrib/middleman-deploy"
+          %li= link_to "middleman-meta-tags", "https://github.com/HappyFunCorp/middleman-autometatags"
+          %li= link_to "middleman-livereload", "https://github.com/middleman/middleman-livereload"
+          %li= link_to "bh", "https://github.com/Fullscreen/bh"
 
 
         = link_to "Read Middleman Documentation", "http://middlemanapp.com/"
@@ -41,7 +41,7 @@ title: Welcome to Happy Seeds Static Site
           %li CNAME file gets generated if it exists for github pages subdomaining
           %li data/site.yml file for default site meta data
           %li meta_tags is enabled with the auto_meta tagger
-          %li Bootstrap nav bar helpers are actived
+          %li Bootstrap helpers
           %li Livereload is on for development
           %li Asset cleanup is on for build
           %li Deploy to github pages setup by default

data/lib/generators/happy_seed/static/templates/source/layouts/_main_header.haml

@@ -1,16 +1,11 @@
-= navbar fixed: :top do
-  = navbar_header brand: data['site']['title'], brand_link: '/'
-  = navbar_collapse do
-    = navbar_group class: 'foo', id: 'menu' do
-      = navbar_text 'Pick an option:'
-      = navbar_item "Home", '/'
-      = navbar_item '/contact' do
+= navbar position: :top do
+  = vertical do
+    = link_to data['site']['title'], '/'
+  = horizontal do
+    = nav do
+      = link_to "Home", '/'
+      = link_to '/contact' do    
         %span.glyphicon.glyphicon-hand-right
         Contact Us!
-      = navbar_dropdown "Stuff" do
-        = navbar_dropdown_header 'Great stuff!'
-        = navbar_item "One", '/one'
-        = navbar_item "Two", '/two'
-        = navbar_item "Three", '/three'
-    = navbar_group align: 'right' do
-      = navbar_item "About Us", '/about-us'
+    = nav class: 'navbar-right' do
+      = link_to "About Us", '/about-us'

data/lib/generators/happy_seed/static/templates/source/stylesheets/application.css.scss

@@ -1,5 +1,7 @@
 @import "bootstrap";
 
+$sticky_footer_height: 60px;
+
 body {
   padding-top: $navbar-height + 20;
 }
@@ -10,12 +12,16 @@ html.sticky {
   min-height: 100%;
 }
 
+.sticky body {
+  margin-bottom: $sticky_footer_height;
+}
+
 .sticky .footer {
   position: absolute;
   bottom: 0;
   width: 100%;
   /* Set the fixed height of the footer here */
-  height: 60px;
+  height: $sticky_footer_height;
   background-color: #f5f5f5;
 
   .text-muted {

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

@@ -2,9 +2,9 @@
 # the following line to use "http://" instead
 source 'https://rubygems.org'
 
-gem "middleman", "~>3.3.7"
+gem "middleman", "~>3.3"
 gem "middleman-deploy"
-gem "middleman-blog", "~> 3.5.3"
+gem "middleman-blog", "~> 3.5"
 gem "middleman-blog-drafts"
 gem "middleman-autometatags"
 gem "middleman-livereload", "~> 3.1.0"

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

@@ -1,33 +1,37 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.8)
+    activesupport (4.1.10)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
-    bootstrap-navbar (2.2.2)
+    addressable (2.3.8)
+    autoprefixer-rails (5.2.0)
+      execjs
+      json
+    bootstrap-navbar (2.2.4)
       gem_config (~> 0.3)
-    bootstrap-sass (3.3.1.0)
-      sass (~> 3.2)
+    bootstrap-sass (3.3.4.1)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.2.19)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    chunky_png (1.3.3)
-    coffee-script (2.3.0)
+    chunky_png (1.3.4)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
-    compass (1.0.1)
+    coffee-script-source (1.9.1.1)
+    compass (1.0.3)
       chunky_png (~> 1.2)
-      compass-core (~> 1.0.1)
+      compass-core (~> 1.0.2)
       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)
+    compass-core (1.0.3)
       multi_json (~> 1.0)
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
@@ -36,38 +40,38 @@ GEM
       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)
+    eventmachine (1.0.7)
+    execjs (2.5.2)
+    ffi (1.9.8)
     gem_config (0.3.1)
-    haml (4.0.5)
+    haml (4.0.6)
       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)
+    i18n (0.7.0)
     jquery-middleman (3.0.4)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    kramdown (1.5.0)
-    listen (2.8.2)
-      celluloid (>= 0.15.2)
+    json (1.8.2)
+    kramdown (1.7.0)
+    listen (2.10.0)
+      celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    middleman (3.3.7)
+    middleman (3.3.12)
       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-core (= 3.3.12)
       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)
@@ -79,12 +83,12 @@ GEM
     middleman-bootstrap-navbar (2.0.0)
       bootstrap-navbar (~> 2.0)
       middleman-core (>= 3.0)
-    middleman-core (3.3.7)
+    middleman-core (3.3.12)
       activesupport (~> 4.1.0)
       bundler (~> 1.1)
       erubis
       hooks (~> 0.3)
-      i18n (~> 0.6.9)
+      i18n (~> 0.7.0)
       listen (>= 2.7.9, < 3.0)
       padrino-helpers (~> 0.12.3)
       rack (>= 1.4.5, < 2.0)
@@ -100,32 +104,32 @@ GEM
       middleman-core (>= 3.0.2)
       multi_json (~> 1.0)
       rack-livereload
-    middleman-sprockets (3.3.10)
-      middleman-core (~> 3.3)
+    middleman-sprockets (3.4.2)
+      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)
+      sprockets-sass (~> 1.3.0)
+    minitest (5.7.0)
+    multi_json (1.11.0)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
-    padrino-helpers (0.12.4)
+    net-ssh (2.9.2)
+    padrino-helpers (0.12.5)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.4)
+      padrino-support (= 0.12.5)
       tilt (~> 1.4.1)
-    padrino-support (0.12.4)
+    padrino-support (0.12.5)
       activesupport (>= 3.1)
-    ptools (1.2.6)
-    rack (1.5.2)
+    ptools (1.3.2)
+    rack (1.6.1)
     rack-livereload (0.3.15)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rb-fsevent (0.9.4)
+    rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    sass (3.4.9)
+    sass (3.4.14)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -133,18 +137,18 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    sprockets-sass (1.2.0)
+    sprockets-sass (1.3.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     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)
+    uber (0.0.13)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
@@ -155,9 +159,9 @@ DEPENDENCIES
   bootstrap-sass
   builder (~> 3.0)
   jquery-middleman
-  middleman (~> 3.3.7)
+  middleman (~> 3.3)
   middleman-autometatags
-  middleman-blog (~> 3.5.3)
+  middleman-blog (~> 3.5)
   middleman-blog-drafts
   middleman-bootstrap-navbar
   middleman-deploy

data/lib/generators/happy_seed/static_blog/templates/source/stylesheets/application.css.scss

@@ -1,5 +1,7 @@
 @import "bootstrap";
 
+$sticky_footer_height: 60px;
+
 body {
   padding-top: $navbar-height + 20;
 }
@@ -10,12 +12,16 @@ html.sticky {
   min-height: 100%;
 }
 
+.sticky body {
+  margin-bottom: $sticky_footer_height;
+}
+
 .sticky .footer {
   position: absolute;
   bottom: 0;
   width: 100%;
   /* Set the fixed height of the footer here */
-  height: 60px;
+  height: $sticky_footer_height;
   background-color: #f5f5f5;
 
   .text-muted {
@@ -24,8 +30,12 @@ html.sticky {
   }
 
   .social {
-    float: right;
-    font-size: 1.5em;
+    display: none;
+    @media (min-width: $screen-sm-min) {
+      float: right;
+      font-size: 1.5em;
+      display: block;
+    }
     a {
       color: white;
     }
@@ -142,6 +152,8 @@ code {
 
 
 .timeline {
+  @extend .container;
+
   margin-top: 2em;
 
   .post {

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 > /dev/null"
+          run "bundle install --without production"
         end
 
         add_omniauth :twitter

data/lib/happy_seed/version.rb

@@ -1,3 +1,3 @@
 module HappySeed
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy_seed
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Will Schenk
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: HappySeed is a project that will build up a rails apps using some common
@@ -66,9 +66,6 @@ files:
 - Rakefile
 - bin/happy_seed
 - happy_seed.rb
-- lib/.DS_Store
-- lib/generators/.DS_Store
-- lib/generators/happy_seed/.DS_Store
 - lib/generators/happy_seed/admin/admin_generator.rb
 - lib/generators/happy_seed/admin/templates/app/admin/campaigns.rb
 - lib/generators/happy_seed/admin/templates/app/admin/dashboard.rb
@@ -102,9 +99,7 @@ files:
 - lib/generators/happy_seed/api/templates/spec/acceptance/api/v1/configurations_spec.rb
 - lib/generators/happy_seed/api/templates/spec/acceptance/api/v1/user_tokens_spec.rb
 - lib/generators/happy_seed/api/templates/spec/acceptance/api/v1/users_spec.rb
-- lib/generators/happy_seed/base/.DS_Store
 - lib/generators/happy_seed/base/base_generator.rb
-- lib/generators/happy_seed/base/templates/.DS_Store
 - lib/generators/happy_seed/base/templates/.env
 - lib/generators/happy_seed/base/templates/.foreman
 - lib/generators/happy_seed/base/templates/Procfile
@@ -114,14 +109,19 @@ files:
 - lib/generators/happy_seed/base/templates/config/unicorn.rb
 - lib/generators/happy_seed/base/templates/docs/README.00.base.rdoc
 - lib/generators/happy_seed/base/templates/lib/tasks/haml2erb.rake
-- lib/generators/happy_seed/base/templates/spec/.DS_Store
 - lib/generators/happy_seed/base/templates/spec/controllers/application_controller_spec.rb
 - lib/generators/happy_seed/base/templates/spec/controllers/setup_controller_spec.rb
 - lib/generators/happy_seed/base/templates/spec/support/controller_helpers.rb
 - lib/generators/happy_seed/bootstrap/bootstrap_generator.rb
 - lib/generators/happy_seed/bootstrap/templates/app/assets/javascripts/application.js
-- lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/application.css.scss
-- lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/variables.css.scss
+- lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/application.scss
+- lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/components/_panel.scss
+- lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/globals/_fonts.scss
+- lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/globals/_mixins.scss
+- lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/globals/_variables.scss
+- lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/sections/_profile_page.scss
+- lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/shared/_buttons.scss
+- lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/shared/_grid.scss
 - lib/generators/happy_seed/bootstrap/templates/app/helpers/application_helper.rb
 - lib/generators/happy_seed/bootstrap/templates/app/views/application/_chromeframe.html.haml
 - lib/generators/happy_seed/bootstrap/templates/app/views/application/_flashes.html.haml
@@ -146,7 +146,6 @@ files:
 - lib/generators/happy_seed/devise/templates/app/views/devise/registrations/new.html.haml
 - lib/generators/happy_seed/devise/templates/app/views/devise/sessions/new.html.haml
 - lib/generators/happy_seed/devise/templates/docs/README.03.devise.rdoc
-- lib/generators/happy_seed/devise/templates/spec/.DS_Store
 - lib/generators/happy_seed/devise/templates/spec/factories/users.rb
 - lib/generators/happy_seed/devise/templates/spec/features/forgot_password_spec.rb
 - lib/generators/happy_seed/devise/templates/test/mailers/previews/devise_preview.rb
@@ -158,9 +157,7 @@ files:
 - lib/generators/happy_seed/facebook/templates/docs/README.06.facebook.rdoc
 - lib/generators/happy_seed/github/github_generator.rb
 - lib/generators/happy_seed/github/templates/docs/README.06.github.rdoc
-- lib/generators/happy_seed/googleoauth/.DS_Store
 - lib/generators/happy_seed/googleoauth/googleoauth_generator.rb
-- lib/generators/happy_seed/googleoauth/templates/.DS_Store
 - lib/generators/happy_seed/googleoauth/templates/add_refresh_token_to_identity.rb
 - lib/generators/happy_seed/googleoauth/templates/app/models/google_apps_client.rb
 - lib/generators/happy_seed/googleoauth/templates/docs/README.06.googleoauth.rdoc
@@ -170,7 +167,6 @@ files:
 - lib/generators/happy_seed/jazz_hands/jazz_hands_generator.rb
 - lib/generators/happy_seed/jazz_hands/templates/config/initializers/jazz_hands.rb
 - lib/generators/happy_seed/jazz_hands/templates/docs/README.12.jazz_hands.rdoc
-- lib/generators/happy_seed/omniauth/.DS_Store
 - lib/generators/happy_seed/omniauth/omniauth_generator.rb
 - lib/generators/happy_seed/omniauth/templates/app/controllers/omniauth_callbacks_controller.rb
 - lib/generators/happy_seed/omniauth/templates/app/controllers/registrations_controller.rb
@@ -201,6 +197,7 @@ files:
 - lib/generators/happy_seed/static/static_generator.rb
 - lib/generators/happy_seed/static/templates/.gitignore
 - lib/generators/happy_seed/static/templates/Gemfile
+- lib/generators/happy_seed/static/templates/Gemfile.lock
 - lib/generators/happy_seed/static/templates/config.rb
 - lib/generators/happy_seed/static/templates/data/site.yml
 - lib/generators/happy_seed/static/templates/source/images/.gitkeep
@@ -246,7 +243,6 @@ files:
 - lib/generators/happy_seed/static_blog/templates/source/stylesheets/fonts/socicon-webfont.woff
 - lib/generators/happy_seed/static_blog/templates/source/stylesheets/socicons.css
 - lib/generators/happy_seed/static_blog/templates/source/tag.html.haml
-- lib/generators/happy_seed/twitter/templates/.DS_Store
 - lib/generators/happy_seed/twitter/templates/docs/README.05.twitter.rdoc
 - lib/generators/happy_seed/twitter/twitter_generator.rb
 - lib/happy_seed.rb
@@ -283,8 +279,6 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -301,17 +295,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: HappySeed is a project that will build up a rails apps using some common
@@ -345,8 +339,6 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config.ru
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html

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

@@ -1,19 +0,0 @@
-//-----------------------------------------
-// Variables, customize bootstrap here
-//-----------------------------------------
-@import 'variables';
-
-@import 'bootstrap-sprockets';
-@import 'bootstrap';
-
-// 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/test/dummy/log/test.log

@@ -1,15 +0,0 @@
-   (0.1ms)  begin transaction
--------------------------
-HappySeedTest: test_truth
--------------------------
-   (0.0ms)  rollback transaction
-   (0.1ms)  begin transaction
--------------------------
-HappySeedTest: test_truth
--------------------------
-   (0.0ms)  rollback transaction
-   (0.1ms)  begin transaction
--------------------------
-HappySeedTest: test_truth
--------------------------
-   (0.0ms)  rollback transaction