locomotivecms_wagon 1.3.0 → 1.3.1

data/generators/foundation/public/stylesheets/normalize.css

@@ -1,10 +1,13 @@
-/* normalize.css v2.1.1 | MIT License | git.io/normalize */
+/*! normalize.css v2.1.2 | MIT License | git.io/normalize */
+
 /* ==========================================================================
    HTML5 display definitions
    ========================================================================== */
+
 /**
  * Correct `block` display not defined in IE 8/9.
  */
+
 article,
 aside,
 details,
@@ -17,233 +20,290 @@ main,
 nav,
 section,
 summary {
-  display: block; }
+    display: block;
+}
 
 /**
  * Correct `inline-block` display not defined in IE 8/9.
  */
+
 audio,
 canvas,
 video {
-  display: inline-block; }
+    display: inline-block;
+}
 
 /**
  * Prevent modern browsers from displaying `audio` without controls.
  * Remove excess height in iOS 5 devices.
  */
+
 audio:not([controls]) {
-  display: none;
-  height: 0; }
+    display: none;
+    height: 0;
+}
 
 /**
- * Address styling not present in IE 8/9.
+ * Address `[hidden]` styling not present in IE 8/9.
+ * Hide the `template` element in IE, Safari, and Firefox < 22.
  */
-[hidden] {
-  display: none; }
+
+[hidden],
+template {
+    display: none;
+}
+
+script {
+  display: none !important;
+}
 
 /* ==========================================================================
    Base
    ========================================================================== */
+
 /**
- * 1. Prevent system color scheme's background color being used in Firefox, IE,
- *    and Opera.
- * 2. Prevent system color scheme's text color being used in Firefox, IE, and
- *    Opera.
- * 3. Set default font family to sans-serif.
- * 4. Prevent iOS text size adjust after orientation change, without disabling
+ * 1. Set default font family to sans-serif.
+ * 2. Prevent iOS text size adjust after orientation change, without disabling
  *    user zoom.
  */
+
 html {
-  background: #fff;
-  /* 1 */
-  color: #000;
-  /* 2 */
-  font-family: sans-serif;
-  /* 3 */
-  -ms-text-size-adjust: 100%;
-  /* 4 */
-  -webkit-text-size-adjust: 100%;
-  /* 4 */ }
+    font-family: sans-serif; /* 1 */
+    -ms-text-size-adjust: 100%; /* 2 */
+    -webkit-text-size-adjust: 100%; /* 2 */
+}
 
 /**
  * Remove default margin.
  */
+
 body {
-  margin: 0; }
+    margin: 0;
+}
 
 /* ==========================================================================
    Links
    ========================================================================== */
+
+/**
+ * Remove the gray background color from active links in IE 10.
+ */
+
+a {
+    background: transparent;
+}
+
 /**
  * Address `outline` inconsistency between Chrome and other browsers.
  */
+
 a:focus {
-  outline: thin dotted; }
+    outline: thin dotted;
+}
 
 /**
  * Improve readability when focused and also mouse hovered in all browsers.
  */
+
 a:active,
 a:hover {
-  outline: 0; }
+    outline: 0;
+}
 
 /* ==========================================================================
    Typography
    ========================================================================== */
+
 /**
  * Address variable `h1` font-size and margin within `section` and `article`
  * contexts in Firefox 4+, Safari 5, and Chrome.
  */
+
 h1 {
-  font-size: 2em;
-  margin: 0.67em 0; }
+    font-size: 2em;
+    margin: 0.67em 0;
+}
 
 /**
  * Address styling not present in IE 8/9, Safari 5, and Chrome.
  */
+
 abbr[title] {
-  border-bottom: 1px dotted; }
+    border-bottom: 1px dotted;
+}
 
 /**
  * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
  */
+
 b,
 strong {
-  font-weight: bold; }
+    font-weight: bold;
+}
 
 /**
  * Address styling not present in Safari 5 and Chrome.
  */
+
 dfn {
-  font-style: italic; }
+    font-style: italic;
+}
 
 /**
  * Address differences between Firefox and other browsers.
  */
+
 hr {
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  height: 0; }
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+    height: 0;
+}
 
 /**
  * Address styling not present in IE 8/9.
  */
+
 mark {
-  background: #ff0;
-  color: #000; }
+    background: #ff0;
+    color: #000;
+}
 
 /**
  * Correct font family set oddly in Safari 5 and Chrome.
  */
+
 code,
 kbd,
 pre,
 samp {
-  font-family: monospace, serif;
-  font-size: 1em; }
+    font-family: monospace, serif;
+    font-size: 1em;
+}
 
 /**
  * Improve readability of pre-formatted text in all browsers.
  */
+
 pre {
-  white-space: pre-wrap; }
+    white-space: pre-wrap;
+}
 
 /**
  * Set consistent quote types.
  */
+
 q {
-  quotes: "\201C" "\201D" "\2018" "\2019"; }
+    quotes: "\201C" "\201D" "\2018" "\2019";
+}
 
 /**
  * Address inconsistent and variable font size in all browsers.
  */
+
 small {
-  font-size: 80%; }
+    font-size: 80%;
+}
 
 /**
  * Prevent `sub` and `sup` affecting `line-height` in all browsers.
  */
+
 sub,
 sup {
-  font-size: 75%;
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline; }
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+}
 
 sup {
-  top: -0.5em; }
+    top: -0.5em;
+}
 
 sub {
-  bottom: -0.25em; }
+    bottom: -0.25em;
+}
 
 /* ==========================================================================
    Embedded content
    ========================================================================== */
+
 /**
  * Remove border when inside `a` element in IE 8/9.
  */
+
 img {
-  border: 0; }
+    border: 0;
+}
 
 /**
  * Correct overflow displayed oddly in IE 9.
  */
+
 svg:not(:root) {
-  overflow: hidden; }
+    overflow: hidden;
+}
 
 /* ==========================================================================
    Figures
    ========================================================================== */
+
 /**
  * Address margin not present in IE 8/9 and Safari 5.
  */
+
 figure {
-  margin: 0; }
+    margin: 0;
+}
 
 /* ==========================================================================
    Forms
    ========================================================================== */
+
 /**
  * Define consistent border, margin, and padding.
  */
+
 fieldset {
-  border: 1px solid #c0c0c0;
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em; }
+    border: 1px solid #c0c0c0;
+    margin: 0 2px;
+    padding: 0.35em 0.625em 0.75em;
+}
 
 /**
  * 1. Correct `color` not being inherited in IE 8/9.
  * 2. Remove padding so people aren't caught out if they zero out fieldsets.
  */
+
 legend {
-  border: 0;
-  /* 1 */
-  padding: 0;
-  /* 2 */ }
+    border: 0; /* 1 */
+    padding: 0; /* 2 */
+}
 
 /**
  * 1. Correct font family not being inherited in all browsers.
  * 2. Correct font size not being inherited in all browsers.
  * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
  */
+
 button,
 input,
 select,
 textarea {
-  font-family: inherit;
-  /* 1 */
-  font-size: 100%;
-  /* 2 */
-  margin: 0;
-  /* 3 */ }
+    font-family: inherit; /* 1 */
+    font-size: 100%; /* 2 */
+    margin: 0; /* 3 */
+}
 
 /**
  * Address Firefox 4+ setting `line-height` on `input` using `!important` in
  * the UA stylesheet.
  */
+
 button,
 input {
-  line-height: normal; }
+    line-height: normal;
+}
 
 /**
  * Address inconsistent `text-transform` inheritance for `button` and `select`.
@@ -251,9 +311,11 @@ input {
  * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
  * Correct `select` style inheritance in Firefox 4+ and Opera.
  */
+
 button,
 select {
-  text-transform: none; }
+    text-transform: none;
+}
 
 /**
  * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
@@ -262,78 +324,87 @@ select {
  * 3. Improve usability and consistency of cursor style between image-type
  *    `input` and others.
  */
+
 button,
-html input[type="button"],
+html input[type="button"], /* 1 */
 input[type="reset"],
 input[type="submit"] {
-  -webkit-appearance: button;
-  /* 2 */
-  cursor: pointer;
-  /* 3 */ }
+    -webkit-appearance: button; /* 2 */
+    cursor: pointer; /* 3 */
+}
 
 /**
  * Re-set default cursor for disabled elements.
  */
+
 button[disabled],
 html input[disabled] {
-  cursor: default; }
+    cursor: default;
+}
 
 /**
  * 1. Address box sizing set to `content-box` in IE 8/9.
  * 2. Remove excess padding in IE 8/9.
  */
+
 input[type="checkbox"],
 input[type="radio"] {
-  box-sizing: border-box;
-  /* 1 */
-  padding: 0;
-  /* 2 */ }
+    box-sizing: border-box; /* 1 */
+    padding: 0; /* 2 */
+}
 
 /**
  * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
  * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
  *    (include `-moz` to future-proof).
  */
+
 input[type="search"] {
-  -webkit-appearance: textfield;
-  /* 1 */
-  -moz-box-sizing: content-box;
-  -webkit-box-sizing: content-box;
-  /* 2 */
-  box-sizing: content-box; }
+    -webkit-appearance: textfield; /* 1 */
+    -moz-box-sizing: content-box;
+    -webkit-box-sizing: content-box; /* 2 */
+    box-sizing: content-box;
+}
 
 /**
  * Remove inner padding and search cancel button in Safari 5 and Chrome
  * on OS X.
  */
+
 input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none; }
+    -webkit-appearance: none;
+}
 
 /**
  * Remove inner padding and border in Firefox 4+.
  */
+
 button::-moz-focus-inner,
 input::-moz-focus-inner {
-  border: 0;
-  padding: 0; }
+    border: 0;
+    padding: 0;
+}
 
 /**
  * 1. Remove default vertical scrollbar in IE 8/9.
  * 2. Improve readability and alignment in all browsers.
  */
+
 textarea {
-  overflow: auto;
-  /* 1 */
-  vertical-align: top;
-  /* 2 */ }
+    overflow: auto; /* 1 */
+    vertical-align: top; /* 2 */
+}
 
 /* ==========================================================================
    Tables
    ========================================================================== */
+
 /**
  * Remove most spacing between table cells.
  */
+
 table {
-  border-collapse: collapse;
-  border-spacing: 0; }
+    border-collapse: collapse;
+    border-spacing: 0;
+}

data/lib/locomotive/wagon/exceptions.rb

@@ -36,7 +36,7 @@ module Locomotive
 
       def log_page_into_backtrace(exception)
         line = self.template.line_offset
-        line += (exception.respond_to?(:line) ? exception.line : 0) + 1
+        line += (exception.respond_to?(:line) ? exception.line || 0 : 0) + 1
 
         message = "#{self.template.filepath}:#{line}:in `#{self.name}'"
 

data/lib/locomotive/wagon/generators/site/bootstrap2.rb

@@ -0,0 +1,35 @@
+module Locomotive
+  module Wagon
+    module Generators
+      module Site
+
+        class Bootstrap2 < Base
+
+          def copy_sources
+            directory('.', self.destination, { recursive: true }, {
+              name:     self.name,
+              version:  Locomotive::Wagon::VERSION
+            })
+          end
+
+          def choose_haml_over_html
+            if yes?('Do you prefer HAML templates ?')
+              remove_file File.join(self.destination, 'app/views/pages/index.liquid')
+              remove_file File.join(self.destination, 'app/views/pages/404.liquid')
+              remove_file File.join(self.destination, 'app/views/snippets/footer.liquid')
+            else
+              remove_file File.join(self.destination, 'app/views/pages/index.liquid.haml')
+              remove_file File.join(self.destination, 'app/views/pages/404.liquid.haml')
+              remove_file File.join(self.destination, 'app/views/snippets/footer.liquid.haml')
+            end
+          end
+
+        end
+
+        Locomotive::Wagon::Generators::Site.register(:bootstrap2, Bootstrap2, %{
+          A LocomotiveCMS site with Twitter Bootstrap (v2.3.2) and Font Awesome (v3.2.1).
+        })
+      end
+    end
+  end
+end

data/lib/locomotive/wagon/generators/site/{bootstrap.rb → bootstrap3.rb}

@@ -3,7 +3,7 @@ module Locomotive
     module Generators
       module Site
 
-        class Bootstrap < Base
+        class Bootstrap3 < Base
 
           def copy_sources
             directory('.', self.destination, { recursive: true }, {
@@ -26,8 +26,8 @@ module Locomotive
 
         end
 
-        Locomotive::Wagon::Generators::Site.register(:bootstrap, Bootstrap, %{
-          A LocomotiveCMS site powered by Twitter bootstrap (v2.2.2).
+        Locomotive::Wagon::Generators::Site.register(:bootstrap3, Bootstrap3, %{
+          A LocomotiveCMS site powered by Twitter bootstrap (v3.0.0).
         })
       end
     end

data/lib/locomotive/wagon/generators/site/foundation.rb

@@ -27,7 +27,7 @@ module Locomotive
         end
 
         Locomotive::Wagon::Generators::Site.register(:foundation, Foundation, %{
-          A LocomotiveCMS site powered by Foundation (v4.2.1).
+          A LocomotiveCMS site powered by Foundation (v4.3.2).
         })
       end
     end

data/lib/locomotive/wagon/generators/site.rb

@@ -94,7 +94,8 @@ end
 
 require 'locomotive/wagon/generators/site/base'
 require 'locomotive/wagon/generators/site/blank'
-require 'locomotive/wagon/generators/site/bootstrap'
+require 'locomotive/wagon/generators/site/bootstrap2'
+require 'locomotive/wagon/generators/site/bootstrap3'
 require 'locomotive/wagon/generators/site/foundation'
 require 'locomotive/wagon/generators/site/unzip'
 require 'locomotive/wagon/generators/site/cloned'

data/lib/locomotive/wagon/liquid/drops/base.rb

@@ -7,8 +7,6 @@ module Locomotive
 
           @@forbidden_attributes = %w{_id _version _index}
 
-          attr_reader :_source
-
           def initialize(source)
             @_source = source
           end
@@ -37,6 +35,10 @@ module Locomotive
             self.class.liquify(*records, &block)
           end
 
+          def _source
+            @_source
+          end
+
         end
       end
     end

data/lib/locomotive/wagon/liquid/drops/content_entry.rb

@@ -4,10 +4,10 @@ module Locomotive
       module Drops
         class ContentEntry < Base
 
-          delegate :seo_title, :meta_keywords, :meta_description, :to => '_source'
+          delegate :seo_title, :meta_keywords, :meta_description, to: :@_source
 
           def _label
-            @_label ||= self._source._label
+            @_label ||= @_source._label
           end
 
           def _permalink
@@ -32,10 +32,10 @@ module Locomotive
           end
 
           def before_method(meth)
-            return '' if self._source.nil?
+            return '' if @_source.nil?
 
             if not @@forbidden_attributes.include?(meth.to_s)
-              self._source.send(meth)
+              @_source.send(meth)
             else
               nil
             end

data/lib/locomotive/wagon/liquid/drops/page.rb

@@ -5,16 +5,16 @@ module Locomotive
         class Page < Base
 
           delegate :title, :slug, :fullpath, :parent, :depth, :seo_title, :redirect_url, :meta_description, :meta_keywords,
-                   :templatized?, :published?, :redirect?, :listed?, :handle, to: '_source'
+                   :templatized?, :published?, :redirect?, :listed?, :handle, to: :@_source
 
           def children
-            _children = _source.children || []
+            _children = @_source.children || []
             _children = _children.sort { |a, b| a.position.to_i <=> b.position.to_i }
             @children ||= liquify(*_children)
           end
 
           def content_type
-            ProxyCollection.new(_source.content_type) if _source.content_type
+            ProxyCollection.new(@_source.content_type) if @_source.content_type
           end
 
           def breadcrumbs

data/lib/locomotive/wagon/liquid/drops/site.rb

@@ -5,18 +5,18 @@ module Locomotive
         class Site < Base
           include Scopeable
 
-          delegate :name, :seo_title, :meta_description, :meta_keywords, :to => '_source'
+          delegate :name, :seo_title, :meta_description, :meta_keywords, to: :@_source
 
           def index
             @index ||= self.mounting_point.pages['index']
           end
 
           def pages
-            @pages ||= liquify(*apply_scope(self.mounting_point.pages.values))
+            liquify(*apply_scope(self.mounting_point.pages.values))
           end
 
           def domains
-            self._source.domains
+            @_source.domains
           end
 
         end

data/lib/locomotive/wagon/liquid/tags/link_to.rb

@@ -46,8 +46,9 @@ module Locomotive
 
               page = case handle
               when Locomotive::Mounter::Models::Page          then handle
+              when Liquid::Drops::Page                        then handle.send(:_source)
               when String                                     then fetch_page(mounting_point, handle)
-              when Liquid::Drops::ContentEntry                then fetch_page(mounting_point, handle._source, true)
+              when Liquid::Drops::ContentEntry                then fetch_page(mounting_point, handle.send(:_source), true)
               when Locomotive::Mounter::Models::ContentEntry  then fetch_page(mounting_point, handle, true)
               else
                 nil

data/lib/locomotive/wagon/misc/better_errors.rb

@@ -38,7 +38,7 @@ module BetterErrors
         scope = self.liquid_context.scopes.last.clone
 
         scope.delete_if { |k, _| %w(models contents params session).include?(k) }.tap do |_scope|
-          _scope['site'] = _scope['site']._source.to_hash
+          _scope['site'] = _scope['site'].send(:_source).to_hash
           _scope['page'] = _scope['page'].to_hash.delete_if { |k, _| %w(template).include?(k) }
         end
       else