shoestrap 1.2.0.pre2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66f35274e27bc8f59fc2276a3b7f875a78940601
-  data.tar.gz: 410932f9bef837db7c8ec4ce896138a148ace025
+  metadata.gz: 60b923e6b4b219fc3b8c2523ba93f7df17d1f113
+  data.tar.gz: 1c14d0566feccfa005137b7195f88913e036c571
 SHA512:
-  metadata.gz: 3e5431dc83e95df483f3021ba73e3979863aff6a0170c9532116457f0238d35ce17ae17d283a31fb2b04fd3e3e8b28aa3dcefb2b513b84f0f4f8e1e7d0b1f8b6
-  data.tar.gz: eb46add7d73fe886300946e882d2e20c57dcd458e4d660a186d62ee7c8a5d6446c0ffcbadffdaa708d08c24dbfd74ccd588a90c8f58041235bab9ac8d440425d
+  metadata.gz: 9e827cc67ce1cec3cc0851575cdde82cabd23a4ffeb95337b8f012745a77fab413e8889b9b16b238b6fc240dc4af92625a7603fba2db577aa4edc4f86e6d14c9
+  data.tar.gz: 06cbb8ed329794768a80a29e00a7db80eb7f527579ce3f121e3d78a2dbbb10a857aa377d47d3a7a5b0d7297653779139c99f3789e4b21ec79c376ba69906399f

data/CHANGELOG.md

@@ -1,8 +1,13 @@
 # CHANGELOG
 
-## master
+# 1.2 - 2013-12-12
 
+- google analytics code snippet:
+  - move it up to head tag (just before closing tag), that it matches Google Analytics set up guidelines
+  - render it only on produciton environment
 - Various bugfixes/tweaks for cms generator
+- optimize favicon integration for ie10
+- tested on ie8, ie9, ie10
 
 ## 1.1.1 - 2013-10-07
 

data/features/shoestrap/commands/new_command_spec.rb

@@ -104,9 +104,9 @@ describe 'application generated with shoestrap new <application_name>' do
     end
 
     it 'has favicons' do
-      expect(application_layout).to match(/favicon_link_tag\('favicons\/favicon\-sc\-129x129\.png',\ rel:\ 'apple\-touch\-icon',\ type:\ 'image\/png'\)/)
-      expect(application_layout).to match(/favicon_link_tag\('favicons\/favicon\-sc\-32x32\.png',\ rel:\ 'icon',\ type:\ 'image\/png'\)/)
-      expect(application_layout).to match(/favicon_link_tag\('favicons\/favicon\-sc\-16x16\.ico'\)/)
+      expect(application_layout).to match(/favicon_link_tag\('favicons\/129x129\.png',\ rel:\ 'apple\-touch\-icon',\ type:\ 'image\/png'\)/)
+      expect(application_layout).to match(/favicon_link_tag\('favicons\/32x32\.png',\ rel:\ 'icon',\ type:\ 'image\/png'\)/)
+      expect(application_layout).to match(/favicon_link_tag\('favicons\/32x32\.ico'\)/)
     end
 
     it 'has an application stylehseet link' do
@@ -150,15 +150,15 @@ describe 'application generated with shoestrap new <application_name>' do
 
   context 'favicons' do
     it 'has a favicon' do
-      expect(application_file('app/assets/images/favicons/favicon-sc-32x32.png')).not_to be_nil
+      expect(application_file('app/assets/images/favicons/32x32.png')).not_to be_nil
     end
 
     it 'has a favicon for iDevices' do
-      expect(application_file('app/assets/images/favicons/favicon-sc-129x129.png')).not_to be_nil
+      expect(application_file('app/assets/images/favicons/129x129.png')).not_to be_nil
     end
 
     it 'has a favicton for IE' do
-      expect(application_file('app/assets/images/favicons/favicon-sc-16x16.ico')).not_to be_nil
+      expect(application_file('app/assets/images/favicons/32x32.ico')).not_to be_nil
     end
   end
 

data/lib/shoestrap/version.rb

@@ -1,3 +1,3 @@
 module Shoestrap
-  VERSION = "1.2.0.pre2"
+  VERSION = "1.2.0"
 end

data/shoestrap.gemspec

@@ -44,8 +44,8 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency "launchy"
   end
 
-  spec.add_dependency 'rails', '4.0.0'
+  spec.add_dependency 'rails', '~> 4.0.2'
   spec.add_dependency 'airbrake'
   spec.add_dependency 'thor'
-  spec.add_dependency 'blazing', '0.4.0.beta3'
+  spec.add_dependency 'blazing', '~> 0.4.0.beta3'
 end

data/templates/application_generator/application.html.haml

@@ -21,11 +21,9 @@
     %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1.0' }
 
     -# Favicons
-    = favicon_link_tag('favicons/favicon-sc-129x129.png', rel: 'apple-touch-icon', type: 'image/png')
-    = favicon_link_tag('favicons/favicon-sc-32x32.png', rel: 'icon', type: 'image/png')
-    <!--[if IE]>
-    = favicon_link_tag('favicons/favicon-sc-16x16.ico')
-    <![endif]-->
+    = favicon_link_tag('favicons/129x129.png', rel: 'apple-touch-icon', type: 'image/png')
+    = favicon_link_tag('favicons/32x32.png', rel: 'icon', type: 'image/png')
+    = favicon_link_tag('favicons/32x32.ico')
 
     -# Typekit
     = render 'layouts/typekit'
@@ -38,6 +36,23 @@
     = javascript_include_tag 'modernizr', 'data-turbolinks-track' => true
     = csrf_meta_tags
 
+    -# Google Analytics
+    - if Rails.env.production?
+      :javascript
+        ((b, o, i, l, e, r) ->
+          b.GoogleAnalyticsObject = l
+          b[l] or (b[l] = ->
+            (b[l].q = b[l].q or []).push arguments_
+          )
+          b[l].l = +new Date
+          e = o.createElement(i)
+          r = o.getElementsByTagName(i)[0]
+          e.src = "//www.google-analytics.com/analytics.js"
+          r.parentNode.insertBefore e, r
+        ) window, document, "script", "ga"
+        ga "create", "UA-XXXXX-X"
+        ga "send", "pageview"
+
   %body{ class: body_class }
     %header{role: "banner"}
       = render 'partials/header'
@@ -56,19 +71,3 @@
     <!--[if lte IE 8]>
     = javascript_include_tag 'selectivizr'
     <![endif]-->
-
-    -# Google Analytics
-    :javascript
-      ((b, o, i, l, e, r) ->
-        b.GoogleAnalyticsObject = l
-        b[l] or (b[l] = ->
-          (b[l].q = b[l].q or []).push arguments_
-        )
-        b[l].l = +new Date
-        e = o.createElement(i)
-        r = o.getElementsByTagName(i)[0]
-        e.src = "//www.google-analytics.com/analytics.js"
-        r.parentNode.insertBefore e, r
-      ) window, document, "script", "ga"
-      ga "create", "UA-XXXXX-X"
-      ga "send", "pageview"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoestrap
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre2
+  version: 1.2.0
 platform: ruby
 authors:
 - Felipe Kaufmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,16 +112,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: airbrake
   requirement: !ruby/object:Gem::Requirement
@@ -154,14 +154,14 @@ dependencies:
   name: blazing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0.beta3
 description: SC Bootstrapper and Generators
@@ -238,9 +238,9 @@ files:
 - templates/application_generator/application.html.haml
 - templates/application_generator/application_helper.rb
 - templates/application_generator/application_template.rb
-- templates/application_generator/favicons/favicon-sc-129x129.png
-- templates/application_generator/favicons/favicon-sc-16x16.ico
-- templates/application_generator/favicons/favicon-sc-32x32.png
+- templates/application_generator/favicons/129x129.png
+- templates/application_generator/favicons/32x32.ico
+- templates/application_generator/favicons/32x32.png
 - templates/application_generator/modernizr.js
 - templates/bdd_generator/active_record_spec_helper.rb
 - templates/bdd_generator/dotrspec
@@ -291,12 +291,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Rails App Bootstrapper and Generator used at Screen Concept