locomotivecms_mounter 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed7a36b0bfe0218fb12928ff8ea035b96d986562
-  data.tar.gz: d5a7882dacf040bc121fa20b0be5d1f7b2357973
+  metadata.gz: 301a98697d9128b4ec05baa581691f173f0e081b
+  data.tar.gz: d969e10e742d09b6e9b8d14a9d2e6131b6651ddd
 SHA512:
-  metadata.gz: ab0588d4b36bd438b6c28161fe96ef3091171335bd31819cd8b3b9ca22bb4d113ccb241ed717b38cea9f6bb88a9da527341ee1513a445270cf1bbd7f0b1c37ba
-  data.tar.gz: b9bf2f3ff894b385cb9156fe2280705a2b5301045cc536f393cf621294428cb99b5ff433ba8bfcb35674d4970e11799f708c06e3ee78038bbb7154a29bd0e83b
+  metadata.gz: 95d709f4fdb958ca747c0a8fbeb96111f555acb534e9ddf240a72b9ac0cde7b5f6776ebdd63ccf021e347c8eb246c9fed4ec3be47f109922ca533ad90748c46e
+  data.tar.gz: 1832c1335bea29613ebefc00b188b843b823bd50912599e39981b6b54a7e080a8b713fff2364b049f765bafe58e14621f73c672fe4e59ae0343b4621e3ae82e7

data/lib/locomotive/mounter/extensions/compass.rb

@@ -4,7 +4,8 @@ module Locomotive
 
       module Compass
 
-        # Configure Compass for the current site
+        # Configure Compass for the current site.
+        # [DEPRECATED] we use sprockets-sass now
         #
         # @param [ String ] site_path The root directory of the site
         #

data/lib/locomotive/mounter/extensions/sprockets.rb

@@ -0,0 +1,30 @@
+module Locomotive
+  module Mounter
+    module Extensions
+
+      module Sprockets
+
+        @@env = @@path = nil
+
+        # Build a Sprocket environment for the current site.
+        # This method returns an unique environment for each call
+        # unless the site_path changed.
+        #
+        # @param [ String ] site_path The root directory of the site
+        #
+        def self.environment(site_path)
+          return @@env if @@env && @@path == site_path
+
+          @@path  = site_path
+          @@env   = ::Sprockets::Environment.new.tap do |env|
+            %w(fonts stylesheets javascripts).each do |name|
+              env.append_path File.join(site_path, 'public', name)
+            end
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/locomotive/mounter/models/content_entry.rb

@@ -102,7 +102,7 @@ module Locomotive
         #
         def is_dynamic_field?(name)
           name = name.to_s.gsub(/\=$/, '').to_sym
-          !self.content_type.find_field(name).nil?
+          !self.content_type.try(:find_field, name).nil?
         end
 
         # Return the value of a dynamic field and cast it depending
@@ -117,7 +117,7 @@ module Locomotive
           value = self.localized_dynamic_attribute_value(field)
 
           case field.type
-          when :date
+          when :date, :date_time
             value.is_a?(String) ? Chronic.parse(value) : value
           when :file
             value.present? ? { 'url' => value } : nil
@@ -158,6 +158,27 @@ module Locomotive
           end
         end
 
+        # We also have to deal with dynamic attributes so that
+        # it does not raise an exception when calling the attributes=
+        # method.
+        #
+        # @param [ Hash ] attributes The new attributes
+        #
+        def write_attributes(attributes)
+          _attributes = attributes.select do |name, value|
+            if self.is_dynamic_field?(name)
+              self.dynamic_setter(name, value)
+              false
+            else
+              true
+            end
+          end
+
+          super(_attributes)
+        end
+
+        alias :attributes= :write_attributes
+
         # The magic of dynamic fields happens within this method.
         # It calls the getter/setter of a dynamic field if it is one of them.
         def method_missing(name, *args, &block)

data/lib/locomotive/mounter/models/page.rb

@@ -29,7 +29,7 @@ module Locomotive
         field :editable_elements, type: :array, class_name: 'Locomotive::Mounter::Models::EditableElement'
 
         ## other accessors ##
-        attr_accessor :content_type_id, :content_entry, :parent_id, :children
+        attr_accessor :content_type_id, :content_entry, :parent_id, :children, :templatized_from_parent
 
         ## aliases ##
         alias :listed?      :listed
@@ -64,7 +64,7 @@ module Locomotive
             self.slug
           else
             base  = self.parent.safe_fullpath
-            _slug = if self.templatized?
+            _slug = if self.templatized? && !self.templatized_from_parent
               '*'
             elsif !self.translated_in?(Locomotive::Mounter.locale)
               self.slug_translations[self.mounting_point.default_locale]
@@ -180,7 +180,8 @@ module Locomotive
           !self.redirect_url.blank?
         end
 
-        # Add a child to the page. It also sets the parent of the child
+        # Add a child to the page. It also sets the parent of the child.
+        # If the parent page is a templatized one, give the same properties to the child.
         #
         # @param [ Object ] page The child page
         #
@@ -189,6 +190,15 @@ module Locomotive
         def add_child(page)
           page.parent = self
 
+          if self.templatized?
+            page.templatized_from_parent = true
+
+            # copy properties from the parent
+            %w(templatized content_type content_type_id).each do |name|
+              page.send(:"#{name}=", self.send(name.to_sym))
+            end
+          end
+
           (self.children ||= []) << page
 
           self.children.sort! { |a, b| (a.position || 999) <=> (b.position || 999) }
@@ -333,7 +343,7 @@ module Locomotive
           _attributes.delete('redirect_type') if self.redirect_url.blank?
 
           # templatized page
-          _attributes['content_type'] = self.content_type.slug if self.templatized?
+          _attributes['content_type'] = self.content_type.slug if self.templatized? && !self.templatized_from_parent
 
           # editable elements
           _attributes['editable_elements'] = {}

data/lib/locomotive/mounter/models/theme_asset.rb

@@ -4,11 +4,13 @@ module Locomotive
 
       class ThemeAsset < Base
 
-        PRECOMPILED_CSS_TYPES   = %w(sass scss less)
+        PRECOMPILED_CSS_TYPES     = %w(sass scss less)
 
-        PRECOMPILED_JS_TYPES    = %w(coffee)
+        PRECOMPILED_JS_TYPES      = %w(coffee)
 
-        PRECOMPILED_FILE_TYPES  = PRECOMPILED_CSS_TYPES + PRECOMPILED_JS_TYPES
+        PRECOMPILED_FILE_TYPES    = PRECOMPILED_CSS_TYPES + PRECOMPILED_JS_TYPES
+
+        CSS_JS_SHORT_PATH_REGEXP  = /^(javascripts|stylesheets|fonts)\/(.*)$/
 
         ## fields ##
         field :folder
@@ -42,6 +44,17 @@ module Locomotive
           File.join(self.folder, self.filename)
         end
 
+        # Return the path without the leading javascripts, stylesheets, fonts
+        # font. This is needed by Sprockets.
+        # Only relevant for javascripts / stylesshets files.
+        #
+        # @return [ String ] The path of the asset without the first folder
+        #
+        def short_path
+          self.path =~ /^(javascripts|stylesheets|fonts)\/(.*)$/
+          $2
+        end
+
         # Return the mime type of the file based on the Mime::Types lib.
         #
         # @return [ String ] The mime type of the file or nil if unknown.
@@ -99,9 +112,9 @@ module Locomotive
 
           if self.uri
             @raw = HTTParty.get(self.uri.to_s).body
-          elsif self.precompiled?
-            template = Tilt.new(self.filepath)
-            @raw = template.render
+          # elsif self.precompiled?
+            # template = Tilt.new(self.filepath)
+            # @raw = template.render
           else
             @raw = File.read(self.filepath)
           end

data/lib/locomotive/mounter/mounting_point.rb

@@ -5,6 +5,18 @@ module Locomotive
 
       attr_accessor :resources, :root_page, :path
 
+      # attr_reader   :sprockets
+
+      # Initializes Sprockets once the path is set
+      def path= dir
+        @path = dir
+
+        # @sprockets = Locomotive::Mounter::Extensions::Sprockets.environment
+        # %w(fonts stylesheets javascripts).each do |name|
+        #   @sprockets.append_path File.join(dir, 'public', name)
+        # end
+      end
+
       # Return all the locales defined by the site related to that mounting point.
       #
       # @return [ Array ] The list of the locales

data/lib/locomotive/mounter/reader/file_system/theme_assets_reader.rb

@@ -43,7 +43,7 @@ module Locomotive
             Dir.glob(File.join(self.root_dir, '**/*')).each do |file|
               next if self.exclude?(file)
 
-              folder = File.dirname(file.gsub(self.root_dir, ''))
+              folder = File.dirname(file.gsub("#{self.root_dir}/", ''))
 
               asset = Locomotive::Mounter::Models::ThemeAsset.new(folder: folder, filepath: file)
 

data/lib/locomotive/mounter/version.rb

@@ -2,7 +2,7 @@
 module Locomotive
   module Mounter #:nodoc
 
-    VERSION = '1.2.5'
+    VERSION = '1.2.6'
 
   end
 end

data/lib/locomotive/mounter/writer/api/base.rb

@@ -12,7 +12,7 @@ module Locomotive
 
           attr_accessor :mounting_point, :runner
 
-          delegate :default_locale, :locales, :site, to: :mounting_point
+          delegate :default_locale, :locales, :site, :sprockets, to: :mounting_point
 
           delegate :force?, to: :runner
 

data/lib/locomotive/mounter/writer/api/theme_assets_writer.rb

@@ -20,17 +20,22 @@ module Locomotive
           # the assets stored in the engine have the same base url
           attr_accessor :remote_base_url
 
+          # cache the compiled theme assets to avoid to perform compilation more than once
+          attr_accessor :cached_compiled_assets
+
           def prepare
             super
 
             self.checksums = {}
 
+            self.cached_compiled_assets = {}
+
             # prepare the place where the assets will be stored temporarily.
             self.create_tmp_folder
 
             # assign an _id to a local content type if possible
             self.get(:theme_assets, nil, true).each do |attributes|
-              remote_path = File.join('/', attributes['folder'], File.basename(attributes['local_path']))
+              remote_path = File.join(attributes['folder'], File.basename(attributes['local_path']))
 
               if theme_asset = self.theme_assets[remote_path]
                 theme_asset._id                 = attributes['id']
@@ -114,7 +119,7 @@ module Locomotive
             FileUtils.mkdir_p(File.dirname(path))
 
             File.open(path, 'w') do |file|
-              file.write(theme_asset.content)
+              file.write(self.content_of(theme_asset))
             end
 
             File.new(path)
@@ -150,11 +155,11 @@ module Locomotive
           # @return [ Boolean ] True if the checksums of the local and remote files are different.
           #
           def theme_asset_changed?(theme_asset)
-            content = theme_asset.content
+            content = self.content_of(theme_asset)
 
             if theme_asset.stylesheet_or_javascript?
               # we need to compare compiled contents (sass, coffeescript) with the right urls inside
-              content = content.gsub(/[("'](\/(stylesheets|javascripts|images|media|others)\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+)\.[a-z]{2,3})[)"']/) do |path|
+              content = content.gsub(/[("'](\/(stylesheets|javascripts|fonts|images|media|others)\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+)\.[a-z]{2,3})[)"']/) do |path|
                 sanitized_path = path.gsub(/[("')]/, '').gsub(/^\//, '')
                 sanitized_path = File.join(self.remote_base_url, sanitized_path)
 
@@ -166,6 +171,29 @@ module Locomotive
             Digest::MD5.hexdigest(content) != self.checksums[theme_asset._id]
           end
 
+          # Return the content of a theme asset.
+          # If the theme asset is either a stylesheet or javascript file,
+          # it uses Sprockets to compile it.
+          # Otherwise, it returns the raw content of the asset.
+          #
+          # @return [ String ] The content of the theme asset
+          #
+          def content_of(theme_asset)
+            if theme_asset.stylesheet_or_javascript?
+              if self.cached_compiled_assets[theme_asset.path].nil?
+                self.cached_compiled_assets[theme_asset.path] = self.sprockets[theme_asset.short_path].to_s
+              end
+
+              self.cached_compiled_assets[theme_asset.path]
+            else
+              theme_asset.content
+            end
+          end
+
+          def sprockets
+            Locomotive::Mounter::Extensions::Sprockets.environment(self.mounting_point.path)
+          end
+
         end
       end
     end

data/lib/locomotive/mounter.rb

@@ -14,6 +14,8 @@ require 'digest/sha1'
 require 'chronic'
 
 require 'tilt'
+require 'sprockets'
+require 'sprockets-sass'
 require 'haml'
 require 'compass'
 
@@ -36,6 +38,7 @@ require 'locomotive/mounter/engine_api'
 
 # Extensions
 require 'locomotive/mounter/extensions/httmultiparty'
+require 'locomotive/mounter/extensions/sprockets'
 require 'locomotive/mounter/extensions/compass'
 require 'locomotive/mounter/extensions/tilt/template'
 require 'locomotive/mounter/extensions/tilt/css'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_mounter
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -24,6 +24,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -387,6 +415,7 @@ files:
 - lib/locomotive/mounter/exceptions.rb
 - lib/locomotive/mounter/extensions/compass.rb
 - lib/locomotive/mounter/extensions/httmultiparty.rb
+- lib/locomotive/mounter/extensions/sprockets.rb
 - lib/locomotive/mounter/extensions/tilt/css.rb
 - lib/locomotive/mounter/extensions/tilt/haml.rb
 - lib/locomotive/mounter/extensions/tilt/liquid.rb
@@ -472,7 +501,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: locomotivecms_mounter
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: LocomotiveCMS Mounter