locomotivecms_wagon 2.4.0.rc2 → 2.4.0

data/generators/foundation/public/stylesheets/foundation6/xy-grid/_collapse.scss

@@ -0,0 +1,74 @@
+// Foundation for Sites by ZURB
+// foundation.zurb.com
+// Licensed under MIT Open Source
+
+////
+/// @group xy-grid
+////
+
+/// Collapses the grid a cells within it.
+///
+/// @param {String} $selector [.cell] - The child element to remove the gutter from.
+/// @param {Keyword} $gutter-type [margin] - The type of gutter to remove.
+/// @param {List} $gutter-position [right left] - The positions to remove gutters from. Accepts `top`, `bottom`, `left`, `right` in any combination.
+@mixin xy-grid-collapse(
+  $selector: '.cell',
+  $gutter-type: margin,
+  $gutter-position: right left,
+  $min-breakpoint: $-zf-zero-breakpoint
+) {
+  // First, lets negate any margins on the top level
+  @if ($gutter-type == 'margin') {
+
+    @include breakpoint($min-breakpoint) {
+      @each $value in $gutter-position {
+        margin-#{$value}: 0;
+      }
+
+      > #{$selector} {
+        @each $value in $gutter-position {
+          margin-#{$value}: 0;
+        }
+      }
+    }
+
+    $excluded-bps: -zf-breakpoints-less-than($min-breakpoint);
+
+    // Output new widths to not include gutters
+    @each $bp in $breakpoint-classes {
+      @if(sl-contain($excluded-bps, $bp)) {
+        @include breakpoint($min-breakpoint) {
+          @for $i from 1 through $grid-columns {
+            // Sizing (percentage)
+            > .#{$bp}-#{$i} {
+              @include xy-cell-static($i, $gutter-output: false, $gutter-type: padding);
+            }
+          }
+        }
+      } @else {
+        @include breakpoint($bp) {
+          @for $i from 1 through $grid-columns {
+            // Sizing (percentage)
+            > .#{$bp}-#{$i} {
+              @include xy-cell-static($i, $gutter-output: false, $gutter-type: padding);
+            }
+          }
+        }
+      } 
+    }
+  }
+  @else {
+
+    @include breakpoint($min-breakpoint) {
+      @each $value in $gutter-position {
+        margin-#{$value}: 0;
+      }
+
+      > #{$selector} {
+        @each $value in $gutter-position {
+          padding-#{$value}: 0;
+        }
+      }
+    }
+  }
+}

data/generators/foundation/public/stylesheets/foundation6/xy-grid/_frame.scss

@@ -0,0 +1,85 @@
+/// Modifies a grid to give it "frame" behavior (no overflow, no wrap, stretch behavior)
+///
+/// @param {Boolean} $vertical [false] - Is grid vertical or horizontal. Should match grid.
+/// @param {Boolean} $nested [false] - Is grid nested or not. If nested is true this sets the frame to 100% height, otherwise will be 100vh.
+/// @param {Number|Map} $gutters [null] - Map or single value for gutters.
+/// @param {String} $breakpoint [null] - The name of the breakpoint size in your gutters map to get the size from.
+/// @param {Boolean} $include-base [true] - Include the base styles that don't vary per breakpoint.
+@mixin xy-grid-frame(
+  $vertical: false,
+  $nested: false,
+  $gutters: null,
+  $breakpoint: null,
+  $include-base: true
+) {
+
+  @if $include-base {
+    overflow: hidden;
+    position: relative;
+    flex-wrap: nowrap;
+    align-items: stretch;
+  }
+
+  @if $breakpoint == null and type-of($gutters) == 'map' {
+    @include -zf-each-breakpoint() {
+      @include xy-grid-frame($vertical, $nested, $gutters, $-zf-size, false);
+    }
+  } @else {
+    // Get our gutters if applicable
+    $gutter: -zf-get-bp-val($gutters, $breakpoint);
+
+    // If we have a gutter, add it to the width/height
+    @if $gutter {
+      @if $vertical == true {
+        $unit: if($nested == true, 100%, 100vh);
+        $gutter: rem-calc($gutter);
+        height: calc(#{$unit} + #{$gutter});
+      } @else {
+        $unit: if($nested == true, 100%, 100vw);
+        $gutter: rem-calc($gutter);
+        width: calc(#{$unit} + #{$gutter});
+      }
+    }
+    @else {
+      @if $vertical == true {
+        height: if($nested == true, 100%, 100vh);
+      } @else {
+        width: if($nested == true, 100%, 100vw);
+      }
+    }
+  }
+}
+
+/// Modifies a cell to give it "block" behavior (overflow auto, inertial scrolling)
+///
+/// @param {Boolean} $vertical [false] - Is grid vertical or horizontal. Should match grid.
+@mixin xy-cell-block(
+  $vertical: false
+) {
+  $property: if($vertical == true, 'overflow-y', 'overflow-x');
+
+  @if $vertical == true {
+    overflow-y: auto;
+    max-height: 100%;
+  } @else {
+    overflow-x: auto;
+    max-width: 100%;
+  }
+
+  -webkit-overflow-scrolling: touch;
+  -ms-overflow-stype: -ms-autohiding-scrollbar;
+}
+
+/// Container for inside a grid frame containing multiple blocks. Typically used
+/// as a modifier for a `.cell` to allow the cell to pass along flex sizing
+/// constraints / from parents to children.
+@mixin xy-cell-block-container() {
+  display: flex;
+  flex-direction: column;
+  max-height: 100%;
+
+  > .grid-x {
+    max-height: 100%;
+    flex-wrap: nowrap;
+  }
+}

data/generators/foundation/public/stylesheets/foundation6/xy-grid/_grid.scss

@@ -0,0 +1,35 @@
+// Foundation for Sites by ZURB
+// foundation.zurb.com
+// Licensed under MIT Open Source
+
+////
+/// @group xy-grid
+////
+
+/// Creates a max width container, designed to house your grid content.
+///
+/// @param {Number} $width [$grid-container] - a width to limit the container to.
+@mixin xy-grid-container(
+  $width: $grid-container,
+  $padding: $grid-container-padding
+) {
+  @include xy-gutters($gutters: $padding, $gutter-type: padding);
+
+  max-width: $width;
+  margin: 0 auto;
+}
+
+/// Creates a container for your flex cells.
+///
+/// @param {Keyword} $direction [horizontal] - Either horizontal or vertical direction of cells within.
+/// @param {Boolean} $wrap [true] - If the cells within should wrap or not.
+@mixin xy-grid(
+  $direction: horizontal,
+  $wrap: true
+) {
+  $direction: if($direction == 'horizontal', row, column);
+  $wrap: if($wrap, wrap, nowrap);
+
+  display: flex;
+  flex-flow: $direction $wrap;
+}

data/generators/foundation/public/stylesheets/foundation6/xy-grid/_gutters.scss

@@ -0,0 +1,45 @@
+// Foundation for Sites by ZURB
+// foundation.zurb.com
+// Licensed under MIT Open Source
+
+////
+/// @group xy-grid
+////
+
+/// Create gutters for a cell/container.
+///
+/// @param {Number|Map} $gutters [$grid-margin-gutters] - Map or single value for gutters.
+/// @param {Keyword} $gutter-type [margin] - Type of gutter to output. Accepts either margin or padding.
+/// @param {List} $gutter-position [right left] - The position to apply gutters to. Accepts `top`, `bottom`, `left`, `right` in any combination.
+/// @param {Boolean} $negative [false] - Whether to apply the gutter as a negative value. Commonly used for nested grids.
+@mixin xy-gutters(
+  $gutters: $grid-margin-gutters,
+  $gutter-type: margin,
+  $gutter-position: right left,
+  $negative: false
+) {
+  $operator: if($negative, '-', '');
+
+  // If we have declared negative gutters, force type to `margin.
+  $gutter-type: if($negative, 'margin', $gutter-type);
+
+  // Output our margin gutters.
+  @if (type-of($gutters) == 'map') {
+    @include -zf-breakpoint-value(auto, $gutters) {
+      $gutter: rem-calc($-zf-bp-value) / 2;
+
+      // Loop through each gutter position
+      @each $value in $gutter-position {
+        #{$gutter-type}-#{$value}: #{$operator}$gutter;
+      }
+    }
+  }
+  @elseif (type-of($gutters) == 'number') {
+    $gutter: rem-calc($gutters) / 2;
+
+    // Loop through each gutter position
+    @each $value in $gutter-position {
+      #{$gutter-type}-#{$value}: #{$operator}$gutter;
+    }
+  }
+}

data/generators/foundation/public/stylesheets/foundation6/xy-grid/_layout.scss

@@ -0,0 +1,33 @@
+// Foundation for Sites by ZURB
+// foundation.zurb.com
+// Licensed under MIT Open Source
+
+////
+/// @group xy-grid
+////
+
+/// Sizes child elements so that `$n` number of items appear on each row.
+///
+/// @param {Number} $n - Number of elements to display per row.
+/// @param {String} $selector ['.cell'] - Selector(s) to use for child elements.
+/// @param {Boolean} $gutter-output [true] - Whether or not to output gutters
+/// @param {Number|Map} $gutters [$grid-margin-gutters] - Map or single value for gutters.
+/// @param {Keyword} $gutter-type [margin] - Type of gutter to output. Accepts `margin` or `padding`.
+/// @param {List} $gutter-position [right left] - The position to apply gutters to. Accepts `top`, `bottom`, `left`, `right` in any combination.
+/// @param {Boolean} $vertical [false] - Set to true to output vertical (height) styles rather than widths.
+@mixin xy-grid-layout(
+  $n,
+  $selector: '.cell',
+  $gutter-output: true,
+  $gutters: $grid-margin-gutters,
+  $gutter-type: margin,
+  $gutter-position: right left,
+  $breakpoint: $-zf-zero-breakpoint,
+  $vertical: false
+) {
+  $size: percentage(1/$n);
+
+  & > #{$selector} {
+    @include xy-cell($size, $gutter-output, $gutters, $gutter-type, $gutter-position, $breakpoint, $vertical);
+  }
+}

data/generators/foundation/public/stylesheets/foundation6/xy-grid/_position.scss

@@ -0,0 +1,28 @@
+// Foundation for Sites by ZURB
+// foundation.zurb.com
+// Licensed under MIT Open Source
+
+////
+/// @group xy-grid
+////
+
+/// Offsets a column to the right/bottom by `$n` columns.
+///
+/// @param {Number|List} $n - Size to offset by. You can pass in any value accepted by the `zf-cell()` mixin, such as `6`, `50%`, or `1 of 2`.
+/// @param {Boolean} $vertical [false] Sets the direction of the offset. If set to true will apply margin-top instead.
+@mixin xy-cell-offset(
+ $n,
+ $gutters: $grid-margin-gutters,
+ $gutter-type: margin,
+ $breakpoint: $-zf-zero-breakpoint,
+ $vertical: false
+) {
+  $direction: if($vertical, 'top', $global-left);
+
+  @include -zf-breakpoint-value($breakpoint, $gutters) {
+    $gutter: rem-calc($-zf-bp-value) / 2;
+    $size: if($gutter-type == 'margin', calc(#{xy-cell-size($n)} + #{$gutter}), #{xy-cell-size($n)});
+
+    margin-#{$direction}: #{$size};
+  }
+}

data/generators/foundation/public/stylesheets/foundation6/xy-grid/_xy-grid.scss

@@ -0,0 +1,51 @@
+// Foundation for Sites by ZURB
+// foundation.zurb.com
+// Licensed under MIT Open Source
+
+////
+/// @group xy-grid
+////
+
+/// Enables the XY grid.
+/// @type Boolean
+$xy-grid: true !default;
+
+/// The maximum width of a grid container.
+/// @type Number
+$grid-container: $global-width !default;
+
+/// The number of columns used in the grid.
+/// @type Number
+$grid-columns: 12 !default;
+
+/// The amount of margin between cells at different screen sizes when using the margin grid. To use just one size, set the variable to a number instead of a map.
+/// @type Map | Length
+$grid-margin-gutters: (
+  small: 20px,
+  medium: 30px
+) !default;
+
+/// The amount of padding in cells at different screen sizes when using the padding grid. To use just one size, set the variable to a number instead of a map.
+/// @type Map | Length
+$grid-padding-gutters: $grid-margin-gutters !default;
+
+/// The amount of padding to use when padding the grid-container.
+/// @type Map | Length
+$grid-container-padding: $grid-padding-gutters !default;
+
+/// The maximum width to apply to a grid container
+/// @type Number
+$grid-container-max: $global-width !default;
+
+/// The maximum number of cells in an XY block grid.
+/// @type Number
+$xy-block-grid-max: 8 !default;
+
+@import 'gutters';
+@import 'grid';
+@import 'cell';
+@import 'frame';
+@import 'position';
+@import 'layout';
+@import 'collapse';
+@import 'classes';

data/lib/locomotive/wagon/tools/styled_yaml.rb

@@ -105,7 +105,7 @@ module StyledYAML
   # A Psych.dump alternative that uses the custom TreeBuilder
   def self.dump obj, io = nil, options = {}
     real_io = io || StringIO.new(''.encode('utf-8'))
-    visitor = YAMLTree.new(options, TreeBuilder.new)
+    visitor = YAMLTree.create(options, TreeBuilder.new)
     visitor << obj
     ast = visitor.tree
 

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '2.4.0.rc2'
+    VERSION = '2.4.0'
   end
 end

data/locomotivecms_wagon.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'netrc',                 '~> 0.11.0'
 
   gem.add_dependency 'locomotivecms_common',  '~> 0.3.0'
-  gem.add_dependency 'locomotivecms_coal',    '~> 1.5.0'
-  gem.add_dependency 'locomotivecms_steam',   '~> 1.4.0.rc1'
+  gem.add_dependency 'locomotivecms_coal',    '~> 1.5.1'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.4.0'
 
   gem.add_dependency 'haml',                  '~> 4.0.7'
   gem.add_dependency 'listen',                '~> 3.1.5'

data/spec/fixtures/cassettes/authenticate.yml

@@ -20,21 +20,31 @@ http_interactions:
     headers:
       Content-Type:
       - application/json
-      X-Error-Detail:
-      - Invalid email or password.
+      Content-Length:
+      - '40'
+      Connection:
+      - keep-alive
+      Status:
+      - 401 Unauthorized
       Cache-Control:
       - no-cache
-      X-Request-Id:
-      - 3135ef1e-c2ff-4ebd-9ef3-84f81719f663
+      X-Error-Detail:
+      - Invalid email or password.
       X-Runtime:
-      - '0.003065'
-      Content-Length:
-      - '40'
+      - '0.218876'
+      X-Request-Id:
+      - d1fdb5d1-5e08-4b9f-9153-7ac91689d986
+      Date:
+      - Wed, 26 Sep 2018 20:37:08 GMT
+      X-Powered-By:
+      - Phusion Passenger 5.3.1
+      Server:
+      - nginx/1.14.0 + Phusion Passenger 5.3.1
     body:
       encoding: UTF-8
       string: '{"message":"Invalid email or password."}'
     http_version: 
-  recorded_at: Fri, 09 Mar 2018 11:20:57 GMT
+  recorded_at: Wed, 26 Sep 2018 20:37:08 GMT
 - request:
     method: post
     uri: http://localhost:3000/locomotive/api/v3/my_account.json
@@ -55,21 +65,31 @@ http_interactions:
     headers:
       Content-Type:
       - application/json
-      ETag:
-      - W/"8e497a154dca317960b23d7d1bfa7251"
+      Content-Length:
+      - '250'
+      Connection:
+      - keep-alive
+      Status:
+      - 201 Created
       Cache-Control:
       - max-age=0, private, must-revalidate
-      X-Request-Id:
-      - 5ea41529-a8bf-4cd8-a690-2f005979635c
+      ETag:
+      - W/"dee6b1c938803658bf23ded93edc449f"
       X-Runtime:
-      - '0.050731'
-      Content-Length:
-      - '250'
+      - '0.037922'
+      X-Request-Id:
+      - 0a6fd119-299d-48f5-9065-2d635aaa53f9
+      Date:
+      - Wed, 26 Sep 2018 20:37:08 GMT
+      X-Powered-By:
+      - Phusion Passenger 5.3.1
+      Server:
+      - nginx/1.14.0 + Phusion Passenger 5.3.1
     body:
       encoding: UTF-8
-      string: '{"_id":"5aa26e19e051bb8a0de44ece","created_at":"2018-03-09T11:20:57Z","updated_at":"2018-03-09T11:20:57Z","name":"John","email":"john@doe.net","locale":"en","api_key":"ddb35822ed0ebc95083e3ed1b506361bb94f10b2","super_admin":false,"local_admin":false}'
+      string: '{"_id":"5babedf4a9533064ec0350d4","created_at":"2018-09-26T20:37:08Z","updated_at":"2018-09-26T20:37:08Z","name":"John","email":"john@doe.net","locale":"en","api_key":"8ed79fb207e4eacf922a7d030138be545f98ccda","super_admin":false,"local_admin":false}'
     http_version: 
-  recorded_at: Fri, 09 Mar 2018 11:20:57 GMT
+  recorded_at: Wed, 26 Sep 2018 20:37:08 GMT
 - request:
     method: post
     uri: http://localhost:3000/locomotive/api/v3/tokens.json
@@ -90,24 +110,34 @@ http_interactions:
     headers:
       Content-Type:
       - application/json
-      ETag:
-      - W/"f002e74c360f53454cb2d1c4dc596c9d"
+      Content-Length:
+      - '32'
+      Connection:
+      - keep-alive
+      Status:
+      - 201 Created
       Cache-Control:
       - max-age=0, private, must-revalidate
-      X-Request-Id:
-      - b4b4c001-6a51-422f-87f5-c55e1e22880d
+      ETag:
+      - W/"54fbe8a83f4a578879f58ded5b7adf50"
       X-Runtime:
-      - '0.004271'
-      Content-Length:
-      - '32'
+      - '0.007055'
+      X-Request-Id:
+      - db76cb6c-9e85-4233-b4ca-b31760b02ec0
+      Date:
+      - Wed, 26 Sep 2018 20:37:08 GMT
+      X-Powered-By:
+      - Phusion Passenger 5.3.1
+      Server:
+      - nginx/1.14.0 + Phusion Passenger 5.3.1
     body:
       encoding: UTF-8
-      string: '{"token":"7ussE5FK8ZQAWxoYWaoJ"}'
+      string: '{"token":"hE1AJhyKRVCvfaWUAqWF"}'
     http_version: 
-  recorded_at: Fri, 09 Mar 2018 11:20:57 GMT
+  recorded_at: Wed, 26 Sep 2018 20:37:08 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=7ussE5FK8ZQAWxoYWaoJ
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=hE1AJhyKRVCvfaWUAqWF
     body:
       encoding: US-ASCII
       string: ''
@@ -119,7 +149,7 @@ http_interactions:
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - 7ussE5FK8ZQAWxoYWaoJ
+      - hE1AJhyKRVCvfaWUAqWF
   response:
     status:
       code: 200
@@ -127,24 +157,36 @@ http_interactions:
     headers:
       Content-Type:
       - application/json
-      ETag:
-      - W/"f50f010a60faed3360aeeea1e3c7a890"
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Status:
+      - 200 OK
       Cache-Control:
       - max-age=0, private, must-revalidate
-      X-Request-Id:
-      - e8bbcf8c-f607-4f56-ac39-0beafc90ad7b
+      ETag:
+      - W/"9c825b2ccbfb0b1db27457250e1d163a"
       X-Runtime:
-      - '0.005462'
-      Content-Length:
-      - '261'
+      - '0.018540'
+      X-Request-Id:
+      - c361da84-e02e-4234-a800-7be054d333b9
+      Date:
+      - Wed, 26 Sep 2018 20:37:08 GMT
+      X-Powered-By:
+      - Phusion Passenger 5.3.1
+      Server:
+      - nginx/1.14.0 + Phusion Passenger 5.3.1
+      Content-Encoding:
+      - gzip
     body:
       encoding: UTF-8
-      string: '{"_id":"5aa26db4e051bb89c3fe7684","created_at":"2018-03-09T11:19:16Z","updated_at":"2018-03-09T11:19:16Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
+      string: '{"_id":"5babed90a9533062ea501b61","created_at":"2018-09-26T20:35:28Z","updated_at":"2018-09-26T20:35:28Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Fri, 09 Mar 2018 11:20:57 GMT
+  recorded_at: Wed, 26 Sep 2018 20:37:08 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=7ussE5FK8ZQAWxoYWaoJ
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=hE1AJhyKRVCvfaWUAqWF
     body:
       encoding: US-ASCII
       string: ''
@@ -156,7 +198,7 @@ http_interactions:
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - 7ussE5FK8ZQAWxoYWaoJ
+      - hE1AJhyKRVCvfaWUAqWF
   response:
     status:
       code: 200
@@ -164,19 +206,31 @@ http_interactions:
     headers:
       Content-Type:
       - application/json
-      ETag:
-      - W/"f50f010a60faed3360aeeea1e3c7a890"
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Status:
+      - 200 OK
       Cache-Control:
       - max-age=0, private, must-revalidate
-      X-Request-Id:
-      - 60488f67-93ca-49c7-9292-e0f9c115dc9a
+      ETag:
+      - W/"9c825b2ccbfb0b1db27457250e1d163a"
       X-Runtime:
-      - '0.005633'
-      Content-Length:
-      - '261'
+      - '0.008966'
+      X-Request-Id:
+      - c87ad837-8491-4467-8eff-4601cae4e617
+      Date:
+      - Wed, 26 Sep 2018 20:37:08 GMT
+      X-Powered-By:
+      - Phusion Passenger 5.3.1
+      Server:
+      - nginx/1.14.0 + Phusion Passenger 5.3.1
+      Content-Encoding:
+      - gzip
     body:
       encoding: UTF-8
-      string: '{"_id":"5aa26db4e051bb89c3fe7684","created_at":"2018-03-09T11:19:16Z","updated_at":"2018-03-09T11:19:16Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
+      string: '{"_id":"5babed90a9533062ea501b61","created_at":"2018-09-26T20:35:28Z","updated_at":"2018-09-26T20:35:28Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Fri, 09 Mar 2018 11:20:57 GMT
+  recorded_at: Wed, 26 Sep 2018 20:37:08 GMT
 recorded_with: VCR 4.0.0