anadea-spark 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4b48f90a25699a12c93b8d28e223b7f4c603120
-  data.tar.gz: be3810d089bff6f6b4f4ec30f9f6160f68ef21c3
+  metadata.gz: 7f49d7ffcea2b42eed9ec9c223426a32f8f93a74
+  data.tar.gz: 37cacb751e0d962f5f76ac88ff74dc44d49f79b6
 SHA512:
-  metadata.gz: 34d9fd22ae8f55e6c371a61b985e50679d7a6e08d7f4cd8257c51ee44c2b986a7619d6af129953ad7f449e0d1d3a581c7b819032793bf26ba5144156f76eea32
-  data.tar.gz: 99384de1504d9760f6a9ab99b47394fbe32028b3e67e4de60dcc884c86479145479989351ba4ece36c5ee954ea10ab9e9414ece63ab5c27976ec72c8d4d2d324
+  metadata.gz: 813db1c0f5aceb94b7ceac5c3c838972deee3f92abd7ec2cfa2ec85cdd2acf172b0ed5a0fe6ec2c27e616c66d61e2441143ce4c031ca582d0c84bf99087356af
+  data.tar.gz: 55982b5b1e377e09902b69bc92119b48d70373a28f19611833c0ba70f0186aa62dc544d6a6eaf9ce323dd906158dceebcbc398e1e1ad1a6890e7e4aa82a51594

data/README.md

@@ -18,7 +18,6 @@
 
 * [Bootstrap](https://github.com/twbs/bootstrap-sass) для стандартного внешнего
   вида и вёрстки по сетке.
-* [Coffee Rails](https://github.com/rails/coffee-rails) как дефолт Рельсов.
 * [Email Validator](https://github.com/balexand/email_validator) для валидации
   адреса электронной почты.
 * [Exception Notification](https://github.com/smartinez87/exception_notification)
@@ -27,27 +26,16 @@
   `MAIL_ERRORS_TO`, задающей список адресов для уведомления через запятую.
 * [Figaro](https://github.com/laserlemon/figaro) для конфигурации приложения
   через переменные окружения.
-* [Haml Rails](https://github.com/indirect/haml-rails) для структурированных
-  шаблонов.
-* [High Voltage](https://github.com/thoughtbot/high_voltage) для статических
-  страничек.
+* [High Voltage](https://github.com/thoughtbot/high_voltage) отображения
+  домашней страницы и других страниц, не требующих кастомного контроллера.
 * [Jquery Rails](https://github.com/rails/jquery-rails) для JQuery как дефолт
   Рельсов.
 * [Postgres](https://github.com/ged/ruby-pg) для доступа к базе данных Postgres.
-* [Puma](https://github.com/puma/puma) как руби-сервер в разработке и в
-  продакшене.
-* [Rack Timeout](https://github.com/heroku/rack-timeout) чтобы отменять слишком
-  длинные запросы. Включается при наличии переменной окружения `RACK_TIMEOUT`,
-  задаваемой в секундах.
-* [Recipient Interceptor](https://github.com/croaky/recipient_interceptor) чтобы
-  избежать случайной отправки почты реальным адресатам со стейджинга. Включается
-  при наличии переменной окружения `EMAIL_RECIPIENTS`, задающей адрес, которым
-  будет заменено поле `to` любого отправляемого письма.
+* [Thin](https://github.com/macournoyer/thin) как руби-сервер в разработке и в
+  первоначальном продакшене.
 * [Sass Rails](https://github.com/rails/sass-rails) как дефолт Рельсов.
 * [Simple Form](https://github.com/plataformatec/simple_form) для разметки и
   стиллизации форм. Инициализатор сгенерирован для twitter bootstrap.
-* [Title](https://github.com/calebthompson/title) для удобного задания тайтлов
-  страниц в файлах перевода i18n.
 * [Uglifier](https://github.com/lautis/uglifier) как дефолт Рельсов.
 
 ## Гемы для разработки
@@ -87,9 +75,9 @@
 * В приложении создаётся скрипт `bin/setup` для лёгкого старта новыми разработчиками.
 * Макет (layout) приложения с флеш-сообщениями, навигацией и подвалом, сделанный
   под twitter bootstrap.
+* Удалён гем `coffee-rails`, так как Coffeescript признан плохой практикой.
 * Готовый шаблон для home page – заходи и меняй.
 * Несколько удобных форматов даты и времени для локализации.
-* `Rack::Deflater` для [сжатия HTTP ответов с помощью Gzip][compress].
 * [Уменьшен размер пула соединений с базой данных][pool].
 * `t()` и `l()` хелперы в тестах, чтобы вызывать их без префиксов.
 * Переменная окружения `SECRET_KEY_BASE` используется во всех окружениях.
@@ -107,7 +95,6 @@
 * Добавлен `.ruby-version`, понимаемый большинством менеджеров версий Руби.
 * Контент `config/routes.rb`, состоящий из большого комментария, удалён.
 
-[compress]: http://robots.thoughtbot.com/content-compression-with-rack-deflater/
 [pool]: https://devcenter.heroku.com/articles/concurrency-and-database-connections
 [rails12factor]: https://github.com/heroku/rails_12factor
 [mailcatcher]: http://mailcatcher.me/

data/lib/spark/app_builder.rb

@@ -83,20 +83,6 @@ module Spark
         :after => 'config.action_mailer.raise_delivery_errors = false'
     end
 
-    def enable_rack_deflater
-      config = <<-RUBY
-
-  # Enable deflate / gzip compression of controller-generated responses
-  config.middleware.use Rack::Deflater
-      RUBY
-
-      inject_into_file(
-        "config/environments/production.rb",
-        config,
-        after: serve_static_files_line
-      )
-    end
-
     def setup_asset_host
       replace_in_file 'config/environments/production.rb',
         "# config.action_controller.asset_host = 'http://assets.example.com'",
@@ -124,29 +110,29 @@ module Spark
     def create_partials
       empty_directory 'app/views/application'
 
-      copy_file 'views/application/_flashes.html.haml',
-        'app/views/application/_flashes.html.haml'
-      copy_file 'views/application/_javascript.html.haml',
-        'app/views/application/_javascript.html.haml'
-      copy_file 'views/application/_navigation.html.haml',
-        'app/views/application/_navigation.html.haml'
-      copy_file 'views/application/_navigation_links.html.haml',
-        'app/views/application/_navigation_links.html.haml'
-      copy_file 'views/application/_analytics.html.haml',
-        'app/views/application/_analytics.html.haml'
-      copy_file 'views/application/_footer.html.haml',
-        'app/views/application/_footer.html.haml'
+      copy_file 'views/application/_flashes.html.erb',
+        'app/views/application/_flashes.html.erb'
+      copy_file 'views/application/_javascript.html.erb',
+        'app/views/application/_javascript.html.erb'
+      copy_file 'views/application/_navigation.html.erb',
+        'app/views/application/_navigation.html.erb'
+      copy_file 'views/application/_navigation_links.html.erb',
+        'app/views/application/_navigation_links.html.erb'
+      copy_file 'views/application/_analytics.html.erb',
+        'app/views/application/_analytics.html.erb'
+      copy_file 'views/application/_footer.html.erb',
+        'app/views/application/_footer.html.erb'
     end
 
     def create_home_page
-      copy_file 'views/pages/home.html.haml',
-        'app/views/pages/home.html.haml'
+      copy_file 'views/pages/home.html.erb',
+        'app/views/pages/home.html.erb'
     end
 
     def create_application_layout
       remove_file 'app/views/layouts/application.html.erb'
-      copy_file 'views/layouts/application.html.haml',
-        'app/views/layouts/application.html.haml'
+      template 'views/layouts/application.html.erb.erb',
+        'app/views/layouts/application.html.erb', force: true
     end
 
     def use_postgres_config_template
@@ -188,10 +174,6 @@ module Spark
       copy_file "spec/spec_helper.rb", "spec/spec_helper.rb"
     end
 
-    def configure_i18n_for_test_environment
-      copy_file "spec/support/i18n.rb", "spec/support/i18n.rb"
-    end
-
     def configure_i18n_for_missing_translations
       raise_on_missing_translations_in("development")
       raise_on_missing_translations_in("test")
@@ -210,16 +192,6 @@ module Spark
       template "config/locales_en.yml.erb", "config/locales/en.yml"
     end
 
-    def configure_rack_timeout
-      copy_file 'config/initializers/rack_timeout.rb',
-        'config/initializers/rack_timeout.rb'
-    end
-
-    def configure_mail_interceptor
-      copy_file 'config/initializers/mail_interceptor.rb',
-        'config/initializers/mail_interceptor.rb'
-    end
-
     def configure_simple_form
       # Here we suppress simple_form warning that simple_form hasn't been configured
       bundle_command "exec rails generate simple_form:install --bootstrap > /dev/null 2>&1"
@@ -250,11 +222,6 @@ module Spark
       generate 'rspec:install'
     end
 
-    def configure_puma
-      bundle_command 'binstub puma'
-      remove_file 'bin/pumactl'
-    end
-
     def setup_foreman
       copy_file 'Procfile', 'Procfile'
     end

data/lib/spark/generators/app_generator.rb

@@ -30,7 +30,6 @@ module Spark
       invoke :setup_test_environment
       invoke :setup_production_environment
       invoke :setup_assets
-      invoke :configure_mail_interceptor
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :remove_routes_comment_lines
@@ -77,7 +76,6 @@ module Spark
       build :configure_background_jobs_for_rspec
       build :enable_database_cleaner
       build :configure_spec_support_features
-      build :configure_i18n_for_test_environment
       build :configure_action_mailer_in_specs
     end
 
@@ -85,7 +83,6 @@ module Spark
       say 'Setting up the production environment'
       build :configure_exception_notification
       build :configure_smtp
-      build :enable_rack_deflater
       build :setup_asset_host
     end
 
@@ -112,12 +109,10 @@ module Spark
       build :configure_action_mailer
       build :configure_active_job
       build :configure_time_formats
-      build :configure_rack_timeout
       build :configure_simple_form
       build :disable_xml_params
       build :fix_i18n_deprecation_warning
       build :setup_default_rake_task
-      build :configure_puma
       build :setup_foreman
     end
 
@@ -127,11 +122,6 @@ module Spark
       build :setup_javascripts
     end
 
-    def configure_mail_interceptor
-      say 'Configure mail interceptor'
-      build :configure_mail_interceptor
-    end
-
     def setup_git
       if !options[:skip_git]
         say 'Initializing git'

data/lib/spark/version.rb

@@ -1,5 +1,5 @@
 module Spark
   RAILS_VERSION = "4.2.1"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/features/new_project_spec.rb

@@ -11,7 +11,7 @@ RSpec.feature 'Build a new project with default configuration' do
     end
   end
 
-  scenario 'generated .ruby-version is pulled from gem .ruby-version' do
+  scenario 'generated .ruby-version is pulled from interpreter' do
     run_generator
 
     ruby_version_file = IO.read("#{project_path}/.ruby-version")
@@ -33,12 +33,6 @@ RSpec.feature 'Build a new project with default configuration' do
     expect(File).to exist("#{project_path}/spec/support/action_mailer.rb")
   end
 
-  scenario "i18n support file is added" do
-    run_generator
-
-    expect(File).to exist("#{project_path}/spec/support/i18n.rb")
-  end
-
   scenario 'exception notification reads mail address from ENV' do
     run_generator
 
@@ -52,11 +46,13 @@ RSpec.feature 'Build a new project with default configuration' do
 
   scenario 'records pageviews through Google Analytics if ENV variable set' do
     run_generator
+    analytics_partial =
+      IO.read("#{project_path}/app/views/application/_analytics.html.erb")
 
     expect(analytics_partial).
-      to include(%{- if ENV.key?("GOOGLE_ANALYTICS_KEY")})
+      to include(%{<% if ENV.key?("GOOGLE_ANALYTICS_KEY") %>})
     expect(analytics_partial).
-      to include(%{_gaq.push(['_setAccount', '\#{ENV["GOOGLE_ANALYTICS_KEY"]}']);})
+      to include(%{_gaq.push(['_setAccount', '<%= ENV["GOOGLE_ANALYTICS_KEY"] %>']);})
   end
 
   scenario "raises on unpermitted parameters in all environments" do
@@ -81,19 +77,12 @@ RSpec.feature 'Build a new project with default configuration' do
     end
   end
 
-  scenario "specs for missing or unused translations" do
-    run_generator
-
-    expect(File).to exist("#{project_path}/spec/i18n_spec.rb")
-  end
-
   scenario "generated en.yml is evaluated" do
     run_generator
 
     locales_en_file = IO.read("#{project_path}/config/locales/en.yml")
-    app_name = TestHelpers::APP_NAME
 
-    expect(locales_en_file).to match(/application: #{app_name.humanize}/)
+    expect(locales_en_file).to match(/with_weekday/)
   end
 
   scenario "config simple_form" do
@@ -123,8 +112,4 @@ RSpec.feature 'Build a new project with default configuration' do
       /^ +config.active_job.queue_adapter = :inline$/
     )
   end
-
-  def analytics_partial
-    IO.read("#{project_path}/app/views/application/_analytics.html.haml")
-  end
 end

data/templates/Gemfile.erb

@@ -3,22 +3,17 @@ source "https://rubygems.org"
 ruby "<%= ::RUBY_VERSION %>"
 
 gem "bootstrap-sass", "~> 3.3.4"
-gem "coffee-rails", "~> 4.1.0"
 gem "delayed_job_active_record"
 gem "email_validator"
 gem "exception_notification"
 gem "figaro"
-gem "haml-rails"
 gem "high_voltage"
 gem "jquery-rails"
 gem "pg"
-gem "puma"
-gem "rack-timeout"
 gem "rails", "<%= Spark::RAILS_VERSION %>"
-gem "recipient_interceptor"
 gem "sass-rails", "~> 5.0"
 gem "simple_form"
-gem "title"
+gem "thin"
 gem "uglifier"
 
 group :development do

data/templates/Procfile

@@ -1,2 +1,2 @@
-web: ./bin/puma -t ${PUMA_MIN_THREADS:-8}:${PUMA_MAX_THREADS:-12} -w ${PUMA_WORKERS:-2} -p $PORT -e ${RACK_ENV:-development}
+web: ./bin/rails server thin -p $PORT -e $RACK_ENV
 worker: bundle exec rake jobs:work

data/templates/config/locales_en.yml.erb

@@ -14,6 +14,3 @@ en:
         "%b %-d, %Y"
       short:
         "%B %d"
-
-  titles:
-    application: <%= app_name.humanize %>

data/templates/views/application/{_analytics.html.haml → _analytics.html.erb}

@@ -1,7 +1,8 @@
-- if ENV.key?("GOOGLE_ANALYTICS_KEY")
-  :javascript
+<% if ENV.key?("GOOGLE_ANALYTICS_KEY") %>
+  <script type="text/javascript">
+
     var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '#{ENV["GOOGLE_ANALYTICS_KEY"]}']);
+    _gaq.push(['_setAccount', '<%= ENV["GOOGLE_ANALYTICS_KEY"] %>']);
     _gaq.push(['_trackPageview']);
 
     (function() {
@@ -9,3 +10,7 @@
       ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
+
+
+  </script>
+<% end %>

data/templates/views/application/_flashes.html.erb

@@ -0,0 +1,6 @@
+<% flash.each do |name, msg| %>
+  <div class="alert alert-<%= name == "notice" ? "success" : "danger" %>">
+    <button aria-hidden="true" class="close" data-dismiss="alert" type="button">×</button>
+    <%= content_tag :div, msg, :id => "flash_#{name}" %>
+  </div>
+<% end %>

data/templates/views/application/_footer.html.erb

@@ -0,0 +1,15 @@
+<div id="footer">
+  <div class="container">
+    <div class="row footer-first-row">
+      <div class="col-xs-12 text-center">
+        <p>
+          <small>
+            © #{Time.now.year} - Yourself!
+            <br/>
+            Assembled with #{link_to "Spark", "https://github.com/Anadea/spark"}
+          </small>
+        </p>
+      </div>
+    </div>
+  </div>
+</div>

data/templates/views/application/_javascript.html.erb

@@ -0,0 +1,9 @@
+<%= javascript_include_tag :application %>
+<%= yield :javascript %>
+<%= render "analytics" %>
+<% if Rails.env.test? %>
+  <%= javascript_tag do %>
+    $.fx.off = true;
+    $.ajaxSetup({ async: false });
+  <% end %>
+<% end %>

data/templates/views/application/_navigation.html.erb

@@ -0,0 +1,18 @@
+<nav class="navbar navbar-default">
+  <div class="container">
+    <div class="navbar-header">
+      <button class="navbar-toggle" data-target=".navbar-collapse" data-toggle="collapse" type="button">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <%= link_to 'Home', root_path, class: 'navbar-brand' %>
+    </div>
+    <div class="collapse navbar-collapse">
+      <ul class="nav navbar-nav">
+        <%= render 'navigation_links' %>
+      </ul>
+    </div>
+  </div>
+</nav>

data/templates/views/application/_navigation_links.html.erb

@@ -0,0 +1,2 @@
+<li><%= link_to "Link 1", "#" %></li>
+<li><%= link_to "Link 2", "#" %></li>

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

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
+    <meta charset="utf-8"/>
+    <meta content="NOODP" name="ROBOTS"/>
+    <meta content="initial-scale=1" name="viewport"/>
+    <title><%= app_name.humanize %></title>
+    <%%= stylesheet_link_tag :application, media: "all" %>
+    <%%= csrf_meta_tags %>
+  </head>
+  <body>
+    <div id="wrap">
+      <header>
+        <%%= render 'navigation' %>
+      </header>
+      <div class="container">
+        <div class="row">
+          <div class="col-sm-6 col-sm-offset-3 text-center">
+            <%%= render 'flashes' %>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-12">
+            <%%= yield %>
+          </div>
+        </div>
+      </div>
+    </div>
+    <%%= render 'footer' %>
+    <%%= render 'javascript' %>
+  </body>
+</html>

data/templates/views/pages/home.html.erb

@@ -0,0 +1,5 @@
+<h1>
+  <i class="fa fa-home"></i>
+  Home Page
+  <small>views/pages/home.html.erb</small>
+</h1>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anadea-spark
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - anadea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,8 +121,6 @@ files:
 - templates/config/initializers/errors.rb
 - templates/config/initializers/exception_notification.rb.erb
 - templates/config/initializers/json_encoding.rb
-- templates/config/initializers/mail_interceptor.rb
-- templates/config/initializers/rack_timeout.rb
 - templates/config/locales_en.yml.erb
 - templates/config/newrelic.yml.erb
 - templates/config/postgresql_database.yml.erb
@@ -133,17 +131,16 @@ files:
 - templates/spec/support/action_mailer.rb
 - templates/spec/support/database_cleaner_rspec.rb
 - templates/spec/support/factory_girl_rspec.rb
-- templates/spec/support/i18n.rb
 - templates/tasks/bundler_audit.rake
 - templates/tasks/development_seeds.rake
-- templates/views/application/_analytics.html.haml
-- templates/views/application/_flashes.html.haml
-- templates/views/application/_footer.html.haml
-- templates/views/application/_javascript.html.haml
-- templates/views/application/_navigation.html.haml
-- templates/views/application/_navigation_links.html.haml
-- templates/views/layouts/application.html.haml
-- templates/views/pages/home.html.haml
+- templates/views/application/_analytics.html.erb
+- templates/views/application/_flashes.html.erb
+- templates/views/application/_footer.html.erb
+- templates/views/application/_javascript.html.erb
+- templates/views/application/_navigation.html.erb
+- templates/views/application/_navigation_links.html.erb
+- templates/views/layouts/application.html.erb.erb
+- templates/views/pages/home.html.erb
 homepage: http://github.com/Anadea/spark
 licenses:
 - MIT

data/templates/config/initializers/mail_interceptor.rb

@@ -1,4 +0,0 @@
-# https://github.com/croaky/recipient_interceptor
-Mail.register_interceptor(
-  RecipientInterceptor.new(ENV["EMAIL_RECIPIENTS"])
-) if ENV.key?("EMAIL_RECIPIENTS")

data/templates/config/initializers/rack_timeout.rb

@@ -1 +0,0 @@
-Rack::Timeout.timeout = ENV["RACK_TIMEOUT"].to_i if ENV.key?("RACK_TIMEOUT")

data/templates/spec/support/i18n.rb

@@ -1,3 +0,0 @@
-RSpec.configure do |config|
-  config.include AbstractController::Translation
-end

data/templates/views/application/_flashes.html.haml

@@ -1,4 +0,0 @@
-- flash.each do |name, msg|
-  %div{:class => "alert alert-#{name == "notice" ? "success" : "danger"}"}
-    %button.close{"aria-hidden" => "true", "data-dismiss" => "alert", :type => "button"} ×
-    = content_tag :div, msg, :id => "flash_#{name}"

data/templates/views/application/_footer.html.haml

@@ -1,9 +0,0 @@
-#footer
-  .container
-    .row.footer-first-row
-      .col-xs-12.text-center
-        %p
-          %small
-            © #{Time.now.year} - Yourself!
-            %br/
-            Assembled with #{link_to "Spark", "https://github.com/Anadea/spark"}

data/templates/views/application/_javascript.html.haml

@@ -1,8 +0,0 @@
-= javascript_include_tag :application
-= yield :javascript
-= render "analytics"
-
-- if Rails.env.test?
-  = javascript_tag do
-    $.fx.off = true;
-    $.ajaxSetup({ async: false });

data/templates/views/application/_navigation.html.haml

@@ -1,12 +0,0 @@
-%nav.navbar.navbar-default
-  .container
-    .navbar-header
-      %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", :type => "button"}
-        %span.sr-only Toggle navigation
-        %span.icon-bar
-        %span.icon-bar
-        %span.icon-bar
-      = link_to 'Home', root_path, class: 'navbar-brand'
-    .collapse.navbar-collapse
-      %ul.nav.navbar-nav
-        = render 'navigation_links'

data/templates/views/application/_navigation_links.html.haml

@@ -1,2 +0,0 @@
-%li= link_to "Link 1", "#"
-%li= link_to "Link 2", "#"

data/templates/views/layouts/application.html.haml

@@ -1,23 +0,0 @@
-!!!
-%html
-  %head
-    %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
-    %meta{:charset => "utf-8"}/
-    %meta{:content => "NOODP", :name => "ROBOTS"}/
-    %meta{:content => "initial-scale=1", :name => "viewport"}/
-    %title= title
-    = stylesheet_link_tag :application, media: "all"
-    = csrf_meta_tags
-  %body
-    #wrap
-      %header
-        = render 'navigation'
-      .container
-        .row
-          .col-sm-6.col-sm-offset-3.text-center
-            = render 'flashes'
-        .row
-          .col-sm-12
-            = yield
-    = render 'footer'
-    = render 'javascript'

data/templates/views/pages/home.html.haml

@@ -1,4 +0,0 @@
-%h1
-  %i.fa.fa-home
-  Home Page
-  %small views/pages/home.html.erb