locomotivecms_steam 1.0.0.pre.beta.3 → 1.0.0.rc1

data/lib/locomotive/steam/liquid/tags/editable/text.rb

@@ -9,11 +9,21 @@ module Locomotive
 
             def render_element(context, element)
               with_inline_editing(context, element) do
-                if element.default_content?
+                content = if element.default_content?
                   render_default_content
                 else
                   element.content
                 end
+
+                format_content(content, element.format, context)
+              end
+            end
+
+            def format_content(content, format, context)
+              case format
+              when 'markdown' then markdown_service(context).to_html(content)
+              else
+                content
               end
             end
 
@@ -43,6 +53,10 @@ module Locomotive
               ['locomotive-editable-text', block_name, @slug].compact.join('-')
             end
 
+            def markdown_service(context)
+              context.registers[:services].markdown
+            end
+
           end
 
           ::Liquid::Template.register_tag('editable_text'.freeze, Text)

data/lib/locomotive/steam/liquid/tags/google_analytics.rb

@@ -19,18 +19,14 @@ module Locomotive
           def ga_snippet(account_id)
             %{
               <script type="text/javascript">
-
-                var _gaq = _gaq || [];
-                _gaq.push(['_setAccount', '#{account_id}']);
-                _gaq.push(['_trackPageview']);
-
-                (function() \{
-                  var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-                  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-                  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-                \})();
-
-              </script>}
+                (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+                m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+                })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+                ga('create', '#{account_id}', 'auto');
+                ga('send', 'pageview');
+              </script>
+            }
           end
 
         end

data/lib/locomotive/steam/middlewares/default_env.rb

@@ -1,7 +1,9 @@
 module Locomotive::Steam
   module Middlewares
 
-    class DefaultEnv < Struct.new(:app)
+    class DefaultEnv
+
+      attr_accessor_initialize :app
 
       def call(env)
         request = Rack::Request.new(env)

data/lib/locomotive/steam/middlewares/entry_submission.rb

@@ -123,7 +123,7 @@ module Locomotive::Steam
         if entry = services.entry_submission.submit(slug, entry_attributes)
           entry
         else
-          raise %{Unknown content type "#{slug}"}
+          raise %{Unknown content type "#{slug}" or public_submission_enabled property not true}
         end
       end
 

data/lib/locomotive/steam/middlewares/favicon.rb

@@ -1,7 +1,9 @@
 module Locomotive::Steam
   module Middlewares
 
-    class Favicon < Struct.new(:app)
+    class Favicon
+
+      attr_accessor_initialize :app
 
       include Helpers
 

data/lib/locomotive/steam/middlewares/helpers.rb

@@ -13,8 +13,8 @@ module Locomotive::Steam
         self.request.content_type == 'application/json' || File.extname(self.request.path) == '.json'
       end
 
-      def render_response(content, code = 200, type = 'text/html')
-        @next_response = [code, { 'Content-Type' => type }, [content]]
+      def render_response(content, code = 200, type = nil)
+        @next_response = [code, { 'Content-Type' => type || 'text/html' }, [content]]
       end
 
       def redirect_to(location, type = 301)

data/lib/locomotive/steam/middlewares/logging.rb

@@ -3,10 +3,12 @@ module Locomotive::Steam
 
     # Track the request into the current logger
     #
-    class Logging < Struct.new(:app)
+    class Logging
 
       include Helpers
 
+      attr_accessor_initialize :app
+
       def call(env)
         now = Time.now
 

data/lib/locomotive/steam/middlewares/page.rb

@@ -9,6 +9,8 @@ module Locomotive::Steam
       include Helpers
 
       def _call
+        return env['steam.page'] if env['steam.page']
+
         if page = fetch_page
           if !page.not_found?
             log "Found page \"#{page.title}\" [#{page.fullpath}]"

data/lib/locomotive/steam/middlewares/path.rb

@@ -4,7 +4,9 @@ module Locomotive::Steam
     # Sanitize the path from the previous middleware in order
     # to make it work for the renderer.
     #
-    class Path < Struct.new(:app)
+    class Path
+
+      attr_accessor_initialize :app
 
       def call(env)
         set_path!(env)
@@ -14,7 +16,7 @@ module Locomotive::Steam
       protected
 
       def set_path!(env)
-        path = env['steam.path'] || request.path_info
+        path = (env['steam.path'] || request.path_info).dup
 
         path.gsub!(/\.[a-zA-Z][a-zA-Z0-9]{2,}$/, '')
         path.gsub!(/^\//, '')

data/lib/locomotive/steam/middlewares/renderer.rb

@@ -20,7 +20,7 @@ module Locomotive::Steam
           redirect_to(page.redirect_url, page.redirect_type)
         else
           content = parse_and_render_liquid
-          render_response(content, page.not_found? ? 404: 200)
+          render_response(content, page.not_found? ? 404: 200, page.response_type)
         end
       end
 

data/lib/locomotive/steam/middlewares/robots.rb

@@ -1,10 +1,12 @@
 module Locomotive::Steam
   module Middlewares
 
-    class Robots < Struct.new(:app, :options)
+    class Robots
 
       include Helpers
 
+      attr_accessor_initialize :app
+
       def call(env)
         if env['PATH_INFO'] == '/robots.txt'
           site = env['steam.site']

data/lib/locomotive/steam/middlewares/sitemap.rb

@@ -6,7 +6,7 @@ module Locomotive::Steam
       include Helpers
 
       def _call
-        if env['PATH_INFO'] == '/sitemap.xml'
+        if env['PATH_INFO'] == '/sitemap.xml' && (page.nil? || page.not_found?)
           render_response(build_xml, 200, 'text/plain')
         end
       end

data/lib/locomotive/steam/middlewares/{threadsafe.rb → thread_safe.rb}

@@ -1,7 +1,8 @@
 module Locomotive::Steam::Middlewares
 
-  class ThreadSafe < Struct.new(:app)
+  class ThreadSafe
 
+    attr_accessor_initialize :app
     attr_accessor :env
 
     def call(env)

data/lib/locomotive/steam/middlewares.rb

@@ -1,4 +1,4 @@
-require_relative 'middlewares/threadsafe'
+require_relative 'middlewares/thread_safe'
 require_relative 'middlewares/helpers'
 
 require_relative_all 'middlewares'

data/lib/locomotive/steam/models/concerns/to_json.rb

@@ -0,0 +1,31 @@
+module Locomotive
+  module Steam
+    module Models
+      module Concerns
+
+        module ToJson
+
+          def to_hash
+            {}.tap do |_attributes|
+              attributes.each do |key, value|
+                next if value && value.respond_to?(:repository) # skip associations
+
+                _attributes[key.to_s] = value
+              end
+            end
+          end
+
+          def as_json(options = nil)
+            to_hash.as_json(options)
+          end
+
+          def to_json
+            as_json.to_json
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/locomotive/steam/models/entity.rb

@@ -4,6 +4,7 @@ module Locomotive::Steam
     module Entity
 
       include Locomotive::Steam::Models::Concerns::Validation
+      include Locomotive::Steam::Models::Concerns::ToJson
 
       attr_accessor :attributes, :associations, :localized_attributes, :base_url
 

data/lib/locomotive/steam/models/i18n_field.rb

@@ -14,6 +14,11 @@ module Locomotive::Steam
         self.translations = translations
       end
 
+      def initialize_copy(field)
+        super
+        self.translations = field.translations.dup
+      end
+
       def [](locale)
         @translations[locale]
       end
@@ -36,10 +41,16 @@ module Locomotive::Steam
 
       alias :__translations__ :translations
 
+      alias :to_hash :translations
+
       def serialize(attributes)
         attributes[@name] = @translations
       end
 
+      def to_json
+        to_hash.to_json
+      end
+
     end
 
   end

data/lib/locomotive/steam/models.rb

@@ -1,4 +1,5 @@
 require_relative 'models/concerns/validation'
+require_relative 'models/concerns/to_json'
 require_relative 'models/i18n_field'
 require_relative 'models/associations/embedded'
 require_relative 'models/associations/referenced'

data/lib/locomotive/steam/repositories.rb

@@ -3,10 +3,12 @@ require_relative_all 'repositories'
 module Locomotive
   module Steam
 
-    class Repositories < Struct.new(:current_site, :locale, :configuration)
+    class Repositories
 
       include Morphine
 
+      attr_accessor_initialize :current_site, :locale, :configuration
+
       register :adapter do
         build_adapter(configuration.adapter)
       end

data/lib/locomotive/steam/server.rb

@@ -56,12 +56,12 @@ module Locomotive::Steam
           Middlewares::Logging,
           Middlewares::Robots,
           Middlewares::Timezone,
-          Middlewares::Sitemap,
           Middlewares::EntrySubmission,
           Middlewares::Locale,
           Middlewares::LocaleRedirection,
           Middlewares::Path,
           Middlewares::Page,
+          Middlewares::Sitemap,
           Middlewares::TemplatizedPage
         ]
       end

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

@@ -14,6 +14,8 @@ module Locomotive
       def compute(source, timestamp = nil)
         return source if source.nil?
 
+        timestamp ||= (site.try(:template_version) || site.try(:updated_at)).to_i
+
         return add_timestamp_suffix(source, timestamp) if source =~ Steam::IsHTTP
 
         url = self.host ? URI.join(host, source).to_s : source
@@ -28,7 +30,7 @@ module Locomotive
           if host.respond_to?(:call)
             host.call(request, site)
           else
-            host
+            host =~ Steam::IsHTTP ? host : "https://#{host}"
           end
         else
           nil

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

@@ -1,7 +1,9 @@
 module Locomotive
   module Steam
 
-    class CsrfProtectionService < Struct.new(:enabled, :field, :token)
+    class CsrfProtectionService
+
+      attr_accessor_initialize :enabled, :field, :token
 
       def enabled?
         !!enabled

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

@@ -1,10 +1,12 @@
 module Locomotive
   module Steam
 
-    class EditableElementService < Struct.new(:repository, :locale)
+    class EditableElementService
 
       include Locomotive::Steam::Services::Concerns::Decorator
 
+      attr_accessor_initialize :repository, :locale
+
       def find(page, block, slug)
         decorate(Decorators::I18nDecorator) do
           repository.editable_element_for(page, block, slug).tap do |element|

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

@@ -3,14 +3,16 @@ require 'sanitize'
 module Locomotive
   module Steam
 
-    class EntrySubmissionService < Struct.new(:content_type_repository, :repository, :locale)
+    class EntrySubmissionService
 
       include Locomotive::Steam::Services::Concerns::Decorator
 
+      attr_accessor_initialize :content_type_repository, :repository, :locale
+
       def submit(slug, attributes = {})
         type = get_type(slug)
 
-        return nil if type.nil?
+        return nil if type.nil? || type.public_submission_enabled == false
 
         clean_attributes(attributes)
 

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

@@ -1,7 +1,9 @@
 module Locomotive
   module Steam
 
-    class ImageResizerService < Struct.new(:resizer, :asset_path)
+    class ImageResizerService
+
+      attr_accessor_initialize :resizer, :asset_path
 
       def resize(source, geometry)
         return nil if disabled? || geometry.blank?

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

@@ -1,7 +1,9 @@
 module Locomotive
   module Steam
 
-    class LiquidParserService < Struct.new(:parent_finder, :snippet_finder)
+    class LiquidParserService
+
+      attr_accessor_initialize :parent_finder, :snippet_finder
 
       def parse(page)
         _parse(page,

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

@@ -1,10 +1,12 @@
 module Locomotive
   module Steam
 
-    class PageFinderService < Struct.new(:repository)
+    class PageFinderService
 
       include Locomotive::Steam::Services::Concerns::Decorator
 
+      attr_accessor_initialize :repository
+
       def find(path)
         decorate do
           repository.by_fullpath(path)

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

@@ -1,7 +1,9 @@
 module Locomotive
   module Steam
 
-    class SiteFinderService < Struct.new(:repository, :request)
+    class SiteFinderService
+
+      attr_accessor_initialize :repository, :request
 
       def find
         repository.by_domain(request.host)

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

@@ -1,10 +1,12 @@
 module Locomotive
   module Steam
 
-    class SnippetFinderService < Struct.new(:repository)
+    class SnippetFinderService
 
       include Locomotive::Steam::Services::Concerns::Decorator
 
+      attr_accessor_initialize :repository
+
       def find(slug)
         decorate do
           repository.by_slug(slug)

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

@@ -1,7 +1,9 @@
 module Locomotive
   module Steam
 
-    class ThemeAssetUrlService < Struct.new(:repository, :asset_host, :checksum)
+    class ThemeAssetUrlService
+
+      attr_accessor_initialize :repository, :asset_host, :checksum
 
       def build(path)
         # keep the query string safe

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

@@ -1,7 +1,9 @@
 module Locomotive
   module Steam
 
-    class TranslatorService < Struct.new(:repository, :current_locale)
+    class TranslatorService
+
+      attr_accessor_initialize :repository, :current_locale
 
       # Return the translation described by a key.
       #

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

@@ -1,7 +1,9 @@
 module Locomotive
   module Steam
 
-    class UrlBuilderService < Struct.new(:site, :current_locale, :request)
+    class UrlBuilderService
+
+      attr_accessor_initialize :site, :current_locale, :request
 
       def url_for(page, locale = nil)
         prefix(_url_for(page, locale))

data/lib/locomotive/steam/services.rb

@@ -1,4 +1,4 @@
-  require 'morphine'
+require 'morphine'
 
 require_relative_all %w(concerns .), 'services'
 
@@ -28,10 +28,12 @@ module Locomotive
         end
       end
 
-      class Instance < Struct.new(:request)
+      class Instance
 
         include Morphine
 
+        attr_accessor_initialize :request
+
         register :current_site do
           repositories.current_site = Defer.new { site_finder.find }
         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.0.0-beta.3'
+    VERSION = '1.0.0.rc1'
   end
 end

data/locomotivecms_steam.gemspec

@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'sanitize',               '~> 4.0.0'
   spec.add_dependency 'morphine',               '~> 0.1.1'
-  spec.add_dependency 'httparty',               '~> 0.13.5'
+  spec.add_dependency 'httparty',               '~> 0.13.6'
   spec.add_dependency 'chronic',                '~> 0.10.2'
 
   spec.add_dependency 'rack-rewrite',           '~> 1.5.1'
   spec.add_dependency 'rack-cache',             '~> 1.2'
-  spec.add_dependency 'dragonfly',              '~> 1.0.10'
+  spec.add_dependency 'dragonfly',              '~> 1.0.12'
   spec.add_dependency 'moneta',                 '~> 0.8.0'
   spec.add_dependency 'rack_csrf',              '~> 2.5.0'
 
@@ -45,7 +45,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mime-types',             '~> 2.6.1'
 
   spec.add_dependency 'locomotivecms-solid',      '~> 4.0.0.alpha2'
-  spec.add_dependency 'locomotivecms_common',     '~> 0.0.4'
+  spec.add_dependency 'locomotivecms_common',     '~> 0.0.5'
 
   spec.required_ruby_version = '>= 2.0'
 end

data/spec/fixtures/default/README

@@ -0,0 +1,11 @@
+[LocomotiveCMS]
+
+mongoid.yml: locomotive_engine_wagon_dev
+
+> bundle exec rake development:bootstrap
+> bundle exec rails c
+  # Locomotive::Site.first.destroy
+
+[Steam]
+wagon_dev deploy development -d -v spec/fixtures/default
+bundle exec rake mongodb:test:seed

data/spec/fixtures/default/app/views/pages/layouts/simple.liquid

@@ -0,0 +1,14 @@
+---
+title: Simple layout
+---
+<html>
+  <head>
+    <title>{{ page. title }}</title>
+  </head>
+  <body>
+    {% editable_text body %}
+    <h1>Hello world</h1>
+    <p>Lorem ipsum</p>
+    {% endeditable_text %}
+  </body>
+</html>

data/spec/fixtures/default/config/deploy.yml

@@ -1,7 +1,8 @@
 development:
-  host: sample.lvh.me:3000
-  email: john@doe.net
-  api_key: a9ac1e08c2c22c1b6f3da6db77a70cac4a615bd7
+  host: localhost:3000
+  handle: sample
+  email: admin@locomotivecms.com
+  api_key: d49cd50f6f0d2b163f48fc73cb249f0244c37074
 staging:
   host: staging.example.com
   email: john@doe.net

data/spec/fixtures/default/config/site.yml

@@ -1,4 +1,4 @@
-name: Sample website
+name: Sample site
 
 subdomain: sample
 

data/spec/fixtures/mongodb/locomotive_accounts.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_2_5_dev.locomotive_accounts" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_wagon_dev.locomotive_accounts" } ] }

data/spec/fixtures/mongodb/locomotive_activities.metadata.json

@@ -0,0 +1 @@
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_wagon_dev.locomotive_activities" } ] }

data/spec/fixtures/mongodb/locomotive_content_assets.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_2_5_dev.locomotive_content_assets" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_wagon_dev.locomotive_content_assets" } ] }

data/spec/fixtures/mongodb/locomotive_content_entries.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_2_5_dev.locomotive_content_entries" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_wagon_dev.locomotive_content_entries" } ] }

data/spec/fixtures/mongodb/locomotive_content_types.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_2_5_dev.locomotive_content_types" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_wagon_dev.locomotive_content_types" } ] }

data/spec/fixtures/mongodb/locomotive_pages.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_2_5_dev.locomotive_pages" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_wagon_dev.locomotive_pages" } ] }

data/spec/fixtures/mongodb/locomotive_sites.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_2_5_dev.locomotive_sites" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_wagon_dev.locomotive_sites" } ] }

data/spec/fixtures/mongodb/locomotive_snippets.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_2_5_dev.locomotive_snippets" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_wagon_dev.locomotive_snippets" } ] }