locomotivecms_steam 1.2.1 → 1.3.0.rc1

data/lib/locomotive/steam/services/content_entry_service.rb

@@ -56,6 +56,20 @@ module Locomotive
         end
       end
 
+      def update_decorated_entry(decorated_entry, attributes)
+        with_repository(decorated_entry.content_type) do |_repository|
+          entry = decorated_entry.__getobj__
+
+          entry.change(clean_attributes(attributes))
+
+          _repository.update(entry)
+
+          logEntryOperation(decorated_entry.content_type.slug, decorated_entry)
+
+          decorated_entry
+        end
+      end
+
       def delete(type_slug, id_or_slug)
         with_repository(type_slug) do |_repository|
           entry = _repository.by_slug(id_or_slug) || _repository.find(id_or_slug)

data/lib/locomotive/steam/services/external_api_service.rb

@@ -7,23 +7,55 @@ module Locomotive
 
       include ::HTTParty
 
-      def consume(url, options = {})
-        options[:base_uri], path = extract_base_uri_and_path(url)
+      # Available option keys:
+      # - method
+      # - data
+      # - format
+      # - username / password (basic auth)
+      # - headers
+      # - header_auth
+      # - with_user_agent
+      #
+      def consume(url, options = {}, with_status = false)
+        base_uri, path = extract_base_uri_and_path(url)
+
+        method = (options[:method] || 'GET').to_s.downcase
+
+        _options = build_httpparty_options(options, method)
+        _options[:base_uri] = base_uri
+
+        if with_status
+          verbose_perform_request_to(method, path, _options)
+        else
+          perform_request_to(method, path, _options)
+        end
+      end
+
+      private
 
-        options.delete(:format) if options[:format] == 'default'
+      def build_httpparty_options(options, method)
+        _options = {}
 
-        # auth ?
-        username, password = options.delete(:username), options.delete(:password)
-        options[:basic_auth] = { username: username, password: password } if username
+        # data: body (POST/PUT/PATCH) or query (GET)
+        _options[method == 'get' ? :query : :body] = options[:data] if options[:data]
 
-        # authorization header ?
-        header_auth = options.delete(:header_auth)
-        options[:headers] = { 'Authorization' => header_auth } if header_auth
+        # basic auth?
+        username, password = options[:username], options[:password]
+        _options[:basic_auth] = { username: username, password: password } if username
 
-        perform_request_to(path, options)
-      end
+        # headers
+        _options[:headers] = options[:headers] || {}
+        _options[:headers]['Authorization'] = options[:header_auth] if options[:header_auth]
+        _options[:headers]['User-Agent'] = 'LocomotiveCMS' if options[:with_user_agent]
+        _options.delete(:headers) if _options[:headers].blank?
 
-      private
+        # format
+        if options.has_key?(:format) && options[:format] != 'default'
+          _options[:format] = options[:format].gsub(/[\'\"]/, '').to_sym
+        end
+
+        _options
+      end
 
       def extract_base_uri_and_path(url)
         url = HTTParty.normalize_base_uri(url)
@@ -31,32 +63,34 @@ module Locomotive
         uri       = URI.parse(url)
         path      = uri.request_uri || '/'
         base_uri  = "#{uri.scheme}://#{uri.host}"
-        base_uri  += ":#{uri.port}" if uri.port != 80
+        base_uri  += ":#{uri.port}" if (uri.port != 80 && uri.port != 443)
 
         [base_uri, path]
       end
 
-      def perform_request_to(path, options)
-        # [DEBUG] puts "[WebService] consuming #{path}, #{options.inspect}"
-
-        # sanitize the options
-        options[:format]  = options[:format].gsub(/[\'\"]/, '').to_sym if options.has_key?(:format)
-        if options[:with_user_agent]
-          user_agent = { 'User-Agent' => 'LocomotiveCMS' }
-          options[:headers] ? options[:headers].merge!(user_agent) : options[:headers] = user_agent
-        end
-
-        response        = self.class.get(path, options)
+      def perform_request_to(method, path, options)
+        response        = self.class.send(method.to_sym, path, options)
         parsed_response = response.parsed_response
 
         if response.code == 200
           HashConverter.to_underscore(parsed_response)
         else
-          Locomotive::Common::Logger.error "[WebService] consumed #{path}, #{options.inspect}, response = #{response.inspect}"
+          Locomotive::Common::Logger.error "[WebService] consumed [#{method.to_s.upcase}] #{path}, #{options.inspect}, response = #{response.inspect}"
           nil
         end
       end
 
+      def verbose_perform_request_to(method, path, options)
+        response        = self.class.send(method.to_sym, path, options)
+        parsed_response = response.parsed_response
+        {
+          status: response.code,
+          data:   HashConverter.to_underscore(parsed_response)
+        }
+      rescue Exception => e
+        { status: nil, error: e.message }
+      end
+
     end
   end
 end

data/lib/locomotive/steam/services/liquid_parser_service.rb

@@ -22,7 +22,11 @@ module Locomotive
 
       def _parse(object, options = {})
         # Note: the template must not be parsed here
-        Locomotive::Steam::Liquid::Template.parse(object.liquid_source, options)
+        begin
+          Locomotive::Steam::Liquid::Template.parse(object.liquid_source, options)
+        rescue ::Liquid::Error => e
+          raise Locomotive::Steam::RenderError.new(e, object.template_path, object.liquid_source)
+        end
       end
 
     end

data/lib/locomotive/steam/services/page_redirection_service.rb

@@ -0,0 +1,29 @@
+module Locomotive
+  module Steam
+
+    class PageRedirectionService
+
+      attr_accessor_initialize :page_finder, :url_builder
+
+      def redirect_to(handle, locale = nil)
+        if page_url = url_to(handle, locale)
+          raise Locomotive::Steam::RedirectionException.new(page_url)
+        else
+          false
+        end
+      end
+
+      private
+
+      def url_to(handle, locale)
+        if page = page_finder.by_handle(handle)
+          url = url_builder.url_for(page, locale)
+        else
+          false
+        end
+      end
+
+    end
+
+  end
+end

data/lib/locomotive/steam/version.rb

@@ -3,6 +3,6 @@
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive
   module Steam
-    VERSION = '1.2.1'
+    VERSION = '1.3.0.rc1'
   end
 end

data/locomotivecms_steam.gemspec

@@ -18,32 +18,34 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler',    '~> 1.7'
   spec.add_development_dependency 'rake',       '~> 10.4.2'
 
-  spec.add_development_dependency 'mongo',      '~> 2.2.7'
-  spec.add_development_dependency 'origin',     '~> 2.2.0'
+  spec.add_development_dependency 'mongo',      '~> 2.4.1'
+  spec.add_development_dependency 'origin',     '~> 2.3.0'
 
-  spec.add_dependency 'nokogiri',               '~> 1.6.8'
-  spec.add_dependency 'sanitize',               '~> 4.0.1'
+  spec.add_dependency 'nokogiri',               '~> 1.7.0.1'
+  spec.add_dependency 'sanitize',               '~> 4.4.0'
   spec.add_dependency 'morphine',               '~> 0.1.1'
-  spec.add_dependency 'httparty',               '~> 0.13.6'
+  spec.add_dependency 'httparty',               '~> 0.14.0'
   spec.add_dependency 'chronic',                '~> 0.10.2'
+  spec.add_dependency 'bcrypt',                 '~> 3.1.11'
 
   spec.add_dependency 'rack-rewrite',           '~> 1.5.1'
-  spec.add_dependency 'rack-cache',             '~> 1.6.1'
-  spec.add_dependency 'dragonfly',              '~> 1.0.12'
-  spec.add_dependency 'moneta',                 '~> 0.8.0'
-  spec.add_dependency 'rack_csrf',              '~> 2.5.0'
-
-  spec.add_dependency 'sprockets',              '~> 3.5.2'
-  spec.add_dependency 'sass',                   '~> 3.4.21'
+  spec.add_dependency 'rack-cache',             '~> 1.7.0'
+  spec.add_dependency 'rack_csrf',              '~> 2.6.0'
+  spec.add_dependency 'dragonfly',              '~> 1.1.1'
+  spec.add_dependency 'moneta',                 '~> 1.0.0'
+
+  spec.add_dependency 'sprockets',              '~> 3.7.1'
+  spec.add_dependency 'sass',                   '~> 3.4.23'
+  spec.add_dependency 'uglifier',               '~> 3.1.6'
   spec.add_dependency 'coffee-script',          '~> 2.4.1'
   spec.add_dependency 'compass',                '~> 1.0.3'
-  spec.add_dependency 'autoprefixer-rails',     '~> 6.3.3.1'
+  spec.add_dependency 'autoprefixer-rails',     '~> 6.7.2'
 
-  spec.add_dependency 'kramdown',               '~> 1.10.0'
+  spec.add_dependency 'kramdown',               '~> 1.13.2'
   spec.add_dependency 'RedCloth',               '~> 4.3.2'
   spec.add_dependency 'mimetype-fu',            '~> 0.1.2'
-  spec.add_dependency 'mime-types',             '~> 2.6.1'
-  spec.add_dependency 'duktape',                '~> 1.3.0.6'
+  spec.add_dependency 'mime-types',             '~> 3.1.0'
+  spec.add_dependency 'duktape',                '~> 1.6.1.0'
   spec.add_dependency 'pony',                   '~> 1.11'
 
   spec.add_dependency 'locomotivecms-solid',      '~> 4.0.1'

data/spec/fixtures/default/app/content_types/accounts.yml

@@ -0,0 +1,59 @@
+# Human readable name of this type
+name: Accounts
+
+# Lowercase, underscored handle used to access this type
+slug: accounts
+
+# Explanatory text displayed in the back-office
+description: A description of the content type for the editors
+
+# Slug of field used to identify entries by default, such as the title
+label_field_name: name
+
+# Valid values: manually, created_at, updated_at, or the slug of any field
+order_by: manually
+
+# Valid values: asc (ascending) and desc (descending). Set to asc by default.
+# order_direction: asc
+
+# Specify a field slug to group entries by that field in the back-office.
+# group_by: <your field>
+
+# Activate public 'create' API (e.g for a contact form)
+# public_submission_enabled: false
+
+# Array of emails to be notified of new entries made with the public API
+# public_submission_accounts: ['john@example.com']
+
+# Control the display of the content type in the back-office.
+# display_settings:
+#   seo: false              # display the SEO tab for the content entries
+#   advanced: false         # display the Advanced tab for the content entries
+#   position: 1             # position in the sidebar menu
+#   hidden: false           # hidden for authors?
+
+# By default, the back-office displays the _label property (see label_field_name) of the content entry. This can be modified by writing your own Liquid template below:
+# entry_template: '<a href="{{ link }}">{{ entry._label }}</a>' # The default template
+
+# A list describing each field
+fields:
+- name: # The lowercase, underscored name of the field
+    label: Name # Human readable name of the field
+    type: string
+    required: true
+    hint: Explanatory text displayed in the back office
+    localized: false
+
+- email: # The lowercase, underscored name of the field
+    label: Email # Human readable name of the field
+    type: email
+    required: false
+    hint: Explanatory text displayed in the back office
+    localized: false
+
+- password: # The lowercase, underscored name of the field
+    label: Password # Human readable name of the field
+    type: password
+    required: false
+    hint: Explanatory text displayed in the back office
+    localized: false

data/spec/fixtures/default/app/content_types/songs.yml

@@ -15,6 +15,7 @@ fields:
     label: Cover
     type: file
     required: true
+    # localized: true # required when pushing the site with Wagon
 - short_description:
     type: text
     text_formatting: html
@@ -22,4 +23,4 @@ fields:
     type: string
     hint: Url to a service like Blip for instance
 - duration:
-    hint: "format like: mm:ss"
+    hint: "format like: mm:ss"

data/spec/fixtures/default/app/views/pages/about_us/john_doe.fr.liquid.haml

@@ -2,4 +2,8 @@
 title: Jean Personne
 slug: jean-personne
 ---
-{% extends parent %}
+{% action "fake action" %}
+
+foo(32);
+
+{% endaction %}

data/spec/fixtures/default/app/views/pages/about_us/john_doe.liquid.haml

@@ -3,4 +3,4 @@ position: 1
 published: true
 listed: true
 ---
-{% extends parent %}
+{% for %} <!-- Liquid syntax error -->

data/spec/fixtures/default/app/views/pages/account/forgot_password.liquid

@@ -0,0 +1,39 @@
+---
+title: Forgot password
+published: true
+listed: false
+handle: forgot_password
+---
+{% extends 'index' %}
+
+{% block content %}
+
+<h1>Forgot your password</h1>
+
+{% if current_account %}
+  <div class="alert alert-warning">
+    You're already authenticated!
+  </div>
+{% else %}
+  {% if auth_reset_password_instructions_sent %}
+    {{ auth_reset_password_instructions_sent | translate }}
+  {% else %}
+    <form action="{% path_to 'forgot_password' %}" method="POST">
+      <input type="hidden" name="auth_action" value="forgot_password" />
+      <input type="hidden" name="auth_content_type" value="accounts" />
+      <input type="hidden" name="auth_id_field" value="email" />
+      <input type="hidden" name="auth_callback" value="{% path_to sign_in %}" />
+
+      {% if auth_wrong_email %}
+        {{ auth_wrong_email | translate }}
+      {% endif %}
+
+      <label for="auth-email">Your E-mail</label>
+      <input type="email" id="auth-email" placeholder="Email" name="auth_id" value="{{ params.auth_id }}">
+
+      <button type="submit" class="btn btn-default">Submit</button>
+    </form>
+  {% endif %}
+{% endif %}
+
+{% endblock %}

data/spec/fixtures/default/app/views/pages/account/me.liquid

@@ -0,0 +1,15 @@
+---
+title: Account profile
+listed: false
+published: true
+handle: me
+---
+{% extends 'index' %}
+
+{% block content %}
+
+{% if current_account %}
+  <p>My name is {{ current_account.name }} and I'm logged in!</p>
+{% endif %}
+
+{% endblock %}

data/spec/fixtures/default/app/views/pages/account/reset_password.liquid

@@ -0,0 +1,42 @@
+---
+title: Change your password
+published: true
+listed: false
+handle: reset_password
+---
+{% extends 'index' %}
+
+{% block content %}
+
+<h2>Change your password</h2>
+
+{% if current_account %}
+  You're already authenticated!
+{% else %}
+  <form action="{% path_to 'reset_password' %}" method="POST">
+    <input type="hidden" name="auth_action" value="reset_password" />
+    <input type="hidden" name="auth_content_type" value="accounts" />
+    <input type="hidden" name="auth_password_field" value="email" />
+    <input type="hidden" name="auth_reset_token" value="{{ params.token }}" />
+    <input type="hidden" name="auth_callback" value="{% path_to me %}" />
+
+    {% if auth_invalid_token %}
+      {{ auth_invalid_token | translate }}
+    {% endif %}
+
+    {% if auth_password_too_short %}
+      {{ auth_password_too_short | translate }}
+    {% endif %}
+
+    <div class="form-group">
+      <label for="auth-password">Your new password</label>
+      <input type="password" class="form-control" id="auth-password" placeholder="Password" name="auth_password">
+    </div>
+
+    <button type="submit" class="btn btn-default">Submit</button>
+  </form>
+
+{% endif %}
+</div>
+
+{% endblock %}

data/spec/fixtures/default/app/views/pages/account/sign_in.liquid

@@ -0,0 +1,49 @@
+---
+title: Sign in
+listed: false
+published: true
+handle: sign_in
+---
+{% extends 'index' %}
+
+{% block content %}
+
+<h1>Sign in</h1>
+
+{% if current_account %}
+  <div class="alert alert-warning">
+    You're already authenticated!
+  </div>
+{% else %}
+
+  <form action="{% path_to 'sign_in' %}" method="POST">
+    <input type="hidden" name="auth" value="sign_in" />
+    <input type="hidden" name="auth_content_type" value="accounts" />
+    <input type="hidden" name="auth_id_field" value="email" />
+    <input type="hidden" name="auth_password_field" value="password" />
+
+    {% if auth_signed_out %}
+      <div class="alert alert-info">
+        {{ auth_signed_out | translate }}
+      </div>
+    {% endif %}
+
+    {% if auth_wrong_credentials %}
+      <div class="alert alert-warning">
+        {{ auth_wrong_credentials | translate }}
+      </div>
+    {% endif %}
+
+    <div class="form-group">
+      <label for="auth-email">Your E-mail</label>
+      <input type="email" name="auth_id" class="form-control" id="auth-email" placeholder="Email">
+    </div>
+    <div class="form-group">
+      <label for="auth-password">Password</label>
+      <input type="password" name="auth_password" class="form-control" id="auth-password" placeholder="Password">
+    </div>
+    <button type="submit" class="btn btn-default">Sign in</button>
+  </form>
+{% endif %}
+
+{% endblock %}