locomotive_cms 0.0.4.beta12 → 0.0.4

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

@@ -2,13 +2,7 @@ Locomotive.configure do |config|
   # if not defined, locomotive will use example.com as main domain name. Remove prefix www from your domain name.
   # Ex:
   # config.default_domain = Rails.env.production? ? 'mydomain.com' : 'example.com'
-  #
-  # 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'
+  config.default_domain = 'mydomain.com'
 
   # configure how many items we display in sub menu in the "Contents" section.
   config.lastest_items_nb = 5
@@ -29,12 +23,4 @@ Locomotive.configure do |config|
   # Ex:
   # config.heroku = { :name => '<my heroku app name>', :login => 'john@doe.net', :password => 'easy' }
   config.heroku = false
-
-  # Locomotive uses the DelayedJob gem for the theme import module.
-  # In case you want to deploy to Heroku, you will have to pay for an extra dyno.
-  # If you do not mind about importing theme without DelayedJob, disable it.
-  config.delayed_job = false
-
-  # default locale (for now, only en and fr are supported)
-  config.default_locale = :en
 end

data/lib/locomotive/carrierwave.rb

@@ -5,4 +5,3 @@ require 'locomotive/carrierwave/patches'
 # register missing mime types
 EXTENSIONS[:eot] = 'application/vnd.ms-fontobject'
 EXTENSIONS[:woff] = 'application/x-woff'
-EXTENSIONS[:otf] = 'application/octet-stream'

data/lib/locomotive/configuration.rb

@@ -10,9 +10,7 @@ module Locomotive
       :locales          => %w{en fr},
       :cookie_key       => '_locomotive_session',
       :enable_logs      => false,
-      :heroku           => false,
-      :delayed_job      => true,
-      :default_locale   => :en
+      :heroku           => false
     }
 
     cattr_accessor :settings

data/lib/locomotive/custom_fields.rb

@@ -5,6 +5,7 @@ module CustomFields
       class FileUploader < ::CarrierWave::Uploader::Base
 
         def store_dir
+          puts
           "sites/#{model.site_id}/contents/#{model.class.model_name.underscore}/#{model.id}/files"
         end
 

data/lib/locomotive/delayed_job.rb

@@ -1,4 +1,5 @@
-require 'delayed_job_mongoid'
+require 'delayed_job'
+require 'delayed/backend/mongoid'
 
 module Delayed
   module Backend

data/lib/locomotive/engine.rb

@@ -1,37 +1,20 @@
-puts "...loading Locomotive engine"
+puts "...Locomotive engine loaded"
 
-require 'rails'
+require 'mimetype_fu'
+require 'liquid'
 require 'devise'
+require 'carrierwave'
+require 'formtastic'
 require 'mongoid'
 require 'mongoid_acts_as_tree'
-require 'will_paginate'
-require 'haml'
-require 'liquid'
-require 'formtastic'
-require 'inherited_resources'
-require 'carrierwave'
-require 'custom_fields'
-require 'mimetype_fu'
-require 'actionmailer_with_request'
-require 'heroku'
 require 'httparty'
 require 'redcloth'
-require 'delayed_job_mongoid'
+require 'actionmailer_with_request'
 require 'zip/zipfilesystem'
-require 'jammit-s3'
-
-$:.unshift File.dirname(__FILE__)
+require 'custom_fields'
 
 module Locomotive
   class Engine < Rails::Engine
 
-    rake_tasks do
-      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/heroku.rb

@@ -1,5 +1,4 @@
 require 'heroku'
-require 'heroku/client'
 require 'locomotive/heroku/custom_domain'
 
 module Locomotive

data/lib/locomotive/httparty/webservice.rb

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

data/lib/locomotive/import.rb

@@ -1,5 +1,3 @@
-require 'locomotive/import/logger'
-require 'locomotive/import/base'
 require 'locomotive/import/job'
 require 'locomotive/import/site'
 require 'locomotive/import/assets'

data/lib/locomotive/import/asset_collections.rb

@@ -1,34 +1,30 @@
 module Locomotive
   module Import
-    class AssetCollections < Base
+    module AssetCollections
+
+      def self.process(context)
+        site, database = context[:site], context[:database]
 
-      def process
         asset_collections = database['site']['asset_collections']
 
         return if asset_collections.nil?
 
         asset_collections.each do |name, attributes|
-          self.log "slug = #{attributes['slug']}"
+          puts "....asset_collection = #{attributes['slug']}"
 
           asset_collection = site.asset_collections.where(:slug => attributes['slug']).first
 
-          asset_collection ||= self.build_asset_collection(attributes.merge(:name => name))
+          asset_collection ||= self.build_asset_collection(site, attributes.merge(:name => name))
 
           self.add_or_update_fields(asset_collection, attributes['fields'])
 
-          if options[:samples] && attributes['assets']
-            self.insert_samples(asset_collection, attributes['assets'])
-          end
-
           asset_collection.save!
 
           site.reload
         end
       end
 
-      protected
-
-      def build_asset_collection(data)
+      def self.build_asset_collection(site, data)
         attributes = { :internal => false }.merge(data)
 
         attributes.delete_if { |name, value| %w{fields assets}.include?(name) }
@@ -36,7 +32,7 @@ module Locomotive
         site.asset_collections.build(attributes)
       end
 
-      def add_or_update_fields(asset_collection, fields)
+      def self.add_or_update_fields(asset_collection, fields)
         fields.each_with_index do |data, position|
           name, data = data.keys.first, data.values.first
 
@@ -52,34 +48,6 @@ module Locomotive
         end
       end
 
-      def insert_samples(asset_collection, assets)
-        assets.each_with_index do |data, position|
-          value, attributes = data.is_a?(Array) ? [data.first, data.last] : [data.keys.first, data.values.first]
-
-          url = attributes.delete('url')
-
-          # build with default attributes
-          asset = asset_collection.assets.build(:name => value, :position => position, :source => self.open_sample_asset(url))
-
-          attributes.each do |name, value|
-            field = asset_collection.asset_custom_fields.detect { |f| f._alias == name }
-
-            value = (case field.kind.downcase
-            when 'file'     then self.open_sample_asset(value)
-            when 'boolean'  then Boolean.set(value)
-            else
-              value
-            end)
-
-            asset.send("#{name}=", value)
-          end
-
-          asset.save
-
-          self.log "insert asset '#{asset.name}'"
-        end
-      end
-
     end
   end
 end

data/lib/locomotive/import/assets.rb

@@ -1,26 +1,24 @@
 module Locomotive
   module Import
-    class Assets < Base
+    module Assets
 
-      def process
-        whitelist = self.build_regexps_in_withlist(database['site']['assets']['whitelist']) rescue nil
+      def self.process(context)
+        site, theme_path = context[:site], context[:theme_path]
 
-        self.log "white list = #{whitelist.inspect}"
+        whitelist = self.build_regexps_in_withlist(context[:database]['site']['assets']['whitelist']) rescue nil
 
-        self.add_theme_assets(whitelist)
+        self.add_theme_assets(site, theme_path, whitelist)
 
-        self.add_other_assets
+        self.add_other_assets(site, theme_path)
       end
 
-      protected
-
-      def add_theme_assets(whitelist)
+      def self.add_theme_assets(site, theme_path, whitelist)
         %w(images media fonts javascripts stylesheets).each do |kind|
           Dir[File.join(theme_path, 'public', kind, '**/*')].each do |asset_path|
 
             next if File.directory?(asset_path)
 
-            visible = self.check_against_whitelist(whitelist, asset_path.gsub(File.join(theme_path, 'public'), '').gsub(/^\//, ''))
+            visible = self.check_against_whitelist(whitelist, asset_path.gsub(File.join(theme_path, 'public'), ''))
 
             folder = asset_path.gsub(File.join(theme_path, 'public'), '').gsub(File.basename(asset_path), '').gsub(/^\//, '').gsub(/\/$/, '')
 
@@ -30,33 +28,27 @@ module Locomotive
 
             asset.attributes = { :source => File.open(asset_path), :performing_plain_text => false, :hidden => !visible }
 
-            begin
-              asset.save!
-            rescue Exception => e
-              self.log "!ERROR! = #{e.message}, #{asset_path}"
-            end
+            asset.save!
 
             site.reload
           end
         end
       end
 
-      def add_other_assets
+      def self.add_other_assets(site, theme_path)
         collection = AssetCollection.find_or_create_internal(site)
 
         Dir[File.join(theme_path, 'public', 'samples', '*')].each do |asset_path|
 
           next if File.directory?(asset_path)
 
-          self.log "other asset = #{asset_path}"
-
           name = File.basename(asset_path, File.extname(asset_path)).parameterize('_')
 
           collection.assets.create! :name => name, :source => File.open(asset_path)
         end
       end
 
-      def build_regexps_in_withlist(rules)
+      def self.build_regexps_in_withlist(rules)
         rules.collect do |rule|
           if rule.start_with?('^')
             Regexp.new(rule.gsub('/', '\/'))
@@ -66,7 +58,7 @@ module Locomotive
         end
       end
 
-      def check_against_whitelist(whitelist, path)
+      def self.check_against_whitelist(whitelist, path)
         (whitelist || []).each do |rule|
           case rule
             when Regexp

data/lib/locomotive/import/content_types.rb

@@ -1,16 +1,20 @@
 module Locomotive
   module Import
-    class ContentTypes < Base
+    module ContentTypes
+
+      def self.process(context)
+        site, database = context[:site], context[:database]
+
+        content_types = database['site']['content_types']
 
-      def process
         return if content_types.nil?
 
         content_types.each do |name, attributes|
-          self.log "[content_types] slug = #{attributes['slug']}"
+          puts "....content_type = #{attributes['slug']}"
 
           content_type = site.content_types.where(:slug => attributes['slug']).first
 
-          content_type ||= self.build_content_type(attributes.merge(:name => name))
+          content_type ||= self.build_content_type(site, attributes.merge(:name => name))
 
           self.add_or_update_fields(content_type, attributes['fields'])
 
@@ -20,31 +24,21 @@ module Locomotive
 
           self.set_group_by_value(content_type)
 
-          if options[:samples] && attributes['contents']
-            self.insert_samples(content_type, attributes['contents'])
-          end
-
           content_type.save!
 
           site.reload
         end
       end
 
-      protected
-
-      def content_types
-        database['site']['content_types']
-      end
-
-      def build_content_type(data)
-        attributes = { :group_by_field_name => data.delete('group_by') }.merge(data)
+      def self.build_content_type(site, data)
+        attributes = { :order_by => '_position_in_list', :group_by_field_name => data.delete('group_by') }.merge(data)
 
         attributes.delete_if { |name, value| %w{fields contents}.include?(name) }
 
         site.content_types.build(attributes)
       end
 
-      def add_or_update_fields(content_type, fields)
+      def self.add_or_update_fields(content_type, fields)
         fields.each_with_index do |data, position|
           name, data = data.keys.first, data.values.first
 
@@ -60,54 +54,24 @@ module Locomotive
         end
       end
 
-      def insert_samples(content_type, contents)
-        contents.each_with_index do |data, position|
-          value, attributes = data.is_a?(Array) ? [data.first, data.last] : [data.keys.first, data.values.first]
-
-          # build with default attributes
-          content = content_type.contents.build(content_type.highlighted_field_name.to_sym => value, :_position_in_list => position)
-
-          attributes.each do |name, value|
-            field = content_type.content_custom_fields.detect { |f| f._alias == name }
-
-            value = (case field.kind.downcase
-            when 'file'     then self.open_sample_asset(value)
-            when 'boolean'  then Boolean.set(value)
-            else
-              value
-            end)
-
-            content.send("#{name}=", value)
-          end
-
-          content.save
-
-          self.log "insert content '#{content.send(content_type.highlighted_field_name.to_sym)}'"
-        end
-      end
-
-      def set_highlighted_field_name(content_type)
+      def self.set_highlighted_field_name(content_type)
         field = content_type.content_custom_fields.detect { |f| f._alias == content_type.highlighted_field_name }
 
         content_type.highlighted_field_name = field._name if field
       end
 
-      def set_order_by_value(content_type)
-        self.log "order by #{content_type.order_by}"
-
+      def self.set_order_by_value(content_type)
         order_by = (case content_type.order_by
         when 'manually', '_position_in_list' then '_position_in_list'
-        when 'default', 'created_at' then 'created_at'
+        when 'date', 'updated_at' then 'updated_at'
         else
           content_type.content_custom_fields.detect { |f| f._alias == content_type.order_by }._name rescue nil
         end)
 
-        self.log "order by (after) #{order_by}"
-
         content_type.order_by = order_by || '_position_in_list'
       end
 
-      def set_group_by_value(content_type)
+      def self.set_group_by_value(content_type)
         return if content_type.group_by_field_name.blank?
 
         field = content_type.content_custom_fields.detect { |f| f._alias == content_type.group_by_field_name }

data/lib/locomotive/import/job.rb

@@ -4,21 +4,12 @@ module Locomotive
   module Import
     class Job
 
-      include Logger
+      def initialize(theme_file, site = nil, enabled = {})
+        raise "Theme zipfile not found" unless File.exists?(theme_file)
 
-      def initialize(zipfile, site, options = {})
+        @theme_file = theme_file
         @site = site
-        @options = {
-          :reset    => false,
-          :samples  => false,
-          :enabled  => {}
-        }.merge(options)
-
-        @identifier = self.store_zipfile(zipfile)
-
-        raise "Theme identifier not found" if @identifier.blank?
-
-        @uploader = nil # fix issue with Ruby 1.9.2 and serialization
+        @enabled = enabled
       end
 
       def before(worker)
@@ -26,7 +17,7 @@ module Locomotive
       end
 
       def perform
-        self.log "theme identifier #{@identifier}"
+        puts "theme_file = #{@theme_file} / #{@site.present?} / #{@enabled.inspect}"
 
         self.unzip!
 
@@ -40,96 +31,23 @@ module Locomotive
           :worker => @worker
         }
 
-        self.reset! if @options[:reset]
-
         %w(site content_types assets asset_collections snippets pages).each do |step|
-          if @options[:enabled][step] != false
-            "Locomotive::Import::#{step.camelize}".constantize.process(context, @options)
+          if @enabled[step] != false
+            "Locomotive::Import::#{step.camelize}".constantize.process(context)
             @worker.update_attributes :step => step if @worker
           else
-            self.log "skipping #{step}"
+            puts "skipping #{step}"
           end
         end
       end
 
-      def success(worker)
-        self.log 'deleting original zip file'
-
-        uploader = self.get_uploader(@site)
-
-        uploader.retrieve_from_store!(@identifier)
-
-        uploader.remove!
-
-        self.log 'deleting working folder'
-
-        FileUtils.rm_rf(themes_folder) rescue nil
-      end
-
-      def self.run!(zipfile, site, options = {})
-        job = self.new(zipfile, site, options)
-
-        if Locomotive.config.delayed_job
-          Delayed::Job.enqueue job, { :site => site, :job_type => 'import' }
-        else
-          job.perform
-        end
-      end
-
       protected
 
-      def themes_folder
-        File.join(Rails.root, 'tmp', 'themes', @site.id.to_s)
-      end
-
-      def prepare_folder
-        FileUtils.rm_rf self.themes_folder if File.exists?(self.themes_folder)
-
-        FileUtils.mkdir_p(self.themes_folder)
-      end
-
-      def store_zipfile(zipfile)
-        return nil if zipfile.blank?
-
-        file = CarrierWave::SanitizedFile.new(zipfile)
-
-        uploader = self.get_uploader(@site)
-
-        begin
-          uploader.store!(file)
-          uploader.identifier
-        rescue CarrierWave::IntegrityError
-          nil
-        end
-      end
-
-      def retrieve_zipfile
-        uploader = self.get_uploader(@site)
-
-        uploader.retrieve_from_store!(@identifier)
-
-        if uploader.file.respond_to?(:url)
-          self.log 'file from remote storage'
-
-          @theme_file = File.join(self.themes_folder, @identifier)
-
-          File.open(@theme_file, 'w') { |f| f.write(uploader.file.read) }
-        else # local filesystem
-          self.log 'file from local storage'
-
-          @theme_file = uploader.path
-        end
-      end
-
       def unzip!
-        self.prepare_folder
-
-        self.retrieve_zipfile
-
-        self.log "unzip #{@theme_file}"
-
         Zip::ZipFile.open(@theme_file) do |zipfile|
-          destination_path = self.themes_folder
+          destination_path = File.join(Rails.root, 'tmp', 'themes', @site.id.to_s)
+
+          FileUtils.rm_r destination_path, :force => true
 
           zipfile.each do |entry|
             next if entry.name =~ /__MACOSX/
@@ -147,20 +65,7 @@ module Locomotive
             zipfile.extract(entry, File.join(destination_path, entry.name))
           end
         end
-      end
 
-      def reset!
-        @site.pages.destroy_all
-        @site.theme_assets.destroy_all
-        @site.content_types.destroy_all
-        @site.asset_collections.destroy_all
-      end
-
-      def get_uploader(site)
-        unless Locomotive.config.delayed_job
-          ThemeUploader.storage = :file
-        end
-        @uploader ||= ThemeUploader.new(site)
       end
 
     end