orats 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b087e4b8c21cbfe5c1dcea8b3216f91d1b1631ff
-  data.tar.gz: efc9b450b01b1f0417fa8eb8a164c169e6d99bce
+  metadata.gz: d8d3b5c32852f8387ced21f30ce46cfb09477662
+  data.tar.gz: dfa8f11755ba22556f3990112f8928ed89ed9de1
 SHA512:
-  metadata.gz: 4715024b5981df05313fb886f2672f456ec8a7c524dbc109e1159ecc76930cd22dc3a61d3ac1adb5387eb9e239cbb7ebdd3273f67be655e2eb88c0f2dc7292b0
-  data.tar.gz: eb6d7aadc7522f5cc0378ce780debf1e77ce2f60c94c9c6f422f8322c58e286359fef650f70004c567cd950ec2230867a5bd84e91b32280e4c9eb236455f0c60
+  metadata.gz: d92d999e5cb58886e5d8bab902fed46f14e054d1db4450e774c473266aa7a6d2a65c9eeaf63e3d653809c83f4c9c5f10734377d79b3f04c441573afcc74e2a14
+  data.tar.gz: 2ff29088ba5833ea4029a574890867768f84844d6a6798b8013fa7504573abd5074c58a63292160e8bbf5f5b1ae749a2fe1a26ee12ecc9d6f1ec74ebcbeb45bb

data/README.md

@@ -6,7 +6,7 @@ It stands for opinionated rails application templates. The templates include sol
 
 ## What version of Rails and Ruby are you targeting?
 
-#### Rails 4.1.x and Ruby 2.1.x
+#### Rails 4.2.x and Ruby 2.1.x
 
 Gems will also be updated once they are proven to work on the target rails/ruby versions. The gems are locked using the pessimistic operator `~>` to ensure your installation works over time as long as rubygems.org's API is working.
 
@@ -43,7 +43,7 @@ Before running orats...
 - [Postgres](https://wiki.postgresql.org/wiki/Detailed_installation_guides)
 - [Redis](http://redis.io/topics/quickstart)
 - Ruby 2.1.x - [chruby](https://github.com/postmodern/chruby) | [rbenv](https://github.com/sstephenson/rbenv) | [rvm](https://rvm.io/)
-- Rails 4.1.x - `gem install rails -v '~> 4.1.4'`
+- Rails 4.2.x - `gem install rails -v '~> 4.2.0'`
 
 #### You should install
 

data/lib/orats/templates/auth.rb

@@ -1,7 +1,7 @@
 require 'securerandom'
 
 # =============================================================================
-# template for generating an orats auth project for rails 4.1.x
+# template for generating an orats auth project for rails 4.2.x
 # =============================================================================
 # view the task list at the bottom of the file
 # -----------------------------------------------------------------------------
@@ -59,9 +59,9 @@ def update_gemfile
   inject_into_file 'Gemfile', before: "\ngem 'kaminari'" do
     <<-S
 
-gem 'devise', '~> 3.3.0'
+gem 'devise', '~> 3.4.1'
 gem 'devise-async', '~> 0.9.0'
-gem 'pundit', '~> 0.2.3'
+gem 'pundit', '~> 0.3.0'
     S
   end
   commit 'Add authentication related gems'

data/lib/orats/templates/base.rb

@@ -1,7 +1,7 @@
 require 'securerandom'
 
 # =============================================================================
-# template for generating an orats base project for rails 4.1.x
+# template for generating an orats base project for rails 4.2.x
 # =============================================================================
 # view the task list at the bottom of the file
 # -----------------------------------------------------------------------------
@@ -286,7 +286,7 @@ require 'syslog/logger'
   end
 
   inject_into_file 'config/environments/production.rb',
-                   after: "config.log_level = :info\n" do
+                   after: "config.log_level = :debug\n" do
     <<-S
 
   # Log to syslog.
@@ -296,21 +296,17 @@ require 'syslog/logger'
   end
   commit 'Update the logger to be tagged and sent to syslog'
 
-  inject_into_file 'config/environments/production.rb',
+  inject_into_file 'config/initializers/assets.rb',
                    after: "%w( search.js )\n" do
     <<-'S'
-  config.assets.precompile << Proc.new { |path|
-    if path =~ /\.(eot|svg|ttf|woff|png)\z/
-      true
-    end
-  }
+Rails.application.config.assets.precompile << Proc.new { |path|
+  if path =~ /\.(eot|svg|ttf|woff|png)\z/
+    true
+  end
+}
     S
   end
   commit 'Update the assets precompiler to include common file types'
-
-  gsub_file 'config/environments/production.rb',
-            '# config.assets.css_compressor', 'config.assets.css_compressor'
-  commit 'Add sass asset compression'
 end
 
 def update_routes
@@ -368,7 +364,6 @@ def add_layout_partials
   gsub_file 'app/views/layouts/_footer.html.erb', 'app_name', app_name
 
   orats_to_local 'app/views/layouts/_google_analytics_snippet.html.erb'
-  orats_to_local 'app/views/layouts/_google_analytics_tracker.html.erb'
 
   orats_to_local 'app/views/layouts/_disqus_comments_snippet.html.erb'
   orats_to_local 'app/views/layouts/_disqus_count_snippet.html.erb'
@@ -392,12 +387,12 @@ def update_sass
   task __method__
 
   run 'mv app/assets/stylesheets/application.css app/assets/stylesheets/' + \
-      'application.css.scss'
+      'application.scss'
 
-  inject_into_file 'app/assets/stylesheets/application.css.scss',
+  inject_into_file 'app/assets/stylesheets/application.scss',
                    " *= require font-awesome\n",
                    before: " *= require_self\n"
-  append_file 'app/assets/stylesheets/application.css.scss' do
+  append_file 'app/assets/stylesheets/application.scss' do
     <<-S
 
 // Core variables and mixins
@@ -467,6 +462,11 @@ img {
   color: $brand-danger;
   font-size: $font-size-small;
 }
+
+html.turbolinks-progress-bar::before {
+  background-color: #aa0000 !important;
+  height: 3px !important;
+}
     S
   end
   commit 'Add font-awesome, bootstrap and a few default styles'
@@ -498,6 +498,10 @@ def update_coffeescript
 //= require bootstrap/transition
     S
   end
+
+  inject_into_file 'app/assets/javascripts/application.js',
+                   "\nTurbolinks.enableProgressBar();\n",
+                   after: "//= require_tree .\n"
   commit 'Add jquery.turbolinks and bootstrap'
 end
 

data/lib/orats/templates/includes/new/rails/Gemfile

@@ -1,45 +1,46 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.1.4'
-gem 'turbolinks', '~> 2.2.2'
-gem 'jquery-rails', '~> 3.1.1'
-gem 'jquery-turbolinks', '~> 2.0.2'
+gem 'rails', '~> 4.2.0'
+gem 'turbolinks', '~> 2.5.3'
+gem 'jquery-rails', '~> 4.0.1'
+gem 'jquery-turbolinks', '~> 2.1.0'
 #gem 'jbuilder'
 
-gem 'bootstrap-sass', '~> 3.2.0'
-gem 'font-awesome-rails', '~> 4.1.0'
+gem 'font-awesome-rails', '~> 4.2.0'
+gem 'bootstrap-sass', '~> 3.3.1'
 
 gem 'pg', '~> 0.17.1'
 gem 'redis-rails', '~> 4.0.0'
 
 gem 'unicorn', '~> 4.8.3'
-#gem 'puma', '~> 2.9.0'
-gem 'sidekiq', '~> 3.2.1'
+#gem 'puma', '~> 2.10.2'
+gem 'sidekiq', '~> 3.3.0'
 gem 'sinatra', '>= 1.4.5', require: false
 
-gem 'whenever', '~> 0.9.2', require: false
+gem 'whenever', '~> 0.9.4', require: false
 
-gem 'sitemap_generator', '~> 5.0.2'
+gem 'sitemap_generator', '~> 5.0.5'
 gem 'favicon_maker', '~> 1.3'
 gem 'kaminari', '~> 0.16.1'
 
 group :development do
   gem 'foreman', require: false
-  gem 'spring', '~> 1.1.2'
+  gem 'spring', '~> 1.2.0'
+  gem 'web-console', '~> 2.0.0'
   gem 'rack-mini-profiler', '~> 0.9.1'
-  gem 'bullet', '~> 4.10.0'
+  gem 'bullet', '~> 4.14.0'
   gem 'meta_request', '~> 0.3.0'
   gem 'railroady', '~> 1.1.1', require: false
 end
 
 group :development, :test do
-  gem 'dotenv-rails', '~> 0.11.1'
+  gem 'dotenv-rails', '~> 1.0.2'
 end
 
 group :assets do
-  gem 'sass-rails', '~> 4.0.3'
-  gem 'coffee-rails', '~> 4.0.1'
-  gem 'uglifier', '~> 2.5.1'
+  gem 'sass-rails', '~> 5.0.0'
+  gem 'coffee-rails', '~> 4.1.0'
+  gem 'uglifier', '~> 2.6.0'
 end
 
 group :doc do

data/lib/orats/templates/includes/new/rails/app/views/layouts/_google_analytics_snippet.html.erb

@@ -1,13 +1,21 @@
-<script type="text/javascript">
-  var _gaq = _gaq || [];
-  <% if ENV['GOOGLE_ANALYTICS_UA'].present? %>
-  _gaq.push(['_setAccount', '<%= ENV["GOOGLE_ANALYTICS_UA"] %>']);
-  (function () {
-    var ga = document.createElement('script');
-    ga.type = 'text/javascript';
-    ga.async = true;
-    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);
-  })();
-  <% end %>
+<% if ENV['GOOGLE_ANALYTICS_UA'].present? %>
+<script data-turbolinks-eval="false">
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', '<%= ENV["GOOGLE_ANALYTICS_UA"] %>', 'auto');
+</script>
+
+<script>
+  // Enable 'Demographics and interest reports' in your analytics settings
+  // ga('require', 'displayfeatures');
+
+  // Enable 'Use enhanced link attribution' in your analytics settings
+  // ga('require', 'linkid', 'linkid.js');
+
+  ga('set', 'location', location.href.split('#')[0]);
+  ga('send', 'pageview', { 'title': document.title });
+</script>
+<% end %>

data/lib/orats/templates/includes/new/rails/app/views/layouts/application.html.erb

@@ -19,11 +19,10 @@
   <script
       src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.js"></script>
   <![endif]-->
-  <%= render 'layouts/google_analytics_snippet' %>
 </head>
 
 <body>
-<%= render 'layouts/google_analytics_tracker' %>
+<%= render 'layouts/google_analytics_snippet' %>
 <header>
   <%= render 'layouts/navigation' %>
 </header>

data/lib/orats/version.rb

@@ -1,4 +1,4 @@
 # set the version of this gem
 module Orats
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -121,7 +121,6 @@ files:
 - lib/orats/templates/includes/new/rails/app/views/layouts/_flash.html.erb
 - lib/orats/templates/includes/new/rails/app/views/layouts/_footer.html.erb
 - lib/orats/templates/includes/new/rails/app/views/layouts/_google_analytics_snippet.html.erb
-- lib/orats/templates/includes/new/rails/app/views/layouts/_google_analytics_tracker.html.erb
 - lib/orats/templates/includes/new/rails/app/views/layouts/_navigation.html.erb
 - lib/orats/templates/includes/new/rails/app/views/layouts/_navigation_auth.html.erb
 - lib/orats/templates/includes/new/rails/app/views/layouts/_navigation_links.html.erb
@@ -178,3 +177,4 @@ summary: Opinionated rails application templates.
 test_files:
 - test/integration/cli_test.rb
 - test/test_helper.rb
+has_rdoc: 

data/lib/orats/templates/includes/new/rails/app/views/layouts/_google_analytics_tracker.html.erb

@@ -1,4 +0,0 @@
-<script type="text/javascript">
-  // This is added in the body to track both turbolinks and regular hits.
-  _gaq.push(['_trackPageview']);
-</script>