locomotivecms_steam 1.0.0.pre.beta.2 → 1.0.0.pre.beta.3

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

@@ -2,11 +2,35 @@ module Locomotive
   module Steam
     module Liquid
       module Tags
+
+        # Blocks are used with the Extends tag to define
+        # the content of blocks. Nested blocks are allowed.
+        #
+        #   {% extends home %}
+        #   {% block content }Hello world{% endblock %}
+        #
+        # Options used to generate the UI/UX of the editable element inputs
+        #   - short_name (Boolean): use just the name and skip the name of the nested blocks.
+        #   - priority (Integer): allow blocks to be displayed before others
+        #
         class InheritedBlock < ::Liquid::InheritedBlock
 
+          def initialize(tag_name, markup, options)
+            super
+
+            @attributes = { short_name: false, priority: 0 }
+            markup.scan(::Liquid::TagAttributes) do |key, value|
+              @attributes[key.to_sym] = ::Liquid::Expression.parse(value)
+            end
+          end
+
           def parse(tokens)
             super.tap do
-              ActiveSupport::Notifications.instrument('steam.parse.inherited_block', page: options[:page], name: @name, found_super: self.contains_super?(nodelist))
+              ActiveSupport::Notifications.instrument('steam.parse.inherited_block', {
+                page: options[:page],
+                name: @name,
+                found_super: self.contains_super?(nodelist)
+              }.merge(@attributes))
             end
           end
 

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

@@ -11,9 +11,7 @@ module Locomotive::Steam
       def _call
         site = find_site
 
-        # render a simple message if the service was not able to find a site
-        # based on the request.
-        render_no_site if site.nil?
+        no_site! if site.nil?
 
         # log anyway
         log_site(site)
@@ -30,8 +28,14 @@ module Locomotive::Steam
         end
       end
 
-      def render_no_site
-        render_response('Hi, we are sorry but no site was found.', 404, 'text/html')
+      def no_site!
+        # render a simple message if the service was not able to find a site
+        # based on the request.
+        if services.configuration.render_404_if_no_site
+          render_response('Hi, we are sorry but no site was found.', 404, 'text/html')
+        else
+          raise NoSiteException.new
+        end
       end
 
       def log_site(site)

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

@@ -12,29 +12,30 @@ module Locomotive::Steam
       end
 
       def method_missing(name, *args, &block)
-        if attributes.include?(name)
-          self[name]
-        elsif name.to_s.end_with?('=') && attributes.include?(name.to_s.chop)
-          self[name.to_s.chop] = args.first
+        _name = name.to_s
+        if attributes.include?(_name)
+          self[_name]
+        elsif _name.end_with?('=') && attributes.include?(_name.chop)
+          self[_name.chop] = args.first
         else
           super
         end
       end
 
       def respond_to?(name, include_private = false)
-        attributes.include?(name) || super
+        attributes.include?(name.to_s) || super
       end
 
       def _id
-        self[:_id]
+        self['_id']
       end
 
       def []=(name, value)
-        attributes[name.to_sym] = value
+        attributes[name] = value
       end
 
       def [](name)
-        attributes[name.to_sym]
+        attributes[name]
       end
 
       def serialize

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

@@ -19,6 +19,8 @@ module Locomotive::Steam
         @default_attributes   = []
         @associations         = []
 
+        @entity_map           = {}
+
         instance_eval(&block) if block_given?
       end
 
@@ -47,15 +49,17 @@ module Locomotive::Steam
       end
 
       def to_entity(attributes)
-        entity_klass.new(deserialize(attributes)).tap do |entity|
-          set_default_attributes(entity)
+        cache_entity(entity_klass, attributes) do
+          entity_klass.new(deserialize(attributes)).tap do |entity|
+            set_default_attributes(entity)
 
-          entity.localized_attributes = @localized_attributes_hash || {}
-          entity.associations = {}
+            entity.localized_attributes = @localized_attributes_hash || {}
+            entity.associations = {}
 
-          attach_entity_to_associations(entity)
+            attach_entity_to_associations(entity)
 
-          entity.base_url = @repository.base_url(entity)
+            entity.base_url = @repository.base_url(entity)
+          end
         end
       end
 
@@ -132,6 +136,18 @@ module Locomotive::Steam
         end
       end
 
+      def cache_entity(entity_klass, attributes, &block)
+        return yield if attributes['_id'].blank?
+
+        key = "#{entity_klass.to_s}-#{attributes['_id']}"
+
+        if (entity = @entity_map[key]).nil?
+          entity = @entity_map[key] = yield
+        end
+
+        entity
+      end
+
     end
 
   end

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

@@ -130,7 +130,21 @@ module Locomotive
       end
 
       def prepare_conditions(*conditions)
-        super({ _visible: true }, conditions)
+        _conditions = conditions.first.try(:with_indifferent_access)
+
+        prepare_conditions_for_select_fields(_conditions) if _conditions
+
+        super({ _visible: true }, _conditions)
+      end
+
+      # select fields? if so, use the _id of the option instead of the option name
+      def prepare_conditions_for_select_fields(conditions)
+        self.content_type.fields.selects.each do |field|
+          if value = conditions[name = field.name.to_s]
+            conditions.delete(name)
+            conditions[name + '_id'] = field.select_options.by_name(value).try(:_id)
+          end
+        end
       end
 
       def add_localized_fields_to_mapper(mapper)

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

@@ -18,6 +18,10 @@ module Locomotive
         query { order_by(position: :asc) }.all
       end
 
+      def by_name(name)
+        query { where(name: name) }.first
+      end
+
     end
   end
 end

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

@@ -26,6 +26,13 @@ module Locomotive
         end.all
       end
 
+      def only_handle_and_fullpath
+        query do
+          where(k(:handle, :ne) => nil).
+            only(:_id, :title, :handle, :fullpath)
+        end.all
+      end
+
       def by_handle(handle)
         first { where(handle: handle) }
       end

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

@@ -11,8 +11,7 @@ module Locomotive
       end
 
       def by_domain(domain)
-        conditions = { k(:domains, :in) => [*domain] }
-        first { where(conditions) }
+        first { where(k(:domains, :in) => [*domain]) }
       end
 
       def by_handle_or_domain(handle, domain)

data/lib/locomotive/steam/server.rb

@@ -12,6 +12,11 @@ require 'dragonfly/middleware'
 
 require_relative 'middlewares'
 
+if ENV['PROFILER']
+  require 'moped'
+  require 'rack-mini-profiler'
+end
+
 module Locomotive::Steam
   module Server
 
@@ -38,6 +43,8 @@ module Locomotive::Steam
           use Rack::Lint
           use Rack::Session::Moneta, configuration.moneta
 
+          use Rack::MiniProfiler if ENV['PROFILER']
+
           server.steam_middleware_stack.each { |k| use k }
         }
       end

data/lib/locomotive/steam/services.rb

@@ -1,4 +1,4 @@
-require 'morphine'
+  require 'morphine'
 
 require_relative_all %w(concerns .), 'services'
 
@@ -15,22 +15,17 @@ module Locomotive
         end
       end
 
-      class SiteProxy < SimpleDelegator
-
+      class Defer < SimpleDelegator
         def initialize(&block)
-          @site     = nil
-          @default  = block
-          super(@site)
+          @constructor = block
+          super(nil)
         end
-
         def __getobj__
-          super || @default.call
+          super || __setobj__(@constructor.call)
         end
-
         def nil?
           __getobj__.nil?
         end
-
       end
 
       class Instance < Struct.new(:request)
@@ -38,7 +33,7 @@ module Locomotive
         include Morphine
 
         register :current_site do
-          repositories.current_site = SiteProxy.new { site_finder.find }
+          repositories.current_site = Defer.new { site_finder.find }
         end
 
         register :repositories do
@@ -134,6 +129,10 @@ module Locomotive
           self.current_site.__setobj__(site)
         end
 
+        def defer(name, &block)
+          send(:"#{name}=", Defer.new(&block))
+        end
+
       end
 
     end

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

@@ -17,8 +17,29 @@ module Locomotive
         end
       end
 
+      def by_handle(handle)
+        decorate { page_map[handle] }
+      end
+
       private
 
+      # Instead of hitting the DB each time we want a page from its handle,
+      # just get all the handles at once and cache the result. (up to 20% boost)
+      #
+      def page_map
+        @page_map ||= {}
+
+        return @page_map[repository.locale] if @page_map[repository.locale]
+
+        {}.tap do |map|
+          repository.only_handle_and_fullpath.each do |page|
+            map[page.handle] = page
+          end
+
+          @page_map[repository.locale] = map
+        end
+      end
+
       def path_combinations(path)
         _path_combinations(path.split('/'))
       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.2'
+    VERSION = '1.0.0-beta.3'
   end
 end

data/spec/integration/repositories/content_entry_repository_spec.rb

@@ -50,6 +50,11 @@ describe Locomotive::Steam::ContentEntryRepository do
       it { expect(subject.name).to eq 'Alice in Chains' }
     end
 
+    describe 'filter by a select field' do
+      subject { repository.all(kind: 'grunge') }
+      it { expect(subject.map { |entry| entry[:name] }).to eq(['Alice in Chains', 'Pearl Jam']) }
+    end
+
     describe '#group_by_select_option' do
       subject { repository.group_by_select_option(:kind) }
       it { expect(subject.map { |h| h[:name] }).to eq(%w(grunge rock country)) }

data/spec/integration/repositories/page_repository_spec.rb

@@ -37,6 +37,11 @@ describe Locomotive::Steam::PageRepository do
       it { expect(subject.title[:en]).to eq 'Music' }
     end
 
+    describe '#only_handle_and_fullpath' do
+      subject { repository.only_handle_and_fullpath }
+      it { expect(subject.size).to eq 3 }
+    end
+
     describe '#by_fullpath' do
       subject { repository.by_fullpath('archives/news') }
       it { expect(subject.title[:en]).to eq 'News archive' }

data/spec/support/liquid.rb

@@ -9,6 +9,17 @@ def parse_template(source, options = nil)
 end
 
 module Liquid
+
+  class TestDrop < Liquid::Drop
+    def initialize(source)
+      @_source = source
+    end
+
+    def before_method(meth)
+      @_source[meth.to_sym]
+    end
+  end
+
   class SimpleEventsListener
     def initialize
       ActiveSupport::Notifications.subscribe(/^steam\.parse\./) do |name, start, finish, id, payload|

data/spec/unit/liquid/filters/json_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::Liquid::Filters::Json do
+
+  include Locomotive::Steam::Liquid::Filters::Json
+
+  let(:input) { nil }
+  subject     { json(*input) }
+
+  describe 'adds quotes to a string' do
+
+    let(:input) { 'foo' }
+    it { expect(subject).to eq %("foo") }
+
+  end
+
+  context 'drop' do
+
+    describe 'includes only the fields specified' do
+
+      let(:input) { [Liquid::TestDrop.new(title: 'Acme', body: 'Lorem ipsum'), 'title'] }
+      it { expect(subject).to eq %("title":"Acme") }
+
+    end
+
+  end
+
+  context 'collections' do
+
+    describe 'adds brackets and quotes to a collection' do
+
+      let(:input) { [['foo', 'bar']] }
+      it { expect(subject).to eq %(["foo","bar"]) }
+
+    end
+
+    describe 'includes the first field' do
+
+      let(:input) {
+        [[Liquid::TestDrop.new(title: 'Acme', body: 'Lorem ipsum'),
+          Liquid::TestDrop.new(title: 'Hello world', body: 'Lorem ipsum')], 'title'] }
+      it { expect(subject).to eq %("Acme","Hello world") }
+
+    end
+
+    describe 'includes the specified fields' do
+
+      let(:input) {
+        [[Liquid::TestDrop.new(title: 'Acme', body: 'Lorem ipsum', date: '2013-12-13'),
+          Liquid::TestDrop.new(title: 'Hello world', body: 'Lorem ipsum', date: '2013-12-12')], 'title, body'] }
+      it { expect(subject).to eq %({"title":"Acme","body":"Lorem ipsum"},{"title":"Hello world","body":"Lorem ipsum"}) }
+
+    end
+
+  end
+
+end

data/spec/unit/liquid/filters/misc_spec.rb

@@ -105,4 +105,18 @@ describe Locomotive::Steam::Liquid::Filters::Misc do
 
   end
 
+  describe '#hexdigest' do
+
+    let(:key)     { 'key' }
+    let(:data)    { 'The quick brown fox jumps over the lazy dog' }
+    let(:digest)  { nil }
+
+    subject { hexdigest(data, key, digest) }
+
+    it 'returns the authentication code as a hex-encoded string' do
+      expect(subject).to eq 'de7c9b85b8b78aa6bc8a7a36f70a90701c9db4d9'
+    end
+
+  end
+
 end