locomotive_cms 0.0.4.beta10 → 0.0.4.beta11

data/Gemfile

@@ -30,7 +30,7 @@ gem 'RedCloth'
 gem 'delayed_job', '2.1.2'
 gem 'delayed_job_mongoid', '1.0.1'
 gem 'rubyzip'
-gem 'jammit-s3'
+gem 'locomotive_jammit-s3', :require => 'jammit-s3'
 
 # The rest of the dependencies are for use when in the locomotive dev environment
 

data/app/controllers/admin/imports_controller.rb

@@ -31,7 +31,9 @@ module Admin
         flash[:notice] = t("flash.admin.imports.create.#{Locomotive.config.delayed_job ? 'notice' : 'done'}")
 
         redirect_to Locomotive.config.delayed_job ? admin_import_url : new_admin_import_url
-      rescue
+      rescue Exception => e
+        logger.error "[Locomotive import] #{e.message}"
+
         @error = t('errors.messages.invalid_theme_file')
         flash[:alert] = t('flash.admin.imports.create.alert')
 

data/app/controllers/admin/pages_controller.rb

@@ -6,7 +6,7 @@ module Admin
     respond_to :json, :only => [:update, :sort, :get_path]
 
     def index
-      @pages = current_site.pages.roots
+      @pages = current_site.all_pages_in_once
     end
 
     def new

data/app/models/extensions/page/tree.rb

@@ -27,8 +27,62 @@ module Models
           alias :descendants :hacked_descendants
         end
 
+        module ClassMethods
+
+          # Warning: used only in read-only
+          def quick_tree(site)
+            pages = site.pages.minimal_attributes.order_by([[:depth, :asc], [:position, :asc]]).to_a
+
+            tmp = []
+
+            while !pages.empty?
+              tmp << _quick_tree(pages.delete_at(0), pages)
+            end
+
+            tmp
+          end
+
+          def _quick_tree(current_page, pages)
+            i, children = 0, []
+
+            while !pages.empty?
+              page = pages[i]
+
+              break if page.nil?
+
+              if page.parent_id == current_page.id
+                page = pages.delete_at(i)
+
+                children << _quick_tree(page, pages)
+              else
+                i += 1
+              end
+            end
+
+            current_page.instance_eval do
+              def children=(list); @children = list; end
+              def children; @children || []; end
+            end
+
+            current_page.children = children
+
+            current_page
+          end
+
+        end
+
         module InstanceMethods
 
+          def children?
+            self.class.where(self.parent_id_field => self.id).count
+          end
+
+          def children_with_minimal_attributes
+            self.class.where(self.parent_id_field => self.id).
+              order_by(self.tree_order).
+              minimal_attributes
+          end
+
           def sort_children!(ids)
             ids.each_with_index do |id, position|
               child = self.children.detect { |p| p._id == BSON::ObjectId(id) }
@@ -53,8 +107,12 @@ module Models
           def change_parent
             if self.parent_id_changed?
               self.fix_position(false)
-              self.position = nil # make it move to bottom
-              self.add_to_list_bottom
+
+              unless self.parent_id_was.nil?
+                self.position = nil # make it move to bottom
+                self.add_to_list_bottom
+              end
+
               self.instance_variable_set :@_will_move, true
             end
           end

data/app/models/page.rb

@@ -40,6 +40,8 @@ class Page
   scope :index, :where => { :slug => 'index', :depth => 0 }
   scope :not_found, :where => { :slug => '404', :depth => 0 }
   scope :published, :where => { :published => true }
+  scope :fullpath, lambda { |fullpath| { :where => { :fullpath => fullpath } } }
+  scope :minimal_attributes, :only => %w(title slug fullpath position depth published templatized parent_id created_at updated_at)
 
   ## methods ##
 

data/app/models/site.rb

@@ -40,6 +40,10 @@ class Site
 
   ## methods ##
 
+  def all_pages_in_once
+    Page.quick_tree(self)
+  end
+
   def domains=(array)
     array = [] if array.blank?; super(array)
   end

data/app/uploaders/asset_uploader.rb

@@ -60,7 +60,7 @@ class AssetUploader < CarrierWave::Uploader::Base
 
   def self.content_types
     {
-      :image      => ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg'],
+      :image      => ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg', 'image/x-icon'],
       :video      => [/^video/, 'application/x-shockwave-flash', 'application/x-swf'],
       :audio      => [/^audio/, 'application/ogg', 'application/x-mp3'],
       :pdf        => ['application/pdf', 'application/x-pdf'],

data/app/uploaders/theme_asset_uploader.rb

@@ -15,7 +15,18 @@ class ThemeAssetUploader < AssetUploader
   end
 
   def extension_white_list
-    %w(jpg jpeg gif png css js swf flv eot svg ttf woff otf)
+    %w(jpg jpeg gif png css js swf flv eot svg ttf woff otf ico)
+  end
+
+  def self.url_for(site, path)
+    build(site, path).url
+  end
+
+  def self.build(site, path)
+    asset = ThemeAsset.new(:site => site, :folder => File.dirname(path))
+    uploader = ThemeAssetUploader.new(asset)
+    uploader.retrieve_from_store!(File.basename(path))
+    uploader
   end
 
 end

data/app/views/admin/pages/_page.html.haml

@@ -1,5 +1,7 @@
 %li{ :id => "item-#{page.id}", :class => "#{'not-found' if page.not_found? } #{'templatized' if page.templatized?}"}
-  - if not page.index? and not page.children.empty?
+  - with_children = !page.children.empty?
+
+  - if not page.index? and with_children
     = image_tag 'admin/list/icons/node_closed.png', :class => 'toggler'
   %em
   %strong= link_to truncate(page.title, :length => 80), edit_admin_page_url(page)
@@ -11,6 +13,6 @@
     - if not page.index? and not page.not_found?
       = link_to image_tag('admin/list/icons/trash.png'), admin_page_url(page), :class => 'remove', :confirm => t('admin.messages.confirm'), :method => :delete
 
-  - if not page.children.empty?
+  - if with_children
     %ul{ :id => "folder-#{page._id}", :class => "folder depth-#{(page.depth || 0) + 1}", :data_url => sort_admin_page_url(page), :style => "display: #{cookies["folder-#{page._id}"] || 'block'}" }
       = render page.children

data/app/views/admin/shared/menu/_contents.html.haml

@@ -5,7 +5,7 @@
     .inner
       %h2!= t('admin.pages.index.lastest_items')
       %ul
-        - current_site.pages.latest_updated.each do |page|
+        - current_site.pages.latest_updated.minimal_attributes.each do |page|
           %li
             = link_to truncate(page.title, :length => 25), edit_admin_page_url(page)
             %span= time_ago_in_words(page.updated_at)

data/config/initializers/locomotive.rb

@@ -8,6 +8,8 @@ Locomotive.configure do |config|
   # If you use locomotive for a single site in Heroku, use "heroku.com" as default domain name.
   # Your heroku app name (<app_name>.heroku.name) will be used as the sub domain name in Locomotive
   # during the installation wizzard.
+  # Ex:
+  # config.default_domain = Rails.env.production? ? 'heroku.com' : 'example.com'
   config.default_domain = 'example.com'
 
   # configure how many items we display in sub menu in the "Contents" section.

data/config/locales/admin_ui_en.yml

@@ -290,7 +290,7 @@ en:
         next: Create account
       step_3:
         title: "Step 3/3 — Create first site"
-        explanations: "This is the last step of the installation. You can upload a theme as a zip file. We have free available themes <a href=\"http://www.locomotivecms.com/docs/themes\">here</a>."
+        explanations: "This is the last step of the installation. You can upload a theme as a zip file. We have free available themes <a href=\"http://www.locomotivecms.com/support/themes\">here</a>."
         next: Create site
 
 

data/config/locales/admin_ui_fr.yml

@@ -291,7 +291,7 @@ fr:
         next: Créer compte
       step_3:
         title: "Étape 3/3 — Créer premier site"
-        explanations: "C'est la dernière étape de l'installation. Vous pouvez uploader un theme sous forme d'un fichier zip. Nous avons quelques themes disponibles <a href=\"http://www.locomotivecms.com/docs/themes\">ici</a>."
+        explanations: "C'est la dernière étape de l'installation. Vous pouvez uploader un theme sous forme d'un fichier zip. Nous avons quelques themes disponibles <a href=\"http://www.locomotivecms.com/support/themes\">ici</a>."
         next: Créer site
 
   formtastic:

data/config/mongoid.yml

@@ -18,8 +18,15 @@ test:
 production:
   <<: *defaults
   database: locomotive_prod
-  host: <%= ENV['MONGOID_HOST'] %>
-  port: <%= ENV['MONGOID_PORT'] %>
-  username: <%= ENV['MONGOID_USERNAME'] %>
-  password: <%= ENV['MONGOID_PASSWORD'] %>
-  database: <%= ENV['MONGOID_DATABASE'] %>
+
+  # other settings for production
+
+  # host: <%= ENV['MONGOID_HOST'] %>
+  # port: <%= ENV['MONGOID_PORT'] %>
+  # username: <%= ENV['MONGOID_USERNAME'] %>
+  # password: <%= ENV['MONGOID_PASSWORD'] %>
+  # database: <%= ENV['MONGOID_DATABASE'] %>
+
+  # heroku
+  # uri: <%= ENV['MONGOHQ_URL'] %>
+

data/lib/generators/locomotive/install/templates/locomotive.rb

@@ -6,7 +6,9 @@ Locomotive.configure do |config|
   # If you use locomotive for a single site in Heroku, use "heroku.com" as default domain name.
   # Your heroku app name (<app_name>.heroku.name) will be used as the sub domain name in Locomotive
   # during the installation wizzard.
-  config.default_domain = 'mydomain.com'
+  # Ex:
+  # config.default_domain = Rails.env.production? ? 'heroku.com' : 'example.com'
+  config.default_domain = 'example.com'
 
   # configure how many items we display in sub menu in the "Contents" section.
   config.lastest_items_nb = 5
@@ -35,4 +37,4 @@ Locomotive.configure do |config|
 
   # default locale (for now, only en and fr are supported)
   config.default_locale = :en
-end
+end

data/lib/locomotive/engine.rb

@@ -18,7 +18,6 @@ require 'httparty'
 require 'redcloth'
 require 'delayed_job_mongoid'
 require 'zip/zipfilesystem'
-# require 'jammit'
 require 'jammit-s3'
 
 $:.unshift File.dirname(__FILE__)
@@ -30,5 +29,9 @@ module Locomotive
       load "railties/tasks.rake"
     end
 
+    initializer "serving fonts" do |app|
+      app.middleware.insert_after Rack::Lock, '::Locomotive::Middlewares::Fonts', :path => %r{^/fonts}
+    end
+
   end
 end

data/lib/locomotive/httparty/webservice.rb

@@ -17,7 +17,18 @@ module Locomotive
 
         # puts "[WebService] consuming #{path}, #{options.inspect}"
 
-        self.get(path, options).try(:underscore_keys)
+        response = self.get(path, options)
+
+        if response.code == 200
+          if response.respond_to?(:each)
+            response.collect(&:underscore_keys)
+          else
+            response.try(:underscore_keys)
+          end
+        else
+          nil
+        end
+
       end
 
     end

data/lib/locomotive/import/pages.rb

@@ -36,7 +36,8 @@ module Locomotive
           :title        => fullpath.split('/').last.humanize,
           :slug         => fullpath.split('/').last,
           :parent       => parent,
-          :raw_template => template
+          :raw_template => template,
+          :published    => true
         }.merge(self.pages[fullpath] || {}).symbolize_keys
 
         # templatized ?
@@ -54,7 +55,7 @@ module Locomotive
 
         page.save!
 
-        self.log "adding #{page.fullpath}"
+        self.log "adding #{page.fullpath} / #{page.position}"
 
         site.reload
 
@@ -137,10 +138,23 @@ module Locomotive
         pages = context[:database]['site']['pages']
 
         if pages.is_a?(Array) # ordered list of pages
-          tmp = {}
-          pages.each_with_index do |data, position|
+          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[data.keys.first.to_s] = attributes
+
+            tmp[fullpath] = attributes
           end
           pages = tmp
         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,11 +36,7 @@ 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
@@ -143,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/nav.rb

@@ -1,24 +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].gsub(/"|'/, '')) if @options[:exclude]
+            @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
@@ -27,29 +29,45 @@ 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)
 
-          if source.respond_to?(:name) # site ?
-            source = source.pages.index.first # start from home page
-          else
-            source = source.parent || source
+          entries.each_with_index do |p, index|
+            css = []
+            css << 'first' if index == 0
+            css << 'last' if index == entries.size - 1
+
+            children_output << render_entry_link(p, css.join(' '))
           end
 
-          output = source.children.map { |p| include_page?(p) ? render_child_link(p) : ''  }.join("\n")
+          output = children_output.join("\n")
 
-           if @options[:no_wrapper] != 'true'
-             output = %{<ul id="nav">\n#{output}</ul>}
-           end
+          if @options[:no_wrapper] != 'true'
+            output = %{<ul id="#{@options[:id]}">\n#{output}</ul>}
+          end
 
           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?
+          if page.templatized? || !page.published?
             false
           elsif @options[:exclude]
             (page.fullpath =~ @options[:exclude]).nil?
@@ -58,14 +76,14 @@ module Locomotive
           end
         end
 
-        def render_child_link(page)
-          selected = @current_page._id == page._id ? ' on' : ''
+        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/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/routing/site_dispatcher.rb

@@ -26,9 +26,11 @@ module Locomotive
         end
 
         def require_site
+          return true if current_site
+
           redirect_to admin_installation_url and return false if Account.count == 0 || Site.count == 0
 
-          render_no_site_error and return false if current_site.nil?
+          render_no_site_error and return false
         end
 
         def render_no_site_error

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = "0.0.4.beta10"
+  VERSION = "0.0.4.beta11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: locomotive_cms
 version: !ruby/object:Gem::Version 
-  hash: -1967355474
+  hash: -1967355473
   prerelease: true
   segments: 
   - 0
   - 0
   - 4
-  - beta10
-  version: 0.0.4.beta10
+  - beta11
+  version: 0.0.4.beta11
 platform: ruby
 authors: 
 - Didier Lafforgue
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 +01:00
+date: 2011-01-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -380,7 +380,7 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  name: jammit-s3
+  name: locomotive_jammit-s3
   version_requirements: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: