locomotivecms_builder 1.0.0.alpha2 → 1.0.0.alpha3

data/Rakefile

@@ -3,7 +3,6 @@
 
 require 'rubygems'
 require 'bundler/setup'
-require 'bundler/gem_tasks'
 
 require 'rake'
 require 'vcr'

data/lib/locomotive/builder/exceptions.rb

@@ -3,9 +3,19 @@ module Locomotive
 
     class DefaultException < ::Exception
 
-      def initialize(message = nil)
-        # no specific treatment for now
-        super
+      def initialize(message = nil, parent_exception = nil)
+        self.log_backtrace(parent_exception) if parent_exception
+
+        super(message)
+      end
+
+      protected
+
+      def log_backtrace(parent_exception)
+        full_error_message = "#{parent_exception.message}\n\t"
+        full_error_message += parent_exception.backtrace.join("\n\t")
+        full_error_message += "\n\n"
+        Locomotive::Builder::Logger.fatal full_error_message
       end
 
     end

data/lib/locomotive/builder/listen.rb

@@ -30,7 +30,16 @@ module Locomotive::Builder
 
     def apply(definition)
       reloader = Proc.new do |modified, added, removed|
-        reader.reload(definition.last)
+        resources = [*definition.last]
+        names     = resources.map { |n| "\"#{n}\"" }.join(', ')
+
+        Locomotive::Builder::Logger.info "* Reloaded #{names} at #{Time.now}"
+
+        begin
+          reader.reload(resources)
+        rescue Exception => e
+          Locomotive::Builder::MounterException.new('Unable to reload', e)
+        end
       end
 
       filter  = definition[1]

data/lib/locomotive/builder/logger.rb

@@ -0,0 +1,54 @@
+module Locomotive
+  module Builder
+
+    class Logger
+
+      attr_accessor :logger, :logfile_path, :stdout
+
+      def initialize
+        self.logger = nil
+      end
+
+      # Setup the single instance of the ruby logger.
+      #
+      # @param [ String ] path The path to the log file (default: log/builder.log)
+      # @param [ Boolean ] stdout Instead of having a file, log to the standard output
+      #
+      def setup(path, stdout = false)
+        require 'logger'
+
+        self.stdout = stdout
+
+        self.logfile_path = File.expand_path(File.join(path, 'log', 'builder.log'))
+        FileUtils.mkdir_p(File.dirname(logfile_path))
+
+        out = self.stdout ? STDOUT : self.logfile_path
+
+        self.logger = ::Logger.new(out).tap do |log|
+          log.level     = ::Logger::DEBUG
+          log.formatter = proc do |severity, datetime, progname, msg|
+            "#{msg}\n"
+          end
+        end
+      end
+
+      def self.instance
+        @@instance ||= self.new
+      end
+
+      def self.setup(path, stdout = false)
+        self.instance.setup(path, stdout)
+      end
+
+      class << self
+        %w(debug info warn error fatal unknown).each do |name|
+          define_method(name) do |message|
+            self.instance.logger.send(name.to_sym, message)
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/locomotive/builder/misc/dragonfly.rb

@@ -65,15 +65,12 @@ module Locomotive
             c.url_format = '/images/dynamic/:job/:basename.:format'
           end
 
-          puts 'Dragonfly enabled'
-
           self.instance.enabled = true
         rescue Exception => e
-          puts %{
-  \tIf you want to take full benefits of all the features in the LocomotiveEditor, we recommend you to install ImageMagick and RMagick.
-  \tCheck out the documentation here: http://doc.locomotivecms.com/editor/installation.}
-
-          puts 'Dragonfly disabled'
+          Locomotive::Builder::Logger.warn %{
+[Dragonfly] !disabled!
+[Dragonfly] If you want to take full benefits of all the features in the LocomotiveBuilder, we recommend you to install ImageMagick and RMagick. Check out the documentation here: http://doc.locomotivecms.com/editor/installation.
+}
         end
       end
 

data/lib/locomotive/builder/misc/httparty.rb

@@ -22,7 +22,7 @@ module Locomotive
 
           path ||= '/'
 
-          # puts "[WebService] consuming #{path}, #{options.inspect}"
+          # Locomotive::Builder::Logger.debug "[WebService] consuming #{path}, #{options.inspect}"
 
           response = self.get(path, options)
 
@@ -34,8 +34,7 @@ module Locomotive
               _response.collect(&:underscore_keys)
             end
           else
-            # TODO: handle errors
-            puts "[Locomotive][Builder][Error] consuming #{path}, #{options.inspect}, response = #{response.inspect}"
+            Locomotive::Builder::Logger.error "[WebService] consumed #{path}, #{options.inspect}, response = #{response.inspect}"
             nil
           end
 

data/lib/locomotive/builder/server/locale.rb

@@ -31,7 +31,7 @@ module Locomotive::Builder
         Locomotive::Mounter.locale = locale
         ::I18n.locale = locale
 
-        puts "[Builder|Locale] path = #{self.path.inspect}, locale = #{locale.inspect}"
+        self.log "Detecting locale #{locale.upcase}"
 
         env['builder.locale'] = locale
         env['builder.path']   = self.path

data/lib/locomotive/builder/server/logging.rb

@@ -0,0 +1,32 @@
+module Locomotive::Builder
+  class Server
+
+    # Track the request into the current logger
+    #
+    class Logging < Middleware
+
+      def call(env)
+        now = Time.now
+
+        log "Started #{env['REQUEST_METHOD'].upcase} \"#{env['PATH_INFO']}\" at #{now}"
+
+        app.call(env).tap do |response|
+          done_in_ms = (Time.now - now) * 1000
+          log "Completed #{code_to_human(response.first)} in #{done_in_ms}ms\n\n"
+        end
+      end
+
+      protected
+
+      def code_to_human(code)
+        case code.to_i
+        when 200 then '200 OK'
+        when 301 then '301 Found'
+        when 302 then '302 Found'
+        when 404 then '404 Not Found'
+        end
+      end
+
+    end
+  end
+end

data/lib/locomotive/builder/server/middleware.rb

@@ -44,8 +44,13 @@ module Locomotive::Builder
         self.request.content_type == 'application/json' || File.extname(self.request.path) == '.json'
       end
 
-      def redirect_to(location)
-        [301, { 'Content-Type' => 'text/html', 'Location' => location }, []]
+      def redirect_to(location, type = 301)
+        self.log "Redirected to #{location}"
+        [type, { 'Content-Type' => 'text/html', 'Location' => location }, []]
+      end
+
+      def log(msg)
+        Locomotive::Builder::Logger.info msg
       end
 
     end

data/lib/locomotive/builder/server/not_found.rb

@@ -7,6 +7,7 @@ module Locomotive::Builder
         self.set_accessors(env)
 
         if self.page.nil?
+          self.log "Page not found"
           env['builder.page'] = self.mounting_point.pages['404']
         end
 

data/lib/locomotive/builder/server/page.rb

@@ -19,7 +19,9 @@ module Locomotive::Builder
       def set_page!(env)
         page = self.fetch_page
 
-        puts "[Builder|Page] #{page.inspect}"
+        if page
+          self.log "Found page \"#{page.title}\" [/#{page.inspect}]"
+        end
 
         env['builder.page'] = page
       end

data/lib/locomotive/builder/server/renderer.rb

@@ -6,12 +6,12 @@ module Locomotive::Builder
       def call(env)
         self.set_accessors(env)
 
-        puts "[Builder|Renderer] page = #{page.inspect}"
-
         if self.page
           if self.page.redirect?
-            [self.page.redirect_type, { 'Location' => self.page.redirect_url, 'Content-Type' => 'text/html' }, []]
+            self.redirect_to(self.page.redirect_url, self.page.redirect_type)
           else
+            self.log "Rendered liquid template"
+
             type = self.page.response_type || 'text/html'
             html = self.render
 

data/lib/locomotive/builder/server.rb

@@ -5,6 +5,7 @@ require 'locomotive/builder/listen'
 require 'locomotive/builder/server/middleware'
 require 'locomotive/builder/server/favicon'
 require 'locomotive/builder/server/dynamic_assets'
+require 'locomotive/builder/server/logging'
 require 'locomotive/builder/server/entry_submission'
 require 'locomotive/builder/server/path'
 require 'locomotive/builder/server/locale'
@@ -60,6 +61,8 @@ module Locomotive::Builder
         use Favicon
         use DynamicAssets
 
+        use Logging
+
         use EntrySubmission
 
         use Path

data/lib/locomotive/builder/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Builder
-    VERSION = '1.0.0.alpha2'
+    VERSION = '1.0.0.alpha3'
   end
 end

data/lib/locomotive/builder.rb

@@ -1,4 +1,5 @@
 require 'locomotive/builder/version'
+require 'locomotive/builder/logger'
 require 'locomotive/builder/exceptions'
 
 module Locomotive
@@ -141,27 +142,22 @@ module Locomotive
     # @param [ Object ] An instance of the reader is the get_reader parameter has been set.
     #
     def self.require_mounter(path, get_reader = false)
-      require 'locomotive/mounter'
+      Locomotive::Builder::Logger.setup(path, false)
 
-      logfile = File.join(path, 'log', 'mounter.log')
-      FileUtils.mkdir_p(File.dirname(logfile))
+      require 'locomotive/mounter'
 
-      Locomotive::Mounter.logger = ::Logger.new(logfile).tap do |log|
-        log.level = Logger::DEBUG
-      end
+      Locomotive::Mounter.logger = Locomotive::Builder::Logger.instance.logger
 
-      # begin
       if get_reader
-        reader = Locomotive::Mounter::Reader::FileSystem.instance
-        reader.run!(path: path)
-        reader
+        begin
+          reader = Locomotive::Mounter::Reader::FileSystem.instance
+          reader.run!(path: path)
+          reader
+        rescue Exception => e
+          raise Locomotive::Builder::MounterException.new "Unable to read the local LocomotiveCMS site. Please check the logs.", e
+        end
       end
-      # rescue Exception => e
-        # Locomotive::Mounter.logger.error e.backtrace
-        # raise Locomotive::Builder::MounterException.new "Unable to read the local LocomotiveCMS site: #{e.message}\nPlease check the logs file (#{path}/log/mounter.log)"
-      # end if get_reader
     end
 
-
   end
 end

data/locomotivecms_builder.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rmagick',               '2.12.2'
   gem.add_dependency 'httmultiparty',         '~> 0.3.8'
   gem.add_dependency 'will_paginate',         '~> 3.0.3'
-  gem.add_dependency 'locomotivecms_mounter', '1.0.0.alpha1'
+  gem.add_dependency 'locomotivecms_mounter', '1.0.0.alpha2'
 
   gem.add_dependency 'faker',                 '~> 0.9.5'
 

metadata

@@ -2,7 +2,7 @@
 name: locomotivecms_builder
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 1.0.0.alpha2
+  version: 1.0.0.alpha3
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -195,7 +195,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha1
+        version: 1.0.0.alpha2
   name: locomotivecms_mounter
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha1
+        version: 1.0.0.alpha2
 - !ruby/object:Gem::Dependency
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
@@ -391,6 +391,7 @@ files:
 - lib/locomotive/builder/liquid/tags/snippet.rb
 - lib/locomotive/builder/liquid/tags/with_scope.rb
 - lib/locomotive/builder/listen.rb
+- lib/locomotive/builder/logger.rb
 - lib/locomotive/builder/misc.rb
 - lib/locomotive/builder/misc/core_ext.rb
 - lib/locomotive/builder/misc/dragonfly.rb
@@ -402,6 +403,7 @@ files:
 - lib/locomotive/builder/server/entry_submission.rb
 - lib/locomotive/builder/server/favicon.rb
 - lib/locomotive/builder/server/locale.rb
+- lib/locomotive/builder/server/logging.rb
 - lib/locomotive/builder/server/middleware.rb
 - lib/locomotive/builder/server/not_found.rb
 - lib/locomotive/builder/server/page.rb
@@ -442,7 +444,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -3538862883379602338
+      hash: -1360444636888489867
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false