locomotivecms_wagon 2.2.0.beta1 → 2.2.0.rc1

data/generators/{foundation5/public/stylesheets/normalize.css.scss → foundation/public/stylesheets/foundation6/vendor/normalize.scss}

@@ -1,9 +1,9 @@
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
 
 /**
  * 1. Set default font family to sans-serif.
- * 2. Prevent iOS text size adjust after orientation change, without disabling
- *    user zoom.
+ * 2. Prevent iOS and IE text size adjust after device orientation change,
+ *    without disabling user zoom.
  */
 
 html {
@@ -71,7 +71,7 @@ audio:not([controls]) {
 
 /**
  * Address `[hidden]` styling not present in IE 8/9/10.
- * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
+ * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.
  */
 
 [hidden],
@@ -91,7 +91,8 @@ a {
 }
 
 /**
- * Improve readability when focused and also mouse hovered in all browsers.
+ * Improve readability of focused elements when they are also in an
+ * active/hover state.
  */
 
 a:active,
@@ -209,7 +210,6 @@ figure {
  */
 
 hr {
-  -moz-box-sizing: content-box;
   box-sizing: content-box;
   height: 0;
 }
@@ -350,15 +350,12 @@ input[type="number"]::-webkit-outer-spin-button {
 
 /**
  * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
- * 2. Address `box-sizing` set to `border-box` in Safari and Chrome
- *    (include `-moz` to future-proof).
+ * 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
  */
 
 input[type="search"] {
   -webkit-appearance: textfield; /* 1 */
-  -moz-box-sizing: content-box;
-  -webkit-box-sizing: content-box; /* 2 */
-  box-sizing: content-box;
+  box-sizing: content-box; /* 2 */
 }
 
 /**

data/generators/site_metafields/schema.yml.tt

@@ -12,7 +12,7 @@
 #     <name_1>:
 #       label: <my label> # used as the label of the HTML input. Use a hash if you want it in another languages.
 #       hint: <my hint> # used as the hint of the HTML input. Use a hash if you want it in another languages.
-#       type: <string|text|integer|float|file|image|boolean|select|color>
+#       type: <string|text|integer|float|image|boolean|select|color>
 #       localized: <true|false> # if the value is scoped by the current locale when rendering the site.
 #       position: <0..n> # position of the input in the form
 #       select_options: [array]

data/lib/locomotive/wagon/commands/push_command.rb

@@ -160,6 +160,7 @@ module Locomotive::Wagon
     end
 
     def require_misc_gems
+      require 'haml'
       require 'bundler'
       Bundler.require 'misc'
     end

data/lib/locomotive/wagon/commands/serve_command.rb

@@ -63,6 +63,7 @@ module Locomotive::Wagon
     private
 
     def require_steam
+      require 'haml'
       require 'locomotive/steam'
       require 'locomotive/steam/server'
       require 'locomotive/wagon/middlewares/error_page'

data/lib/locomotive/wagon/decorators/concerns/persist_assets_concern.rb

@@ -7,9 +7,9 @@ module Locomotive::Wagon
     def replace_with_content_assets!(text)
       return text if text.blank?
 
-      text.to_s.gsub(/\/samples\/\S*\.[a-zA-Z0-9]+/) do |match|
-        url = __content_assets_pusher__.persist(match)
-        url || match
+      text.to_s.gsub(/([^a-zA-Z0-9])(\/samples\/\S*\.[a-zA-Z0-9]+)/) do
+        url = __content_assets_pusher__.persist($2) || $2
+        $1 + url
       end
     end
 

data/lib/locomotive/wagon/decorators/content_type_decorator.rb

@@ -16,7 +16,7 @@ module Locomotive
           public_submission_enabled
           public_submission_accounts
           public_submission_title_template
-          entry_template display_settings)
+          entry_template display_settings filter_fields)
       end
 
       def fields
@@ -66,6 +66,10 @@ module Locomotive
         self[:display_settings]
       end
 
+      def filter_fields
+        self[:filter_fields]
+      end
+
       def with_relationships?
         __getobj__.fields.associations.count > 0
       end

data/lib/locomotive/wagon/generators/site/{foundation5.rb → foundation.rb}

@@ -3,7 +3,7 @@ module Locomotive
     module Generators
       module Site
 
-        class Foundation5 < Base
+        class Foundation < Base
 
           may_use_haml
           may_use_scss
@@ -12,24 +12,20 @@ module Locomotive
             if haml?
               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
 
           def choose_scss_over_css
             if scss?
-              remove_file File.join(self.destination, 'public/stylesheets/application.css')
-              remove_file File.join(self.destination, 'public/stylesheets/foundation.css')
-              remove_file File.join(self.destination, 'public/stylesheets/normalize.css')
+              remove_file File.join(self.destination, 'public/stylesheets/app.css')
+              remove_file File.join(self.destination, 'public/stylesheets/foundation.min.css')
             else
-              remove_dir File.join(self.destination, 'public/stylesheets/foundation')
-              remove_file File.join(self.destination, 'public/stylesheets/application.css.scss')
-              remove_file File.join(self.destination, 'public/stylesheets/foundation.css.scss')
-              remove_file File.join(self.destination, 'public/stylesheets/normalize.css.scss')
+              remove_dir File.join(self.destination, 'public/stylesheets/foundation6')
+              remove_file File.join(self.destination, 'public/stylesheets/app.scss')
+              remove_file File.join(self.destination, 'public/stylesheets/_settings.scss')
             end
           end
 
@@ -39,8 +35,8 @@ module Locomotive
 
         end
 
-        Locomotive::Wagon::Generators::Site.register(:foundation5, Foundation5, %{
-          A site powered by Foundation (v5.4.7).
+        Locomotive::Wagon::Generators::Site.register(:foundation, Foundation, %{
+          A site powered by Foundation (v6.2.1).
         })
       end
     end

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

@@ -140,6 +140,6 @@ require 'locomotive/wagon/generators/site/base'
 require 'locomotive/wagon/generators/site/blank'
 require 'locomotive/wagon/generators/site/line_case'
 require 'locomotive/wagon/generators/site/bootstrap'
-require 'locomotive/wagon/generators/site/foundation5'
+require 'locomotive/wagon/generators/site/foundation'
 require 'locomotive/wagon/generators/site/unzip'
 require 'locomotive/wagon/generators/site/cloned'

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '2.2.0.beta1'
+    VERSION = '2.2.0.rc1'
   end
 end

data/locomotivecms_wagon.gemspec

@@ -27,9 +27,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'netrc',                 '~> 0.10.3'
 
   gem.add_dependency 'locomotivecms_common',  '~> 0.2.0'
-  gem.add_dependency 'locomotivecms_coal',    '~> 1.2.0'
-  gem.add_dependency 'locomotivecms_steam',   '~> 1.2.0.beta'
+  gem.add_dependency 'locomotivecms_coal',    '~> 1.3.0.rc1'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.2.0.rc1'
 
+  gem.add_dependency 'haml',                  '~> 4.0.7'
   gem.add_dependency 'listen',                '~> 3.0.4'
   gem.add_dependency 'rack-livereload',       '~> 0.3.16'
   gem.add_dependency 'yui-compressor',        '~> 0.12.0'

data/spec/fixtures/cassettes/authenticate.yml

@@ -8,13 +8,13 @@ http_interactions:
       string: email=john%40doe.net&password=asimplepassword
     headers:
       User-Agent:
-      - HTTPClient/1.0 (2.7.1, ruby 2.2.3 (2015-08-18))
+      - HTTPClient/1.0 (2.7.2, ruby 2.2.3 (2015-08-18))
       Accept:
       - application/json
       Accept-Encoding:
       - gzip,deflate
       Date:
-      - Mon, 21 Mar 2016 17:36:40 GMT
+      - Fri, 17 Jun 2016 08:02:04 GMT
       Content-Type:
       - application/x-www-form-urlencoded
   response:
@@ -29,16 +29,16 @@ http_interactions:
       Cache-Control:
       - no-cache
       X-Request-Id:
-      - f97c50d2-f8ae-4fd8-bce0-3b623afae5f3
+      - b0c718fe-9812-411b-9824-367063c7c7c8
       X-Runtime:
-      - '0.448075'
+      - '0.641600'
       Content-Length:
       - '40'
     body:
       encoding: UTF-8
       string: '{"message":"Invalid email or password."}'
     http_version: 
-  recorded_at: Mon, 21 Mar 2016 17:36:41 GMT
+  recorded_at: Fri, 17 Jun 2016 08:02:05 GMT
 - request:
     method: post
     uri: http://localhost:3000/locomotive/api/v3/my_account.json
@@ -47,13 +47,13 @@ http_interactions:
       string: account%5Bemail%5D=john%40doe.net&account%5Bname%5D=John&account%5Bpassword%5D=asimplepassword
     headers:
       User-Agent:
-      - HTTPClient/1.0 (2.7.1, ruby 2.2.3 (2015-08-18))
+      - HTTPClient/1.0 (2.7.2, ruby 2.2.3 (2015-08-18))
       Accept:
       - application/json
       Accept-Encoding:
       - gzip,deflate
       Date:
-      - Mon, 21 Mar 2016 17:36:41 GMT
+      - Fri, 17 Jun 2016 08:02:05 GMT
       Content-Type:
       - application/x-www-form-urlencoded
   response:
@@ -64,20 +64,20 @@ http_interactions:
       Content-Type:
       - application/json
       Etag:
-      - W/"13d961357bc8b2ce65f4f13ee8adba85"
+      - W/"0e3f9d0daf88f8fd4f0a2ec082a5a7e5"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - a3c557e9-41e9-44dc-ae1d-91af5ddd3b96
+      - ca31d12a-1fbb-41c6-a7eb-f2f36de12f0b
       X-Runtime:
-      - '0.098826'
+      - '0.158071'
       Content-Length:
       - '250'
     body:
       encoding: UTF-8
-      string: '{"_id":"56f03129c36511207342cbcb","created_at":"2016-03-21T17:36:41Z","updated_at":"2016-03-21T17:36:41Z","name":"John","email":"john@doe.net","locale":"en","api_key":"901baf472a28a8e3a6a871255c90b232de964686","super_admin":false,"local_admin":false}'
+      string: '{"_id":"5763ae7d87f6437d12223b7e","created_at":"2016-06-17T08:02:05Z","updated_at":"2016-06-17T08:02:05Z","name":"John","email":"john@doe.net","locale":"en","api_key":"f3d9eb1da9dd7d755bf61cb78040eb3ac20054b7","super_admin":false,"local_admin":false}'
     http_version: 
-  recorded_at: Mon, 21 Mar 2016 17:36:41 GMT
+  recorded_at: Fri, 17 Jun 2016 08:02:05 GMT
 - request:
     method: post
     uri: http://localhost:3000/locomotive/api/v3/tokens.json
@@ -86,13 +86,13 @@ http_interactions:
       string: email=admin%40locomotivecms.com&password=locomotive
     headers:
       User-Agent:
-      - HTTPClient/1.0 (2.7.1, ruby 2.2.3 (2015-08-18))
+      - HTTPClient/1.0 (2.7.2, ruby 2.2.3 (2015-08-18))
       Accept:
       - application/json
       Accept-Encoding:
       - gzip,deflate
       Date:
-      - Mon, 21 Mar 2016 17:36:41 GMT
+      - Fri, 17 Jun 2016 08:02:05 GMT
       Content-Type:
       - application/x-www-form-urlencoded
   response:
@@ -103,39 +103,39 @@ http_interactions:
       Content-Type:
       - application/json
       Etag:
-      - W/"3cfd61d41b23cdfb3d8833133c136131"
+      - W/"454972cc6e9c77359905d2dea5ba89ee"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 805ec3c4-ce19-4edb-bd06-6b499447f2a1
+      - cb777707-131e-4a7b-beff-040b267ac2c6
       X-Runtime:
-      - '0.016118'
+      - '0.022266'
       Content-Length:
       - '32'
     body:
       encoding: UTF-8
-      string: '{"token":"V8VMCfCsp7XzQLvAd1AY"}'
+      string: '{"token":"HyqKxyBLmEH9x_GzYnWY"}'
     http_version: 
-  recorded_at: Mon, 21 Mar 2016 17:36:41 GMT
+  recorded_at: Fri, 17 Jun 2016 08:02:05 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=V8VMCfCsp7XzQLvAd1AY
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=HyqKxyBLmEH9x_GzYnWY
     body:
       encoding: UTF-8
       string: ''
     headers:
       User-Agent:
-      - HTTPClient/1.0 (2.7.1, ruby 2.2.3 (2015-08-18))
+      - HTTPClient/1.0 (2.7.2, ruby 2.2.3 (2015-08-18))
       Accept:
       - application/json
       Accept-Encoding:
       - gzip,deflate
       Date:
-      - Mon, 21 Mar 2016 17:36:41 GMT
+      - Fri, 17 Jun 2016 08:02:05 GMT
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - V8VMCfCsp7XzQLvAd1AY
+      - HyqKxyBLmEH9x_GzYnWY
   response:
     status:
       code: 200
@@ -144,39 +144,39 @@ http_interactions:
       Content-Type:
       - application/json
       Etag:
-      - W/"2ce6a3f4e073d2d83a53613d0139477e"
+      - W/"7560269880972609752ff82cb3ed592f"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - e4ca46c9-4c89-42db-9bdb-ca21e8adb1a9
+      - 4fab7136-9216-46fb-a2ce-f25e5b40ca17
       X-Runtime:
-      - '0.029466'
+      - '0.037894'
       Content-Length:
       - '261'
     body:
       encoding: UTF-8
-      string: '{"_id":"56f03072c365112052cab389","created_at":"2016-03-21T17:33:38Z","updated_at":"2016-03-21T17:33:38Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
+      string: '{"_id":"5763ad8487f6437cec5812c1","created_at":"2016-06-17T07:57:56Z","updated_at":"2016-06-17T07:57:56Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Mon, 21 Mar 2016 17:36:41 GMT
+  recorded_at: Fri, 17 Jun 2016 08:02:05 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=V8VMCfCsp7XzQLvAd1AY
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=HyqKxyBLmEH9x_GzYnWY
     body:
       encoding: UTF-8
       string: ''
     headers:
       User-Agent:
-      - HTTPClient/1.0 (2.7.1, ruby 2.2.3 (2015-08-18))
+      - HTTPClient/1.0 (2.7.2, ruby 2.2.3 (2015-08-18))
       Accept:
       - application/json
       Accept-Encoding:
       - gzip,deflate
       Date:
-      - Mon, 21 Mar 2016 17:36:41 GMT
+      - Fri, 17 Jun 2016 08:02:05 GMT
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - V8VMCfCsp7XzQLvAd1AY
+      - HyqKxyBLmEH9x_GzYnWY
   response:
     status:
       code: 200
@@ -185,18 +185,18 @@ http_interactions:
       Content-Type:
       - application/json
       Etag:
-      - W/"2ce6a3f4e073d2d83a53613d0139477e"
+      - W/"7560269880972609752ff82cb3ed592f"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 059e56ad-ec66-4fa7-98a4-85f7eb38746c
+      - ad034495-4fa7-42ab-9176-e24422eef3ff
       X-Runtime:
-      - '0.019939'
+      - '0.025608'
       Content-Length:
       - '261'
     body:
       encoding: UTF-8
-      string: '{"_id":"56f03072c365112052cab389","created_at":"2016-03-21T17:33:38Z","updated_at":"2016-03-21T17:33:38Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
+      string: '{"_id":"5763ad8487f6437cec5812c1","created_at":"2016-06-17T07:57:56Z","updated_at":"2016-06-17T07:57:56Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Mon, 21 Mar 2016 17:36:41 GMT
-recorded_with: VCR 3.0.0
+  recorded_at: Fri, 17 Jun 2016 08:02:05 GMT
+recorded_with: VCR 3.0.1