blueberry_rails 0.4.1 → 1.0.0

data/templates/spec/factories/administrators.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :administrator do
     sequence(:email) { |n| "joe#{n}@example.com" }
-    password         'joesthebest'
+    password         { 'joesthebest' }
   end
 end

data/templates/spec/factories/users.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     sequence(:email) { |n| "joe#{n}@example.com" }
-    password         'joesthebest'
+    password         { 'joesthebest' }
   end
 end

data/templates/spec/factories_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'rails_helper'
 
-FactoryGirl.factories.map(&:name).each do |factory_name|
-  describe "factory #{factory_name}" do
+FactoryBot.factories.map(&:name).each do |factory_name|
+  RSpec.describe "factory #{factory_name}" do
     it 'is valid' do
       factory = build(factory_name)
 

data/templates/spec/factory_bot_syntax.rb

@@ -0,0 +1,3 @@
+RSpec.configure do |config|
+  config.include FactoryBot::Syntax::Methods
+end

data/templates/spec/spec_helper.rb

@@ -6,7 +6,6 @@ ENV['RAILS_ENV'] = 'test'
 require File.expand_path('../../config/environment', __FILE__)
 
 require 'rspec/rails'
-require 'capybara/poltergeist'
 
 Dir[Rails.root.join('spec/support/**/*.rb')].each { |file| require file }
 
@@ -24,10 +23,4 @@ RSpec.configure do |config|
   config.include MailBodyHelpers, type: :mailer
 end
 
-Capybara.javascript_driver = :poltergeist
-
-Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app, { js_errors: false, timeout: 15 })
-end
-
 WebMock.disable_net_connect!(allow_localhost: true, allow: 'codeclimate.com')

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

@@ -6,8 +6,8 @@ html
       separator: ' – '
     meta charset='utf-8'
     meta name='viewport' content='width=device-width, initial-scale=1.0'
-    = render 'favicon'
-    = stylesheet_link_tag :admin, media: 'all'
+    = render 'application/favicon'
+    = stylesheet_pack_tag 'admin'
     = csrf_meta_tags
 
   body class=body_class
@@ -21,5 +21,5 @@ html
         = render 'application/flashes'
         = yield
 
-    = javascript_include_tag :admin
+    = javascript_pack_tag 'admin'
     = yield :javascript

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

@@ -8,8 +8,8 @@ html
     = meta_robots_tag
     meta charset='utf-8'
     meta name='viewport' content='width=device-width, initial-scale=1.0'
-    = render 'favicon'
-    = stylesheet_link_tag :application, media: 'all'
+    = render 'application/favicon'
+    = stylesheet_pack_tag 'application'
     = csrf_meta_tags
 
   body class=body_class
@@ -21,5 +21,5 @@ html
 
     = render 'footer'
 
-    = javascript_include_tag :application
+    = javascript_pack_tag 'application'
     = yield :javascript

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

@@ -0,0 +1,7 @@
+doctype html
+html
+  head
+    meta http-equiv="Content-Type" content="text/html; charset=utf-8"
+
+  body
+    = yield

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blueberry_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 1.0.0
 platform: ruby
 authors:
 - BlueberryApps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: 5.2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: 5.2.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +60,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".eslintrc"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -70,7 +72,6 @@ files:
 - 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
@@ -81,41 +82,12 @@ files:
 - templates/Gemfile_custom.erb
 - templates/Procfile
 - templates/README.md.erb
-- templates/admin_assets/javascripts/admin.coffee
-- templates/admin_assets/javascripts/admin/.keep
-- templates/admin_assets/stylesheets/admin.sass
-- templates/admin_assets/stylesheets/admin/.keep
 - templates/admin_controllers/base_controller.rb
 - templates/admin_controllers/dashboard_controller.rb
 - templates/admin_views/dashboard/show.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
-- templates/assets/javascripts/application.coffee
-- templates/assets/javascripts/common/.keep
-- templates/assets/javascripts/frontend/.keep
-- templates/assets/stylesheets/application.sass
-- templates/assets/stylesheets/frontend/base/buttons.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/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
-- templates/assets/stylesheets/frontend/pages/.keep
-- templates/assets/stylesheets/frontend/third-party/includes.sass
-- templates/assets/stylesheets/frontend/utils/functions.sass
-- templates/assets/stylesheets/frontend/utils/make-columns.sass
-- templates/assets/stylesheets/frontend/utils/mixins.sass
-- templates/assets/stylesheets/frontend/utils/render-to.sass
-- templates/assets/stylesheets/frontend/utils/renderto-debug.sass
 - templates/circle.yml.erb
 - templates/config/initializers/airbrake.rb
 - templates/config/initializers/plurals.rb
@@ -125,33 +97,6 @@ files:
 - templates/database.yml.erb
 - templates/fontcustom.yml
 - templates/gitignore_custom.erb
-- templates/gulp/application.js.coffee
-- templates/gulp/application.sass
-- templates/gulp/config.coffee
-- templates/gulp/global.coffee
-- templates/gulp/global.sass
-- templates/gulp/gulp_helper.rb
-- templates/gulp/gulpfile.js
-- templates/gulp/message.coffee
-- templates/gulp/package.json
-- templates/gulp/rev_manifest.rb
-- templates/gulp/tasks/browserSync.coffee
-- templates/gulp/tasks/browserify.coffee
-- templates/gulp/tasks/build.coffee
-- templates/gulp/tasks/clean.coffee
-- templates/gulp/tasks/default.coffee
-- templates/gulp/tasks/fontIcons/generateIconSass.coffee
-- templates/gulp/tasks/fontIcons/index.coffee
-- templates/gulp/tasks/fontIcons/template.sass
-- templates/gulp/tasks/images.coffee
-- templates/gulp/tasks/rev/index.coffee
-- templates/gulp/tasks/rev/rev-assets.coffee
-- templates/gulp/tasks/rev/rev-font-workaround.coffee
-- templates/gulp/tasks/sass.coffee
-- templates/gulp/tasks/watch.coffee
-- 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/locales/cs/cs.devise.yml
@@ -187,17 +132,16 @@ files:
 - 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/drivers.rb
 - templates/spec/factories/administrators.rb
 - templates/spec/factories/users.rb
 - templates/spec/factories_spec.rb
-- templates/spec/factory_girl_syntax.rb
+- templates/spec/factory_bot_syntax.rb
 - templates/spec/mail_body_helpers.rb
 - templates/spec/spec_helper.rb
-- templates/tasks/icons.rake
 - templates/tasks/images.rake
 - templates/views/application/_favicon.html.slim
 - templates/views/application/_flashes.html.slim
@@ -207,6 +151,7 @@ files:
 - templates/views/application/_navbar.html.slim
 - templates/views/layouts/admin.html.slim.erb
 - templates/views/layouts/application.html.slim.erb
+- templates/views/layouts/mailer.html.slim.erb
 homepage: https://github.com/blueberryapps/blueberry_rails
 licenses:
 - MIT
@@ -219,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.5.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -227,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Rails app template by BlueberryApps

data/circle.yml

@@ -1,5 +0,0 @@
-test:
-  override:
-    - bundle exec rake:
-        parallel: true
-        timeout: 1400

data/templates/admin_assets/javascripts/admin.coffee

@@ -1,6 +0,0 @@
-#= require jquery
-#= require jquery-ujs
-#= require bootstrap-sass/bootstrap
-
-#= require_directory ./common
-#= require_directory ./admin

data/templates/admin_assets/stylesheets/admin.sass

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

data/templates/assets/icons/_font_icons.scss

@@ -1,18 +0,0 @@
-<%= font_face(url: "font-url", path: @font_path_alt) %>
-
-[data-icon]:before { content: attr(data-icon); }
-
-@mixin fontcustom {
-<%= glyph_properties %>
-}
-
-%fontcustom,
-[data-icon]:before,
-<%= glyph_selectors %> {
-<%= glyph_properties %>
-}
-
-<%= glyphs %>
-
-<% @glyphs.each do |name, value| %>
-$font-<%= font_name.gsub(/[^\w\d_]/, '-') %>-<%= name.to_s %>: "\<%= value[:codepoint].to_s(16) %>";<% end %>

data/templates/assets/javascripts/application.coffee

@@ -1,6 +0,0 @@
-#= require jquery
-#= require jquery-ujs
-#= require bootstrap-sass/bootstrap
-
-#= require_directory ./common
-#= require_directory ./frontend

data/templates/assets/stylesheets/application.sass

@@ -1,9 +0,0 @@
-// import custom bootstrap
-@import frontend/common/bootstrap-override
-
-// import app stylesheets
-@import frontend/utils/**/*
-@import frontend/base/**/*
-@import frontend/layout/**/*
-@import frontend/components/**/*
-@import frontend/pages/**/*

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

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

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

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

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

@@ -1,128 +0,0 @@
-// Bootstrap Mid-Small - col-ms-* - the missing grid set for Bootstrap3.
-//
-// This is a hack to fill the gap between 480 and 767 pixels - a missing range
-// in the bootstrap responsive grid structure.  Use these classes to style pages
-// on cellphones when they transition from portrait to landscape.
-//
-// Contains:
-//   Columns, Offsets, Pushes, Pulls for the Mid-Small layout
-//   Visibility classes for the Mid-Small layout
-//   Redefined visibility classes for the Extra Small layout
-//
-// See https://github.com/twbs/bootstrap/issues/10203 for more info.
-// Original gist: https://gist.github.com/andyl/6360906
-//
-// Instructions: Add the following to the end of bootstrap.scss
-//
-//   @import "bootstrap-ms"
-//
-
-// Mid-Small breakpoint
-$screen-ms: 480px !default
-$screen-ms-min: $screen-ms !default
-$screen-ms-max: $screen-sm-min - 1 !default
-
-// Redefined Extra Small max value (Can't override non-default variables in SASS)
-$screen-xs-max-new: $screen-ms-min - 1 !default
-
-// Common styles (see make-grid-columns() in bootstrap/mixins/_grid-framework.scss)
-.col-ms-1,
-.col-ms-2,
-.col-ms-3,
-.col-ms-4,
-.col-ms-5,
-.col-ms-6,
-.col-ms-7,
-.col-ms-8,
-.col-ms-9,
-.col-ms-10,
-.col-ms-11,
-.col-ms-12
-  position: relative
-  // Prevent columns from collapsing when empty
-  min-height: 1px
-  // Inner gutter via padding
-  padding-left: $grid-gutter-width / 2
-  padding-right: $grid-gutter-width / 2
-
-// Misc. class adjustments for col-ms
-@media (min-width: $screen-ms) and (max-width: $screen-ms-max)
-  .container
-    max-width: $screen-sm - 20px
-  .hidden-xs
-    display: block !important
-
-// col-ms grid
-@media (min-width: $screen-ms-min) and (max-width: $screen-ms-max)
-  +make-grid(xs)
-
-// Visibility utilities
-+responsive-invisibility(".visible-xs, .visible-ms")
-
-.visible-xs-block,
-.visible-xs-inline,
-.visible-xs-inline-block,
-.visible-ms-block,
-.visible-ms-inline,
-.visible-ms-inline-block
-  display: none !important
-
-@media (max-width: $screen-xs-max-new)
-  +responsive-visibility(".visible-xs")
-
-.visible-xs-block
-  @media (max-width: $screen-xs-max-new)
-    display: block !important
-
-.visible-xs-inline
-  @media (max-width: $screen-xs-max-new)
-    display: inline !important
-
-.visible-xs-inline-block
-  @media (max-width: $screen-xs-max-new)
-    display: inline-block !important
-
-@media (min-width: $screen-ms-min) and (max-width: $screen-ms-max)
-  +responsive-visibility(".visible-ms")
-
-.visible-ms-block
-  @media (min-width: $screen-ms-min) and (max-width: $screen-ms-max)
-    display: block !important
-
-.visible-ms-inline
-  @media (min-width: $screen-ms-min) and (max-width: $screen-ms-max)
-    display: inline !important
-
-.visible-ms-inline-block
-  @media (min-width: $screen-ms-min) and (max-width: $screen-ms-max)
-    display: inline-block !important
-
-@media (max-width: $screen-xs-max-new)
-  +responsive-invisibility(".hidden-xs")
-
-@media (min-width: $screen-ms-min) and (max-width: $screen-ms-max)
-  +responsive-invisibility(".hidden-ms")
-
-//  An extension of andyl's hack – https://gist.github.com/andyl/6360906
-//  in a mixin version.
-
-=make-ms-column($columns, $gutter: $grid-gutter-width)
-  position: relative
-  min-height: 1px
-  padding-left: $gutter / 2
-  padding-right: $gutter / 2
-  @media (min-width: $screen-ms-min)
-    float: left
-    width: percentage($columns / $grid-columns)
-
-=make-ms-column-offset($columns)
-  @media (min-width: $screen-ms-min)
-    margin-left: percentage($columns / $grid-columns)
-
-=make-ms-column-push($columns)
-  @media (min-width: $screen-ms-min)
-    left: percentage($columns / $grid-columns)
-
-=make-ms-column-pull($columns)
-  @media (min-width: $screen-ms-min)
-    right: percentage($columns / $grid-columns)