locomotivecms_wagon 2.0.0.pre.alpha.2 → 2.0.0.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 899fd4c2ed0a4643d64986400f4364f9122a095b
-  data.tar.gz: e32bb56243302ce2cec3a665515f44f35a2ba377
+  metadata.gz: a50873f213bdcfed4f2805e3234779843063a592
+  data.tar.gz: 858be1870e92f8babccc46f1d1e0c9ec45f6cf7f
 SHA512:
-  metadata.gz: e7e5423622eadcdf38ff4a033470ce27cba8c8827c0728f66a53440549c18e9be6a95616dbbd5cb6fc6c69746b0d7f7a99eb1f4fb49d2be45a2e228c45c12dda
-  data.tar.gz: 11befc5b800ab97d419da76d0010170cc81cc632d373fb3614ee4de20c4791da23093cdf4109e85f278406ea692d1448cc7661d0d24ce7320960084a8e6fc59f
+  metadata.gz: ccf20a282732acfb247467c130fe9001b065ef06e60f7d2507f44e3f13a506b8b476d29861167ffc7618fc567f1a04d247a92a828870ca4df14f36ff789e8878
+  data.tar.gz: c7264b43a72794eb57de873f4eb52e62235dd03a83b65a522f774b893105232d5174c7b5be95a2f66cadc33483bcd94f89f51e5804228dacce7d578119b280fe

data/generators/blank/Gemfile.tt

@@ -4,18 +4,18 @@ gem 'locomotivecms_wagon', '<%= config[:version] -%>'
 
 group :development do
   # Mac OS X
-  gem 'rb-fsevent', '~> 0.9.1', require: RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
+  # gem 'rb-fsevent', '~> 0.9.1', require: RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
 
   # Unix
-  gem 'therubyracer', require: 'v8', platforms: :ruby unless RUBY_PLATFORM.include?('darwin')
-  gem 'rb-inotify', '~> 0.9', require: RUBY_PLATFORM.include?('linux') && 'rb-inotify'
+  # gem 'therubyracer', require: 'v8', platforms: :ruby unless RUBY_PLATFORM.include?('darwin')
+  # gem 'rb-inotify', '~> 0.9', require: RUBY_PLATFORM.include?('linux') && 'rb-inotify'
 
   # Windows
-  gem 'wdm', '>= 0.1.0', require: RUBY_PLATFORM =~ /mswin|mingw/i && 'wdm'
+  # gem 'wdm', '>= 0.1.0', require: RUBY_PLATFORM =~ /mswin|mingw/i && 'wdm'
 end
 
 group :misc do
   # Add your extra gems here
   # gem 'susy', require: 'susy'
   # gem 'redcarpet', require: 'redcarpet'
-end
+end

data/generators/blank/app/views/pages/404.liquid

@@ -1,6 +1,6 @@
 ---
 title: Page not found
-published: false
+published: true
 ---
 {% extends index %}
 
@@ -8,4 +8,4 @@ published: false
 
 <p>Page not found</p>
 
-{% endblock %}
+{% endblock %}

data/generators/blank/app/views/pages/404.liquid.haml

@@ -1,6 +1,6 @@
 ---
 title: Page not found
-published: false
+published: true
 ---
 {% extends index %}
 
@@ -8,4 +8,4 @@ published: false
 
 %p Page not found
 
-{% endblock %}
+{% endblock %}

data/generators/blank/config/site.yml.tt

@@ -3,11 +3,6 @@
 # can be used in templates through the site.name global variable
 name: "<%= config[:name] %>"
 
-# The site's subdomain
-# This option is for sites on multi-site engines
-# The value determines where the site can be accessed under the engine's primary domain
-subdomain: <%= config[:name].parameterize %>
-
 # An array of domain aliases for the site
 # This option is for sites on multi-site engines
 # domains: [www.example.com, example.com]
@@ -30,4 +25,4 @@ locales: [en]
 # They can be accessed in templates through the site.seo_title, site.meta_keywords, and site.meta_description variables
 seo_title: <%= @name %>
 meta_keywords: "some meta keywords"
-meta_description: "some meta description"
+meta_description: "some meta description"

data/generators/bootstrap3/config/site.yml.tt

@@ -3,11 +3,6 @@
 # can be used in templates through the site.name global variable
 name: "<%= config[:name] %>"
 
-# The site's subdomain
-# This option is for sites on multi-site engines
-# The value determines where the site can be accessed under the engine's primary domain
-subdomain: <%= config[:name].parameterize %>
-
 # An array of domain aliases for the site
 # This option is for sites on multi-site engines
 # domains: [www.example.com, example.com]

data/generators/foundation5/config/site.yml.tt

@@ -3,11 +3,6 @@
 # can be used in templates through the site.name global variable
 name: "<%= config[:name] %>"
 
-# The site's subdomain
-# This option is for sites on multi-site engines
-# The value determines where the site can be accessed under the engine's primary domain
-subdomain: <%= config[:name].parameterize %>
-
 # An array of domain aliases for the site
 # This option is for sites on multi-site engines
 # domains: [www.example.com, example.com]
@@ -30,4 +25,4 @@ locales: [en]
 # They can be accessed in templates through the site.seo_title, site.meta_keywords, and site.meta_description variables
 seo_title: <%= @name %>
 meta_keywords: "some meta keywords"
-meta_description: "some meta description"
+meta_description: "some meta description"

data/lib/locomotive/wagon/cli.rb

@@ -78,8 +78,8 @@ module Locomotive
 
           say('The fields are missing', :red) and return false if fields.empty?
 
-          if check_path!
-            Locomotive::Wagon.generate :content_type, [name, fields, self.options.delete('path')], self.options
+          if path = check_path!
+            Locomotive::Wagon.generate :content_type, [name, fields, path], self.options
           end
         end
 
@@ -101,8 +101,8 @@ module Locomotive
         def relationship(source, type, target)
           force_color_if_asked(options)
 
-          if check_path!
-            Locomotive::Wagon.generate :relationship, [source, type, target, self.options.delete('path')], self.options
+          if path = check_path!
+            Locomotive::Wagon.generate :relationship, [source, type, target, path], self.options
           end
         end
 
@@ -127,7 +127,7 @@ module Locomotive
 
           if path = check_path!
             self.options[:default_locales] = self.site_config(path)['locales']
-            Locomotive::Wagon.generate :page, [fullpath, self.options.delete('path')], self.options
+            Locomotive::Wagon.generate :page, [fullpath, path], self.options
           end
         end
 
@@ -145,7 +145,7 @@ module Locomotive
 
           if path = check_path!
             locales = self.site_config(path)['locales']
-            Locomotive::Wagon.generate :snippet, [slug, locales, self.options.delete('path')], self.options
+            Locomotive::Wagon.generate :snippet, [slug, locales, path], self.options
           end
         end
 
@@ -300,14 +300,14 @@ module Locomotive
         desc 'push ENV [PATH]', 'Push a site to a remote LocomotiveCMS Engine'
         method_option :resources, aliases: '-r', type: 'array', default: nil, desc: 'Only push the resource(s) passed in argument'
         method_option :data, aliases: '-d', type: 'boolean', default: false, desc: 'Push the content entries and the editable elements (by default, they are not)'
-        method_option :shell, type: 'boolean', default: true, desc: 'Use shell to ask for missing connection information like the subdomain (in this case, take a random one)'
+        method_option :shell, type: 'boolean', default: true, desc: 'Use shell to ask for missing connection information like the site handle (in this case, take a random one)'
         method_option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
         def push(env, path = '.')
           force_color_if_asked(options)
 
           if check_path!(path)
             begin
-              Locomotive::Wagon.push(env, path, options)
+              Locomotive::Wagon.push(env, path, options, options[:shell] ? shell : nil)
             rescue Exception => e
               self.print_exception(e, options[:verbose])
               exit(1)

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

@@ -11,7 +11,7 @@ require_relative_all  'push_sub_commands'
 
 module Locomotive::Wagon
 
-  class PushCommand < Struct.new(:env, :path, :options)
+  class PushCommand < Struct.new(:env, :path, :options, :shell)
 
     RESOURCES = %w(content_types content_entries pages snippets theme_assets translations).freeze
 
@@ -25,8 +25,8 @@ module Locomotive::Wagon
 
     attr_accessor :platform_url, :credentials
 
-    def self.push(env, path, options)
-      self.new(env, path, options).push
+    def self.push(env, path, options, shell)
+      self.new(env, path, options, shell).push
     end
 
     def push
@@ -80,7 +80,7 @@ module Locomotive::Wagon
       # get an instance of the Steam services in order to load the information about the site (SiteRepository)
       steam_services.current_site.tap do |site|
         # ask for a handle if not found (blank: random one)
-        site[:handle] ||= shell.ask "What is the handle of your site?"
+        site[:handle] ||= shell.try(:ask, "What is the handle of your site?")
 
         # create the site
         attributes = SiteDecorator.new(site).to_hash
@@ -104,15 +104,11 @@ module Locomotive::Wagon
     def ask_for_platform_url
       default = ENV['LOCOMOTIVE_PLATFORM_URL'] || DEFAULT_PLATFORM_URL
 
-      url = shell.ask "What is the URL of your platform? (default: #{default})"
+      url = shell.try(:ask, "What is the URL of your platform? (default: #{default})")
 
       self.platform_url = url.blank? ? default : url
     end
 
-    def shell
-      options[:shell]
-    end
-
   end
 
 end

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

@@ -47,6 +47,8 @@ module Locomotive::Wagon
 
     def require_steam
       require 'locomotive/steam'
+      require 'locomotive/steam/server'
+      require 'locomotive/wagon/middlewares/error_page'
       require 'bundler'
       Bundler.require 'misc'
 
@@ -61,6 +63,8 @@ module Locomotive::Wagon
           require_relative '../tools/livereload'
           config.middleware.insert_before Rack::Lint, Rack::LiveReload, live_reload_port: port
         end
+
+        config.middleware.insert_before Rack::Lint, Locomotive::Wagon::Middlewares::ErrorPage
       end
     end
 
@@ -97,7 +101,6 @@ module Locomotive::Wagon
 
     def build_server
       # TODO: new feature -> pick the right Rack handler (Thin, Puma, ...etc)
-      require 'locomotive/steam/server'
       require 'thin'
 
       app = Locomotive::Steam::Server.to_app

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

@@ -38,7 +38,11 @@ module Locomotive
       end
 
       def is_layout
-        self[:is_layout]
+        if self[:is_layout].nil?
+          !(__getobj__._fullpath =~ %r(^layouts/)).nil?
+        else
+          self[:is_layout]
+        end
       end
 
       def allow_layout

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

@@ -9,6 +9,13 @@ module Locomotive
         (__getobj__.domains || []) - ['localhost']
       end
 
+      def picture
+        picture_path = __getobj__.picture
+        if picture_path && File.exists?(picture_path)
+          Locomotive::Coal::UploadIO.new(picture_path, nil, 'icon.png')
+        end
+      end
+
       %i(robots_txt locales timezone seo_title meta_keywords meta_description).each do |name|
         define_method(name) do
           self[name]
@@ -16,7 +23,7 @@ module Locomotive
       end
 
       def __attributes__
-        %i(name handle robots_txt locales timezone seo_title meta_keywords meta_description)
+        %i(name handle robots_txt locales timezone seo_title meta_keywords meta_description picture)
       end
 
     end

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

@@ -0,0 +1,74 @@
+require 'erb'
+require 'locomotive/steam/middlewares/threadsafe'
+require 'locomotive/steam/middlewares/helpers'
+
+require 'pry-byebug'
+
+module Locomotive::Wagon
+  module Middlewares
+
+    # Display a nice page error
+    #
+    class ErrorPage < Locomotive::Steam::Middlewares::ThreadSafe
+
+      include Locomotive::Steam::Middlewares::Helpers
+
+      def _call
+        begin
+          self.next
+        rescue StandardError => error
+          @error = error
+          log_error
+          render_error_page
+        end
+      end
+
+      private
+
+      def log_error
+        log "Error: #{@error.message}".red
+        log @error.backtrace.join("\n")
+      end
+
+      def render_error_page
+        _template = ERB.new(template, nil, '-')
+        render_response(_template.result(binding))
+      end
+
+      def template
+        %{
+<DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head>
+      <title>Wagon - Rendering error</title>
+    </head>
+
+    <body>
+      <h1>Arrrghhhh, we could not render page</h1>
+      <h2><%= @error.message %></h2>
+
+      <h3>File: <%= @error.respond_to?(:file) ? @error.file : '?' %></h3>
+
+      <h3>Code</h3>
+      <% if @error.respond_to?(:code_lines) %>
+        <pre>
+<% @error.code_lines.each do |(line, statement)| -%>
+<strong><%= line %></strong> <%= statement %>
+<% end -%>
+        </pre>
+      <% else %>
+        <p><i>No code</i></p>
+      <% end %>
+
+      <h3>Back trace</h3>
+      <%= @error.backtrace.join("<br/>") %>
+
+    </body>
+  </html>}
+      end
+
+    end
+
+  end
+end

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

@@ -41,11 +41,24 @@ module Locomotive::Wagon
       Proc.new do |modified, added, removed|
         resources.each do |resource|
           Locomotive::Common::Logger.info "service=listen action=reload resource=#{resource} timestamp=#{Time.now}"
-          cache.delete(resource)
+
+          clear_cache_for(resource, modified + added + removed)
         end
       end
     end
 
+    def clear_cache_for(resource, files)
+      keys = case resource
+      when :sites then '_sites'
+      when :content_entries
+        files.map { |f| "site_1_content_type_#{File.basename(f, '.yml')}_content_entries" }
+      else
+        "site_1_#{resource}"
+      end
+
+      [*keys].each { |key| cache.delete(key) }
+    end
+
   end
 
 end

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '2.0.0-alpha.2'
+    VERSION = '2.0.0-alpha.3'
   end
 end

data/lib/locomotive/wagon.rb

@@ -65,12 +65,12 @@ module Locomotive
     #
     # @param [ String ] env The environment we deploy the site to
     # @param [ String ] path The path of the site
-    # @param [ Hash ] connection_info The information to get connected to the remote site
+    # @param [ Object ] shell The Thor shell used to ask for information if needed
     # @param [ Hash ] options The options passed to the push process
     #
-    def self.push(env, path, options = {})
+    def self.push(env, path, options = {}, shell)
       require_relative 'wagon/commands/push_command'
-      Locomotive::Wagon::PushCommand.push(env, path, options)
+      Locomotive::Wagon::PushCommand.push(env, path, options, shell)
     end
 
     # Pull a site from a remote LocomotiveCMS engine described

data/locomotivecms_wagon.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'netrc',                 '~> 0.10.3'
 
   gem.add_dependency 'locomotivecms_coal',    '~> 1.0.0-alpha.3'
-  gem.add_dependency 'locomotivecms_steam',   '~> 1.0.0-alpha.1'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.0.0-alpha.2'
 
   gem.add_dependency 'listen',                '~> 2.10.0'
   gem.add_dependency 'rack-livereload',       '~> 0.3.15'

data/spec/fixtures/blog/app/views/pages/404.liquid

@@ -8,4 +8,4 @@ published: false
 
 <p>Page not found</p>
 
-{% endblock %}
+{% endblock %}

data/spec/fixtures/cassettes/authenticate.yml

@@ -17,39 +17,43 @@ http_interactions:
       - Ruby
   response:
     status:
-      code: 401
-      message: Unauthorized
+      code: 201
+      message: Created
     headers:
       Content-Type:
       - application/json
-      X-Error-Detail:
-      - Invalid email or password.
       Content-Length:
-      - '40'
+      - '32'
+      Etag:
+      - W/"2245a1c3eefc06a0a39cca5e28eb4822"
       Cache-Control:
-      - no-cache
+      - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 7fb8047a-d658-4749-a06f-6d8ffdb31979
+      - c7ddea05-6b69-4454-8f5a-b667a8628ef9
       X-Runtime:
-      - '0.020220'
+      - '0.590206'
       Connection:
       - keep-alive
       Server:
       - thin
     body:
       encoding: UTF-8
-      string: '{"message":"Invalid email or password."}'
+      string: '{"token":"ib6bXanDDnsFjyujf9Gt"}'
     http_version: 
-  recorded_at: Tue, 19 May 2015 14:11:30 GMT
+  recorded_at: Mon, 25 May 2015 23:06:12 GMT
 - request:
-    method: post
+    method: get
     uri: http://localhost:3000/locomotive/api/v3/my_account.json
     body:
       encoding: UTF-8
-      string: account%5Bemail%5D=john%40doe.net&account%5Bname%5D=John&account%5Bpassword%5D=asimplepassword
+      string: auth_token=ib6bXanDDnsFjyujf9Gt
     headers:
       Accept:
       - application/json
+      X-Locomotive-Account-Email:
+      - john@doe.net
+      X-Locomotive-Account-Token:
+      - ib6bXanDDnsFjyujf9Gt
       Content-Type:
       - application/x-www-form-urlencoded
       Accept-Encoding:
@@ -58,8 +62,53 @@ http_interactions:
       - Ruby
   response:
     status:
-      code: 201
-      message: Created
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '250'
+      Etag:
+      - W/"77a6faa0568f7ba809893a63188e0841"
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      X-Request-Id:
+      - ea9681b4-a8ed-4c0e-86e7-da1824762b79
+      X-Runtime:
+      - '0.087301'
+      Connection:
+      - keep-alive
+      Server:
+      - thin
+    body:
+      encoding: UTF-8
+      string: '{"_id":"555b4492646964986c220000","created_at":"2015-05-19T14:11:30Z","updated_at":"2015-05-19T14:11:30Z","name":"John","email":"john@doe.net","locale":"en","api_key":"c17eb23cfde7a2f7f3d08689dd20470cf9bd95a8","super_admin":false,"local_admin":false}'
+    http_version: 
+  recorded_at: Mon, 25 May 2015 23:06:12 GMT
+- request:
+    method: get
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json
+    body:
+      encoding: UTF-8
+      string: auth_token=ib6bXanDDnsFjyujf9Gt
+    headers:
+      Accept:
+      - application/json
+      X-Locomotive-Account-Email:
+      - john@doe.net
+      X-Locomotive-Account-Token:
+      - ib6bXanDDnsFjyujf9Gt
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
     headers:
       Content-Type:
       - application/json
@@ -70,9 +119,9 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 9db2c62e-ad67-441a-873e-7f89212ce6bb
+      - 736fdff0-e01e-424f-9071-619960ad972f
       X-Runtime:
-      - '0.022082'
+      - '0.013798'
       Connection:
       - keep-alive
       Server:
@@ -81,7 +130,7 @@ http_interactions:
       encoding: UTF-8
       string: '{"_id":"555b4492646964986c220000","created_at":"2015-05-19T14:11:30Z","updated_at":"2015-05-19T14:11:30Z","name":"John","email":"john@doe.net","locale":"en","api_key":"c17eb23cfde7a2f7f3d08689dd20470cf9bd95a8","super_admin":false,"local_admin":false}'
     http_version: 
-  recorded_at: Tue, 19 May 2015 14:11:30 GMT
+  recorded_at: Mon, 25 May 2015 23:06:12 GMT
 - request:
     method: post
     uri: http://localhost:3000/locomotive/api/v3/tokens.json
@@ -111,9 +160,9 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 1907747b-b550-4ec4-9da6-9e7f282e435f
+      - a19a725f-16bd-4e61-9965-0663181e5262
       X-Runtime:
-      - '0.017065'
+      - '0.014548'
       Connection:
       - keep-alive
       Server:
@@ -122,7 +171,7 @@ http_interactions:
       encoding: UTF-8
       string: '{"token":"6UA3Po7vVz4Ry34swEqa"}'
     http_version: 
-  recorded_at: Tue, 19 May 2015 14:11:30 GMT
+  recorded_at: Mon, 25 May 2015 23:06:12 GMT
 - request:
     method: get
     uri: http://localhost:3000/locomotive/api/v3/my_account.json
@@ -152,23 +201,23 @@ http_interactions:
       Content-Length:
       - '264'
       Etag:
-      - W/"d661a7257212c7c3bdbddfbef6296311"
+      - W/"cd64b967426892bd75445b74968ee0e7"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 6ec73621-c20a-4248-912a-fdc96683df1d
+      - 1637260c-7fdc-47cc-b2cb-4b32a976146a
       X-Runtime:
-      - '0.015687'
+      - '0.014046'
       Connection:
       - keep-alive
       Server:
       - thin
     body:
       encoding: UTF-8
-      string: '{"_id":"5555b35a646964e1ca000000","created_at":"2015-05-15T08:50:34Z","updated_at":"2015-05-19T14:03:41Z","name":"John
+      string: '{"_id":"5555b35a646964e1ca000000","created_at":"2015-05-15T08:50:34Z","updated_at":"2015-05-21T11:12:17Z","name":"John
         Doe","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Tue, 19 May 2015 14:11:30 GMT
+  recorded_at: Mon, 25 May 2015 23:06:12 GMT
 - request:
     method: get
     uri: http://localhost:3000/locomotive/api/v3/my_account.json
@@ -198,21 +247,21 @@ http_interactions:
       Content-Length:
       - '264'
       Etag:
-      - W/"d661a7257212c7c3bdbddfbef6296311"
+      - W/"cd64b967426892bd75445b74968ee0e7"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 68f440fc-1603-4bd7-a028-7f3741011060
+      - 286b83c2-dc57-4ff6-b93e-69d4b083b7ef
       X-Runtime:
-      - '0.014680'
+      - '0.019133'
       Connection:
       - keep-alive
       Server:
       - thin
     body:
       encoding: UTF-8
-      string: '{"_id":"5555b35a646964e1ca000000","created_at":"2015-05-15T08:50:34Z","updated_at":"2015-05-19T14:03:41Z","name":"John
+      string: '{"_id":"5555b35a646964e1ca000000","created_at":"2015-05-15T08:50:34Z","updated_at":"2015-05-21T11:12:17Z","name":"John
         Doe","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Tue, 19 May 2015 14:11:30 GMT
+  recorded_at: Mon, 25 May 2015 23:06:12 GMT
 recorded_with: VCR 2.9.3