blueberry_rails 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad73f9f1faa51a145051e88b2b0a2d0526215793
-  data.tar.gz: 4b5544ca9d8fd5a966243b210c1c569f4dc94ef3
+  metadata.gz: 5596f930c3e53e38e875c66416bc9392965523c8
+  data.tar.gz: e2591af5b3a01d05746ee80085c723946ae4c7a2
 SHA512:
-  metadata.gz: 9133fcb4f9ab213384cb227e2c5b255982e18982213a7ccf940a911a99a074a9eaa2148207200b9506707daff57d3d483ed3886c7b812aaed5351595748bb85a
-  data.tar.gz: d2d4e2af8041a6b6b657b4c12b53273eb43370d1e31ea037a4ed1ff557dbbe61510a07cc6609ec8f42138fad80485562cc5dbd5448535d1b3d119257c347e1a4
+  metadata.gz: c22615911ac5ed27aea09cd160bff1bc1591ae8d9d45ddb20bbba44064d9b6b91158b47190def8843fda61d563483e1d5b191215134128bcd191adb6ab5e5112
+  data.tar.gz: 80afcd4d330b76fcdcb0b5447f4ebfc85e30ce2d2e6e76928d6e6debf942a8faac541bd15d7fc3965806ec566a3c13d0be64fdb70291543a1022cf48f09d0f4c

data/.rubocop.yml

@@ -2,7 +2,9 @@ AllCops:
   Exclude:
     - db/schema.rb
     - bin/*
-  RunRailsCops: true
+
+Rails:
+  Enabled: true
 
 AbcSize:
   Enabled: false
@@ -215,7 +217,7 @@ StringLiterals:
 VariableInterpolation:
   Enabled: false
 
-TrailingComma:
+TrailingCommaInLiteral:
   Enabled: true
 
 TrivialAccessors:

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/.travis.yml

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

data/README.md

@@ -14,6 +14,10 @@ Then you can run
 
 ### Available options
 
+Heroku review apps config
+
+    --heroku
+
 Translation Engine
 
     --translation-engine

data/lib/blueberry_rails/app_builder.rb

@@ -1,6 +1,5 @@
 module BlueberryRails
   class AppBuilder < Rails::AppBuilder
-
     include BlueberryRails::ActionHelpers
 
     def readme
@@ -19,6 +18,13 @@ module BlueberryRails
       template 'secret_token.rb.erb', 'config/initializers/secret_token.rb'
     end
 
+    def setup_secret_token
+      inject_into_file 'config/secrets.yml',
+                       "\nstaging:\n" \
+                       "  secret_key_base: <%= ENV[\"SECRET_KEY_BASE\"] %>\n",
+                       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'
@@ -37,8 +43,7 @@ module BlueberryRails
     end
 
     def use_postgres_config_template
-      template 'database.yml.erb', 'config/database.yml',
-        force: true
+      template 'database.yml.erb', 'config/database.yml', force: true
       template 'database.yml.erb', 'config/database.yml.sample'
     end
 
@@ -61,7 +66,7 @@ module BlueberryRails
                        "\n  namespace :admin do\n" \
                        "    root to: 'dashboard#show'\n" \
                        "  end\n\n",
-                       before: "  root"
+                       before: '  root'
     end
 
     def create_partials_directory
@@ -74,9 +79,7 @@ module BlueberryRails
       template 'views/layouts/application.html.slim.erb',
                'app/views/layouts/application.html.slim'
 
-      remove_file 'app/helpers/application_helper.rb'
-      copy_file 'helpers/application_helper.rb',
-                'app/helpers/application_helper.rb'
+      directory 'helpers', 'app/helpers', force: true
 
       remove_file 'public/favicon.ico'
       directory 'public/icons', 'public'
@@ -125,6 +128,14 @@ module BlueberryRails
       copy_file 'pryrc.rb', '.pryrc'
     end
 
+    def create_procfile
+      copy_file 'Procfile', 'Procfile'
+    end
+
+    def create_puma_config
+      copy_file 'puma.rb', 'config/puma.rb'
+    end
+
     def create_database
       bundle_command 'exec rake db:create'
     end
@@ -158,6 +169,12 @@ module BlueberryRails
       bundle_command 'exec guard init'
     end
 
+    def setup_guard
+      config = 'watch(%r{^spec/factories/(.+)\.rb$}) { |m| rspec.spec.call("models/factories") }'
+      inject_into_file('Guardfile',
+                       "\n\n  #{config}", before: "\nend")
+    end
+
     def raise_on_unpermitted_parameters
       configure_environment 'development',
         'config.action_controller.action_on_unpermitted_parameters = :raise'
@@ -206,8 +223,8 @@ module BlueberryRails
                             "Logger.new(Rails.root.join('log/i18n.log'))"
     end
 
-    def configure_travis
-      template 'travis.yml.erb', '.travis.yml'
+    def configure_circle
+      template 'circle.yml.erb', 'circle.yml'
     end
 
     def add_ruby_version_file
@@ -228,11 +245,7 @@ module BlueberryRails
 
     def install_devise
       generate 'devise:install'
-      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"
+      generate_root_controller_and_route
       if options[:devise_model].present?
         generate 'devise', options[:devise_model]
       end
@@ -287,6 +300,13 @@ module BlueberryRails
                 'spec/controllers/root_controller_spec.rb', force: true
     end
 
+    def cache_and_compress
+      configure_environment 'production',
+        'config.static_cache_control = \'public, max-age=31536000\''
+      configure_environment 'production',
+        'config.middleware.insert_before ActionDispatch::Static, Rack::Deflater'
+    end
+
     def setup_gitignore
       [ 'spec/lib',
         'spec/controllers',
@@ -332,11 +352,23 @@ module BlueberryRails
     end
 
     def configure_bin_setup
+      copy_file 'setup', 'bin/setup', force: true
+    end
 
-      original = "# puts \"\\n== Copying sample files ==\"\n  # unless File.exist?(\"config/database.yml\")\n  #   system \"cp config/database.yml.sample config/database.yml\"\n  # end"
-      updated = "puts \"\\n== Copying sample files ==\"\n  unless File.exist?(\"config/database.yml\")\n    system \"cp config/database.yml.sample config/database.yml\"\n  end"
+    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"
+    end
 
-      replace_in_file 'bin/setup', original, updated
+    def create_root_page
+      generate_root_controller_and_route
+    end
+
+    def reviews_app
+      template 'app.json.erb', 'app.json'
     end
 
     # Gulp
@@ -369,6 +401,5 @@ module BlueberryRails
       copy_file 'gulp/gulpfile.js',  'gulpfile.js'
       copy_file 'gulp/package.json', 'package.json'
     end
-
   end
 end

data/lib/blueberry_rails/generators/app_generator.rb

@@ -3,7 +3,6 @@ require 'rails/generators/rails/app/app_generator'
 
 module BlueberryRails
   class AppGenerator < Rails::Generators::AppGenerator
-
     class_option :database, type: :string, aliases: '-d', default: 'postgresql',
       desc: "Preconfigure for selected database " \
             "(options: #{DATABASES.join('/')})"
@@ -24,10 +23,10 @@ module BlueberryRails
       desc: 'Skip Test::Unit files'
 
     class_option :skip_turbolinks, type: :boolean, default: true,
-      desc: "Skip turbolinks gem"
+      desc: 'Skip turbolinks gem'
 
-    class_option :skip_bundle, type: :boolean, aliases: "-B", default: true,
-      desc: "Don't run bundle install"
+    class_option :skip_bundle, type: :boolean, aliases: '-B', default: true,
+      desc: 'Don\'t run bundle install'
 
     class_option :gulp, type: :boolean, aliases: '-g', default: false,
       desc: 'Include Gulp asset pipeline'
@@ -47,6 +46,9 @@ module BlueberryRails
     class_option :custom_errors, type: :boolean, aliases: '-ce', default: false,
       desc: 'Include Errors Controller'
 
+    class_option :heroku, type: :boolean, aliases: '-he', default: true,
+      desc: 'Heroku reviews app config'
+
     def finish_template
       if options[:administration] && (!options[:devise] || !options[:bootstrap])
         raise 'Administration depends on bootstrap and devise!'
@@ -73,6 +75,8 @@ module BlueberryRails
       invoke :setup_custom_errors
       invoke :setup_initializers
       invoke :setup_fontcustom
+      invoke :setup_heroku
+      invoke :setup_cache_and_compress
     end
 
     def customize_gemfile
@@ -103,13 +107,15 @@ module BlueberryRails
       build :configure_rspec
       build :setup_rspec_support_files
       build :test_factories_first
-      build :configure_travis
+      build :configure_circle
       build :init_guard
+      build :setup_guard
     end
 
     def setup_staging_environment
       say 'Setting up the staging environment'
       build :setup_staging_environment
+      build :setup_secret_token
     end
 
     def setup_initializers
@@ -155,6 +161,8 @@ module BlueberryRails
       build :disable_xml_params
       build :setup_mailer_hosts
       build :create_pryrc
+      build :create_procfile
+      build :create_puma_config
       build :add_ruby_version_file
       build :hound_config
       build :configure_i18n
@@ -165,6 +173,11 @@ module BlueberryRails
       build :remove_routes_comment_lines
     end
 
+    def setup_cache_and_compress
+      say 'Setting up compress and cache for production env'
+      build :cache_and_compress
+    end
+
     def setup_gems
       say 'Setting up SimpleForm'
       build :configure_simple_form
@@ -173,6 +186,8 @@ module BlueberryRails
         build :install_devise
         build :replace_users_factory
         build :replace_root_controller_spec
+      else
+        build :create_root_page
       end
       if options[:capistrano]
         say 'Setting up Capistrano'
@@ -193,6 +208,13 @@ module BlueberryRails
       end
     end
 
+    def setup_heroku
+      if options[:heroku]
+        say 'Add heroku reviews apps config'
+        build :reviews_app
+      end
+    end
+
     def rake_tasks
       build :copy_rake_tasks
     end

data/lib/blueberry_rails/version.rb

@@ -1,7 +1,7 @@
 module BlueberryRails
-  VERSION = '0.3.9'
+  VERSION = '0.3.10'
 
-  RUBY_VERSION = '2.2.3'
+  RUBY_VERSION = '2.3.1'
 
-  RAILS_VERSION = '4.2.4'
+  RAILS_VERSION = '4.2.7'
 end

data/spec/blueberry_rails_spec.rb

@@ -22,8 +22,19 @@ class BlueberryRailsTest < Minitest::Test
     assert_exist_file 'config/initializers/simple_form.rb'
     assert_exist_file '.hound.yml'
     assert_exist_file '.rubocop.yml'
+    assert_exist_file 'circle.yml'
     assert_exist_file '.rspec'
+    assert_exist_file 'app.json'
     assert_file_have_content 'README.md', 'Test Project'
+    assert_file_have_content 'bin/setup', 'bundle install --deployment'
+    assert_file_have_content 'Procfile', 'bundle exec puma'
+    assert_file_have_content 'config/puma.rb', 'preload_app!'
+    assert_file_have_content 'config/environments/production.rb', 'static_cache_control'
+    assert_file_have_content 'config/environments/production.rb', 'Rack::Deflater'
+    assert_file_have_content 'Guardfile', 'factories'
+    assert_file_have_content 'config/secrets.yml', 'staging'
+    assert_file_have_content 'config/initializers/airbrake.rb', 'config.blacklist_keys'
+
     assert run_rake
   end
 
@@ -103,4 +114,11 @@ class BlueberryRailsTest < Minitest::Test
     assert_exist_file 'package.json'
     assert run_rake
   end
+
+  def test_rake_runs_with_heroku_option
+    create_project '--heroku'
+
+    assert_exist_file 'app.json'
+    assert run_rake
+  end
 end

data/templates/Gemfile_custom.erb

@@ -16,15 +16,14 @@ gem 'jquery-rails'
 gem 'metamagic'
 gem 'pg'
 gem 'rails', '~> <%= BlueberryRails::RAILS_VERSION %>'
-gem 'sass-rails', '~> 5.0'
+gem 'sassc-rails'
 gem 'simple_form'
 gem 'slim-rails'
 <% if options[:translation_engine] -%>
-gem 'translation_engine',
-  git: 'https://github.com/blueberryapps/translation-engine.git'
+gem 'translation_engine', github: 'blueberryapps/translation-engine'
 <% end -%>
 gem 'uglifier', '>= 1.3.0'
-gem 'unicorn'
+gem 'puma'
 
 source 'https://rails-assets.org' do
 <% if options[:bootstrap] -%>
@@ -47,6 +46,7 @@ group :development do
   gem 'fontcustom'
 <% end -%>
   gem 'guard-rspec'
+  gem 'i18n_yaml_sorter'
   gem 'image_optimizer', '~> 1.3.0'
   gem 'mailcatcher'
   gem 'pry-rails'

data/templates/Procfile

@@ -0,0 +1 @@
+web: bundle exec puma -C config/puma.rb

data/templates/app.json.erb

@@ -0,0 +1,34 @@
+{
+  "name": "<%=app_name%>",
+  "scripts": {
+  },
+  "env": {
+    "AWS_ACCESS_KEY_ID":        { "required": false },
+    "AWS_REGION":               { "required": false },
+    "AWS_SECRET_ACCESS_KEY":    { "required": false },
+    "DEPLOY_TASKS":             { "required": false },
+    "HEROKU_APP_NAME":          { "required": true },
+    "LANG":                     { "required": true },
+    "RACK_ENV":                 { "required": true },
+    "RAILS_ENV":                { "required": true },
+    "RAILS_SERVE_STATIC_FILES": { "required": true },
+    "S3_BUCKET_NAME":           { "required": false },
+    "SECRET_KEY_BASE":          { "required": true },
+    "TZ":                       { "required": false }
+  },
+  "formation": {
+    "worker": { "quantity": 1 },
+    "web":    { "quantity": 1 }
+  },
+  "addons": [
+    "heroku-postgresql"
+  ],
+  "buildpacks": [
+    {
+      "url": "urn:buildpack:heroku/ruby"
+    },
+    {
+      "url": "https://github.com/gunpowderlabs/buildpack-ruby-rake-deploy-tasks"
+    }
+  ]
+}

data/templates/circle.yml.erb

@@ -0,0 +1,13 @@
+machine:
+  services:
+    - postgresql
+
+  # Version of ruby to use
+  ruby:
+    version:
+      <%= BlueberryRails::RUBY_VERSION %>
+
+
+  # Add some environment variables
+  environment:
+    CIRCLE_ENV: test

data/templates/config/initializers/airbrake.rb

@@ -1,6 +1,9 @@
 Airbrake.configure do |config|
-  config.host = 'http://errors.blueberry.cz'
-  config.project_id = true
-  config.project_key = 'APIKEY'
+  config.host                = 'http://errors.blueberry.cz'
+  config.project_id          = -1
+  config.project_key         = 'API_KEY'
+
+  config.environment         = Rails.env
   config.ignore_environments = %w(development test)
+  config.blacklist_keys      = [/password/i]
 end

data/templates/config/initializers/simple_form_bootstrap.rb

@@ -4,6 +4,31 @@ SimpleForm.setup do |config|
   config.button_class = 'btn btn-default'
   config.boolean_label_class = nil
 
+  config.wrappers :adaptive_placeholder, tag: 'div', class: 'form-group adaptive-placeholder', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.wrapper tag: 'div', class: 'form-control-wrapper' do |ba|
+      ba.use :input, class: 'form-control empty'
+      ba.use :label, class: 'control-label', tag: 'div'
+      ba.use :hint,  wrap_with: { tag: 'div', class: 'hint' }
+    end
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+  end
+
+  config.wrappers :styled_radio_and_checkboxes, tag: 'div', class: 'form-group',
+                  item_wrapper_class: 'styled-checkbox', item_wrapper_tag: 'div', error_class: 'has-error', label: false do |b|
+    b.use :html5
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+    b.use :input
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
   config.wrappers :vertical_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
     b.use :html5
     b.use :placeholder
@@ -138,14 +163,14 @@ SimpleForm.setup do |config|
   # Check the Bootstrap docs (http://getbootstrap.com)
   # to learn about the different styles for forms and inputs,
   # buttons and other elements.
-  config.default_wrapper = :vertical_form
+  config.default_wrapper = :adaptive_placeholder
   config.wrapper_mappings = {
-    check_boxes: :vertical_radio_and_checkboxes,
+    check_boxes:   :vertical_radio_and_checkboxes,
     radio_buttons: :vertical_radio_and_checkboxes,
-    file: :vertical_file_input,
-    boolean: :vertical_boolean,
-    datetime: :multi_select,
-    date: :multi_select,
-    time: :multi_select
+    file:          :vertical_file_input,
+    boolean:       :vertical_boolean,
+    datetime:      :multi_select,
+    date:          :multi_select,
+    time:          :multi_select
   }
 end

data/templates/controllers/errors_controller.rb

@@ -1,5 +1,4 @@
 class ErrorsController < ApplicationController
-
   def show
     render status_code.to_s, status: status_code
   end
@@ -9,5 +8,4 @@ class ErrorsController < ApplicationController
   def status_code
     params[:code] || 500
   end
-
 end

data/templates/helpers/admin_helper.rb

@@ -0,0 +1,8 @@
+module AdminHelper
+  def simple_form_for(record, options = {}, &block)
+    if controller.send(:_layout) == 'admin'
+      options.reverse_merge!(wrapper: :vertical_form)
+    end
+    super
+  end
+end

data/templates/helpers/body_class_helper.rb

@@ -5,7 +5,6 @@ module BodyClassHelper
     basic_body_class = "#{qualified_controller_name} #{qualified_controller_name}-#{controller.action_name}"
 
     basic_body_class << ' development' if Rails.env.development?
-    basic_body_class << ' show-cookie' if cookies['cookie_eu_consented'] != 'true'
 
     if content_for?(extra_body_classes_symbol)
       [basic_body_class, content_for(extra_body_classes_symbol)].join(' ')

data/templates/puma.rb

@@ -0,0 +1,14 @@
+workers Integer(ENV['WEB_CONCURRENCY'] || 2)
+threads_count = Integer(ENV['MAX_THREADS'] || 5)
+threads threads_count, threads_count
+
+preload_app!
+
+port        ENV['PORT']     || 3000
+environment ENV['RACK_ENV'] || 'development'
+
+on_worker_boot do
+  # Worker specific setup for Rails 4.1+
+  # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
+  ActiveRecord::Base.establish_connection
+end

data/templates/setup

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  if ENV['CI']
+    system "bundle check || bundle install --deployment --path=vendor/bundle"
+  else
+    system "bundle check || bundle install"
+  end
+
+  puts "\n== Copying sample files =="
+  unless File.exist?("config/database.yml")
+    system "cp config/database.yml.sample config/database.yml"
+  end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/templates/spec/spec_helper.rb

@@ -17,7 +17,7 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
-  config.fail_fast = true
+  config.fail_fast = false
   config.infer_base_class_for_anonymous_controllers = false
   config.order = 'random'
   config.use_transactional_fixtures = false

data/templates/tasks/images.rake

@@ -2,7 +2,7 @@ namespace :images do
   task :optimize do
     puts "Start of images optimizing"
 
-    files = Dir.glob("#{Rails.root}/app/assets/images/*")
+    files = Dir.glob("#{Rails.root}/app/assets/images/**/*")
     files.each do |file|
       ImageOptimizer.new(file).optimize
     end

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

@@ -1,7 +1,5 @@
-- if %w(production).include? Rails.env
-  /! Google Tag Manager
+- if ENV['GTM_ID']
   noscript
-    iframe height="0" src="//www.googletagmanager.com/ns.html?id=GTM-123456" style="display:none;visibility:hidden" width="0"
+    iframe height="0" src="//www.googletagmanager.com/ns.html?id=#{ENV['GTM_ID']}" style="display:none;visibility:hidden" width="0"
   javascript:
-    (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'t.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','GTM-123456');
-  /! End Google Tag Manager
+    (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer',"#{ENV['GTM_ID']}");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blueberry_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - BlueberryApps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-08-18 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.4
+        version: 4.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +63,7 @@ files:
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -79,6 +80,7 @@ files:
 - spec/support/blueberry_rails_helpers.rb
 - templates/Capfile
 - templates/Gemfile_custom.erb
+- templates/Procfile
 - templates/README.md.erb
 - templates/admin_assets/javascripts/admin.coffee
 - templates/admin_assets/javascripts/admin/.keep
@@ -88,6 +90,7 @@ files:
 - templates/admin_controllers/dashboard_controller.rb
 - templates/admin_views/dashboard/show.html.slim
 - templates/admin_views/partials/_menu.html.slim
+- templates/app.json.erb
 - templates/assets/icons/_font_icons.scss
 - templates/assets/images/blueberry-logo.png
 - templates/assets/javascripts/application.coffee
@@ -115,6 +118,7 @@ files:
 - 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
@@ -153,10 +157,9 @@ files:
 - templates/gulp/tasks/watchify.coffee
 - templates/gulp/util/bundleLogger.coffee
 - templates/gulp/util/handleErrors.coffee
+- templates/helpers/admin_helper.rb
 - templates/helpers/application_helper.rb
 - templates/helpers/body_class_helper.rb
-- templates/helpers/gtm_helper.rb
-- templates/helpers/images_helper.rb
 - templates/locales/cs/cs.devise.yml
 - templates/locales/cs/cs.meta.yml
 - templates/locales/cs/cs.rails.yml
@@ -189,7 +192,9 @@ files:
 - templates/public/icons/ms-icon-150x150.png
 - templates/public/icons/ms-icon-310x310.png
 - templates/public/icons/ms-icon-70x70.png
+- templates/puma.rb
 - templates/secret_token.rb.erb
+- templates/setup
 - templates/spec/controllers/root_controller_spec.rb
 - templates/spec/database_cleaner_setup.rb
 - templates/spec/factories/administrators.rb
@@ -200,7 +205,6 @@ files:
 - templates/spec/spec_helper.rb
 - templates/tasks/icons.rake
 - templates/tasks/images.rake
-- templates/travis.yml.erb
 - templates/views/application/_favicon.html.slim
 - templates/views/application/_flashes.html.slim
 - templates/views/application/_footer.html.slim
@@ -228,11 +232,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Rails app template by BlueberryApps
 test_files:
 - spec/blueberry_rails_spec.rb
 - spec/support/blueberry_rails_helpers.rb
-has_rdoc: 

data/templates/helpers/gtm_helper.rb

@@ -1,30 +0,0 @@
-module GtmHelper
-  def addEvent(options = {})
-    args = map_options options
-
-    content_for :javascript do
-      javascript_tag("dataLayer.push({ #{args} });")
-    end
-  end
-
-  def renderEvent(options = {})
-    args = map_options options
-    javascript_tag("dataLayer.push({ #{args} });")
-  end
-
-  def renderJsEvent(options = {})
-    args = map_options options
-    raw "dataLayer.push({ #{args} });"
-  end
-
-  private
-
-  def map_options(options)
-    default_options = { 'event': 'GAevent' }
-    merged_options = default_options.merge(options)
-    mappings = { 'category': 'eventCategory', 'action': 'eventAction', 'label': 'eventLabel', 'value': 'eventValue', 'event': 'event' }
-
-    args = merged_options.map { |key, value| [mappings[key], value] }
-                  .map { |a| "'#{a[0]}': '#{a[1]}'" }.join(', ')
-  end
-end

data/templates/helpers/images_helper.rb

@@ -1,13 +0,0 @@
-module ImagesHelper
-  # Acts as a thin wrapper for image_tag and generates an srcset attribute for regular image tags
-  # for usage with responsive images polyfills like picturefill.js, supports asset pipeline path helpers.
-  #
-  # image_set_tag 'pic_1980.jpg', { 'pic_640.jpg' => '640w', 'pic_1024.jpg' => '1024w', 'pic_1980.jpg' => '1980w' }, sizes: '100vw', class: 'my-image'
-  #
-  # => <img src="/assets/ants_1980.jpg" srcset="/assets/pic_640.jpg 640w, /assets/pic_1024.jpg 1024w, /assets/pic_1980.jpg 1980w" sizes="100vw" class="my-image">
-  #
-  def image_set_tag(source, srcset = {}, options = {})
-    srcset = srcset.map { |src, size| "#{path_to_image(src)} #{size}" }.join(', ')
-    image_tag(source, options.merge(srcset: srcset))
-  end
-end

data/templates/travis.yml.erb

@@ -1,23 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-
-rvm:
-  - <%= BlueberryRails::RUBY_VERSION %>
-
-install:
-  - bin/setup
-
-cache:
-  - bundler
-
-branches:
-  only:
-    - master
-
-addons:
-  postgresql: '9.3'
-
-env:
-  global:
-    - RAILS_ENV=test