locomotive_cms 0.0.4.beta12 → 0.0.4

data/lib/locomotive/import/pages.rb

@@ -1,11 +1,13 @@
 module Locomotive
   module Import
-    class Pages < Base
+    module Pages
+
+      def self.process(context)
+        site, pages, theme_path = context[:site], context[:database]['pages'], context[:theme_path]
 
-      def process
         context[:done] = {} # initialize the hash storing pages already processed
 
-        self.add_index_and_404
+        self.add_index_and_404(context)
 
         Dir[File.join(theme_path, 'templates', '**/*')].each do |template_path|
 
@@ -13,50 +15,43 @@ module Locomotive
 
           next if %w(index 404).include?(fullpath)
 
-          self.add_page(fullpath)
+          self.add_page(fullpath, context)
         end
       end
 
-      protected
+      def self.add_page(fullpath, context)
+        puts "....adding #{fullpath}"
 
-      def add_page(fullpath)
         page = context[:done][fullpath]
 
         return page if page # already added, so skip it
 
+        site, pages, theme_path = context[:site], context[:database]['site']['pages'], context[:theme_path]
+
         template = File.read(File.join(theme_path, 'templates', "#{fullpath}.liquid")) rescue "Unable to find #{fullpath}.liquid"
 
-        self.replace_images!(template)
+        self.build_parent_template(template, context)
 
-        self.build_parent_template(template)
+        parent = self.find_parent(fullpath, context)
 
-        parent = self.find_parent(fullpath)
+        page = site.pages.where(:fullpath => fullpath).first || site.pages.build
 
         attributes = {
           :title        => fullpath.split('/').last.humanize,
           :slug         => fullpath.split('/').last,
           :parent       => parent,
-          :raw_template => template,
-          :published    => true
-        }.merge(self.pages[fullpath] || {}).symbolize_keys
+          :raw_template => template
+        }.merge(pages[fullpath] || {}).symbolize_keys
 
         # templatized ?
         if content_type_slug = attributes.delete(:content_type)
-          fullpath.gsub!(/\/template$/, '/content_type_template')
-          attributes.merge!({
-            :templatized  => true,
-            :content_type => site.content_types.where(:slug => content_type_slug).first
-          })
+          attributes[:content_type] = site.content_types.where(:slug => content_type_slug).first
         end
 
-        page = site.pages.where(:fullpath => fullpath).first || site.pages.build
-
         page.attributes = attributes
 
         page.save!
 
-        self.log "adding #{page.fullpath} / #{page.position}"
-
         site.reload
 
         context[:done][fullpath] = page
@@ -64,7 +59,7 @@ module Locomotive
         page
       end
 
-      def build_parent_template(template)
+      def self.build_parent_template(template, context)
         # just check if the template contains the extends keyword
         fullpath = template.scan(/\{% extends (\w+) %\}/).flatten.first
 
@@ -73,11 +68,13 @@ module Locomotive
 
           return if fullpath == 'parent'
 
-          self.add_page(fullpath)
+          self.add_page(fullpath, context)
         end
       end
 
-      def find_parent(fullpath)
+      def self.find_parent(fullpath, context)
+        site = context[:site]
+
         segments = fullpath.split('/')
 
         return site.pages.index.first if segments.size == 1
@@ -89,10 +86,12 @@ module Locomotive
         # look for a local index page in db
         parent = site.pages.where(:fullpath => parent_fullpath).first
 
-        parent || self.add_page(parent_fullpath)
+        parent || self.add_page(parent_fullpath, context)
       end
 
-      def add_index_and_404
+      def self.add_index_and_404(context)
+        site, pages, theme_path = context[:site], context[:database]['site']['pages'], context[:theme_path]
+
         %w(index 404).each_with_index do |slug, position|
           page = site.pages.where({ :slug => slug, :depth => 0 }).first
 
@@ -100,11 +99,7 @@ module Locomotive
 
           template = File.read(File.join(theme_path, 'templates', "#{slug}.liquid"))
 
-          self.replace_images!(template)
-
-          page.attributes = { :raw_template => template }.merge(self.pages[slug] || {})
-
-          page.position = position
+          page.attributes = { :raw_template => template, :position => position }.merge(pages[slug] || {})
 
           page.save! rescue nil # TODO better error handling
 
@@ -114,54 +109,6 @@ module Locomotive
         end
       end
 
-      def replace_images!(template)
-        return if template.blank?
-
-        template.gsub!(/\/samples\/(.*\.[a-zA-Z0-9]{3})/) do |match|
-          name = $1
-
-          collection = AssetCollection.find_or_create_internal(site)
-
-          if asset = collection.assets.detect { |a| a.source_filename == name }
-            asset.source.url
-          else
-            match
-          end
-        end
-      end
-
-      def pages
-        @pages ||= self.retrieve_pages
-      end
-
-      def retrieve_pages
-        pages = context[:database]['site']['pages']
-
-        if pages.is_a?(Array) # ordered list of pages
-          tmp, positions = {}, Hash.new(0)
-          pages.each do |data|
-            position = nil
-            fullpath = data.keys.first.to_s
-
-            unless %w(index 404).include?(fullpath)
-              (segments = fullpath.split('/')).pop
-              position_key = segments.empty? ? 'index' : segments.join('/')
-
-              position = positions[position_key]
-
-              positions[position_key] += 1
-            end
-
-            attributes = (data.values.first || {}).merge(:position => position)
-
-            tmp[fullpath] = attributes
-          end
-          pages = tmp
-        end
-
-        pages
-      end
-
     end
   end
 end

data/lib/locomotive/import/site.rb

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

data/lib/locomotive/import/snippets.rb

@@ -1,18 +1,20 @@
 module Locomotive
   module Import
-    class Snippets < Base
+    module Snippets
+
+      def self.process(context)
+        site, theme_path = context[:site], context[:theme_path]
 
-      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,4 +1,3 @@
-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.ordered_assets.first
+          @collection.assets.first
         end
 
         def last
-          @collection.ordered_assets.last
+          @collection.assets.last
         end
 
         def each(&block)
-          @collection.ordered_assets.each(&block)
+          @collection.assets.each(&block)
         end
 
         def paginate(options = {})
-          paginated_collection = @collection.ordered_assets.paginate(options)
+          paginated_collection = @collection.assets.paginate(options)
           {
             :collection       => paginated_collection,
             :current_page     => paginated_collection.current_page,

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

@@ -18,34 +18,20 @@ module Locomotive
         end
 
         def first
-          self.collection.first
+          content = @content_type.ordered_contents(@context['with_scope']).first
         end
 
         def last
-          self.collection.last
+          content = @content_type.ordered_contents(@context['with_scope']).last
         end
 
         def 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
+          @collection ||= @content_type.ordered_contents(@context['with_scope'])
+          @collection.each(&block)
         end
 
-        protected
-
         def paginate(options = {})
-          @collection = self.collection.paginate(options)
+          @collection ||= @content_type.ordered_contents(@context['with_scope']).paginate(options)
           {
             :collection       => @collection,
             :current_page     => @collection.current_page,
@@ -57,8 +43,17 @@ module Locomotive
           }
         end
 
-        def collection
-          @collection ||= @content_type.ordered_contents(@context['with_scope'])
+        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
       end
     end

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

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

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

@@ -9,7 +9,11 @@ module Locomotive
           return '' if input.nil?
 
           unless input =~ /^(\/|http:)/
-            input = asset_url("stylesheets/#{input}")
+            segments = "stylesheets/#{input}".split('/')
+
+            filename, folder = segments.pop, segments.join('/')
+
+            input = asset_url(folder, filename)
           end
 
           input = "#{input}.css" unless input.ends_with?('.css')
@@ -23,7 +27,14 @@ module Locomotive
           return '' if input.nil?
 
           unless input =~ /^(\/|http:)/
-            input = asset_url("javascripts/#{input}")
+            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)
           end
 
           input = "#{input}.js" unless input.ends_with?('.js')
@@ -36,14 +47,18 @@ module Locomotive
 
           input = "images/#{input}" unless input.starts_with?('/')
 
-          asset_url(input)
+          segments = input.split('/')
+
+          filename, folder = segments.pop, segments.join('/')
+
+          asset_url(folder, filename)
         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=\"#{get_url_from_asset(input)}\" #{image_options}/>"
+          "<img src=\"#{File.join('/', get_url_from_asset(input))}\" #{image_options}/>"
         end
 
         # Embed a flash movie into a page
@@ -68,13 +83,10 @@ 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\">#{previous_label}</span>"
+            "<span class=\"disabled prev_page\">#{I18n.t('pagination.previous')}</span>"
           else
-            "<a href=\"#{paginate['previous']['url']}\" class=\"prev_page\">#{previous_label}</a>"
+            "<a href=\"#{paginate['previous']['url']}\" class=\"prev_page\">#{I18n.t('pagination.previous')}</a>"
           end)
 
           links = ""
@@ -89,9 +101,9 @@ module Locomotive
           end
 
           next_link = (if paginate['next'].blank?
-            "<span class=\"disabled next_page\">#{next_label}</span>"
+            "<span class=\"disabled next_page\">#{I18n.t('pagination.next')}</span>"
           else
-            "<a href=\"#{paginate['next']['url']}\" class=\"next_page\">#{next_label}</a>"
+            "<a href=\"#{paginate['next']['url']}\" class=\"next_page\">#{I18n.t('pagination.next')}</a>"
           end)
 
           %{<div class="pagination #{options[:css]}">
@@ -119,7 +131,7 @@ module Locomotive
         # <key1>="<value1>", <key2>="<value2", ...etc
         def inline_options(options = {})
           return '' if options.empty?
-          (options.stringify_keys.sort.to_a.collect { |a, b| "#{a}=\"#{b}\"" }).join(' ') << ' '
+          (options.stringify_keys.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
@@ -128,10 +140,12 @@ module Locomotive
           input.respond_to?(:url) ? input.url : input
         end
 
-        def asset_url(path)
-          ThemeAssetUploader.url_for(@context.registers[:site], path)
+        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
         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, :force => @expires_in == 0) do
+          Rails.cache.fetch(@cache_key, :expires_in => @expires_in) 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,26 +1,22 @@
 module Locomotive
   module Liquid
     module Tags
-      # Display the children pages of the site, current page or the parent page. If not precised, nav is applied on the current page.
+      # Display the children pages of the site or the current 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
-            @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]
+            @site_or_page = $1 || 'page'
+            @options = {}
+            markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value }
           else
             raise ::Liquid::SyntaxError.new("Syntax Error in 'nav' - Valid syntax: nav <page|site> <options>")
           end
@@ -29,61 +25,34 @@ module Locomotive
         end
 
         def render(context)
-          children_output = []
-
-          entries = fetch_entries(context)
+          @current_page = context.registers[:page]
 
-          entries.each_with_index do |p, index|
-            css = []
-            css << 'first' if index == 0
-            css << 'last' if index == entries.size - 1
+          source = context.registers[@site_or_page.to_sym]
 
-            children_output << render_entry_link(p, css.join(' '))
-          end
+          # puts "#{@site_or_page.to_sym} / source = #{source.inspect}"
 
-          output = children_output.join("\n")
-
-          if @options[:no_wrapper] != 'true'
-            output = %{<ul id="#{@options[:id]}">\n#{output}</ul>}
+          if source.respond_to?(:name) # site ?
+            source = source.pages.index.first # start from home page
+          else
+            source = source.parent || source
           end
 
+          output = %{<ul id="nav">}
+          output += source.children.map { |p| render_child_link(p) }.join("\n")
+          output += %{</ul>}
           output
         end
 
         private
 
-        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' : ''
+        def render_child_link(page)
+          selected = @current_page._id == page._id ? ' 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} #{css}">
+            <li id="#{page.slug.dasherize}" class="link#{selected}">
               <a href="/#{page.fullpath}">#{label}</a>
             </li>
           }.strip