lalala 4.0.0.dev.184 → 4.0.0.dev.185

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5c4e93c4ef58949f83ac21fca7f16db377ffaeb
-  data.tar.gz: 573922e177df210b6c13c4ef91d536206b11c931
+  metadata.gz: 46a65f4b11e189ccd51cc29c1a84950e1c43ffbd
+  data.tar.gz: 04f0ba13930f2381d82477c5219565a212eff51a
 SHA512:
-  metadata.gz: 0bea35bbd3a38df3d057e7c2e910cd00a36d094ea53fd71d53a3c17a65f45ec17e3195c6c5bdc4e60cb9cb8659e21c658e2f67a4906fd53ee90bb11284802419
-  data.tar.gz: 7a401eb60246b93e725f58df06f64f24bde93fa8f7915dbe59facc0e5b2bc38b989eb9041343314179ef385f1c9feab67eec27da272cf6166ebce143859b2bb6
+  metadata.gz: a4263e9f131f5dc6a290c681b889f135b8f254972b5712df95ccc3b8c24a4b01c83b4a0ec162f9120ced3baebb9012d150a8c4695f5f146e53354c256a4a75f7
+  data.tar.gz: 18d34efb073333121cc4a4064e6a695848a92ebb8b2dde2f50cfbf83e338a0d3819a5fb11f83a5d12de51e755ad398dd23f4c694de9d5e6681efb098f6afb987

data/app/assets/stylesheets/lalala/modules/_sidebar-section.css.scss

@@ -14,5 +14,4 @@
   .panel_contents {
     padding: 10px;
   }
-
 }

data/lib/lalala/engine.rb

@@ -119,6 +119,9 @@ module Lalala
     ActionDispatch::Request.send(
       :include, Lalala::ExtActionDispatch::MultiFileUpload)
 
+    ActionDispatch::Request.send(
+      :include, Lalala::ExtActionDispatch::PageName)
+
   end
 
 end

data/lib/lalala/ext_action_dispatch/page_name.rb

@@ -0,0 +1,11 @@
+module Lalala::ExtActionDispatch::PageName
+
+  def page_name
+    @page_name ||= env['PAGE_NAME'].to_s
+  end
+
+  def path
+    page_name + super
+  end
+
+end

data/lib/lalala/ext_action_dispatch.rb

@@ -2,4 +2,5 @@ module Lalala::ExtActionDispatch
   extend ActiveSupport::Autoload
 
   autoload :MultiFileUpload
+  autoload :PageName
 end

data/lib/lalala/ext_rack/page_loader.rb

@@ -22,7 +22,6 @@ class Lalala::ExtRack::PageLoader
 protected
 
   def find_chain(env)
-
     path_info       = env['PATH_INFO']
     path_components = path_info.split('/')
 
@@ -31,20 +30,36 @@ protected
   end
 
   def update_env(env, chain)
-    pages       = []
-    script_name = env['SCRIPT_NAME'].to_s
-    path_info   = env['PATH_INFO'].to_s
+    pages     = []
+    page_name = "/"
+    path_info = env['PATH_INFO'].to_s
 
     chain.each do |(page, path_component)|
-      script_name = File.join(script_name, path_component)
-      path_info   = path_info[(1 + path_component.size)..-1]
+      page_name = File.join(page_name, path_component)
+      path_info = path_info[(1 + path_component.size)..-1]
 
       pages.push page
     end
 
+    unless path_info.starts_with?('/')
+      path_info = "/" + path_info
+    end
+
+    if page_name == "/"
+      page_name = ""
+    end
+
+    if path_info.blank?
+      path_info = "/"
+    end
+
     env['lalala.page_chain'] = pages
     env['lalala.page']       = pages.last
     env['PATH_INFO']         = path_info
+
+    unless page_name.blank?
+      env['PAGE_NAME'] = page_name
+    end
   end
 
 end

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "184"
+  BUILD   = "185"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.184
+  version: 4.0.0.dev.185
 platform: ruby
 authors:
 - Simon Menke
@@ -1394,6 +1394,7 @@ files:
 - lib/lalala/engine.rb
 - lib/lalala/ext_action_dispatch.rb
 - lib/lalala/ext_action_dispatch/multi_file_upload.rb
+- lib/lalala/ext_action_dispatch/page_name.rb
 - lib/lalala/ext_active_record.rb
 - lib/lalala/ext_active_record/assets.rb
 - lib/lalala/ext_active_record/i18n_translations_writer.rb