locomotivecms_steam 1.0.0.pre.alpha → 1.0.0.pre.alpha.1

data/lib/locomotive/steam/entities/content_type_field.rb

@@ -55,6 +55,10 @@ module Locomotive::Steam
       }
     end
 
+    def is_relationship?
+      %i(belongs_to has_many many_to_many).include?(self.type)
+    end
+
     class SelectOption
 
       include Locomotive::Steam::Models::Entity

data/lib/locomotive/steam/entities/theme_asset.rb

@@ -4,6 +4,14 @@ module Locomotive::Steam
 
     include Locomotive::Steam::Models::Entity
 
+    def initialize(attributes = {})
+      super({
+        local_path: nil,
+        checksum:   nil
+      }.merge(attributes))
+    end
+
+
   end
 
 end

data/lib/locomotive/steam/initializers/sprockets.rb

@@ -1,4 +1,53 @@
 require 'sprockets'
 require 'sprockets-sass'
+require 'sprockets-less'
+require 'coffee_script'
+require 'compass'
 
 Sprockets::Sass.add_sass_functions = false
+
+module Locomotive::Steam
+
+  class SprocketsEnvironment < ::Sprockets::Environment
+
+    def initialize(root, options = {})
+      super(root)
+
+      @steam_path = root
+
+      append_steam_paths
+
+      install_yui_compressor(options)
+    end
+
+    private
+
+    def append_steam_paths
+      %w(fonts stylesheets javascripts).each do |name|
+        append_path File.join(@steam_path, name)
+      end
+    end
+
+    def install_yui_compressor(options)
+      return unless options[:minify]
+
+      require 'yui/compressor'
+
+      if is_java_installed?
+        # minify javascripts and stylesheets
+        self.js_compressor  = YUI::JavaScriptCompressor.new
+        self.css_compressor = YUI::CssCompressor.new
+      else
+        message = "[Important] YUICompressor requires java to be installed. The JAVA_HOME variable should also be set.\n"
+        Locomotive::Common::Logger.warn message.red
+        false
+      end
+    end
+
+    def is_java_installed?
+      `which java` != '' && (!ENV['JAVA_HOME'].blank? && File.exists?(ENV['JAVA_HOME']))
+    end
+
+  end
+
+end

data/lib/locomotive/steam/liquid/filters/base.rb

@@ -34,14 +34,13 @@ module Locomotive
           def css_js_asset_url(input, extension, folder)
             return '' if input.nil?
 
-            if input =~ /^(\/|https?:)/
-              uri = URI(input)
+            if input =~ /^https?:/
+              input
             else
-              uri = URI(asset_url("#{folder}/#{input}"))
+              uri = input.starts_with?('/') ? URI(input) : URI(asset_url("#{folder}/#{input}"))
+              uri.path = "#{uri.path}#{extension}" unless uri.path.ends_with?(extension)
+              uri.to_s
             end
-
-            uri.path = "#{uri.path}#{extension}" unless uri.path.ends_with?(extension)
-            uri.to_s
           end
 
           def asset_url(path)

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

@@ -22,10 +22,8 @@ module Locomotive
             end
 
             def parse(tokens)
-              super
-
-              if listener = options[:events_listener]
-                listener.emit(@tag_name.to_sym, page: options[:page], attributes: default_element_attributes)
+              super.tap do
+                ActiveSupport::Notifications.instrument("steam.parse.editable.#{@tag_name}", page: options[:page], attributes: default_element_attributes)
               end
             end
 
@@ -53,7 +51,8 @@ module Locomotive
                 fixed:          !!@element_options[:fixed],
                 disabled:       false,
                 inline_editing: true,
-                from_parent:    false
+                from_parent:    false,
+                type:           @tag_name.to_sym
               }
             end
 

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

@@ -12,13 +12,10 @@ module Locomotive
             # no need to go further if the parent does not exist
             raise PageNotFound.new("Page with fullpath '#{@template_name}' was not found") if parent.nil?
 
-            if listener = options[:events_listener]
-              listener.emit(:extends, page: options[:page], parent: parent)
-            end
+            ActiveSupport::Notifications.instrument("steam.parse.extends", page: options[:page], parent: parent)
 
             # the source has already been parsed before
             options[:parser]._parse(parent, options.merge(page: parent))
-            # parent.template || ::Liquid::Template.parse(parent.source, options.merge(page: parent))
           end
 
         end
@@ -28,35 +25,3 @@ module Locomotive
     end
   end
 end
-
-# def prepare_parsing
-          #   super
-
-          #   parent_page = @context[:parent_page]
-
-          #   @context[:page].merge_editable_elements_from_page(parent_page)
-
-          #   @context[:snippets] = parent_page.snippet_dependencies
-          #   @context[:templates] = ([*parent_page.template_dependencies] + [parent_page.id]).compact
-          # end
-
-# if @template_name == 'parent'
-            #   @context[:parent_page] = @context[:cached_parent] || @context[:page].parent
-            # else
-            #   locale = ::Mongoid::Fields::I18n.locale
-
-            #   @context[:parent_page] = @context[:cached_pages].try(:[], @template_name) ||
-            #     @context[:site].pages.where("fullpath.#{locale}" => @template_name).first
-            # end
-
-            # raise PageNotFound.new("Page with fullpath '#{@template_name}' was not found") if @context[:parent_page].nil?
-
-            # # be sure to work with a copy of the parent template otherwise there will be conflicts
-            # parent_template = @context[:parent_page].template.try(:clone)
-
-            # raise PageNotTranslated.new("Page with fullpath '#{@template_name}' was not translated") if parent_template.nil?
-
-            # # force the page to restore the original version of its template (from the serialized version)
-            # @context[:parent_page].instance_variable_set(:@template, nil)
-
-            # parent_template

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

@@ -6,9 +6,7 @@ module Locomotive
 
           def parse(tokens)
             super.tap do
-              if listener = options[:events_listener]
-                listener.emit(:inherited_block, page: options[:page], name: @name, found_super: self.contains_super?(nodelist))
-              end
+              ActiveSupport::Notifications.instrument("steam.parse.inherited_block", page: options[:page], name: @name, found_super: self.contains_super?(nodelist))
             end
           end
 
@@ -18,7 +16,7 @@ module Locomotive
             nodes.any? do |node|
               if is_node_block_super?(node)
                 true
-              elsif node.respond_to?(:nodelist) && !node.nodelist.nil? && !node.is_a?(Locomotive::Steam::Liquid::Tags::InheritedBlock)
+              elsif is_node_with_nodelist?(node)
                 contains_super?(node.nodelist)
               end
             end
@@ -30,6 +28,14 @@ module Locomotive
             node.raw.strip == 'block.super'
           end
 
+          def is_node_with_nodelist?(node)
+            if node.respond_to?(:nodelist) && !node.is_a?(Locomotive::Steam::Liquid::Tags::InheritedBlock)
+              # some blocks does not have a body like the link_to tag
+               _nodelist = node.nodelist rescue nil
+               !_nodelist.nil?
+            end
+          end
+
         end
 
         ::Liquid::Template.register_tag('block'.freeze, InheritedBlock)

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

@@ -6,14 +6,12 @@ module Locomotive
         class Snippet < ::Liquid::Include
 
           def parse(tokens)
-            if listener = options[:events_listener]
-              listener.emit(:include, page: options[:page], name: @template_name)
-
-              # look for editable elements
-              name = evaluate_snippet_name
-              if snippet = options[:snippet_finder].find(name)
-                options[:parser]._parse(snippet, options.merge(snippet: name))
-              end
+            ActiveSupport::Notifications.instrument("steam.parse.include", page: options[:page], name: @template_name)
+
+            # look for editable elements
+            name = evaluate_snippet_name
+            if options[:snippet_finder] && snippet = options[:snippet_finder].find(name)
+              options[:parser]._parse(snippet, options.merge(snippet: name))
             end
           end
 
@@ -35,7 +33,8 @@ module Locomotive
 
           def evaluate_snippet_name(context = nil)
             context.try(:evaluate, @template_name) ||
-            @template_name.send(:state).first
+            (!@template_name.is_a?(String) && @template_name.send(:state).first) ||
+            @template_name
           end
 
         end

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

@@ -1,56 +1,26 @@
-require 'coffee_script'
-
 module Locomotive::Steam
   module Middlewares
 
     class DynamicAssets
 
-      attr_reader :app, :regexp
+      REGEXP = /^\/(javascripts|stylesheets)\/(.*)$/o
+
+      attr_reader :app, :assets
 
       def initialize(app, options)
         @app    = app
-        @regexp = /^\/(javascripts|stylesheets)\/(.*)$/o
-
-        @assets = ::Sprockets::Environment.new(options[:root]).tap do |env|
-          install_yui_compressor(env, options)
-
-          %w(fonts stylesheets javascripts).each do |name|
-            env.append_path File.join(options[:root], name)
-          end
-        end
+        @assets = Locomotive::Steam::SprocketsEnvironment.new(options[:root], options)
       end
 
       def call(env)
-        if env['PATH_INFO'] =~ self.regexp
+        if env['PATH_INFO'] =~ REGEXP
           env['PATH_INFO'] = $2
-          @assets.call(env)
+          assets.call(env)
         else
           app.call(env)
         end
       end
 
-      private
-
-      def install_yui_compressor(sprockets, options)
-        return unless options[:minify]
-
-        require 'yui/compressor'
-
-        if is_java_installed?
-          # minify javascripts and stylesheets
-          sprockets.js_compressor  = YUI::JavaScriptCompressor.new
-          sprockets.css_compressor = YUI::CssCompressor.new
-        else
-          message = "[Important] YUICompressor requires java to be installed. The JAVA_HOME variable should also be set.\n"
-          Locomotive::Common::Logger.warn message.red
-          false
-        end
-      end
-
-      def is_java_installed?
-        `which java` != '' && (!ENV['JAVA_HOME'].blank? && File.exists?(ENV['JAVA_HOME']))
-      end
-
     end
 
   end

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

@@ -18,8 +18,11 @@ module Locomotive::Steam
       end
 
       def redirect_to(location, type = 301)
-        self.log "Redirected to #{location}".blue
-        @next_response = [type, { 'Content-Type' => 'text/html', 'Location' => location }, []]
+        _location = mounted_on && (location =~ Steam::IsHTTP).nil? ? "#{mounted_on}#{location}" : location
+
+        self.log "Redirected to #{_location}".blue
+
+        @next_response = [type, { 'Content-Type' => 'text/html', 'Location' => _location }, []]
       end
 
       def modify_path(path = nil, &block)
@@ -34,6 +37,10 @@ module Locomotive::Steam
         path
       end
 
+      def mounted_on
+        request.env['steam.mounted_on']
+      end
+
       def log(msg, offset = 2)
         Locomotive::Common::Logger.info (' ' * offset) + msg
       end

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

@@ -9,8 +9,7 @@ module Locomotive::Steam
       include Helpers
 
       def _call
-        env['steam.site'] ||= services.site_finder.find
-        services.repositories.current_site = site = env['steam.site']
+        site = find_site
 
         # render a simple message if the service was not able to find a site
         # based on the request.
@@ -22,6 +21,15 @@ module Locomotive::Steam
 
       private
 
+      def find_site
+        if env['steam.site']
+          # happens if Steam is running within the Engine
+          services.set_site(env['steam.site'])
+        else
+          env['steam.site'] = services.current_site
+        end
+      end
+
       def render_no_site
         render_response('Hi, we are sorry but no site was found.', 404, 'text/html')
       end

data/lib/locomotive/steam/models/associations/embedded.rb

@@ -18,7 +18,7 @@ module Locomotive::Steam
       # of the parent repository, that will change the local repository
       # as well.
       def initialize(repository_klass, collection, scope, options = {})
-        adapter.collection = collection
+        adapter.collection = collection || []
 
         @repository = repository_klass.new(adapter)
         @repository.scope = scope

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

@@ -78,7 +78,8 @@ module Locomotive::Steam
       # create a proxy class for each localized attribute
       def build_localized_attributes(attributes)
         @localized_attributes.each do |name|
-          attributes[name] = I18nField.new(name, attributes[name])
+          _name = name.to_sym
+          attributes[_name] = I18nField.new(_name, attributes[name.to_s] || attributes[_name])
         end
       end
 

data/lib/locomotive/steam/repositories.rb

@@ -41,7 +41,7 @@ module Locomotive
 
       def build_adapter(options)
         name = ((options || {})[:name] || :filesystem).to_s
-        require_relative "adapters/#{name}"
+        require_relative "adapters/#{name.downcase}"
         klass = "Locomotive::Steam::#{name.camelize}Adapter".constantize
         klass.new(options)
       end

data/lib/locomotive/steam/repositories/content_type_field_repository.rb

@@ -14,6 +14,10 @@ module Locomotive
         embedded_association :select_options, ContentTypeFieldSelectOptionRepository
       end
 
+      def by_name(name)
+        first { where(name: name) }
+      end
+
       def selects
         query { where(type: :select) }.all
       end
@@ -22,6 +26,10 @@ module Locomotive
         query { where(k(:type, :in) => %i(belongs_to has_many many_to_many)) }.all
       end
 
+      def no_associations
+        query { where(k(:type, :nin) => %i(belongs_to has_many many_to_many)) }.all
+      end
+
       def unique
         query { where(unique: true) }.all.inject({}) do |memo, field|
           memo[field.name] = field

data/lib/locomotive/steam/repositories/theme_asset_repository.rb

@@ -14,7 +14,7 @@ module Locomotive
 
       def checksums
         query { only(:checksum, :local_path) }.all.inject({}) do |memo, asset|
-          memo[asset.local_path] = asset.checksum
+          memo[asset.local_path] = asset.checksum if asset.checksum
           memo
         end
       end

data/lib/locomotive/steam/server.rb

@@ -1,5 +1,4 @@
 require 'haml'
-require 'compass'
 require 'mimetype_fu'
 require 'mime-types'
 require 'mime/types'

data/lib/locomotive/steam/services.rb

@@ -19,6 +19,10 @@ module Locomotive
 
         include Morphine
 
+        register :current_site do
+          repositories.current_site = site_finder.find
+        end
+
         register :repositories do
           Steam::Repositories.new(nil, nil, configuration)
         end
@@ -52,7 +56,7 @@ module Locomotive
         end
 
         register :url_builder do
-          Steam::UrlBuilderService.new(current_site, locale)
+          Steam::UrlBuilderService.new(current_site, locale, request)
         end
 
         register :theme_asset_url do
@@ -108,8 +112,8 @@ module Locomotive
           @locale = repositories.locale = locale
         end
 
-        def current_site
-          repositories.current_site
+        def set_site(site)
+          self.current_site = repositories.current_site = site
         end
 
       end