locomotivecms_mounter 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a544f668acb9f469e36dbbc2481f94ca5be4e6b2
-  data.tar.gz: 2435a7ca2b750f20afbcafe77b5238b31090dbcf
+  metadata.gz: bd805b0725f79d360e2dca56b557700f21345f3f
+  data.tar.gz: f437f1070d2c438ae866e4bd686b1a5d32407103
 SHA512:
-  metadata.gz: 5e24cb2022d27e11b981eb7e3b7c2c62786f562fb16fe71a8a5707e4d51e22b02b5c821f048c899727ef91919d495035eea36b55c3ba08b924aa61ab89ca16d7
-  data.tar.gz: 0f86671a344ac51f294eae9db59a04fabe5a6d2a0947dde51cb20be3b602dfe1f76d0948ff95dfb5eb24e8faa2b89273ec518c849f68391e1a9cd27b83a8504a
+  metadata.gz: c65468b6d09942dc0f7628990530d74a5f0467da2e3e6b77479526cade925d1e77c0a563c9d22494f625e8ef531f20ba7f8e4217504455381f6a05ba2a5d2ece
+  data.tar.gz: 223bdc863a4e1acc7dcac5f075807441c81599a4ec292ab3126a94269052335c0212b86162eb08292b16eb95c8d004734ce4b64ee7d0228501d1fa03f4376306

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

@@ -150,7 +150,7 @@ module Locomotive
         # @return [ Integer ] An unique id corresponding to the depth and position
         #
         def depth_and_position
-          self.depth * 100 + (self.position || 100)
+          self.depth * 1000 + (self.position || 199)
         end
 
         # A layout is a page whose the template does

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

@@ -64,7 +64,7 @@ module Locomotive
 
             asset = Locomotive::Mounter::Models::ContentAsset.new(uri: url, folder: folder)
 
-            content_assets[url.to_s] = asset
+            content_assets[url.path] = asset
 
             asset.local_filepath
           end

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

@@ -69,10 +69,16 @@ module Locomotive
 
           # Record pages found in file system
           def fetch
-            Dir.glob(File.join(self.root_dir, '**/*')).each do |filepath|
+            position, last_dirname = nil, nil
+
+            Dir.glob(File.join(self.root_dir, '**/*')).sort.each do |filepath|
               next unless File.directory?(filepath) || filepath =~ /\.(#{Locomotive::Mounter::TEMPLATE_EXTENSIONS.join('|')})$/
 
-              page = self.add(filepath)
+              if last_dirname != File.dirname(filepath)
+                position, last_dirname = 100, File.dirname(filepath)
+              end
+
+              page = self.add(filepath, position: position)
 
               next if File.directory?(filepath) || page.nil?
 
@@ -83,6 +89,8 @@ module Locomotive
               else
                 Locomotive::Mounter.logger.warn "Unknown locale in the '#{File.basename(filepath)}' file."
               end
+
+              position += 1
             end
           end
 
@@ -105,6 +113,8 @@ module Locomotive
               page.mounting_point = self.mounting_point
               page.filepath       = File.expand_path(filepath)
 
+              page.template = OpenStruct.new(raw_source: '') if File.directory?(filepath)
+
               self.pages[fullpath] = page
             end
 

data/lib/locomotive/mounter/version.rb

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

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

@@ -227,7 +227,7 @@ module Locomotive
 
               # editable elements
               (params[:editable_elements] || []).each do |element|
-                if element[:content] =~ /$\/samples\//
+                if element[:content] =~ /^\/samples\//
                   element[:source] = self.path_to_file(element.delete(:content))
                 elsif element[:content] =~ %r($http://)
                   element[:source_url] = element.delete(:content)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_mounter
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt