locomotivecms_steam 0.1.2.pre.beta → 1.0.0.pre.alpha

data/lib/locomotive/steam/initializers.rb

@@ -1,7 +1,3 @@
 require_relative 'initializers/sprockets.rb'
 require_relative 'initializers/i18n.rb'
 require_relative 'initializers/dragonfly.rb'
-
-Locomotive::Common.configure do |config|
-  config.notifier = Locomotive::Common::Logger.setup
-end

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

@@ -1,18 +1,58 @@
-require 'dragonfly'
+module Locomotive
+  module Steam
+    module Initializers
 
-# Configure
-Dragonfly.app(:steam).configure do
-  plugin :imagemagick,
-    convert_command:  `which convert`.strip.presence || '/usr/local/bin/convert',
-    identify_command: `which identify`.strip.presence || '/usr/local/bin/identify'
+      class Dragonfly
 
-  protect_from_dos_attacks true
+        def run
+          require 'dragonfly'
 
-  url_format '/images/dynamic/:job/:basename.:ext'
+          # need to be called outside of the configure method
+          imagemagick_commands = find_imagemagick_commands
 
-  fetch_file_whitelist(/public/)
+          ::Dragonfly.app(:steam).configure do
+            if imagemagick_commands
+              plugin :imagemagick, imagemagick_commands
+            end
 
-  fetch_url_whitelist(/.+/)
+            verify_urls true
+
+            secret Locomotive::Steam.configuration.image_resizer_secret
+
+            url_format '/images/dynamic/:job/:basename.:ext'
+
+            fetch_file_whitelist /public/
+
+            fetch_url_whitelist /.+/
+          end
+
+          if ::Dragonfly.logger.nil?
+            ::Dragonfly.logger = Locomotive::Common::Logger.instance
+          end
+        end
+
+        def find_imagemagick_commands
+          convert   = `which convert`.strip.presence || '/usr/local/bin/convert'
+          identify  = `which identify`.strip.presence || '/usr/local/bin/identify'
+
+          if File.exists?(convert)
+            { convert_command: convert, identify_command: identify }
+          else
+            missing_image_magick
+            nil
+          end
+        end
+
+        def missing_image_magick
+          Locomotive::Common::Logger.warn <<-EOF
+[Dragonfly] !disabled!
+[Dragonfly] If you want to take full benefits of all the features in Locomotive Steam, we recommend you to install ImageMagick. Check out the documentation here: http://doc.locomotivecms.com.
+EOF
+        end
+
+      end
+    end
+  end
 end
 
-Dragonfly.logger = Locomotive::Common::Logger.instance
+Locomotive::Steam::Initializers::Dragonfly.new.run

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

@@ -1,3 +1,6 @@
-I18n.load_path = Dir[File.join(File.dirname(__FILE__), "/../../../../config/locales/*.yml")]
-I18n.enforce_available_locales = false
-I18n.backend.reload!
+unless defined?(Rails)
+  I18n.load_path << Dir[File.join(File.dirname(__FILE__), "/../../../../config/locales/*.yml")]
+
+  I18n.enforce_available_locales = false
+  I18n.backend.reload!
+end

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

@@ -1 +1,4 @@
-Sprockets::Sass.add_sass_functions = false
+require 'sprockets'
+require 'sprockets-sass'
+
+Sprockets::Sass.add_sass_functions = false

data/lib/locomotive/steam/liquid.rb

@@ -1,11 +1,8 @@
 require 'solid'
-require 'locomotive/models'
 
-require_relative 'liquid/scopeable'
+require_relative 'liquid/errors'
+require_relative 'liquid/patches'
 require_relative 'liquid/drops/base'
+require_relative 'liquid/drops/i18n_base'
 require_relative 'liquid/tags/hybrid'
-require_relative 'liquid/tags/path_helper'
-
-%w{. drops tags filters}.each do |dir|
-  Dir[File.join(File.dirname(__FILE__), 'liquid', dir, '*.rb')].each { |lib| require lib }
-end
+require_relative_all %w(. drops filters tags/concerns tags), 'liquid'

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

@@ -1,4 +1,3 @@
-# Code taken from Mephisto sources (http://mephistoblog.com/)
 module Locomotive
   module Steam
     module Liquid

data/lib/locomotive/steam/liquid/drops/content_entry.rb

@@ -2,46 +2,67 @@ module Locomotive
   module Steam
     module Liquid
       module Drops
-        class ContentEntry < Base
-          extend Forwardable
+        class ContentEntry < I18nBase
 
-          def_delegators :@_source, :seo_title, :meta_keywords, :meta_description
+          delegate :_slug, :_translated, :seo_title, :meta_keywords, :meta_description, to: :@_source
 
-          def _label
-            @_label ||= @_source._label
-          end
+          alias :_permalink :_slug
 
-          def _permalink
-            @_source._permalink.try(:parameterize)
+          def _id
+            @_source._id.to_s
           end
 
-          alias :_slug :_permalink
+          def _label
+            @_label ||= @_source._label
+          end
 
+          # Returns the next content for the parent content type.
+          # If no content is found, nil is returned.
+          #
+          # Usage:
+          #
+          # {% if article.next %}
+          # <a href="{% path_to article.next %}">Read next article</a>
+          # {% endif %}
+          #
           def next
-            self
+            @next ||= repository(@_source).next(@_source).to_liquid
           end
 
+          # Returns the previous content for the parent content type.
+          # If no content is found, nil is returned.
+          #
+          # Usage:
+          #
+          # {% if article.previous %}
+          # <a href="{% path_to article.previous %}">Read previous article</a>
+          # {% endif %}
+          #
           def previous
-            self
+            @previous ||= repository(@_source).previous(@_source).to_liquid
           end
 
           def errors
-            (@_source.errors || []).inject({}) do |memo, name|
-              memo[name] = ::I18n.t('errors.messages.blank')
-              memo
-            end
+            @_source.errors.messages.to_hash.stringify_keys
           end
 
           def before_method(meth)
             return '' if @_source.nil?
 
             if not @@forbidden_attributes.include?(meth.to_s)
-              @_source.send(meth)
+              repository(@_source).value_for(@_source, meth, @context['with_scope'])
             else
               nil
             end
           end
 
+          protected
+
+          def repository(entry)
+            repository = @context.registers[:services].repositories.content_entry
+            repository.with(entry.content_type)
+          end
+
         end
       end
     end

data/lib/locomotive/steam/liquid/drops/content_entry_collection.rb

@@ -0,0 +1,77 @@
+module Locomotive
+  module Steam
+    module Liquid
+      module Drops
+
+        class ContentEntryCollection < ::Liquid::Drop
+
+          delegate :first, :last, :each, :each_with_index, :empty?, :any?, to: :collection
+
+          def initialize(content_type, repository = nil)
+            @content_type = content_type
+            @repository   = repository
+          end
+
+          def all
+            collection
+          end
+
+          def count
+            repository.count(conditions)
+          end
+
+          alias :size   :count
+          alias :length :count
+
+          def public_submission_url
+            services.url_builder.public_submission_url_for(@content_type)
+          end
+
+          def api
+            Locomotive::Common::Logger.warn "[Liquid template] the api for content_types has been deprecated and replaced by public_submission_url instead."
+            { 'create' => public_submission_url }
+          end
+
+          def before_method(meth)
+            if (meth.to_s =~ /^group_by_(.+)$/) == 0
+              repository.group_by_select_option(@content_type, $1)
+            elsif (meth.to_s =~ /^(.+)_options$/) == 0
+              content_type_repository.select_options(@content_type, $1)
+            else
+              Locomotive::Common::Logger.warn "[Liquid template] trying to call #{meth} on a content_type object"
+              nil
+            end
+          end
+
+          protected
+
+          def slice(index, length)
+            repository.all(conditions) { offset(index).limit(length) }
+          end
+
+          def collection
+            @collection ||= repository.all(conditions)
+          end
+
+          def conditions
+            @context['with_scope']
+          end
+
+          def services
+            @context.registers[:services]
+          end
+
+          def content_type_repository
+            services.repositories.content_type
+          end
+
+          def repository
+            @repository || services.repositories.content_entry.with(@content_type)
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/locomotive/steam/liquid/drops/content_types.rb

@@ -5,114 +5,17 @@ module Locomotive
         class ContentTypes < ::Liquid::Drop
 
           def before_method(meth)
-            type = Locomotive::Models['content_types'][meth.to_s]
-            ProxyCollection.new(type)
-          end
-
-        end
-
-        class ProxyCollection < ::Liquid::Drop
-
-          include Scopeable
-
-          def initialize(content_type)
-            @content_type = content_type
-            @collection = nil
-          end
-
-          def all
-            self.collection
-          end
-
-          def any
-            self.collection.any?
-          end
-
-          def first
-            self.collection.first
-          end
-
-          def last
-            self.collection.last
-          end
-
-          def size
-            self.collection.size
-          end
-
-          alias :length :size
-          alias :count :size
-
-          def each(&block)
-            self.collection.each(&block)
-          end
-
-          def public_submission_url
-            "/entry_submissions/#{@content_type.slug}"
-          end
+            repository = @context.registers[:services].repositories.content_type
 
-          def api
-            { 'create' => "/entry_submissions/#{@content_type.slug}" }
-          end
-
-          def before_method(meth)
-            if (meth.to_s =~ /^group_by_(.+)$/) == 0
-              self.group_entries_by(@content_type, $1)
-            elsif (meth.to_s =~ /^(.+)_options$/) == 0
-              self.select_options_for(@content_type, $1)
+            if content_type = repository.by_slug(meth.to_s)
+              ContentEntryCollection.new(content_type)
             else
-              @content_type.send(meth)
+              nil
             end
           end
 
-          protected
-
-          def group_entries_by(content_type, name)
-            field = @content_type.find_field(name)
-
-            return {} if field.nil? || !%w(belongs_to select).include?(field.type.to_s)
-
-            (@content_type.entries || []).group_by do |entry|
-              entry.send(name.to_sym)
-            end.to_a.collect do |group|
-              { name: group.first, entries: group.last }.with_indifferent_access
-            end
-          end
-
-          def select_options_for(content_type, name)
-            field = @content_type.find_field(name)
-
-            return {} if field.nil? || field.type.to_s != 'select'
-
-            field.select_options.map(&:name)
-          end
-
-          def paginate(options = {})
-            @collection ||= self.collection.paginate(options)
-            {
-              collection:       @collection,
-              current_page:     @collection.current_page,
-              previous_page:    @collection.previous_page,
-              next_page:        @collection.next_page,
-              total_entries:    @collection.total_entries,
-              total_pages:      @collection.total_pages,
-              per_page:         @collection.per_page
-            }
-          end
-
-          def collection
-            return unless @collection.blank?
-
-            # define the default order_by if not set
-            if @context['with_scope'] && !@context['with_scope']['order_by'].blank? && !%w(manually position).include?(@content_type.order_by)
-              @context['with_scope']['order_by'] = @content_type.order_by + '.' + @content_type.order_direction
-            end
-
-            @collection = @content_type.entries.where(@context['with_scope'])
-
-            # @collection = apply_scope(@content_type.entries)
-          end
         end
+
       end
     end
   end

data/lib/locomotive/steam/liquid/drops/current_user.rb

@@ -0,0 +1,23 @@
+module Locomotive
+  module Steam
+    module Liquid
+      module Drops
+        class CurrentUser < Base
+
+          def logged_in?
+            @_source.present?
+          end
+
+          def name
+            @_source.name if logged_in?
+          end
+
+          def email
+            @_source.email if logged_in?
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/locomotive/steam/liquid/drops/i18n_base.rb

@@ -0,0 +1,39 @@
+module Locomotive
+  module Steam
+    module Liquid
+      module Drops
+        class I18nBase < Base
+
+          def initialize(source)
+            # puts "creating #{self.class.name} drop for #{source.class.name}(#{source.object_id.inspect})"
+            decorated = source if source.respond_to?(:__locale__)
+            decorated ||= Locomotive::Steam::Decorators::I18nDecorator.new(source)
+            super(decorated)
+          end
+
+          def context=(context)
+            if locale = context.registers[:locale]
+              @_source.__locale__ = locale
+            end
+
+            @_source.__default_locale__ = context.registers[:site].try(:default_locale)
+
+            super
+          end
+
+          private
+
+          def _change_locale(locale)
+            @_source.__locale__ = locale
+          end
+
+          def _change_locale!(locale)
+            @_source.__locale__ = locale
+            @_source.__freeze_locale__
+          end
+
+        end
+      end
+    end
+  end
+end