locomotivecms_wagon 2.4.1 → 3.0.0.beta2

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

@@ -0,0 +1,82 @@
+require 'thor/group'
+require 'active_support'
+require 'active_support/core_ext'
+
+module Locomotive
+  module Wagon
+    module Generators
+      class Section < Thor::Group
+
+        ICON_LIST = ['header',
+                     'default',
+                     'slide',
+                     'text',
+                     'image_text',
+                     'list',
+                     'footer']
+
+        include Thor::Actions
+        include Locomotive::Wagon::CLI::ForceColor
+
+        argument :slug
+        argument :global
+        argument :icon
+        argument :target_path # path to the site
+
+        def is_global?
+          if self.global.blank?
+            self.global = yes?('Is this section aimed to be used as global?')
+          end
+        end
+
+        def wich_icon?
+          if self.icon.blank?
+            question = 'Which icon should be displayed in the editor UI?'
+            self.icon = ask(question, limited_to: ICON_LIST)
+          end
+        end
+
+        def create_section
+          _slug   = slug.clone.downcase.gsub(/[-]/, '_')
+          options = { name: _slug.humanize, type: _slug, global: self.global, icon: self.icon }
+
+          # create the liquid file
+          file_path = File.join(sections_path, _slug)
+          template "template.liquid.tt", "#{file_path}.liquid", options
+
+          # create the javascript file
+          if File.exists?(sections_js_path)
+            js_class_name = options[:type].classify
+            file_path     = File.join(sections_js_path, options[:type])
+
+            template "%type%.js.tt", "#{file_path}.js", options
+
+            append_to_file File.join(sections_js_path, 'index.js'), <<-JS
+export { default as #{js_class_name} } from './#{options[:type]}';
+            JS
+
+            insert_into_file 'app/assets/javascripts/app.js', after: "// Register sections here. DO NOT REMOVE OR UPDATE THIS LINE\n" do
+              "  sectionsManager.registerSection('#{options[:type]}', Sections.#{js_class_name});\n"
+            end
+          end
+        end
+
+        def self.source_root
+          File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'generators', 'section')
+        end
+
+        protected
+
+        def sections_path
+          File.join(target_path, 'app', 'views', 'sections')
+        end
+
+        def sections_js_path
+          File.join(target_path, 'app', 'assets', 'javascripts', 'sections')
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -138,8 +138,5 @@ end
 
 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/foundation'
 require 'locomotive/wagon/generators/site/unzip'
 require 'locomotive/wagon/generators/site/cloned'

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

@@ -19,10 +19,7 @@ module Locomotive
           argument :skip_bundle
 
           def copy_sources
-            directory('.', self.destination, { recursive: true }, {
-              name:     self.name,
-              version:  Locomotive::Wagon::VERSION
-            })
+            copy_sources_from_generator
           end
 
           def comment_gemfile
@@ -34,37 +31,23 @@ module Locomotive
           end
 
           def self.source_root
-            File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'generators', self.name.demodulize.underscore)
-          end
-
-          def self.may_use_haml
-            class_option :haml, type: :boolean, default: nil, required: false, desc: 'Use HAML templates?'
-          end
-
-          def self.may_use_scss
-            class_option :scss, type: :boolean, default: nil, required: false, desc: 'Use SCSS stylesheets?'
+            File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'generators')
           end
 
           protected
 
-          def destination
-            File.join(target_path, name)
-          end
+          def copy_sources_from_generator(generator_name: nil, options: {})
+            _name = generator_name || self.class.name.demodulize.underscore
 
-          def haml?
-            if options[:haml].nil?
-              yes?('Do you prefer HAML templates?')
-            else
-              options[:haml]
-            end
+            directory(_name, self.destination, {
+              recursive:  true,
+              name:       self.name,
+              version:    Locomotive::Wagon::VERSION
+            }.merge(options))
           end
 
-          def scss?
-            if options[:scss].nil?
-              yes?('Do you prefer SCSS stylesheets?')
-            else
-              options[:scss]
-            end
+          def destination
+            File.join(target_path, name)
           end
 
           def skip_bundle?

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

@@ -5,22 +5,6 @@ module Locomotive
 
         class Blank < Base
 
-          may_use_haml
-
-          def choose_haml_over_html
-            if haml?
-              remove_file File.join(self.destination, 'app/views/pages/index.liquid')
-              remove_file File.join(self.destination, 'app/views/pages/404.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')
-            end
-          end
-
-          def bundle_install
-            super
-          end
-
         end
 
         Locomotive::Wagon::Generators::Site.register(:blank, Blank, %{
@@ -29,4 +13,4 @@ module Locomotive
       end
     end
   end
-end
+end

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

@@ -10,10 +10,7 @@ module Locomotive
           argument :connection_info
 
           def copy_sources
-            directory('.', self.destination, { recursive: true }, {
-              name:     self.name,
-              version:  Locomotive::Wagon::VERSION
-            }.merge(self.connection_info))
+            copy_sources_from_generator(generator_name: 'cloned', options: self.connection_info)
           end
 
           def bundle_install

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

@@ -14,35 +14,27 @@ module Locomotive
         argument :locales
         argument :target_path # path to the site
 
-        attr_accessor :haml
-
-        def ask_for_haml
-          self.haml = yes?('Do you prefer a HAML template ?')
-        end
-
         def apply_locales?
           self.locales.shift # remove the default locale
 
           unless self.locales.empty?
-            unless yes?('Do you want to generate files for each locale ?')
+            unless yes?('Do you want to generate files for each locale?')
               self.locales = []
             end
           end
         end
 
         def create_snippet
-          extension = self.haml ? 'liquid.haml' : 'liquid'
-
           _slug = slug.clone.downcase.gsub(/[-]/, '_')
 
           options   = { slug: _slug, translated: false }
           file_path = File.join(snippets_path, _slug)
 
-          template "template.#{extension}.tt", "#{file_path}.#{extension}", options
+          template "template.liquid.tt", "#{file_path}.liquid", options
 
           self.locales.each do |locale|
             options[:translated] = true
-            template "template.#{extension}.tt", "#{file_path}.#{locale}.#{extension}", options
+            template "template.liquid.tt", "#{file_path}.#{locale}.liquid", options
           end
         end
 

data/lib/locomotive/wagon/middlewares/error_page.rb

@@ -1,6 +1,6 @@
 require 'erb'
+require 'locomotive/steam/middlewares/concerns/helpers'
 require 'locomotive/steam/middlewares/thread_safe'
-require 'locomotive/steam/middlewares/helpers'
 
 module Locomotive::Wagon
   module Middlewares
@@ -9,7 +9,7 @@ module Locomotive::Wagon
     #
     class ErrorPage < Locomotive::Steam::Middlewares::ThreadSafe
 
-      include Locomotive::Steam::Middlewares::Helpers
+      include Locomotive::Steam::Middlewares::Concerns::Helpers
 
       def _call
         begin
@@ -80,7 +80,27 @@ module Locomotive::Wagon
         pre strong {
           margin-right: 20px;
         }
+
+        .backtrace-title {
+          cursor: pointer;
+        }
+
+        .backtrace-title {
+          display: block;
+        }
+
+        .backtrace.hidden {
+          display: none;
+        }
       </style>
+      <script>
+        document.addEventListener('DOMContentLoaded', function() {
+          var el = document.querySelector('h3.backtrace-title');
+          el.onclick = function() {
+            document.querySelector('.backtrace').classList.toggle('hidden');
+          }
+        });
+      </script>
     </head>
 
     <body>
@@ -90,12 +110,12 @@ module Locomotive::Wagon
         <h2><%= @error.message %></h2>
 
         <% if @error.respond_to?(:file) %>
-          <h3>File:</h3>
+          <h3>File</h3>
           <p><%= @error.file %></p>
         <% end %>
 
         <% if @error.respond_to?(:action) %>
-          <h3>Action:</h3>
+          <h3>Action</h3>
           <p><%= @error.action %></p>
         <% end %>
 
@@ -110,8 +130,8 @@ module Locomotive::Wagon
           <p><i>No code</i></p>
         <% end %>
 
-        <h3>Backtrace</h3>
-        <p><%= @error.backtrace.join("<br/>") %></p>
+        <h3 class="backtrace-title">Backtrace <small>(click here to display it)</small></h3>
+        <p class="backtrace hidden"><%= @error.backtrace.join("<br/>") %></p>
       </div>
 
     </body>

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

@@ -18,10 +18,10 @@ module Locomotive::Wagon
 
     def definitions
       [
-        ['config', /\.yml/, [:site, :content_types, :pages, :snippets, :content_entries, :translations]],
-        ['app/views', %r{(pages|snippets)/(.+\.liquid).*}, [:pages, :snippets]],
+        ['config', /\.yml/, [:site, :content_types, :pages, :snippets, :sections, :content_entries, :translations]],
+        ['app/views', %r{(pages|snippets|sections)/(.+\.liquid).*}, [:pages, :snippets, :sections]],
         ['app/content_types', /\.yml/, [:content_types, :content_entries]],
-        ['data', /\.yml/, :content_entries],
+        ['data', /\.(yml|json)/, [:pages, :content_entries]],
         ['public', %r{((stylesheets|javascripts)/(.+\.(css|js))).*}, []]
       ]
     end

data/lib/locomotive/wagon/version.rb

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

data/locomotivecms_wagon.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ['Didier Lafforgue', 'Rodrigo Alvarez']
   gem.email         = ['did@locomotivecms.com', 'papipo@gmail.com']
   gem.description   = %q{The LocomotiveCMS wagon is a site generator for the LocomotiveCMS engine}
-  gem.summary       = %q{The LocomotiveCMS wagon is a site generator for the LocomotiveCMS engine powered by all the efficient and modern HTML development tools (Haml, SASS, Compass, Less).}
+  gem.summary       = %q{The LocomotiveCMS wagon is a site generator for the LocomotiveCMS engine powered by all the efficient and modern HTML development tools (SASS, Webpack, ...etc).}
   gem.homepage      = 'http://www.locomotivecms.com'
   gem.license       = 'MIT'
 
@@ -22,17 +22,18 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake',      '~> 10.0.4'
 
   gem.add_dependency 'thor',                  '~> 0.19.4'
-  gem.add_dependency 'thin',                  '~> 1.7.0'
-  gem.add_dependency 'rubyzip',               '~> 1.2.1'
+  gem.add_dependency 'thin',                  '~> 1.7.2'
   gem.add_dependency 'netrc',                 '~> 0.11.0'
+  gem.add_dependency 'oj',                    '~> 3.7.11'
 
-  gem.add_dependency 'locomotivecms_common',  '~> 0.3.0'
-  gem.add_dependency 'locomotivecms_coal',    '~> 1.5.1'
-  gem.add_dependency 'locomotivecms_steam',   '~> 1.4.1'
+  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 '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'
 end

data/spec/fixtures/cassettes/authenticate.yml

@@ -8,7 +8,7 @@ http_interactions:
       string: email=john%40doe.net&password=asimplepassword
     headers:
       User-Agent:
-      - Faraday v0.14.0
+      - Faraday v0.15.4
       Accept:
       - application/json
       Content-Type:
@@ -31,20 +31,20 @@ http_interactions:
       X-Error-Detail:
       - Invalid email or password.
       X-Runtime:
-      - '0.218876'
+      - '0.297049'
       X-Request-Id:
-      - d1fdb5d1-5e08-4b9f-9153-7ac91689d986
+      - f13fc285-8a54-47b4-9279-c5bf8e63ac34
       Date:
-      - Wed, 26 Sep 2018 20:37:08 GMT
+      - Mon, 25 Mar 2019 09:22:14 GMT
       X-Powered-By:
-      - Phusion Passenger 5.3.1
+      - Phusion Passenger 6.0.1
       Server:
-      - nginx/1.14.0 + Phusion Passenger 5.3.1
+      - nginx/1.15.8 + Phusion Passenger 6.0.1
     body:
       encoding: UTF-8
       string: '{"message":"Invalid email or password."}'
     http_version: 
-  recorded_at: Wed, 26 Sep 2018 20:37:08 GMT
+  recorded_at: Mon, 25 Mar 2019 09:22:14 GMT
 - request:
     method: post
     uri: http://localhost:3000/locomotive/api/v3/my_account.json
@@ -53,7 +53,7 @@ http_interactions:
       string: account%5Bemail%5D=john%40doe.net&account%5Bname%5D=John&account%5Bpassword%5D=asimplepassword
     headers:
       User-Agent:
-      - Faraday v0.14.0
+      - Faraday v0.15.4
       Accept:
       - application/json
       Content-Type:
@@ -74,22 +74,22 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       ETag:
-      - W/"dee6b1c938803658bf23ded93edc449f"
+      - W/"51a3b535351c433b6cdd6a4e19a838d8"
       X-Runtime:
-      - '0.037922'
+      - '0.125847'
       X-Request-Id:
-      - 0a6fd119-299d-48f5-9065-2d635aaa53f9
+      - f1c4070b-cb5d-415a-be42-316a44950148
       Date:
-      - Wed, 26 Sep 2018 20:37:08 GMT
+      - Mon, 25 Mar 2019 09:22:14 GMT
       X-Powered-By:
-      - Phusion Passenger 5.3.1
+      - Phusion Passenger 6.0.1
       Server:
-      - nginx/1.14.0 + Phusion Passenger 5.3.1
+      - nginx/1.15.8 + Phusion Passenger 6.0.1
     body:
       encoding: UTF-8
-      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}'
+      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}'
     http_version: 
-  recorded_at: Wed, 26 Sep 2018 20:37:08 GMT
+  recorded_at: Mon, 25 Mar 2019 09:22:14 GMT
 - request:
     method: post
     uri: http://localhost:3000/locomotive/api/v3/tokens.json
@@ -98,7 +98,7 @@ http_interactions:
       string: email=admin%40locomotivecms.com&password=locomotive
     headers:
       User-Agent:
-      - Faraday v0.14.0
+      - Faraday v0.15.4
       Accept:
       - application/json
       Content-Type:
@@ -119,37 +119,37 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       ETag:
-      - W/"54fbe8a83f4a578879f58ded5b7adf50"
+      - W/"41fffd400e06d4c367b396e8783391db"
       X-Runtime:
-      - '0.007055'
+      - '0.006812'
       X-Request-Id:
-      - db76cb6c-9e85-4233-b4ca-b31760b02ec0
+      - 4db416d0-8176-4db9-a1d9-ca31cc922572
       Date:
-      - Wed, 26 Sep 2018 20:37:08 GMT
+      - Mon, 25 Mar 2019 09:22:14 GMT
       X-Powered-By:
-      - Phusion Passenger 5.3.1
+      - Phusion Passenger 6.0.1
       Server:
-      - nginx/1.14.0 + Phusion Passenger 5.3.1
+      - nginx/1.15.8 + Phusion Passenger 6.0.1
     body:
       encoding: UTF-8
-      string: '{"token":"hE1AJhyKRVCvfaWUAqWF"}'
+      string: '{"token":"kvvzttwNHTffDHyLX1aQ"}'
     http_version: 
-  recorded_at: Wed, 26 Sep 2018 20:37:08 GMT
+  recorded_at: Mon, 25 Mar 2019 09:22:14 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=hE1AJhyKRVCvfaWUAqWF
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=kvvzttwNHTffDHyLX1aQ
     body:
       encoding: US-ASCII
       string: ''
     headers:
       User-Agent:
-      - Faraday v0.14.0
+      - Faraday v0.15.4
       Accept:
       - application/json
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - hE1AJhyKRVCvfaWUAqWF
+      - kvvzttwNHTffDHyLX1aQ
   response:
     status:
       code: 200
@@ -166,39 +166,39 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       ETag:
-      - W/"9c825b2ccbfb0b1db27457250e1d163a"
+      - W/"c95366dff8aee265e945c8c5b0c1bda6"
       X-Runtime:
-      - '0.018540'
+      - '0.016694'
       X-Request-Id:
-      - c361da84-e02e-4234-a800-7be054d333b9
+      - 5a05b419-6fad-4dc5-831f-4ecf142ee7f1
       Date:
-      - Wed, 26 Sep 2018 20:37:08 GMT
+      - Mon, 25 Mar 2019 09:22:14 GMT
       X-Powered-By:
-      - Phusion Passenger 5.3.1
+      - Phusion Passenger 6.0.1
       Server:
-      - nginx/1.14.0 + Phusion Passenger 5.3.1
+      - nginx/1.15.8 + Phusion Passenger 6.0.1
       Content-Encoding:
       - gzip
     body:
       encoding: UTF-8
-      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}'
+      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}'
     http_version: 
-  recorded_at: Wed, 26 Sep 2018 20:37:08 GMT
+  recorded_at: Mon, 25 Mar 2019 09:22:14 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=hE1AJhyKRVCvfaWUAqWF
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=kvvzttwNHTffDHyLX1aQ
     body:
       encoding: US-ASCII
       string: ''
     headers:
       User-Agent:
-      - Faraday v0.14.0
+      - Faraday v0.15.4
       Accept:
       - application/json
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - hE1AJhyKRVCvfaWUAqWF
+      - kvvzttwNHTffDHyLX1aQ
   response:
     status:
       code: 200
@@ -215,22 +215,22 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       ETag:
-      - W/"9c825b2ccbfb0b1db27457250e1d163a"
+      - W/"c95366dff8aee265e945c8c5b0c1bda6"
       X-Runtime:
-      - '0.008966'
+      - '0.007218'
       X-Request-Id:
-      - c87ad837-8491-4467-8eff-4601cae4e617
+      - dff6981c-5e38-4235-84bc-809560aae671
       Date:
-      - Wed, 26 Sep 2018 20:37:08 GMT
+      - Mon, 25 Mar 2019 09:22:14 GMT
       X-Powered-By:
-      - Phusion Passenger 5.3.1
+      - Phusion Passenger 6.0.1
       Server:
-      - nginx/1.14.0 + Phusion Passenger 5.3.1
+      - nginx/1.15.8 + Phusion Passenger 6.0.1
       Content-Encoding:
       - gzip
     body:
       encoding: UTF-8
-      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}'
+      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}'
     http_version: 
-  recorded_at: Wed, 26 Sep 2018 20:37:08 GMT
+  recorded_at: Mon, 25 Mar 2019 09:22:14 GMT
 recorded_with: VCR 4.0.0