lalala 4.0.0.dev.191 → 4.0.0.dev.192

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8abb57f6cc06fe407cc3dab84bc165a5a63b8601
-  data.tar.gz: eb58f576a4aa169357f352cc53dfa613fec88d83
+  metadata.gz: abdac7f80c3c05f6d398582d7057e27456aeb13e
+  data.tar.gz: f3628af5e5b2601b4521e218fd062876260efdcc
 SHA512:
-  metadata.gz: 27e10c18846ff6867ff3f2c96e1e8077897407e37eff4ab4b246ece110b1797732de9c1bd12487e3c42f7b932da8958132c02e23ae0f7620df9dabe82b9d8806
-  data.tar.gz: 533574226ac2331af079e3e84c90589b22b07917a34a474d19833d03cd60f6dd67f3c89153b9ca592ae9711d4c658a34a8251d4ccad7db7c324eb84838eb5788
+  metadata.gz: c2eaaf24303dafe8cc5704f7a4e0cddb0a974270de9d9fb5691617bbf0b5ba7d47370b68dd282859e35d2b8730163bfdab229f6307998ea5ddf1cd40ce86b2f6
+  data.tar.gz: 778acd41e4e0395cffc9001305e202d7254df49913bc68ed807fc3ffb25b96461b15b9d21631fc6b3738f696034a1462b9ca4410d6fd59cc25d797c26dd84f3e

data/lib/lalala/engine.rb

@@ -122,6 +122,9 @@ module Lalala
     ActionDispatch::Request.send(
       :include, Lalala::ExtActionDispatch::PageName)
 
+    ActionController::Base.send(
+      :include, Lalala::Pages::Helpers)
+
   end
 
 end

data/lib/lalala/pages/helpers.rb

@@ -0,0 +1,18 @@
+module Lalala::Pages::Helpers
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :current_page_chain, :current_page
+  end
+
+protected
+
+  def current_page_chain
+    request.env["lalala.page_chain"] or []
+  end
+
+  def current_page
+    request.env["lalala.page"]
+  end
+
+end

data/lib/lalala/pages/page_type_constraint.rb

@@ -1,15 +1,7 @@
 class Lalala::Pages::PageTypeConstraint
 
   def initialize(type)
-    type = "#{type}_page"
-    type = type.classify
-
-    while type.ends_with?("PagePage")
-      type = type[0..-5]
-    end
-
-    type = type.constantize
-    @type = type
+    @type = type.constantize
   end
 
   def matches?(request)

data/lib/lalala/pages/route_mapper.rb

@@ -15,8 +15,8 @@ module Lalala::Pages::RouteMapper
       raise ArgumentError, "expected a page type"
     end
 
-    type    = args[0]
-    options = { as: type }.merge(options)
+    type    = Lalala::Pages::RouteMapper.page_class_name(args[0])
+    options = { as: type.underscore }.merge(options)
     options[:constraints] = Lalala::Pages::PageTypeConstraint.new(type)
 
     match '/', options
@@ -28,4 +28,15 @@ module Lalala::Pages::RouteMapper
     self
   end
 
+  def self.page_class_name(type)
+    type = "#{type}_page"
+    type = type.classify
+
+    while type.ends_with?("PagePage")
+      type = type[0..-5]
+    end
+
+    type
+  end
+
 end

data/lib/lalala/pages.rb

@@ -7,5 +7,6 @@ module Lalala::Pages
 
   autoload :PageTypeConstraint
   autoload :RouteMapper
+  autoload :Helpers
 
 end

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "191"
+  BUILD   = "192"
 
   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.191
+  version: 4.0.0.dev.192
 platform: ruby
 authors:
 - Simon Menke
@@ -1422,6 +1422,7 @@ files:
 - lib/lalala/pages.rb
 - lib/lalala/pages/child_type_validator.rb
 - lib/lalala/pages/children_length_validator.rb
+- lib/lalala/pages/helpers.rb
 - lib/lalala/pages/page_type_constraint.rb
 - lib/lalala/pages/path_handler.rb
 - lib/lalala/pages/route_mapper.rb