locomotivecms_wagon 3.0.0.beta2 → 3.0.0.rc0

data/generators/webpack/app/assets/javascripts/sections/index.js

@@ -0,0 +1,5 @@
+// Import all the sections here
+//
+// Example:
+// export { default as MyAwesomeSection } from './my_awesome_section';
+//

data/generators/webpack/app/assets/postcss.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  plugins: [
+    require('postcss-flexbugs-fixes'),
+    require('autoprefixer')
+  ]
+}

data/generators/webpack/app/assets/stylesheets/app.scss

@@ -0,0 +1 @@
+// Wagon main stylesheet file

data/generators/webpack/app/assets/webpack.common.js

@@ -0,0 +1,57 @@
+const path = require('path');
+const Webpack = require('webpack');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+
+module.exports = {
+  entry: './app/assets/javascripts/app.js',
+  output: {
+    path:     path.resolve(__dirname, '../../public'),
+    filename: 'javascripts/bundle.js'
+  },
+  module: {
+    rules: [
+      {
+        test: /\.(js|jsx|es6)$/,
+        exclude: /(node_modules|bower_components)/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            presets: ['@babel/preset-env']
+          }
+        }
+      },
+      {
+        test: /\.scss$/,
+        use: ['style-loader', MiniCssExtractPlugin.loader, 'css-loader', 'postcss-loader', 'sass-loader']
+      },
+      {
+        test: /\.(woff2?|svg)$/,
+        loader: 'file-loader?name=fonts/[name].[ext]&useRelativePath=false&publicPath=../'
+      },
+      {
+        test: /\.(ttf|eot|otf)$/,
+        loader: 'file-loader?name=fonts/[name].[ext]&useRelativePath=false&publicPath=../'
+      },
+      {
+        test: /\.(gif|png|jpe?g|svg)$/i,
+        use: [
+          {
+            loader: 'file-loader', options: {
+              outputPath: 'images/',
+              name: '[path][name].[ext]'
+            }
+          },
+          { loader: 'image-webpack-loader', options: { bypassOnDebug: true } }
+        ]
+      }
+    ]
+  },
+  plugins: [
+    new Webpack.ProvidePlugin({
+      $: 'jquery',
+      jQuery: 'jquery',
+      'window.jQuery': 'jquery'
+    }),
+    new MiniCssExtractPlugin({ filename: 'stylesheets/bundle.css', allChunks: true })
+  ]
+};

data/generators/webpack/app/assets/webpack.dev.js

@@ -0,0 +1,11 @@
+const merge = require('webpack-merge');
+const common = require('./webpack.common.js');
+const LiveReloadPlugin = require('webpack-livereload-plugin');
+
+module.exports = merge(common, {
+  mode: 'development',
+  devtool: 'inline-source-map',
+  plugins: [
+    new LiveReloadPlugin()
+  ]
+});

data/generators/webpack/app/assets/webpack.prod.js

@@ -0,0 +1,12 @@
+const merge = require('webpack-merge');
+const common = require('./webpack.config.js');
+const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+
+module.exports = merge(common, {
+  plugins: [
+    new OptimizeCssAssetsPlugin({
+      assetNameRegExp: /\.css$/,
+      cssProcessorOptions: { discardComments: { removeAll: true } }
+    })
+  ]
+});

data/generators/webpack/package.json.tt

@@ -0,0 +1,36 @@
+{
+  "name": "Wagon assets",
+  "version": "1.0.0",
+  "description": "Assets source for the Wagon site",
+  "main": "index.js",
+  "scripts": {
+    "start": "webpack --config app/assets/webpack.dev.js --progress --colors --watch",
+    "build:dev": "webpack --config app/assets/webpack.dev.js --progress",
+    "build:prod": "NODE_ENV=production webpack --config app/assets/webpack.prod.js --progress --mode production",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Wagon",
+  "license": "ISC",
+  "dependencies": {
+  },
+  "devDependencies": {
+    "@babel/core": "^7.4.3",
+    "@babel/plugin-proposal-class-properties": "^7.4.0",
+    "babel-loader": "^8.0.5",
+    "@babel/preset-env": "^7.4.3",
+    "css-loader": "^0.28.11",
+    "file-loader": "^1.1.11",
+    "image-webpack-loader": "^4.3.0",
+    "mini-css-extract-plugin": "^0.4.0",
+    "node-sass": "^4.9.0",
+    "optimize-css-assets-webpack-plugin": "^4.0.2",
+    "postcss-flexbugs-fixes": "^3.3.1",
+    "postcss-loader": "^2.1.5",
+    "sass-loader": "^7.0.1",
+    "style-loader": "^0.21.0",
+    "webpack": "^4.20.2",
+    "webpack-cli": "^3.1.1",
+    "webpack-merge": "^4.1.4",
+    "webpack-livereload-plugin": "^2.2.0"
+  }
+}

data/lib/locomotive/wagon/cli.rb

@@ -164,6 +164,15 @@ module Locomotive
           end
         end
 
+        desc 'public_form', 'Generate a public form like a contact form'
+        def public_form
+          force_color_if_asked(options)
+
+          if path = check_path!
+            Locomotive::Wagon.generate :public_form, [path], self.options
+          end
+        end
+
         desc 'site_metafields', 'Generate the missing file to describe the site metafields'
         def site_metafields
           force_color_if_asked(options)
@@ -173,6 +182,15 @@ module Locomotive
           end
         end
 
+        desc 'webpack', 'Add Webpack to your v3.x Wagon site'
+        def webpack
+          force_color_if_asked(options)
+
+          if path = check_path!
+            Locomotive::Wagon.generate :webpack, [path], self.options
+          end
+        end
+
         protected
 
         # Read the YAML config file of a Locomotive site.
@@ -289,7 +307,7 @@ module Locomotive
         option :port, aliases: '-p', type: 'string', default: '3333', desc: 'The port of the Thin server'
         option :env, aliases: '-e', type: 'string', default: 'local', desc: 'The env used to the data of the pages and content entries'
         option :daemonize, aliases: '-d', type: 'boolean', default: false, desc: 'Run daemonized Thin server in the background'
-        option :live_reload_port, aliases: '-l', type: 'string', default: nil, desc: 'The port the LiveReload javascript lib needs to listen for changes (usually 35729, disabled by default)'
+        option :force_polling, aliases: '-o', type: 'boolean', default: false, desc: 'Force polling of files for reload'
         option :force, aliases: '-f', type: 'boolean', default: false, desc: 'Stop the current daemonized Thin server if found before starting a new one'
         option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'Display the full error stack trace if an error occurs'
         option :debug, type: 'boolean', default: false, desc: 'Display some debugging information (rack middleware stack)'
@@ -407,9 +425,8 @@ module Locomotive
   #{'bundle exec' unless skip_bundle} wagon serve
 
   # In a another terminal
-  cd app/assets
-  npm install
-  npm start
+  yarn
+  yarn start
 
   open http://0.0.0.0:3333
 BASH

data/lib/locomotive/wagon/commands/push_sub_commands/push_content_types_command.rb

@@ -26,7 +26,7 @@ module Locomotive::Wagon
     end
 
     def persist(decorated_entity)
-      raise SkipPersistingException if only_relationships? && !decorated_entity.with_relationships?
+      raise SkipPersistingException.new if only_relationships? && !decorated_entity.with_relationships?
 
       api_client.content_types.update(decorated_entity.slug, decorated_entity.to_hash)
     end

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

@@ -79,11 +79,6 @@ module Locomotive::Wagon
         config.asset_path     = File.expand_path(File.join(path, 'public'))
         config.minify_assets  = false
 
-        if (port = options[:live_reload_port]).to_i > 0
-          require 'rack-livereload'
-          config.middleware.insert_before Rack::Lint, Rack::LiveReload, live_reload_port: port
-        end
-
         config.middleware.insert_before Rack::Lint, Locomotive::Wagon::Middlewares::ErrorPage
 
         config.services_hook = -> (services) {
@@ -121,7 +116,7 @@ module Locomotive::Wagon
 
       cache = Locomotive::Steam::Adapters::Filesystem::SimpleCacheStore.new
 
-      Locomotive::Wagon::Listen.start(path, cache)
+      Locomotive::Wagon::Listen.start(path, cache, options)
     end
 
     def server

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

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

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

@@ -0,0 +1,97 @@
+require 'thor/group'
+require 'active_support'
+require 'active_support/core_ext'
+
+module Locomotive
+  module Wagon
+    module Generators
+      class PublicForm < Thor::Group
+
+        include Thor::Actions
+        include Locomotive::Wagon::CLI::ForceColor
+
+        argument :target_path # path to the site
+
+        def create_content_type
+          slug = ask("What's the slug of the content type? (ex.: user_messages)")
+          @content_type_slug = slug = slug.underscore
+
+          file_path = File.join(content_types_path, slug)
+
+          template "content_type.yml.tt", "#{file_path}.yml", {
+            name: slug.humanize,
+            slug: slug
+          }
+        end
+
+        def create_page_form
+          slug = ask("What's the slug of your page? (ex.: contact-us)")
+          slug = slug.dasherize
+
+          file_path = File.join(pages_path, slug)
+
+          template "page.liquid.tt", "#{file_path}.liquid", {
+            title:        slug.humanize,
+            handle:       slug.underscore,
+            content_type: @content_type_slug
+          }
+        end
+
+        def add_metafields_schema
+          append_to_file 'config/metafields_schema.yml', <<-YAML
+
+google:
+  label: Google API Integration
+  fields:
+    recaptcha_site_key:
+      hint: reCAPTCHA - Site key
+      type: string
+      hint: "Visit: https://developers.google.com/recaptcha/intro"
+    recaptcha_secret:
+      hint: reCAPTCHA - Secret key
+      type: string
+          YAML
+        end
+
+        def add_metafields
+          append_to_file 'config/site.yml', <<-YAML
+
+metafields:
+  google:
+    recaptcha_site_key: "<GOOGLE SITE KEY>"
+    recaptcha_secret: "<GOOGLE SECRET>"
+          YAML
+        end
+
+        def print_next_instructions
+          say <<-TEXT
+
+Congratulations, your public form has been generated with success!
+
+In order to complete the Google reCAPTCHA configuration, visit https://developers.google.com/recaptcha/intro.
+Create a developer account if you don't have one and register your site.
+
+Once done, copy and paste your Google SITE KEY and Google SECRET KEY in the config/site.yml file.
+
+TEXT
+        end
+
+        protected
+
+        def content_types_path
+          File.join(target_path, 'app', 'content_types')
+        end
+
+        def pages_path
+          File.join(target_path, 'app', 'views', 'pages')
+        end
+
+        def self.source_root
+          File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'generators', 'public_form')
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -138,5 +138,4 @@ end
 
 require 'locomotive/wagon/generators/site/base'
 require 'locomotive/wagon/generators/site/blank'
-require 'locomotive/wagon/generators/site/unzip'
 require 'locomotive/wagon/generators/site/cloned'

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

@@ -0,0 +1,29 @@
+require 'thor/group'
+require 'active_support'
+require 'active_support/core_ext'
+
+module Locomotive
+  module Wagon
+    module Generators
+      class Webpack < Thor::Group
+
+        include Thor::Actions
+        include Locomotive::Wagon::CLI::ForceColor
+
+        argument :target_path # path to the site
+
+        def copy_source
+          directory('webpack', self.target_path, {
+            recursive:  true
+          })
+        end
+
+        def self.source_root
+          File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'generators')
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -2,10 +2,13 @@ require 'listen'
 
 module Locomotive::Wagon
 
-  class Listen < Struct.new(:path, :cache)
+  class Listen < Struct.new(:path, :cache, :options)
 
-    def self.start(path, cache)
-      new(path, cache).tap { |instance| instance.apply_definitions }
+    def self.start(path, cache, options)
+      new(path, cache, options).tap do |instance|
+        puts 'Listener polling is on.' if options[:force_polling]
+        instance.apply_definitions
+      end
     end
 
     def apply_definitions
@@ -31,7 +34,10 @@ module Locomotive::Wagon
       filter    = definition[1]
       _path     = File.expand_path(File.join(self.path, definition.first))
 
-      listener = ::Listen.to(_path, only: filter, &reloader)
+      listener = ::Listen.to(_path, {
+        only:           filter,
+        force_polling:  options[:force_polling]
+      }, &reloader)
 
       # non blocking listener
       listener.start

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '3.0.0.beta2'
+    VERSION = '3.0.0.rc0'
   end
 end

data/locomotivecms_wagon.gemspec

@@ -28,11 +28,10 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'locomotivecms_common',  '~> 0.3.1'
   gem.add_dependency 'locomotivecms_coal',    '~> 1.6.0.beta1'
-  gem.add_dependency 'locomotivecms_steam',   '~> 1.5.0.beta3'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.5.0.rc0'
 
   gem.add_dependency 'haml',                  '~> 4.0.7'
   gem.add_dependency 'listen',                '~> 3.1.5'
-  gem.add_dependency 'rack-livereload',       '~> 0.3.16'
   gem.add_dependency 'neatjson',              '~> 0.8.4'
 
   gem.add_dependency 'faker',                 '~> 1.6'

data/spec/fixtures/cassettes/authenticate.yml

@@ -31,20 +31,20 @@ http_interactions:
       X-Error-Detail:
       - Invalid email or password.
       X-Runtime:
-      - '0.297049'
+      - '0.225086'
       X-Request-Id:
-      - f13fc285-8a54-47b4-9279-c5bf8e63ac34
+      - e0a12c11-333f-412b-819d-f8d8438b890e
       Date:
-      - Mon, 25 Mar 2019 09:22:14 GMT
+      - Sun, 07 Apr 2019 15:29:54 GMT
       X-Powered-By:
-      - Phusion Passenger 6.0.1
+      - Phusion Passenger 6.0.2
       Server:
-      - nginx/1.15.8 + Phusion Passenger 6.0.1
+      - nginx/1.15.8 + Phusion Passenger 6.0.2
     body:
       encoding: UTF-8
       string: '{"message":"Invalid email or password."}'
     http_version: 
-  recorded_at: Mon, 25 Mar 2019 09:22:14 GMT
+  recorded_at: Sun, 07 Apr 2019 15:29:54 GMT
 - request:
     method: post
     uri: http://localhost:3000/locomotive/api/v3/my_account.json
@@ -74,22 +74,22 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       ETag:
-      - W/"51a3b535351c433b6cdd6a4e19a838d8"
+      - W/"473276b9204ed33a143e3dc6ba87b3bb"
       X-Runtime:
-      - '0.125847'
+      - '0.087953'
       X-Request-Id:
-      - f1c4070b-cb5d-415a-be42-316a44950148
+      - 5ed7a039-65a5-4eaf-b254-253fcf4cf301
       Date:
-      - Mon, 25 Mar 2019 09:22:14 GMT
+      - Sun, 07 Apr 2019 15:29:54 GMT
       X-Powered-By:
-      - Phusion Passenger 6.0.1
+      - Phusion Passenger 6.0.2
       Server:
-      - nginx/1.15.8 + Phusion Passenger 6.0.1
+      - nginx/1.15.8 + Phusion Passenger 6.0.2
     body:
       encoding: UTF-8
-      string: '{"_id":"5c989dc6cb29bc25dcce6c1f","created_at":"2019-03-25T09:22:14Z","updated_at":"2019-03-25T09:22:14Z","name":"John","email":"john@doe.net","locale":"en","api_key":"0c61fe2e0d142b818832df6f564c76c8e7463428","super_admin":false,"local_admin":false}'
+      string: '{"_id":"5caa1772a9533007beaa4a80","created_at":"2019-04-07T15:29:54Z","updated_at":"2019-04-07T15:29:54Z","name":"John","email":"john@doe.net","locale":"en","api_key":"33ce5fb2a74cc1a7cc32d3fadf64e51409d36bb7","super_admin":false,"local_admin":false}'
     http_version: 
-  recorded_at: Mon, 25 Mar 2019 09:22:14 GMT
+  recorded_at: Sun, 07 Apr 2019 15:29:54 GMT
 - request:
     method: post
     uri: http://localhost:3000/locomotive/api/v3/tokens.json
@@ -119,25 +119,25 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       ETag:
-      - W/"41fffd400e06d4c367b396e8783391db"
+      - W/"fc7c4c3d9d16be8d9545dce1c18b248a"
       X-Runtime:
-      - '0.006812'
+      - '0.008493'
       X-Request-Id:
-      - 4db416d0-8176-4db9-a1d9-ca31cc922572
+      - 52477d7a-87f3-49c1-b79d-6ada23ce6a88
       Date:
-      - Mon, 25 Mar 2019 09:22:14 GMT
+      - Sun, 07 Apr 2019 15:29:54 GMT
       X-Powered-By:
-      - Phusion Passenger 6.0.1
+      - Phusion Passenger 6.0.2
       Server:
-      - nginx/1.15.8 + Phusion Passenger 6.0.1
+      - nginx/1.15.8 + Phusion Passenger 6.0.2
     body:
       encoding: UTF-8
-      string: '{"token":"kvvzttwNHTffDHyLX1aQ"}'
+      string: '{"token":"RzLvRkNVUyRna6okCxP9"}'
     http_version: 
-  recorded_at: Mon, 25 Mar 2019 09:22:14 GMT
+  recorded_at: Sun, 07 Apr 2019 15:29:54 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=kvvzttwNHTffDHyLX1aQ
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=RzLvRkNVUyRna6okCxP9
     body:
       encoding: US-ASCII
       string: ''
@@ -149,7 +149,7 @@ http_interactions:
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - kvvzttwNHTffDHyLX1aQ
+      - RzLvRkNVUyRna6okCxP9
   response:
     status:
       code: 200
@@ -166,27 +166,27 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       ETag:
-      - W/"c95366dff8aee265e945c8c5b0c1bda6"
+      - W/"9f0bb3987772edd70b54bf2882c1f59a"
       X-Runtime:
-      - '0.016694'
+      - '0.021974'
       X-Request-Id:
-      - 5a05b419-6fad-4dc5-831f-4ecf142ee7f1
+      - 99083fe8-48c6-4250-b3b8-3a9f30654ea9
       Date:
-      - Mon, 25 Mar 2019 09:22:14 GMT
+      - Sun, 07 Apr 2019 15:29:54 GMT
       X-Powered-By:
-      - Phusion Passenger 6.0.1
+      - Phusion Passenger 6.0.2
       Server:
-      - nginx/1.15.8 + Phusion Passenger 6.0.1
+      - nginx/1.15.8 + Phusion Passenger 6.0.2
       Content-Encoding:
       - gzip
     body:
       encoding: UTF-8
-      string: '{"_id":"5c989d67cb29bc2525a7d3f9","created_at":"2019-03-25T09:20:39Z","updated_at":"2019-03-25T09:20:39Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
+      string: '{"_id":"5caa173da95330069274f68c","created_at":"2019-04-07T15:29:01Z","updated_at":"2019-04-07T15:29:01Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Mon, 25 Mar 2019 09:22:14 GMT
+  recorded_at: Sun, 07 Apr 2019 15:29:54 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=kvvzttwNHTffDHyLX1aQ
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=RzLvRkNVUyRna6okCxP9
     body:
       encoding: US-ASCII
       string: ''
@@ -198,7 +198,7 @@ http_interactions:
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - kvvzttwNHTffDHyLX1aQ
+      - RzLvRkNVUyRna6okCxP9
   response:
     status:
       code: 200
@@ -215,22 +215,22 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       ETag:
-      - W/"c95366dff8aee265e945c8c5b0c1bda6"
+      - W/"9f0bb3987772edd70b54bf2882c1f59a"
       X-Runtime:
-      - '0.007218'
+      - '0.013451'
       X-Request-Id:
-      - dff6981c-5e38-4235-84bc-809560aae671
+      - 79920346-1e4a-4e94-bf06-77e16afc02ef
       Date:
-      - Mon, 25 Mar 2019 09:22:14 GMT
+      - Sun, 07 Apr 2019 15:29:54 GMT
       X-Powered-By:
-      - Phusion Passenger 6.0.1
+      - Phusion Passenger 6.0.2
       Server:
-      - nginx/1.15.8 + Phusion Passenger 6.0.1
+      - nginx/1.15.8 + Phusion Passenger 6.0.2
       Content-Encoding:
       - gzip
     body:
       encoding: UTF-8
-      string: '{"_id":"5c989d67cb29bc2525a7d3f9","created_at":"2019-03-25T09:20:39Z","updated_at":"2019-03-25T09:20:39Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
+      string: '{"_id":"5caa173da95330069274f68c","created_at":"2019-04-07T15:29:01Z","updated_at":"2019-04-07T15:29:01Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Mon, 25 Mar 2019 09:22:14 GMT
+  recorded_at: Sun, 07 Apr 2019 15:29:54 GMT
 recorded_with: VCR 4.0.0