locomotive_cms 0.0.4 → 1.0.0.beta

data/lib/locomotive/import/site.rb

@@ -1,11 +1,9 @@
 module Locomotive
   module Import
-    module Site
+    class Site < Base
 
-      def self.process(context)
-        site, database = context[:site], context[:database]
-
-        attributes = database['site'].clone.delete_if { |name, value| %w{pages assets content_types asset_collections}.include?(name) }
+      def process
+        attributes = database['site'].clone.delete_if { |name, value| %w{name pages assets content_types asset_collections}.include?(name) }
 
         site.attributes = attributes
 

data/lib/locomotive/import/snippets.rb

@@ -1,20 +1,18 @@
 module Locomotive
   module Import
-    module Snippets
-
-      def self.process(context)
-        site, theme_path = context[:site], context[:theme_path]
+    class Snippets < Base
 
+      def process
         Dir[File.join(theme_path, 'snippets', '*')].each do |snippet_path|
+          self.log "path = #{snippet_path}"
 
           name = File.basename(snippet_path, File.extname(snippet_path)).parameterize('_')
-          
+
           snippet = site.snippets.where(:slug => name).first || site.snippets.build(:name => name)
 
-          snippet.template = File.read(snippet_path) # = site.snippets.create! :name => name, :template => 
-          
+          snippet.template = File.read(snippet_path) # = site.snippets.create! :name => name, :template =>
+
           snippet.save!
-          # puts "snippet = #{snippet.inspect}"
         end
       end
 

data/lib/locomotive/inherited_resources.rb

@@ -1,3 +1,4 @@
+require 'responders'
 require 'inherited_resources'
 require 'inherited_resources/actions'
 require 'inherited_resources/responder'

data/lib/locomotive/liquid/drops/asset_collections.rb

@@ -18,19 +18,19 @@ module Locomotive
         end
 
         def first
-          @collection.assets.first
+          @collection.ordered_assets.first
         end
 
         def last
-          @collection.assets.last
+          @collection.ordered_assets.last
         end
 
         def each(&block)
-          @collection.assets.each(&block)
+          @collection.ordered_assets.each(&block)
         end
 
         def paginate(options = {})
-          paginated_collection = @collection.assets.paginate(options)
+          paginated_collection = @collection.ordered_assets.paginate(options)
           {
             :collection       => paginated_collection,
             :current_page     => paginated_collection.current_page,

data/lib/locomotive/liquid/drops/contents.rb

@@ -18,20 +18,34 @@ module Locomotive
         end
 
         def first
-          content = @content_type.ordered_contents(@context['with_scope']).first
+          self.collection.first
         end
 
         def last
-          content = @content_type.ordered_contents(@context['with_scope']).last
+          self.collection.last
         end
 
         def each(&block)
-          @collection ||= @content_type.ordered_contents(@context['with_scope'])
-          @collection.each(&block)
+          self.collection.each(&block)
+        end
+
+        def api
+          { 'create' => @context.registers[:controller].send('admin_api_contents_url', @content_type.slug) }
+        end
+
+        def before_method(meth)
+          klass = @content_type.contents.klass # delegate to the proxy class
+          if (meth.to_s =~ /^group_by_.+$/) == 0
+            klass.send(meth, :ordered_contents)
+          else
+            klass.send(meth)
+          end
         end
 
+        protected
+
         def paginate(options = {})
-          @collection ||= @content_type.ordered_contents(@context['with_scope']).paginate(options)
+          @collection = self.collection.paginate(options)
           {
             :collection       => @collection,
             :current_page     => @collection.current_page,
@@ -43,17 +57,8 @@ module Locomotive
           }
         end
 
-        def api
-          { 'create' => @context.registers[:controller].send('admin_api_contents_url', @content_type.slug) }
-        end
-
-        def before_method(meth)
-          klass = @content_type.contents.klass # delegate to the proxy class
-          if (meth.to_s =~ /^group_by_.+$/) == 0
-            klass.send(meth, :ordered_contents)
-          else
-            klass.send(meth)
-          end
+        def collection
+          @collection ||= @content_type.ordered_contents(@context['with_scope'])
         end
       end
     end

data/lib/locomotive/liquid/drops/page.rb

@@ -19,6 +19,10 @@ module Locomotive
           @fullpath ||= @source.fullpath
         end
 
+        def depth
+          @source.depth
+        end
+
       end
     end
   end

data/lib/locomotive/liquid/filters/html.rb

@@ -9,11 +9,7 @@ module Locomotive
           return '' if input.nil?
 
           unless input =~ /^(\/|http:)/
-            segments = "stylesheets/#{input}".split('/')
-
-            filename, folder = segments.pop, segments.join('/')
-
-            input = asset_url(folder, filename)
+            input = asset_url("stylesheets/#{input}")
           end
 
           input = "#{input}.css" unless input.ends_with?('.css')
@@ -27,14 +23,7 @@ module Locomotive
           return '' if input.nil?
 
           unless input =~ /^(\/|http:)/
-            segments = "javascripts/#{input}".split('/')
-
-            filename, folder = segments.pop, segments.join('/')
-
-            input = asset_url(folder, filename)
-            # javascript = ThemeAsset.new(:site => @context.registers[:site], :folder => folder)
-            #
-            # input = '/' + ThemeAssetUploader.new(javascript).store_path(filename)
+            input = asset_url("javascripts/#{input}")
           end
 
           input = "#{input}.js" unless input.ends_with?('.js')
@@ -47,18 +36,14 @@ module Locomotive
 
           input = "images/#{input}" unless input.starts_with?('/')
 
-          segments = input.split('/')
-
-          filename, folder = segments.pop, segments.join('/')
-
-          asset_url(folder, filename)
+          asset_url(input)
         end
 
         # Write an image tag
         # input: url of the image OR asset drop
         def image_tag(input, *args)
           image_options = inline_options(args_to_options(args))
-          "<img src=\"#{File.join('/', get_url_from_asset(input))}\" #{image_options}/>"
+          "<img src=\"#{get_url_from_asset(input)}\" #{image_options}/>"
         end
 
         # Embed a flash movie into a page
@@ -83,10 +68,13 @@ module Locomotive
 
           options = args_to_options(args)
 
+          previous_label = options[:previous_label] || I18n.t('pagination.previous')
+          next_label = options[:next_label] || I18n.t('pagination.next')
+
           previous_link = (if paginate['previous'].blank?
-            "<span class=\"disabled prev_page\">#{I18n.t('pagination.previous')}</span>"
+            "<span class=\"disabled prev_page\">#{previous_label}</span>"
           else
-            "<a href=\"#{paginate['previous']['url']}\" class=\"prev_page\">#{I18n.t('pagination.previous')}</a>"
+            "<a href=\"#{paginate['previous']['url']}\" class=\"prev_page\">#{previous_label}</a>"
           end)
 
           links = ""
@@ -101,9 +89,9 @@ module Locomotive
           end
 
           next_link = (if paginate['next'].blank?
-            "<span class=\"disabled next_page\">#{I18n.t('pagination.next')}</span>"
+            "<span class=\"disabled next_page\">#{next_label}</span>"
           else
-            "<a href=\"#{paginate['next']['url']}\" class=\"next_page\">#{I18n.t('pagination.next')}</a>"
+            "<a href=\"#{paginate['next']['url']}\" class=\"next_page\">#{next_label}</a>"
           end)
 
           %{<div class="pagination #{options[:css]}">
@@ -131,7 +119,7 @@ module Locomotive
         # <key1>="<value1>", <key2>="<value2", ...etc
         def inline_options(options = {})
           return '' if options.empty?
-          (options.stringify_keys.to_a.collect { |a, b| "#{a}=\"#{b}\"" }).join(' ') << ' '
+          (options.stringify_keys.sort.to_a.collect { |a, b| "#{a}=\"#{b}\"" }).join(' ') << ' '
         end
 
         # Get the url to be used in html tags such as image_tag, flash_tag, ...etc
@@ -140,12 +128,10 @@ module Locomotive
           input.respond_to?(:url) ? input.url : input
         end
 
-        def asset_url(folder, filename)
-          asset = ThemeAsset.new(:site => @context.registers[:site], :folder => folder)
-          uploader = ThemeAssetUploader.new(asset)
-          uploader.retrieve_from_store!(filename)
-          uploader.url
+        def asset_url(path)
+          ThemeAssetUploader.url_for(@context.registers[:site], path)
         end
+
       end
 
       ::Liquid::Template.register_filter(Html)

data/lib/locomotive/liquid/tags/consume.rb

@@ -39,7 +39,7 @@ module Locomotive
         protected
 
         def render_all_and_cache_it(context)
-          Rails.cache.fetch(@cache_key, :expires_in => @expires_in) do
+          Rails.cache.fetch(@cache_key, :expires_in => @expires_in, :force => @expires_in == 0) do
             context.stack do
               context.scopes.last[@target.to_s] = Locomotive::Httparty::Webservice.consume(@url, @options.symbolize_keys)
 

data/lib/locomotive/liquid/tags/nav.rb

@@ -1,22 +1,26 @@
 module Locomotive
   module Liquid
     module Tags
-      # Display the children pages of the site or the current page. If not precised, nav is applied on the current page.
+      # Display the children pages of the site, current page or the parent page. If not precised, nav is applied on the current page.
       # The html output is based on the ul/li tags.
       #
       # Usage:
       #
       # {% nav site %} => <ul class="nav"><li class="on"><a href="/features">Features</a></li></ul>
       #
+      # {% nav site, no_wrapper: true, exclude: 'contact|about', id: 'main-nav' }
+      #
       class Nav < ::Liquid::Tag
 
         Syntax = /(#{::Liquid::Expression}+)?/
 
         def initialize(tag_name, markup, tokens, context)
           if markup =~ Syntax
-            @site_or_page = $1 || 'page'
-            @options = {}
-            markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value }
+            @source = ($1 || 'page').gsub(/"|'/, '')
+            @options = { :id => 'nav' }
+            markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/"|'/, '') }
+
+            @options[:exclude] = Regexp.new(@options[:exclude]) if @options[:exclude]
           else
             raise ::Liquid::SyntaxError.new("Syntax Error in 'nav' - Valid syntax: nav <page|site> <options>")
           end
@@ -25,34 +29,61 @@ module Locomotive
         end
 
         def render(context)
-          @current_page = context.registers[:page]
+          children_output = []
 
-          source = context.registers[@site_or_page.to_sym]
+          entries = fetch_entries(context)
 
-          # puts "#{@site_or_page.to_sym} / source = #{source.inspect}"
+          entries.each_with_index do |p, index|
+            css = []
+            css << 'first' if index == 0
+            css << 'last' if index == entries.size - 1
 
-          if source.respond_to?(:name) # site ?
-            source = source.pages.index.first # start from home page
-          else
-            source = source.parent || source
+            children_output << render_entry_link(p, css.join(' '))
+          end
+
+          output = children_output.join("\n")
+
+          if @options[:no_wrapper] != 'true'
+            output = %{<ul id="#{@options[:id]}">\n#{output}</ul>}
           end
 
-          output = %{<ul id="nav">}
-          output += source.children.map { |p| render_child_link(p) }.join("\n")
-          output += %{</ul>}
           output
         end
 
         private
 
-        def render_child_link(page)
-          selected = @current_page._id == page._id ? ' on' : ''
+        def fetch_entries(context)
+          @current_page = context.registers[:page]
+
+          children = (case @source
+          when 'site'     then context.registers[:site].pages.index.minimal_attributes.first # start from home page
+          when 'parent'   then @current_page.parent || @current_page
+          when 'page'     then @current_page
+          else
+            context.registers[:site].pages.fullpath(@source).minimal_attributes.first
+          end).children_with_minimal_attributes.to_a
+
+          children.delete_if { |p| !include_page?(p) }
+        end
+
+        def include_page?(page)
+          if page.templatized? || !page.published?
+            false
+          elsif @options[:exclude]
+            (page.fullpath =~ @options[:exclude]).nil?
+          else
+            true
+          end
+        end
+
+        def render_entry_link(page, css)
+          selected = @current_page.fullpath =~ /^#{page.fullpath}/ ? ' on' : ''
 
           icon = @options[:icon] ? '<span></span>' : ''
           label = %{#{icon if @options[:icon] != 'after' }#{page.title}#{icon if @options[:icon] == 'after' }}
 
           %{
-            <li id="#{page.slug.dasherize}" class="link#{selected}">
+            <li id="#{page.slug.dasherize}" class="link#{selected} #{css}">
               <a href="/#{page.fullpath}">#{label}</a>
             </li>
           }.strip

data/lib/locomotive/liquid/tags/paginate.rb

@@ -36,13 +36,13 @@ module Locomotive
 
             raise ::Liquid::ArgumentError.new("Cannot paginate array '#{@collection_name}'. Not found.") if collection.nil?
 
-            pagination = collection.paginate({
+            pagination = collection.send(:paginate, {
               :page       => context['current_page'],
-              :per_page   => @per_page }).stringify_keys!
+              :per_page   => @per_page }).stringify_keys
 
             page_count, current_page = pagination['total_pages'], pagination['current_page']
 
-            path = context['page'].path rescue '/'
+            path = context.registers[:page].fullpath
 
             pagination['previous'] = link(I18n.t('pagination.previous'), current_page - 1, path) if pagination['previous_page']
             pagination['next'] = link(I18n.t('pagination.next'), current_page + 1, path) if pagination['next_page']

data/lib/locomotive/middlewares/fonts.rb

@@ -1,15 +1,11 @@
-require 'rack/utils'
-
 module Locomotive
   module Middlewares
     class Fonts
-      include Rack::Utils
 
       def initialize(app, opts = {})
         @app = app
         @path_regexp = opts[:path] || %r{^/fonts/}
-        @file_server = ::Rack::File.new(opts[:root] || "#{Rails.root}/public")
-        @expires_in = opts[:expires_in] || 24.hour
+        @expires_in = opts[:expires_in] || 24.hour # varnish
       end
 
       def call(env)
@@ -19,13 +15,9 @@ module Locomotive
           if site.nil?
             @app.call(env)
           else
-            env["PATH_INFO"] = ::File.join('/', 'sites', site.id.to_s, 'theme', env["PATH_INFO"])
-
-            response = @file_server.call(env)
-
-            response[1]['Cache-Control'] = "public; max-age=#{@expires_in}" # varnish
+            body = ThemeAssetUploader.build(site, env["PATH_INFO"]).read.to_s
 
-            response
+            [200, { 'Cache-Control' => "public; max-age=#{@expires_in}" }, [body]]
           end
         else
           @app.call(env)

data/lib/locomotive/misc_form_builder.rb

@@ -34,14 +34,9 @@ module Locomotive
       end
     end
 
-    def normalize_model_name(name)
-      if name =~ /(.+)\/(.+)/
-        [$1, $2]
-      else
-        super
-      end
+    def model_name
+      @object.present? ? (@object.class.name || @object.class.model_name) : @object_name.to_s.classify
     end
 
-
   end
 end

data/lib/locomotive/railties/tasks.rake

@@ -0,0 +1,16 @@
+# Re-definitions are appended to existing tasks
+
+# Embed tasks from Delayed_job
+
+namespace :jobs do
+  desc "Clear the delayed_job queue."
+  task :clear => :environment do
+    Delayed::Job.delete_all
+  end
+
+  desc "Start a delayed_job worker."
+  task :work => :environment do
+    puts "Delayed::Job.new = #{Delayed::Job.new.inspect}"
+    ::Delayed::Worker.new(:min_priority => ENV['MIN_PRIORITY'], :max_priority => ENV['MAX_PRIORITY']).start
+  end
+end

data/lib/locomotive/regexps.rb

@@ -1,7 +1,7 @@
 module Locomotive
   module Regexps
 
-    SUBDOMAIN           = /^[a-z][a-z0-9]*[a-z0-9]{1}$/
+    SUBDOMAIN           = /^[a-z][a-z0-9_-]*[a-z0-9]{1}$/
 
     DOMAIN              = /^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix