blueberry_rails 0.3.10 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5596f930c3e53e38e875c66416bc9392965523c8
-  data.tar.gz: e2591af5b3a01d05746ee80085c723946ae4c7a2
+  metadata.gz: 2b45cceda5339e79bf4160f739be691e6b4e1401
+  data.tar.gz: 8ff940fa7c8c36af1de0a9d5ea4e822e0c7b5548
 SHA512:
-  metadata.gz: c22615911ac5ed27aea09cd160bff1bc1591ae8d9d45ddb20bbba44064d9b6b91158b47190def8843fda61d563483e1d5b191215134128bcd191adb6ab5e5112
-  data.tar.gz: 80afcd4d330b76fcdcb0b5447f4ebfc85e30ce2d2e6e76928d6e6debf942a8faac541bd15d7fc3965806ec566a3c13d0be64fdb70291543a1022cf48f09d0f4c
+  metadata.gz: dcbe8a8c0b1904375a7f9225ba491cb6d71de755ccf922bd62e80cd49b7d6cf3e760da4b7f57332ddfb7ea90cd4d8086ffdabf697e15939e95bbd249f8d4ca14
+  data.tar.gz: c34444a140b05419785c9aff70aa42bc0f6a53a4b805d5d0ca12d5912e8c3a74b4955e3192f6976df9ca85afceb88894049843fe652e52eb891a3b6a62dab15c

data/README.md

@@ -1,6 +1,8 @@
-# Blueberry Rails [![Build Status](https://secure.travis-ci.org/blueberryapps/blueberry_rails.png?branch=master)](http://travis-ci.org/blueberryapps/blueberry_rails)
+# Blueberry Rails [![CircleCI](https://circleci.com/gh/blueberryapps/blueberry_rails.svg?style=svg&circle-token=20a1f7352480b65bd50f523291beed7bfc082b07)](https://circleci.com/gh/blueberryapps/blueberry_rails)
 
-A Rails application template used at Blueberry Apps.
+A Rails application template used at Blueberry.
+
+[![blueberry](https://www.google.com/a/blueberryapps.com/images/logo.gif)](http://www.blueberry.cz)
 
 ## Installation
 

data/blueberry_rails.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.version       = BlueberryRails::VERSION
   gem.authors       = ['BlueberryApps']
   gem.email         = ['jzajpt@blueberry.cz']
-  gem.description   = %q{A Rails app template by BlueberryApps }
+  gem.description   = %q{A Rails app template by BlueberryApps}
   gem.summary       = %q{A Rails app template by BlueberryApps}
   gem.homepage      = 'https://github.com/blueberryapps/blueberry_rails'
   gem.license       = 'MIT'

data/circle.yml

@@ -0,0 +1,4 @@
+test:
+  override:
+    - bundle exec rake:
+        parallel: true

data/lib/blueberry_rails/action_helpers.rb

@@ -1,9 +1,8 @@
 module BlueberryRails
   module ActionHelpers
-
     def action_mailer_host(rails_env, host)
-      host_config = "config.action_mailer.default_url_options = { host: '#{host}' }"
-      configure_environment(rails_env, host_config)
+      host = "config.action_mailer.default_url_options = { host: '#{host}' }"
+      configure_environment(rails_env, host)
     end
 
     def configure_environment(rails_env, config)

data/lib/blueberry_rails/app_builder.rb

@@ -25,11 +25,6 @@ module BlueberryRails
                        after: "  secret_key_base: <%= ENV[\"SECRET_KEY_BASE\"] %>\n"
     end
 
-    def disable_xml_params
-      copy_file 'disable_xml_params.rb',
-                'config/initializers/disable_xml_params.rb'
-    end
-
     def hound_config
       copy_file '../.hound.yml', '.hound.yml'
       copy_file '../.rubocop.yml', '.rubocop.yml'
@@ -95,7 +90,7 @@ module BlueberryRails
 
       replace_in_file 'config/initializers/assets.rb',
         '# Rails.application.config.assets.precompile += %w( search.js )',
-        'Rails.application.config.assets.precompile += %w( print.css ie.css )'
+        'Rails.application.config.assets.precompile += %w( ie.css )'
 
       if options[:administration]
         directory 'admin_assets', 'app/assets'
@@ -106,11 +101,6 @@ module BlueberryRails
       end
     end
 
-    def copy_print_style
-      copy_file 'assets/stylesheets/print.sass',
-                'app/assets/stylesheets/print.sass'
-    end
-
     def copy_initializers
       if options[:translation_engine]
         copy_file 'config/initializers/translation_engine.rb',
@@ -133,6 +123,7 @@ module BlueberryRails
     end
 
     def create_puma_config
+      remove_file 'config/puma.rb'
       copy_file 'puma.rb', 'config/puma.rb'
     end
 
@@ -205,13 +196,13 @@ module BlueberryRails
     end
 
     def configure_i18n
-      replace_in_file 'config/application.rb',
-                      "# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]",
-                      "config.i18n.load_path += Dir[Rails.root.join 'config/locales/**/*.{rb,yml}']"
+      inject_into_file "config/application.rb",
+                       "\n\n    config.i18n.load_path += Dir[Rails.root.join 'config/locales/**/*.{rb,yml}']",
+                       before: "\n    # Settings"
 
-      replace_in_file 'config/application.rb',
-                      '# config.i18n.default_locale = :de',
-                      "config.i18n.available_locales = [:cs, :en]\n    config.i18n.default_locale = :cs"
+      inject_into_file 'config/application.rb',
+                       "\n\n    config.i18n.available_locales = [:cs, :en]\n    config.i18n.default_locale = :cs",
+                       before: "\n    # Settings"
 
       remove_file 'config/locales/en.yml'
       directory 'locales', 'config/locales'
@@ -237,12 +228,6 @@ module BlueberryRails
       add_file '.ruby-version', "#{version}\n"
     end
 
-    def remove_routes_comment_lines
-      replace_in_file 'config/routes.rb',
-                      /Rails.application\.routes\.draw do.*end/m,
-                      "Rails.application.routes.draw do\nend"
-    end
-
     def install_devise
       generate 'devise:install'
       generate_root_controller_and_route
@@ -263,14 +248,6 @@ module BlueberryRails
                   'config/locales/en/en.devise.yml'
     end
 
-    def setup_capistrano
-      copy_file 'Capfile', 'Capfile'
-      template 'deploy.rb.erb', 'config/deploy.rb'
-      template 'deploy_production.rb.erb', 'config/deploy/production.rb'
-      template 'deploy_staging.rb.erb', 'config/deploy/staging.rb'
-      template 'capistrano_dotenv.cap', 'lib/capistrano/tasks/dotenv.cap'
-    end
-
     def configure_simple_form
       if options[:bootstrap]
         generate 'simple_form:install --bootstrap'
@@ -357,7 +334,6 @@ module BlueberryRails
 
     def generate_root_controller_and_route
       generate 'controller', 'root index'
-      remove_routes_comment_lines
       inject_into_file 'config/routes.rb',
                        "  root to: 'root#index'\n",
                        after: "Rails.application.routes.draw do\n"
@@ -387,9 +363,9 @@ module BlueberryRails
         "config.assets.paths << Rails.root.join('public', 'assets', 'javascripts')\n"
       end
 
-      replace_in_file 'config/environments/development.rb',
-                      'config.assets.digest = true',
-                      'config.assets.digest = false'
+      inject_into_file 'config/environments/development.rb',
+                       "config.assets.digest = false\n",
+                       before: 'config.assets.quiet = true'
 
       copy_file 'gulp/rev_manifest.rb', 'config/initializers/rev_manifest.rb'
       copy_file 'gulp/global.coffee',   'gulp/assets/javascripts/global.coffee'

data/lib/blueberry_rails/generators/app_generator.rb

@@ -31,9 +31,6 @@ module BlueberryRails
     class_option :gulp, type: :boolean, aliases: '-g', default: false,
       desc: 'Include Gulp asset pipeline'
 
-    class_option :capistrano, type: :boolean, aliases: '-c', default: false,
-      desc: 'Include Capistrano'
-
     class_option :administration, type: :boolean, aliases: '-a', default: false,
       desc: 'Include Admin part of application'
 
@@ -149,16 +146,11 @@ module BlueberryRails
     end
 
     def create_assets
-      if options[:bootstrap]
-        build :copy_assets_directory
-      else
-        build :copy_print_style
-      end
+      build :copy_assets_directory if options[:bootstrap]
     end
 
     def configure_app
       build :secret_token
-      build :disable_xml_params
       build :setup_mailer_hosts
       build :create_pryrc
       build :create_procfile
@@ -189,10 +181,6 @@ module BlueberryRails
       else
         build :create_root_page
       end
-      if options[:capistrano]
-        say 'Setting up Capistrano'
-        build :setup_capistrano
-      end
     end
 
     def setup_git

data/lib/blueberry_rails/version.rb

@@ -1,7 +1,7 @@
 module BlueberryRails
-  VERSION = '0.3.10'
+  VERSION = '0.4.0'
 
   RUBY_VERSION = '2.3.1'
 
-  RAILS_VERSION = '4.2.7'
+  RAILS_VERSION = '5.0.0.1'
 end

data/spec/blueberry_rails_spec.rb

@@ -6,8 +6,6 @@ class BlueberryRailsTest < Minitest::Test
 
   def setup
     remove_project_directory
-    cmd 'dropdb test_project_development'
-    cmd 'dropdb test_project_test'
   end
 
   def run
@@ -38,17 +36,6 @@ class BlueberryRailsTest < Minitest::Test
     assert run_rake
   end
 
-  def test_rake_runs_with_capistrano_option
-    create_project '--capistrano'
-
-    assert_file_have_content 'Gemfile', 'capistrano'
-
-    assert_exist_file 'Capfile'
-    assert_exist_file 'config/deploy.rb'
-    assert_exist_file 'config/deploy/production.rb'
-    assert_exist_file 'config/deploy/staging.rb'
-  end
-
   def test_rake_runs_with_no_devise_option
     create_project '--no-devise'
 

data/spec/support/blueberry_rails_helpers.rb

@@ -13,9 +13,7 @@ module BlueberryRailsHelpers
 
   def run_rake
     Dir.chdir(project_path) do
-      cmd 'bundle exec rake db:create'
-      cmd 'bundle exec rake db:migrate'
-      cmd 'bundle exec rake db:test:prepare'
+      cmd 'bundle exec rake db:drop db:create db:migrate'
       cmd 'bundle exec rake'
     end
   end

data/templates/Gemfile_custom.erb

@@ -6,7 +6,7 @@ gem 'airbrake'
 <% if !options[:gulp] -%>
 gem 'autoprefixer-rails'
 <% end -%>
-gem 'coffee-rails', '~> 4.1.0'
+gem 'coffee-rails', '~> 4.2'
 <% if options[:devise] -%>
 gem 'devise'
 <% end -%>
@@ -15,15 +15,15 @@ gem 'flutie'
 gem 'jquery-rails'
 gem 'metamagic'
 gem 'pg'
+gem 'puma', '~> 3.0'
 gem 'rails', '~> <%= BlueberryRails::RAILS_VERSION %>'
 gem 'sassc-rails'
 gem 'simple_form'
 gem 'slim-rails'
 <% if options[:translation_engine] -%>
-gem 'translation_engine', github: 'blueberryapps/translation-engine'
+gem 'translation_engine', github: 'blueberryapps/translation-engine', branch: 'rails-5-support'
 <% end -%>
 gem 'uglifier', '>= 1.3.0'
-gem 'puma'
 
 source 'https://rails-assets.org' do
 <% if options[:bootstrap] -%>
@@ -36,25 +36,19 @@ group :development do
   gem 'awesome_print'
   gem 'better_errors'
   gem 'binding_of_caller'
-<% if options[:capistrano] -%>
-  gem 'capistrano', '~> 3.0.0'
-  gem 'capistrano-bundler'
-  gem 'capistrano-rails'
-  gem 'capistrano-rbenv'
-<% end -%>
 <% if options[:fontcustom] -%>
   gem 'fontcustom'
 <% end -%>
   gem 'guard-rspec'
   gem 'i18n_yaml_sorter'
   gem 'image_optimizer', '~> 1.3.0'
+  gem 'listen', '~> 3.0.5'
   gem 'mailcatcher'
   gem 'pry-rails'
-  gem 'quiet_assets'
   gem 'rails-i18n-debug', github: 'XeeD/rails-i18n-debug'
   gem 'rubocop', require: false
-  gem 'spring-commands-rspec'
   gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
 <% if options[:fontcustom] -%>
   gem 'svg_optimizer'
 <% end -%>

data/templates/assets/stylesheets/application.sass

@@ -1,17 +1,9 @@
-/*contains system-shared css variables*/
+// import custom bootstrap
 @import frontend/common/bootstrap-override
 
-/*contains global mixins, functions, helper selectors, etc.*/
+// import app stylesheets
 @import frontend/utils/**/*
-
-/*contains global styles, such as resets, typography, colors, etc*/
-// @import frontend/base/**/*
-
-/*contains each self-contained component in its own .scss partial*/
-// @import frontend/components/**/*
-
-/*contains styling for larger layout components; e.g. nav, header, footer, etc.*/
-// @import frontend/layout/**/*
-
-/*contains page-specific styling, if necessary*/
-// @import frontend/pages/**/*
+@import frontend/base/**/*
+@import frontend/layout/**/*
+@import frontend/components/**/*
+@import frontend/pages/**/*

data/templates/assets/stylesheets/frontend/base/buttons.sass

@@ -0,0 +1,3 @@
+//
+// Buttons
+// -------------------------------

data/templates/assets/stylesheets/frontend/base/typo.sass

@@ -0,0 +1,3 @@
+//
+// Typo
+// -------------------------------

data/templates/assets/stylesheets/frontend/common/bootstrap-override.sass

@@ -1,4 +1,3 @@
 @import variables
-
-@import bootstrap-sass
+@import bootstrap
 @import bootstrap-ms

data/templates/assets/stylesheets/frontend/common/bootstrap.sass

@@ -0,0 +1,50 @@
+// Core variables and mixins
+@import "bootstrap-sass/bootstrap/variables"
+@import "bootstrap-sass/bootstrap/mixins"
+
+// Reset and dependencies
+@import "bootstrap-sass/bootstrap/normalize"
+@import "bootstrap-sass/bootstrap/print"
+// @import "bootstrap-sass/bootstrap/glyphicons"
+
+// Core CSS
+@import "bootstrap-sass/bootstrap/scaffolding"
+@import "bootstrap-sass/bootstrap/type"
+@import "bootstrap-sass/bootstrap/code"
+@import "bootstrap-sass/bootstrap/grid"
+// @import "bootstrap-sass/bootstrap/tables"
+@import "bootstrap-sass/bootstrap/forms"
+@import "bootstrap-sass/bootstrap/buttons"
+
+// Components
+// @import "bootstrap-sass/bootstrap/component-animations"
+// @import "bootstrap-sass/bootstrap/dropdowns"
+// @import "bootstrap-sass/bootstrap/button-groups"
+// @import "bootstrap-sass/bootstrap/input-groups"
+// @import "bootstrap-sass/bootstrap/navs"
+// @import "bootstrap-sass/bootstrap/navbar"
+// @import "bootstrap-sass/bootstrap/breadcrumbs"
+// @import "bootstrap-sass/bootstrap/pagination"
+// @import "bootstrap-sass/bootstrap/pager"
+// @import "bootstrap-sass/bootstrap/labels"
+// @import "bootstrap-sass/bootstrap/badges"
+// @import "bootstrap-sass/bootstrap/jumbotron"
+// @import "bootstrap-sass/bootstrap/thumbnails"
+// @import "bootstrap-sass/bootstrap/alerts"
+// @import "bootstrap-sass/bootstrap/progress-bars"
+// @import "bootstrap-sass/bootstrap/media"
+// @import "bootstrap-sass/bootstrap/list-group"
+// @import "bootstrap-sass/bootstrap/panels"
+// @import "bootstrap-sass/bootstrap/responsive-embed"
+// @import "bootstrap-sass/bootstrap/wells"
+// @import "bootstrap-sass/bootstrap/close"
+
+// Components w/ JavaScript
+// @import "bootstrap-sass/bootstrap/modals"
+// @import "bootstrap-sass/bootstrap/tooltip"
+// @import "bootstrap-sass/bootstrap/popovers"
+// @import "bootstrap-sass/bootstrap/carousel"
+
+// Utility classes
+@import "bootstrap-sass/bootstrap/utilities"
+@import "bootstrap-sass/bootstrap/responsive-utilities"

data/templates/assets/stylesheets/frontend/common/variables.sass

@@ -1,26 +1,37 @@
-// Bootstap icons
-$icon-font-path: 'bootstrap-sass/assets/fonts/bootstrap/'
+//
+// Variables
+// -------------------------------
 
 // Colors
-$gray-base:           #000
-$gray-dark:           lighten($gray-base, 20%)
-$gray-light:          lighten($gray-base, 30%)
-$gray-lighter:        lighten($gray-base, 60%)
-$gray-exlight:        lighten($gray-light, 60%)
-$gray-soft:           lighten($gray-light, 65%)
+// $gray-darker:                      #123456
+// $gray-dark:                        #123456
+// $gray:                             #123456
+// $gray-light:                       #123456
+// $gray-lighter:                     #123456
 
-// Forms
-$input-height-base:       50px
+// $brand-primary:                 #123456
 
-$line-height-base:        1.4
+// Scaffolding
+// $text-color:                    #123456
+// $link-color:                    #123456
 
-// Titles
+// Typography
+// $font-size-base:                15px
+// $line-height-base:              1.42
+// $font-family-sans-serif:        'Open Sans', sans-serif
 
-$title-size-base: 25px
+// $headings-font-family:          $font-family-sans-serif
+// $headings-font-weight:          600
+// $headings-line-height:          1.2
+// $headings-color:                inherit
 
-$font-size-h1:          3.167rem !default
-$font-size-h2:          3.056rem !default
-$font-size-h3:          ceil(($title-size-base * 1.12)) !default
-$font-size-h4:          ceil(($title-size-base * 0.8)) !default
-$font-size-h5:          ceil(($title-size-base * 0.6)) !default
-$font-size-h6:          ceil(($title-size-base * 0.5)) !default
+// Grid system
+// $grid-gutter-width:             30px
+// $grid-float-breakpoint:         1100px
+
+// Navbar
+// $navbar-default-color:          #123456
+// $navbar-default-bg:             #123456
+
+// $navbar-default-link-color:         #123456
+// $navbar-default-link-hover-color:   #123456

data/templates/assets/stylesheets/frontend/components/blocks.sass

@@ -0,0 +1,19 @@
+//
+// Body
+// -------------------------------
+
+.block
+  position: relative
+  padding: 1px 0
+  z-index: 10
+
+.block-content
+    @extend .container
+    margin-top: rem(50)
+    margin-bottom: rem(50)
+    position: relative
+    z-index: 10
+
+    &:before,
+    &:after
+      display: none

data/templates/assets/stylesheets/frontend/layout/body.sass

@@ -0,0 +1,3 @@
+//
+// Body
+// -------------------------------

data/templates/assets/stylesheets/frontend/layout/footer.sass

@@ -0,0 +1,3 @@
+//
+// Footer
+// -------------------------------

data/templates/assets/stylesheets/frontend/layout/header.sass

@@ -0,0 +1,3 @@
+//
+// Header
+// -------------------------------

data/templates/assets/stylesheets/frontend/utils/mixins.sass

@@ -1,24 +1,29 @@
-=centered($args...)
+//
+// Mixins
+// -------------------------------
+
+=all-abs($dist: 0)
   position: absolute
-  left: 50%
-  top: 50%
-  transform: translateX(-50%) translateY(-50%)
+  top: $dist
+  right: $dist
+  bottom: $dist
+  left: $dist
+
+=all-fix($dist: 0)
+  position: fixed
+  top: $dist
+  right: $dist
+  bottom: $dist
+  left: $dist
 
 =antialiasing($type:antialiased)
   -webkit-font-smoothing: $type
   font-smoothing: $type
   font-smooth: always
 
-=pos($x, $y)
-  position: absolute
-  top: $x
-  left: $y
-
 =display-flex
   display: flex
   flex-wrap: wrap
-  align-items: flex-end
-  justify-content: flex-start
   &:after,
   &:before
     display: none

data/templates/assets/stylesheets/frontend/utils/render-to.sass

@@ -4,7 +4,7 @@ $sm: "(min-width: #{$screen-sm-min}) and (max-width: #{$screen-sm-max})"
 $md: "(min-width: #{$screen-md-min}) and (max-width: #{$screen-md-max})"
 $lg: "(min-width: #{$screen-lg-min})"
 
-=render-to($type...)
+=render-for($type...)
   @if $type == "xs"
   @for $i from 1 through length($type)
     @if nth($type, $i) == xs
@@ -22,6 +22,45 @@ $lg: "(min-width: #{$screen-lg-min})"
     @else if nth($type, $i) == lg
       @media #{$lg}
         @content
+    @else if nth($type, $i) == navbar-lg
+      @media (min-width: $grid-float-breakpoint)
+        @content
+    @else if nth($type, $i) == navbar-sm
+      @media (max-width: $grid-float-breakpoint - 1)
+        @content
+    @else
+      @media (max-width: $type)
+        @content
+
+=render-up($type...)
+  @for $i from 1 through length($type)
+    @if nth($type, $i) == ms
+      @media (min-width: $screen-ms-min)
+        @content
+    @else if nth($type, $i) == sm
+      @media (min-width: $screen-sm-min)
+        @content
+    @else if nth($type, $i) == md
+      @media (min-width: $screen-md-min)
+        @content
+  @media (min-width: $type)
+    @content
+
+=render-to($type...)
+  @if $type == "xs"
+  @for $i from 1 through length($type)
+    @if nth($type, $i) == xs
+      @media (max-width: $screen-xs-max-new)
+        @content
+    @else if nth($type, $i) == ms
+      @media (max-width: $screen-ms-max)
+        @content
+    @else if nth($type, $i) == sm
+      @media (max-width: $screen-sm-max)
+        @content
+    @else if nth($type, $i) == md
+      @media (max-width: $screen-md-max)
+        @content
     @else
       @media (max-width: $type)
         @content

data/templates/locales/cs/cs.rails.yml

@@ -1,5 +1,12 @@
 ---
 cs:
+  activerecord:
+    errors:
+      messages:
+        record_invalid: 'Validace je neúspešná: %{errors}'
+        restrict_dependent_destroy:
+          has_one: Nemůžu smazat položku protože existuje závislá/ý/é %{record}
+          has_many: Nemůžu smazat položku protože existuje závislé/ý %{record}
   date:
     abbr_day_names:
     - Ne
@@ -127,10 +134,7 @@ cs:
       not_a_number: není číslo
       not_an_integer: musí být celé číslo
       odd: musí být liché číslo
-      record_invalid: 'Validace je neúspešná: %{errors}'
-      restrict_dependent_destroy:
-        one: Nemůžu smazat položku protože existuje závislá/ý/é %{record}
-        many: Nemůžu smazat položku protože existuje závislé/ý %{record}
+      required: musí existovat
       taken: již databáze obsahuje
       too_long: je příliš dlouhý/á/é (max. %{count} znaků)
       too_short: je příliš krátký/á/é (min. %{count} znaků)
@@ -150,7 +154,7 @@ cs:
     submit:
       create: Vytvořit %{model}
       submit: Uložit %{model}
-      update: Upravit %{model}
+      update: Aktualizovat %{model}
   number:
     currency:
       format:
@@ -207,5 +211,5 @@ cs:
     formats:
       default: "%a %d. %B %Y %H:%M %z"
       long: "%A %d. %B %Y %H:%M"
-      short: "%d. %m. %Y %H:%M"
+      short: "%d. %m. %H:%M"
     pm: pm

data/templates/puma.rb

@@ -1,9 +1,10 @@
 workers Integer(ENV['WEB_CONCURRENCY'] || 2)
-threads_count = Integer(ENV['MAX_THREADS'] || 5)
+threads_count = Integer(ENV['RAILS_MAX_THREADS'] || 5)
 threads threads_count, threads_count
 
 preload_app!
 
+rackup      DefaultRackup
 port        ENV['PORT']     || 3000
 environment ENV['RACK_ENV'] || 'development'
 

data/templates/spec/database_cleaner_setup.rb

@@ -1,14 +1,13 @@
 RSpec.configure do |config|
-
   config.before(:suite) do
-    DatabaseCleaner.clean_with(:truncation)
+    DatabaseCleaner.clean_with :truncation, except: %w(ar_internal_metadata)
   end
 
   config.before(:each) do
     DatabaseCleaner.strategy = :transaction
   end
 
-  config.before(:each, :js => true) do
+  config.before(:each, js: true) do
     DatabaseCleaner.strategy = :truncation
   end
 
@@ -19,5 +18,4 @@ RSpec.configure do |config|
   config.after(:each) do
     DatabaseCleaner.clean
   end
-
 end

data/templates/spec/factories_spec.rb

@@ -11,4 +11,3 @@ FactoryGirl.factories.map(&:name).each do |factory_name|
     end
   end
 end
-

data/templates/views/application/_navbar.html.slim

@@ -0,0 +1,2 @@
+header
+  = render 'navbar'

data/templates/views/layouts/application.html.slim.erb

@@ -10,7 +10,6 @@ html
     meta name='viewport' content='width=device-width, initial-scale=1.0'
     = render 'favicon'
     = stylesheet_link_tag :application, media: 'all'
-    = stylesheet_link_tag :print, media: 'print'
     = csrf_meta_tags
 
   body class=body_class

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blueberry_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.0
 platform: ruby
 authors:
 - BlueberryApps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 5.0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 5.0.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 'A Rails app template by BlueberryApps '
+description: A Rails app template by BlueberryApps
 email:
 - jzajpt@blueberry.cz
 executables:
@@ -64,13 +64,13 @@ files:
 - ".hound.yml"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/blueberry_rails
 - blueberry_rails.gemspec
+- circle.yml
 - lib/blueberry_rails.rb
 - lib/blueberry_rails/action_helpers.rb
 - lib/blueberry_rails/app_builder.rb
@@ -78,7 +78,6 @@ files:
 - lib/blueberry_rails/version.rb
 - spec/blueberry_rails_spec.rb
 - spec/support/blueberry_rails_helpers.rb
-- templates/Capfile
 - templates/Gemfile_custom.erb
 - templates/Procfile
 - templates/README.md.erb
@@ -98,13 +97,14 @@ files:
 - templates/assets/javascripts/frontend/.keep
 - templates/assets/stylesheets/application.sass
 - templates/assets/stylesheets/frontend/base/buttons.sass
-- templates/assets/stylesheets/frontend/base/fonts.sass
 - templates/assets/stylesheets/frontend/base/typo.sass
 - templates/assets/stylesheets/frontend/common/bootstrap-ms.sass
 - templates/assets/stylesheets/frontend/common/bootstrap-override.sass
+- templates/assets/stylesheets/frontend/common/bootstrap.sass
 - templates/assets/stylesheets/frontend/common/variables.sass
 - templates/assets/stylesheets/frontend/components/.keep
-- templates/assets/stylesheets/frontend/components/navigation.sass
+- templates/assets/stylesheets/frontend/components/blocks.sass
+- templates/assets/stylesheets/frontend/components/navbar.sass
 - templates/assets/stylesheets/frontend/layout/body.sass
 - templates/assets/stylesheets/frontend/layout/footer.sass
 - templates/assets/stylesheets/frontend/layout/header.sass
@@ -115,19 +115,12 @@ files:
 - templates/assets/stylesheets/frontend/utils/mixins.sass
 - templates/assets/stylesheets/frontend/utils/render-to.sass
 - templates/assets/stylesheets/frontend/utils/renderto-debug.sass
-- templates/assets/stylesheets/ie.sass
-- templates/assets/stylesheets/print.sass
-- templates/capistrano_dotenv.cap
 - templates/circle.yml.erb
 - templates/config/initializers/airbrake.rb
 - templates/config/initializers/simple_form_bootstrap.rb
 - templates/config/initializers/translation_engine.rb
 - templates/controllers/errors_controller.rb
 - templates/database.yml.erb
-- templates/deploy.rb.erb
-- templates/deploy_production.rb.erb
-- templates/deploy_staging.rb.erb
-- templates/disable_xml_params.rb
 - templates/fontcustom.yml
 - templates/gitignore_custom.erb
 - templates/gulp/application.js.coffee
@@ -159,7 +152,6 @@ files:
 - templates/gulp/util/handleErrors.coffee
 - templates/helpers/admin_helper.rb
 - templates/helpers/application_helper.rb
-- templates/helpers/body_class_helper.rb
 - templates/locales/cs/cs.devise.yml
 - templates/locales/cs/cs.meta.yml
 - templates/locales/cs/cs.rails.yml
@@ -210,6 +202,7 @@ files:
 - templates/views/application/_footer.html.slim
 - templates/views/application/_gtm.html.slim
 - templates/views/application/_header.html.slim
+- templates/views/application/_navbar.html.slim
 - templates/views/layouts/admin.html.slim.erb
 - templates/views/layouts/application.html.slim.erb
 homepage: https://github.com/blueberryapps/blueberry_rails

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-script: 'bundle exec rake'
-rvm:
-  - 2.3.1
-before_install:
-  - gem cleanup bundler
-  - gem update --system

data/templates/Capfile

@@ -1,8 +0,0 @@
-require 'capistrano/setup'
-require 'capistrano/deploy'
-require 'capistrano/bundler'
-require 'capistrano/rbenv'
-require 'capistrano/rails/assets'
-require 'capistrano/rails/migrations'
-
-Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }

data/templates/capistrano_dotenv.cap

@@ -1,24 +0,0 @@
-namespace :deploy do
-
-  after :updating, 'dotenv:symlink'
-
-end
-
-namespace :dotenv do
-
-  desc "Symlink .env file"
-  task :symlink do
-    on roles(:app) do
-      target = release_path.join('.env')
-      source = shared_path.join('config/dotenv')
-      unless test "[ -L #{target} ]"
-        if test "[ -f #{target} ]"
-          execute :rm, target
-        end
-        execute :ln, '-s', source, target
-      end
-    end
-  end
-
-end
-

data/templates/deploy.rb.erb

@@ -1,28 +0,0 @@
-set :application, '<%= app_name %>'
-set :repo_url,    'git@github.com:blueberryapps/<%= app_name %>.git'
-set :branch,      'master'
-set :scm,         :git
-
-set :format, :pretty
-set :log_level, :debug
-
-set :linked_files, %w(config/database.yml)
-set :linked_dirs, %w(log tmp/pids tmp/cache tmp/sockets public/system)
-
-set :rbenv_type, :system
-set :rbenv_ruby, `git show #{fetch(:branch)}:.ruby-version`.strip
-
-set :keep_releases, 5
-
-namespace :deploy do
-
-  desc 'Restart application'
-  task :restart do
-    on roles(:app), in: :sequence, wait: 5 do
-      execute :touch, release_path.join('tmp/restart.txt')
-    end
-  end
-
-  after :finishing, 'deploy:cleanup'
-
-end

data/templates/deploy_production.rb.erb

@@ -1,7 +0,0 @@
-set :stage,     :production
-set :rails_env, 'production'
-set :deploy_to, '/var/www/<%= app_name %>_com'
-
-server 'REPLACE_ME',
-       user: '<%= app_name %>',
-       roles: %w(web app db)

data/templates/deploy_staging.rb.erb

@@ -1,8 +0,0 @@
-set :stage,     :staging
-set :deploy_to, '/var/www/<%= app_name %>_webapps_cz'
-set :rails_env, 'staging'
-
-server 'REPLACE_ME',
-        user: '<%= app_name %>_webapps_cz',
-        roles: %w(web app db)
-

data/templates/disable_xml_params.rb

@@ -1,3 +0,0 @@
-# Protect against injection attacks
-# http://www.kb.cert.org/vuls/id/380039
-ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::XML)

data/templates/helpers/body_class_helper.rb

@@ -1,15 +0,0 @@
-module BodyClassHelper
-  def body_class(options = {})
-    extra_body_classes_symbol = options[:extra_body_classes_symbol] || :extra_body_classes
-    qualified_controller_name = controller.controller_path.gsub('/','-')
-    basic_body_class = "#{qualified_controller_name} #{qualified_controller_name}-#{controller.action_name}"
-
-    basic_body_class << ' development' if Rails.env.development?
-
-    if content_for?(extra_body_classes_symbol)
-      [basic_body_class, content_for(extra_body_classes_symbol)].join(' ')
-    else
-      basic_body_class
-    end
-  end
-end