blueberry_rails 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b45cceda5339e79bf4160f739be691e6b4e1401
-  data.tar.gz: 8ff940fa7c8c36af1de0a9d5ea4e822e0c7b5548
+  metadata.gz: c406dea7cfbeac218cb081773eeffd0a27c31f95
+  data.tar.gz: 371ddadce54b93bc4881e398a2529261cb004cdb
 SHA512:
-  metadata.gz: dcbe8a8c0b1904375a7f9225ba491cb6d71de755ccf922bd62e80cd49b7d6cf3e760da4b7f57332ddfb7ea90cd4d8086ffdabf697e15939e95bbd249f8d4ca14
-  data.tar.gz: c34444a140b05419785c9aff70aa42bc0f6a53a4b805d5d0ca12d5912e8c3a74b4955e3192f6976df9ca85afceb88894049843fe652e52eb891a3b6a62dab15c
+  metadata.gz: 9c0d5bb28b507c0591e3734d02da80c9527297e3431389021d969dfe67026c41be298ed049a0bf6957d562b13fc0fe3873c233eca809859e54d2a380a7f71348
+  data.tar.gz: 1e209b2600673e51bea02fa11f1681470e787c1ddedf016aa0e58cd36fd660013f3fd477807e937a3b77bc628faaccabca6b5c8233c60dcc71d0e761fb6bd24a

data/.rubocop.yml

@@ -114,6 +114,9 @@ FormatString:
   Enabled: true
   EnforcedStyle: percent
 
+FrozenStringLiteralComment:
+  Enabled: false
+
 GlobalVars:
   Enabled: true
 

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.4.0

data/circle.yml

@@ -2,3 +2,4 @@ test:
   override:
     - bundle exec rake:
         parallel: true
+        timeout: 1400

data/lib/blueberry_rails/app_builder.rb

@@ -88,10 +88,6 @@ module BlueberryRails
 
       remove_file 'app/assets/icons'
 
-      replace_in_file 'config/initializers/assets.rb',
-        '# Rails.application.config.assets.precompile += %w( search.js )',
-        'Rails.application.config.assets.precompile += %w( ie.css )'
-
       if options[:administration]
         directory 'admin_assets', 'app/assets'
 
@@ -112,6 +108,9 @@ module BlueberryRails
       end
       copy_file 'config/initializers/airbrake.rb',
                 'config/initializers/airbrake.rb'
+
+      copy_file 'config/initializers/plurals.rb',
+                'config/initializers/plurals.rb'
     end
 
     def create_pryrc
@@ -279,7 +278,7 @@ module BlueberryRails
 
     def cache_and_compress
       configure_environment 'production',
-        'config.static_cache_control = \'public, max-age=31536000\''
+        "config.public_file_server.headers = {\n    'Cache-Control' => 'public, max-age=31536000'\n  }"
       configure_environment 'production',
         'config.middleware.insert_before ActionDispatch::Static, Rack::Deflater'
     end
@@ -375,7 +374,7 @@ module BlueberryRails
       directory 'gulp/tasks'
       directory 'gulp/util'
       copy_file 'gulp/gulpfile.js',  'gulpfile.js'
-      copy_file 'gulp/package.json', 'package.json'
+      copy_file 'gulp/package.json', 'package.json', force: true
     end
   end
 end

data/lib/blueberry_rails/generators/app_generator.rb

@@ -19,8 +19,8 @@ module BlueberryRails
     class_option :devise_model, type: :string, aliases: '-M', default: 'User',
       desc: 'Name of devise model to generate'
 
-    class_option :skip_test_unit, type: :boolean, aliases: '-T', default: true,
-      desc: 'Skip Test::Unit files'
+    class_option :skip_test, type: :boolean, aliases: '-T', default: true,
+      desc: 'Skip Test files'
 
     class_option :skip_turbolinks, type: :boolean, default: true,
       desc: 'Skip turbolinks gem'

data/lib/blueberry_rails/version.rb

@@ -1,7 +1,7 @@
 module BlueberryRails
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'.freeze
 
-  RUBY_VERSION = '2.3.1'
+  RUBY_VERSION = '2.4.0'.freeze
 
-  RAILS_VERSION = '5.0.0.1'
+  RAILS_VERSION = '5.1.1'.freeze
 end

data/spec/blueberry_rails_spec.rb

@@ -18,6 +18,7 @@ class BlueberryRailsTest < Minitest::Test
     create_project
 
     assert_exist_file 'config/initializers/simple_form.rb'
+    assert_exist_file 'config/initializers/plurals.rb'
     assert_exist_file '.hound.yml'
     assert_exist_file '.rubocop.yml'
     assert_exist_file 'circle.yml'
@@ -27,7 +28,7 @@ class BlueberryRailsTest < Minitest::Test
     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', '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'

data/templates/Gemfile_custom.erb

@@ -6,6 +6,9 @@ gem 'airbrake'
 <% if !options[:gulp] -%>
 gem 'autoprefixer-rails'
 <% end -%>
+<% if options[:administration] -%>
+gem 'blueberry_admin'
+<% end -%>
 gem 'coffee-rails', '~> 4.2'
 <% if options[:devise] -%>
 gem 'devise'
@@ -21,7 +24,7 @@ gem 'sassc-rails'
 gem 'simple_form'
 gem 'slim-rails'
 <% if options[:translation_engine] -%>
-gem 'translation_engine', github: 'blueberryapps/translation-engine', branch: 'rails-5-support'
+gem 'translation_engine', github: 'blueberryapps/translation-engine'
 <% end -%>
 gem 'uglifier', '>= 1.3.0'
 

data/templates/admin_assets/stylesheets/admin.sass

@@ -1,4 +1,4 @@
 $icon-font-path: 'bootstrap-sass/assets/fonts/bootstrap/'
 
-@import bootstrap-sass
+@import blueberry_admin
 // @import admin/**/*

data/templates/admin_views/dashboard/show.html.slim

@@ -1,12 +1,9 @@
-.row
-  .col-md-12
-    .jumbotron
-      .row
-        .col-md-9
-          h2 Resources
-        col-md-3
-          = link_to 'Nový resource', '#', class: 'btn-lg btn-success pull-right'
+.content-header
+  h1
+    span.glyphicon.glyphicon-user
+    span.text =< t '.title'
 
-.row
-  .col-md-12
-    .panel.panel-default
+  ol.breadcrumb
+    li = link_to 'Home', [:admin, :root]
+    li.active
+      strong =< t '.title'

data/templates/admin_views/partials/_nav_left.html.slim

@@ -0,0 +1,2 @@
+ul.sidebar-menu
+  li.logo = link_to image_tag('blueberry-logo.png'), admin_root_path

data/templates/admin_views/partials/_nav_top.html.slim

@@ -0,0 +1,10 @@
+nav.navbar.navbar-static-top role="navigation"
+  .navbar-custom-menu
+    ul.nav.navbar-nav
+      li
+        = link_to '#'
+          i.glyphicon.glyphicon-user>
+          span.role = current_administrator.email.split('@').first
+      li
+        = link_to destroy_administrator_session_path, method: :delete, title: t('.logout')
+          i.glyphicon.glyphicon-log-out

data/templates/config/initializers/airbrake.rb

@@ -1,9 +1,15 @@
 Airbrake.configure do |config|
-  config.host                = 'http://errors.blueberry.cz'
-  config.project_id          = -1
+  config.host                = 'https://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
+
+Airbrake.add_filter do |notice|
+  if notice[:errors].any? { |error| error[:type] == 'ActiveRecord::RecordNotFound' }
+    notice.ignore!
+  end
+end

data/templates/config/initializers/plurals.rb

@@ -0,0 +1 @@
+I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)

data/templates/config/initializers/translation_engine.rb

@@ -19,5 +19,12 @@ if %w(production staging).include? Rails.env
     # If true TranslationEngine will throw exceptions on connection problems
     # If false TranslationEngine will just log exception to Rails.logger
     config.raise_exceptions = Rails.env.development?
+
+    # Disables sending new translations to Translation Server
+    config.disable_sending_translations = Rails.env.production?
+
+    # Caches downloaded translations for given amount of seconds before checking
+    # for new ones
+    config.cache_timeout = Rails.env.production? ? 60 : 0
   end
 end

data/templates/helpers/admin_helper.rb

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

data/templates/puma.rb

@@ -1,6 +1,6 @@
-workers Integer(ENV['WEB_CONCURRENCY'] || 2)
-threads_count = Integer(ENV['RAILS_MAX_THREADS'] || 5)
-threads threads_count, threads_count
+workers Integer(ENV['WEB_CONCURRENCY'] || 1)
+threads_count = Integer(ENV['RAILS_MAX_THREADS'] || 8)
+threads Integer(threads_count / 2), threads_count
 
 preload_app!
 

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

@@ -11,11 +11,15 @@ html
     = csrf_meta_tags
 
   body class=body_class
-    = render 'admin/partials/menu'
+    .wrapper
+      .sidebar
+        = render 'admin/partials/nav_left'
 
-    .container
-      .row = render 'application/flashes'
-      = yield
+      .content-wrapper
+        .header
+          = render 'admin/partials/nav_top'
+        = render 'application/flashes'
+        = yield
 
     = javascript_include_tag :admin
     = yield :javascript

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blueberry_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - BlueberryApps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +88,8 @@ files:
 - templates/admin_controllers/base_controller.rb
 - templates/admin_controllers/dashboard_controller.rb
 - templates/admin_views/dashboard/show.html.slim
-- templates/admin_views/partials/_menu.html.slim
+- templates/admin_views/partials/_nav_left.html.slim
+- templates/admin_views/partials/_nav_top.html.slim
 - templates/app.json.erb
 - templates/assets/icons/_font_icons.scss
 - templates/assets/images/blueberry-logo.png
@@ -117,6 +118,7 @@ files:
 - templates/assets/stylesheets/frontend/utils/renderto-debug.sass
 - templates/circle.yml.erb
 - templates/config/initializers/airbrake.rb
+- templates/config/initializers/plurals.rb
 - templates/config/initializers/simple_form_bootstrap.rb
 - templates/config/initializers/translation_engine.rb
 - templates/controllers/errors_controller.rb
@@ -225,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A Rails app template by BlueberryApps

data/templates/admin_views/partials/_menu.html.slim

@@ -1,13 +0,0 @@
-nav.admin.navbar.navbar-inverse role='navigation'
-  .container
-    .navbar-header
-      button.navbar-toggle.collapsed data-target='#bs-example-navbar-collapse-1' data-toggle='collapse' type='button'
-        span.sr-only Toggle navigation
-        span.icon-bar
-        span.icon-bar
-        span.icon-bar
-      = link_to 'LOGO', root_path, target: :_blank
-
-    #bs-example-navbar-collapse-1.collapse.navbar-collapse
-      ul.nav.navbar-nav.navbar-right
-        li = link_to 'Odhlásit se', destroy_administrator_session_path, method: :delete