locomotivecms_mounter 1.4.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79663d1b58f4a46ada47776d7e14c92462900fab
-  data.tar.gz: 10e9dd0d045ff02bf5340a3b2717927adcc622ee
+  metadata.gz: 8f209dbffa2e246e39048d073252752052349057
+  data.tar.gz: 5d567b2a2e79a3bda8247283ff1833f1c4b4eed6
 SHA512:
-  metadata.gz: 3a7cefcb901b7a5bce7d9ab72936d2a9f2590b6244548f177c24e8c20a56a484a7737f2fa5894be40e8b87cba99d42f840aedb82429abf217f96bf18e11e16cf
-  data.tar.gz: 20bc67d5480e46fc5ba0e91f89c4b8825d2074062939455368e1cba92fb15143410e67e082365e0c80a5bc0abb6e10439deb488dffc7a89dbd76bd13535ca0f1
+  metadata.gz: 74e99e2982545980ce4bb993a7332ad3124bed53d47e16cc6e85502b4a0e2316318295895670a102bc3cb72eddc176ab23e962cf3ec1bcbc84050cdd118b9457
+  data.tar.gz: aa9fa4a15dbb7c030c69bdfa7be922830795dd0025b76a4eaaa05e2ba02dc2b168b5fae324a63691c3a805353ca8d7069d51fa395fbe8043f5d480c3cbf8781a

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    locomotivecms_mounter (1.4.4)
+    locomotivecms_mounter (1.5.0)
       RedCloth (~> 4.2.3)
-      activesupport (~> 3.2.18)
+      activesupport (~> 3.2.21)
       chronic (~> 0.10.2)
       coffee-script (~> 2.2.0)
       colorize (~> 0.5.8)
@@ -28,12 +28,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (3.2.19)
+    activesupport (3.2.21)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.6)
     chronic (0.10.2)
-    chunky_png (1.3.1)
+    chunky_png (1.3.3)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
@@ -55,22 +55,22 @@ GEM
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    execjs (2.2.1)
-    ffi (1.9.3)
+    execjs (2.2.2)
+    ffi (1.9.6)
     haml (4.0.5)
       tilt
     hike (1.2.3)
     httmultiparty (0.3.10)
       httparty (>= 0.7.3)
       multipart-post
-    httparty (0.13.1)
+    httparty (0.13.3)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     i18n (0.6.11)
     json (1.8.1)
     less (2.2.2)
       commonjs (~> 0.2.6)
-    libv8 (3.11.8.17)
+    libv8 (3.16.14.3)
     logger (1.2.8)
     mime-types (1.25.1)
     multi_json (1.8.4)
@@ -93,9 +93,9 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
     ruby-debug-wrapper (0.0.1)
-    safe_yaml (1.0.3)
-    sass (3.4.5)
-    sprockets (2.12.2)
+    safe_yaml (1.0.4)
+    sass (3.4.7)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -104,11 +104,11 @@ GEM
       sprockets (~> 2.0)
       tilt (~> 1.1)
     stringex (2.0.11)
-    therubyracer (0.11.4)
-      libv8 (~> 3.11.8.12)
+    therubyracer (0.12.1)
+      libv8 (~> 3.16.14.0)
       ref
     tilt (1.4.1)
-    tzinfo (0.3.41)
+    tzinfo (0.3.42)
     vcr (2.4.0)
     webmock (1.9.3)
       addressable (>= 2.2.7)
@@ -120,11 +120,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  libv8 (= 3.16.14.3)
   locomotivecms_mounter!
   rack-test (~> 0.6.1)
   rake (= 0.9.2)
   rspec (~> 2.14.1)
   ruby-debug-wrapper (~> 0.0.1)
-  therubyracer (~> 0.11.4)
+  therubyracer (~> 0.12.1)
   vcr (= 2.4.0)
   webmock (= 1.9.3)

data/lib/locomotive/mounter/engine_api.rb

@@ -36,6 +36,84 @@ module Locomotive
         end
       end
 
+      # Read a resource or a list of resources from the API
+      # Raise an exception if something went wrong.
+      #
+      # @param [ String ] resource_name The path to the resource (usually, the resource name)
+      # @param [ Hash ] query If we want to filter the results
+      # @param [ String ] locale The locale for the request
+      # @param [ Array ] attribute_names The attributes we want to keep in the response
+      #
+      def self.fetch(resource_name, query = {}, locale = nil, attribute_names = nil)
+        params = { query: query || {} }
+        params[:query][:locale] = locale if locale
+
+        url       = "/#{resource_name}.json"
+        response  = self.get(url, params)
+        data      = response.parsed_response
+
+        if response.success?
+          object_or_list = self.keep_attributes(data, attribute_names)
+
+          if response.headers['x-total-pages']
+            PaginatedCollection.new(url, params, attribute_names).tap do |collection|
+              collection.list           = object_or_list
+              collection.total_pages    = response.headers['x-total-pages'].to_i
+              collection.total_entries  = response.headers['x-total-entries'].to_i
+            end
+          else
+            object_or_list
+          end
+        else
+          raise ApiReadException.new(data['error'])
+        end
+      end
+
+      # Create a resource from the API.
+      # Raise an exception if something went wrong.
+      #
+      # @param [ String ] resource_name The path to the resource (usually, the resource name)
+      # @param [ Hash ] attributes The attributes of the resource
+      # @param [ String ] locale The locale for the request
+      # @param [ Array ] attribute_names The attributes we want to keep in the response
+      #
+      # @return [ Object] The response of the API
+      #
+      def self.create(resource_name, attributes, locale = nil, attribute_names = nil)
+        params    = self.build_create_or_params(resource_name, attributes, locale)
+        response  = self.post("/#{resource_name}.json", params)
+        data      = response.parsed_response
+
+        if response.success?
+          self.keep_attributes(data, attribute_names)
+        else
+          raise ApiWriteException.new(data)
+        end
+      end
+
+      # Update a resource from the API.
+      # Raise an exception if something went wrong.
+      #
+      # @param [ String ] resource_name The path to the resource (usually, the resource name)
+      # @param [ String ] id The unique identifier of the resource
+      # @param [ Hash ] attributes The attributes of the resource
+      # @param [ String ] locale The locale for the request
+      # @param [ Array ] attribute_names The attributes we want to keep in the response
+      #
+      # @return [ Object] The response of the API
+      #
+      def self.update(resource_name, id, attributes, locale = nil, attribute_names = nil)
+        params    = self.build_create_or_params(resource_name, attributes, locale)
+        response  = self.put("/#{resource_name}/#{id}.json", params)
+        data      = response.parsed_response
+
+        if response.success?
+          self.keep_attributes(data, attribute_names)
+        else
+          raise ApiWriteException.new(data)
+        end
+      end
+
       def self.teardown
         Locomotive::Mounter::EngineApi.default_options[:base_uri] = nil
         Locomotive::Mounter::EngineApi.default_options[:base_auth] = nil
@@ -58,7 +136,70 @@ module Locomotive
         end
       end
 
+      def self.build_create_or_params(resource_name, attributes, locale)
+        name = resource_name.to_s.split('/').last.singularize
+
+        params = { query: { name => attributes } }
+        params[:query][:locale] = locale if locale
+
+        params
+      end
+
+      def self.keep_attributes(data, attribute_names)
+        return data if attribute_names.blank?
+
+        case data
+        when Hash then data.to_hash.delete_if { |k, _| !attribute_names.include?(k) }
+        when Array
+          data.map do |row|
+            row.delete_if { |k, _| !attribute_names.include?(k) }
+          end
+        else
+          data
+        end
+      end
+
+    end
+
+    class PaginatedCollection < Struct.new(:url, :params, :attribute_names)
+
+      attr_accessor :list, :total_pages, :total_entries
+
+      alias :size :total_entries
+
+      def each(&block)
+        if self.total_pages == 1 && self.list
+          self.list.each(&block)
+        else
+          self.paginated_each(&block)
+        end
+      end
+
+      def paginated_each(&block)
+        loop do
+          self.params[:query][:page] = self.page
+
+          response  = Locomotive::Mounter::EngineApi.get(self.url, self.params)
+          data      = response.parsed_response
+
+          if response.success?
+            self.list = Locomotive::Mounter::EngineApi.send(:keep_attributes, data, self.attribute_names)
+            self.list.each(&block)
+          else
+            raise ApiReadException.new(data['error'])
+          end
+
+          break if self.page >= self.total_pages
+
+          @page += 1
+        end
+      end
+
+      def page
+        @page ||= 1
+      end
+
     end
 
   end
-end
+end

data/lib/locomotive/mounter/exceptions.rb

@@ -34,5 +34,11 @@ module Locomotive
     class WrongCredentials < DefaultException
     end
 
+    class ApiReadException < DefaultException
+    end
+
+    class ApiWriteException < DefaultException
+    end
+
   end
 end

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

@@ -13,15 +13,21 @@ module Locomotive
         # unless the site_path changed.
         #
         # @param [ String ] site_path The root directory of the site
+        # @param [ Boolean ] minify Minify the js and css assets (default: false)
         #
-        def self.environment(site_path)
+        def self.environment(site_path, minify = false)
           return @@env if @@env && @@path == site_path
 
           @@path  = site_path
           @@env   = ::Sprockets::Environment.new.tap do |env|
-            # minify javascripts and stylesheets
-            env.js_compressor  = YUI::JavaScriptCompressor.new
-            env.css_compressor = YUI::CssCompressor.new
+            if minify && is_java_installed?
+              # minify javascripts and stylesheets
+              env.js_compressor  = YUI::JavaScriptCompressor.new
+              env.css_compressor = YUI::CssCompressor.new
+            else
+              message = "[Important] YUICompressor requires java to be installed. The JAVA_HOME variable should also be set.\n"
+              Locomotive::Mounter.logger.warn message.colorize(color: :red)
+            end
 
             %w(fonts stylesheets javascripts).each do |name|
               env.append_path File.join(site_path, 'public', name)
@@ -29,8 +35,12 @@ module Locomotive
           end
         end
 
+        def self.is_java_installed?
+          `which java` != '' && (!ENV['JAVA_HOME'].blank? && File.exists?(ENV['JAVA_HOME']))
+        end
+
       end
 
     end
   end
-end
+end

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

@@ -10,6 +10,8 @@ module Locomotive
         field :title,             localized: true
         field :slug,              localized: true
         field :fullpath,          localized: true
+        field :is_layout,         default: false
+        field :allow_layout,      default: false
         field :redirect_url,      localized: true
         field :redirect_type,     default: 301
         field :template,          localized: true
@@ -40,6 +42,7 @@ module Locomotive
         alias :published?   :published
         alias :templatized? :templatized
         alias :searchable?  :searchable
+        alias :is_layout?   :is_layout
 
         ## methods ##
 
@@ -62,15 +65,17 @@ module Locomotive
         # Return the fullpath dasherized and with the "*" character
         # for the slug of templatized page.
         #
+        # @param [ Boolean ] wildcard If true, replace the slug of a templatized page by the "*" character (default: true)
+        #
         # @return [ String ] The safe full path or nil if the page is not translated in the current locale
         #
-        def safe_fullpath
+        def safe_fullpath(wildcard = true)
           if self.index_or_404?
             self.slug
           else
-            base  = self.parent.safe_fullpath
+            base  = self.parent.safe_fullpath(wildcard)
             _slug = if self.templatized? && !self.templatized_from_parent
-              '*'
+              wildcard ? '*' : self.slug
             elsif !self.translated_in?(Locomotive::Mounter.locale)
               self.slug_translations[self.mounting_point.default_locale]
             else
@@ -155,23 +160,23 @@ module Locomotive
           self.depth * 1000 + (self.position || 199)
         end
 
-        # A layout is a page whose the template does
-        # not include the extend keyword.
-        # If the template is blank then, it is not considered as a layout
+        # Tell if the page extends the template of another page.
+        # Basically, we check if the template of the page includes
+        # the "extends" liquid tag.
         #
         # @return [ Boolean ] True if the template can be a layout.
         #
-        def is_layout?
-          self.layout.nil?
+        def extends_template?
+          !self.template_fullpath.nil?
         end
 
-        # Return the fullpath of the page which is used
-        # as a layout for the current page.
+        # Return the fullpath of the page whose template is extended
+        # in the current template.
         #
-        # @return [ String ] The fullpath to the layout
+        # @return [ String ] The fullpath of the "extended" page or nil if no extends tag
         #
-        def layout
-          return false if self.source.nil? || self.source.strip.blank?
+        def template_fullpath
+          return nil if self.source.nil? || self.source.strip.blank?
 
           self.source =~ /\{%\s*extends\s+\'?([[\w|\-|\_]|\/]+)\'?\s*%\}/
           $1
@@ -333,7 +338,7 @@ module Locomotive
         # @return [ String ] The YAML version of the page
         #
         def to_yaml
-          fields = %w(title slug redirect_url redirect_type handle published listed searchable cache_strategy response_type position seo_title meta_description meta_keywords)
+          fields = %w(title slug redirect_url redirect_type handle published listed is_layout searchable cache_strategy response_type position seo_title meta_description meta_keywords)
 
           _attributes = self.attributes.delete_if do |k, v|
             !fields.include?(k.to_s) || (!v.is_a?(FalseClass) && v.blank?)
@@ -363,7 +368,8 @@ module Locomotive
         # @return [ Hash ] The params
         #
         def to_params
-          params = self.filter_attributes %w(title parent_id slug redirect_url redirect_type handle listed published searchable cache_strategy
+          params = self.filter_attributes %w(title parent_id slug redirect_url redirect_type handle listed is_layout
+            allow_layout published searchable cache_strategy
             response_type position templatized seo_title meta_description meta_keywords)
 
           # slug
@@ -394,7 +400,7 @@ module Locomotive
         # @return [ Hash ] The safe params
         #
         def to_safe_params
-          fields = %w(title slug listed published searchable handle cache_strategy
+          fields = %w(title slug listed is_layout allow_layout published searchable handle cache_strategy
             redirect_url response_type templatized content_type_id position
             seo_title meta_description meta_keywords)
 
@@ -433,4 +439,4 @@ module Locomotive
 
     end
   end
-end
+end

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

@@ -25,23 +25,13 @@ module Locomotive
             self.output_title(:pulling)
           end
 
-          def get(resource_name, locale = nil, raw = false)
-            params = { query: {} }
+          def get(resource_name, locale = nil, dont_filter_attributes = false)
+            attribute_names = dont_filter_attributes ? nil : self.safe_attributes
 
-            params[:query][:locale] = locale if locale
-
-            response = Locomotive::Mounter::EngineApi.get("/#{resource_name}.json", params).parsed_response
-
-            return response if raw
-
-            case response
-            when Hash then response.to_hash.delete_if { |k, _| !self.safe_attributes.include?(k) }
-            when Array
-              response.map do |row|
-                row.delete_if { |k, _| !self.safe_attributes.include?(k) }
-              end
-            else
-              response
+            begin
+              Locomotive::Mounter::EngineApi.fetch(resource_name, {}, locale, attribute_names)
+            rescue ApiReadException => e
+              raise ReaderException.new(e.message)
             end
           end
 
@@ -74,4 +64,4 @@ module Locomotive
       end
     end
   end
-end
+end

data/lib/locomotive/mounter/reader/api/content_entries_reader.rb

@@ -139,4 +139,4 @@ module Locomotive
       end
     end
   end
-end
+end

data/lib/locomotive/mounter/version.rb

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

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

@@ -37,101 +37,71 @@ module Locomotive
             self.runner.parameters[:data] || false
           end
 
-          # Get remote resource(s) by the API
+          # Get remote resource(s) from the API
           #
           # @param [ String ] resource_name The path to the resource (usually, the resource name)
           # @param [ String ] locale The locale for the request
-          # @param [ Boolean ] raw True if the result has to be converted into object.
+          # @param [ Boolean ] dont_filter_attributes False if the we want to only keep the attributes defined by the safe_attributes method
           #
           # @return [ Object] The object or a collection of objects.
           #
-          def get(resource_name, locale = nil, raw = false)
-            params = { query: {} }
+          def get(resource_name, locale = nil, dont_filter_attributes = false)
+            attribute_names = dont_filter_attributes ? nil : self.safe_attributes
 
-            params[:query][:locale] = locale if locale
-
-            response  = Locomotive::Mounter::EngineApi.get("/#{resource_name}.json", params)
-            data      = response.parsed_response
-
-            if response.success?
-              return data if raw
-              self.raw_data_to_object(data)
-            else
-              raise WriterException.new(data['error'])
+            begin
+              Locomotive::Mounter::EngineApi.fetch(resource_name, {}, locale, attribute_names)
+            rescue ApiReadException => e
+              raise WriterException.new(e.message)
             end
           end
 
-          # Create a resource by the API.
+          # Create a resource from the API.
           #
           # @param [ String ] resource_name The path to the resource (usually, the resource name)
-          # @param [ Hash ] params The attributes of the resource
+          # @param [ Hash ] attributes The attributes of the resource
           # @param [ String ] locale The locale for the request
-          # @param [ Boolean ] raw True if the result has to be converted into object.
+          # @param [ Boolean ] raw True if the result has to be filtered in order to keep only the attributes defined by the safe_attributes method
           #
           # @return [ Object] The response of the API or nil if an error occurs
           #
-          def post(resource_name, params, locale = nil, raw = false)
-            params_name = resource_name.to_s.split('/').last.singularize
-
-            query = { query: { params_name => params } }
+          def post(resource_name, attributes, locale = nil, dont_filter_attributes = false)
+            attribute_names = dont_filter_attributes ? nil : self.safe_attributes
 
-            query[:query][:locale] = locale if locale
-
-            response  = Locomotive::Mounter::EngineApi.post("/#{resource_name}.json", query)
-            data      = response.parsed_response
-
-            if response.success?
-              return data if raw
-              self.raw_data_to_object(data)
-            else
-              message = data
-
-              message = data.map do |attribute, errors|
+            begin
+              Locomotive::Mounter::EngineApi.create(resource_name, attributes, locale, attribute_names)
+            rescue ApiWriteException => e
+              message = e.message
+              message = message.map do |attribute, errors|
                 "      #{attribute} => #{[*errors].join(', ')}\n".colorize(color: :red)
-              end.join("\n") if data.respond_to?(:keys)
+              end.join("\n") if message.respond_to?(:keys)
 
               raise WriterException.new(message)
-
-              # self.log "\n"
-              # data.each do |attribute, errors|
-              #   self.log "      #{attribute} => #{[*errors].join(', ')}\n".colorize(color: :red)
-              # end if data.respond_to?(:keys)
-              # nil # DEBUG
             end
           end
 
-          # Update a resource by the API.
+          # Update a resource from the API.
           #
           # @param [ String ] resource_name The path to the resource (usually, the resource name)
-          # @param [ String ] id The unique identifier of the resource
+          # @param [ Hash ] attributes The attributes of the resource
           # @param [ Hash ] params The attributes of the resource
           # @param [ String ] locale The locale for the request
           #
-          # @return [ Object] The response of the API or nil if an error occurs
+          # @return [ Object] The response of the API
           #
-          def put(resource_name, id, params, locale = nil)
-            params_name = resource_name.to_s.split('/').last.singularize
-
-            query = { query: { params_name => params } }
-
-            query[:query][:locale] = locale if locale
-
-            response  = Locomotive::Mounter::EngineApi.put("/#{resource_name}/#{id}.json", query)
-            data      = response.parsed_response
-
-            if response.success?
-              self.raw_data_to_object(data)
-            else
-              message = data
-
-              message = data.map do |attribute, errors|
-                "      #{attribute} => #{[*errors].join(', ')}" #.colorize(color: :red)
-              end.join("\n") if data.respond_to?(:keys)
+          def put(resource_name, id, attributes, locale = nil)
+            begin
+              Locomotive::Mounter::EngineApi.update(resource_name, id, attributes, locale, self.safe_attributes)
+            rescue ApiWriteException => e
+              message = e.message
+              message = message.map do |attribute, errors|
+                "      #{attribute} => #{[*errors].join(', ')}\n".colorize(color: :red)
+              end.join("\n") if message.respond_to?(:keys)
 
               raise WriterException.new(message)
 
+              # self.log "\n"
               # data.each do |attribute, errors|
-              #   self.log "\t\t #{attribute} => #{[*errors].join(', ')}".colorize(color: :red)
+              #   self.log "      #{attribute} => #{[*errors].join(', ')}\n".colorize(color: :red)
               # end if data.respond_to?(:keys)
               # nil # DEBUG
             end
@@ -194,28 +164,9 @@ module Locomotive
             response ? :success : :error
           end
 
-          # Convert raw data into the corresponding object (Page, Site, ...etc)
-          #
-          # @param [ Hash ] data The attributes of the object
-          #
-          # @return [ Object ] A new instance of the object
-          #
-          def raw_data_to_object(data)
-            case data
-            when Hash then data.to_hash.delete_if { |k, _| !self.safe_attributes.include?(k) }
-            when Array
-              data.map do |row|
-                # puts "#{row.inspect}\n---" # DEBUG
-                row.delete_if { |k, _| !self.safe_attributes.include?(k) }
-              end
-            else
-              data
-            end
-          end
-
         end
 
       end
     end
   end
-end
+end

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

@@ -22,7 +22,9 @@ module Locomotive
 
             # assign an _id to a local content entry if possible
             self.content_types.each do |slug, content_type|
-              self.get("content_types/#{slug}/entries", nil, true).each do |attributes|
+              entries = self.get("content_types/#{slug}/entries", nil, true)
+
+              entries.each do |attributes|
                 content_entry = content_type.find_entry(attributes['_slug'])
 
                 if content_entry
@@ -222,4 +224,4 @@ module Locomotive
       end
     end
   end
-end
+end

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

@@ -25,7 +25,9 @@ module Locomotive
 
             # set the unique identifier to each local page
             self.get(:pages, nil, true).each do |attributes|
-              page = self.pages[attributes['fullpath'].dasherize]
+              page = self.pages.values.find do |_page|
+                _page.safe_fullpath(false) == attributes['fullpath'].dasherize
+              end
 
               self.remote_translations[attributes['fullpath']] = attributes['translated_in']
 
@@ -46,8 +48,12 @@ module Locomotive
               self.output_locale
 
               done, attempts = {}, 0
+
+              # begin by the layouts (pages inside the layouts folder)
+              _write_layouts(pages, done)
+
               while done.size < pages.length - 1 && attempts < MAX_ATTEMPTS
-                _write(pages['index'], done, done.size > 0)
+                _write(pages['index'], done, attempts > 0)
 
                 # keep track of the attempts because we don't want to get an infinite loop.
                 attempts += 1
@@ -63,7 +69,22 @@ module Locomotive
 
           protected
 
-          def _write(page, done, already_done = false)
+          def _write_layouts(pages, done)
+            if pages['layouts']
+              _write(pages['layouts'], done, false, false)
+
+              layouts = pages.values.find_all { |page| page.fullpath =~ /^layouts\// }
+
+              # make sure the templates without the extends tag are first in the list
+              layouts.sort! { |a, b| (a.extends_template? ? 1 : 0) <=> (b.extends_template? ? 1 : 0) }
+
+              layouts.each do |page|
+                _write(page, done, false, false)
+              end
+            end
+          end
+
+          def _write(page, done, already_done = false, with_children = true)
             if self.safely_translated?(page)
               write_page(page) unless already_done
             else
@@ -75,12 +96,14 @@ module Locomotive
             done[page.fullpath] = true
 
             # loop over its children
-            (page.children || []).sort_by(&:depth_and_position).each do |child|
-              layout = child.layout
-              layout = page.fullpath if layout && layout == 'parent'
+            if with_children
+              (page.children || []).sort_by(&:depth_and_position).each do |child|
+                template_fullpath = child.template_fullpath
+                template_fullpath = page.fullpath if template_fullpath && template_fullpath == 'parent'
 
-              if done[child.fullpath].nil? && (!layout || done[layout])
-                _write(child, done)
+                if done[child.fullpath].nil? && (!template_fullpath || done[template_fullpath])
+                  _write(child, done)
+                end
               end
             end
           end
@@ -153,40 +176,6 @@ module Locomotive
             self.mounting_point.pages
           end
 
-          # # Return the pages which are layouts for others.
-          # # They are sorted by the depth.
-          # #
-          # # @return [ Array ] The list of layouts
-          # #
-          # def layouts
-          #   self.pages.values.find_all do |page|
-          #     self.safely_translated?(page) && self.is_layout?(page)
-          #   end.sort { |a, b| a.depth <=> b.depth }
-          # end
-
-          # # Return the pages wich are not layouts for others.
-          # # They are sorted by both the depth and the position.
-          # #
-          # # @return [ Array ] The list of non-layout pages
-          # #
-          # def other_than_layouts
-          #   list = (self.pages.values - self.layouts)
-
-          #   # get only the translated ones in the current locale
-          #   list.delete_if do |page|
-          #     # if (!page.parent.nil? && !page.translated_in?(self.mounting_point.default_locale)) ||
-          #     #   !page.translated_in?(Locomotive::Mounter.locale)
-          #     if !self.safely_translated?(page)
-          #       self.output_resource_op page
-          #       self.output_resource_op_status page, :not_translated
-          #       true
-          #     end
-          #   end
-
-          #   # sort them
-          #   list.sort { |a, b| a.depth_and_position <=> b.depth_and_position }
-          # end
-
           # Tell if the page passed in parameter has already been
           # translated on the remote engine for the locale passed
           # as the second parameter.
@@ -218,27 +207,6 @@ module Locomotive
             end
           end
 
-          # # Tell if the page is a real layout, which means no extends tag inside
-          # # and that at least one of the other pages reference it as a parent template.
-          # #
-          # # @param [ Object ] page The page
-          # #
-          # # @return [ Boolean] True if it is a real layout.
-          # #
-          # def is_layout?(page)
-          #   if page.is_layout?
-          #     # has child(ren) extending the page itself ?
-          #     return true if (page.children || []).any? { |child| child.layout == 'parent' }
-
-          #     fullpath = page.fullpath_in_default_locale
-
-          #     # among all the pages, is there a page extending the page itself ?
-          #     self.pages.values.any? { |_page| _page.fullpath_in_default_locale != fullpath && _page.layout == fullpath }
-          #   else
-          #     false # extends not present
-          #   end
-          # end
-
           # Return the parameters of a page sent by the API.
           # It includes the editable_elements if the data option is enabled or
           # if the page is a new one.
@@ -263,7 +231,7 @@ module Locomotive
               (params[:editable_elements] || []).each do |element|
                 if element[:content] =~ /^\/samples\//
                   element[:source] = self.path_to_file(element.delete(:content))
-                elsif element[:content] =~ %r($http://)
+                elsif element[:content] =~ %r(^http://)
                   element[:source_url] = element.delete(:content)
                 else
                   # string / text elements
@@ -278,4 +246,4 @@ module Locomotive
       end
     end
   end
-end
+end

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

@@ -84,7 +84,7 @@ module Locomotive
                   self.site._id     = _site['id']
                 end
               end
-            rescue WriterException => e
+            rescue WriterException, ApiReadException => e
               nil
             end
           end
@@ -122,4 +122,4 @@ module Locomotive
       end
     end
   end
-end
+end

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

@@ -191,11 +191,11 @@ module Locomotive
           end
 
           def sprockets
-            Locomotive::Mounter::Extensions::Sprockets.environment(self.mounting_point.path)
+            Locomotive::Mounter::Extensions::Sprockets.environment(self.mounting_point.path, true)
           end
 
         end
       end
     end
   end
-end
+end

data/locomotivecms_mounter.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'tzinfo',                          '~> 0.3.29'
   s.add_dependency 'chronic',                         '~> 0.10.2'
 
-  s.add_dependency 'activesupport',                   '~> 3.2.18'
+  s.add_dependency 'activesupport',                   '~> 3.2.21'
   s.add_dependency 'i18n',                            '~> 0.6.11'
   s.add_dependency 'stringex',                        '~> 2.0.3'
 
@@ -52,9 +52,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack-test',           '~> 0.6.1'
   s.add_development_dependency 'ruby-debug-wrapper',  '~> 0.0.1'
   s.add_development_dependency 'vcr',                 '2.4.0'
-  s.add_development_dependency 'therubyracer',        '~> 0.11.4'
+  s.add_development_dependency 'therubyracer',        '~> 0.12.1'
   # s.add_development_dependency 'fakeweb'
   s.add_development_dependency 'webmock',             '1.9.3'
+  s.add_development_dependency 'libv8',               '3.16.14.3'
   # s.add_development_dependency 'bson'
   # s.add_development_dependency 'bson_ext'
   # s.add_development_dependency 'typhoeus', '0.5.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_mounter
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.18
+        version: 3.2.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.18
+        version: 3.2.21
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -386,14 +386,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -408,6 +408,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.9.3
+- !ruby/object:Gem::Dependency
+  name: libv8
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.16.14.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.16.14.3
 description: Mount any LocomotiveCMS site, from a template on the filesystem, a zip
   file or even an online engine
 email: