mascot-rails 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af6e9c3364ea71baba94e6f5ef9bb1da5f6b9f1a
-  data.tar.gz: 2005e26040c90e08b059b47badb31892f9cd13d8
+  metadata.gz: b2e3d24929e65ce95f9706e1b19a9c73bdd7daf7
+  data.tar.gz: 1420175c8e4e062ea24c480cf02224a165bb77d6
 SHA512:
-  metadata.gz: af3841f8d9b0e042e6ef4504fd4032e144ae40473caff36b0265db9ddbc05f8b4b6edc571c5c4055cdfe533ea16a7a7db149691b03d1c1459548e1166fc6c412
-  data.tar.gz: df370017cb3d2f457720c3a7126eeef85515d066278e6cb05b7bb1685dca3ceb3adb1850da4504e6f710c3c6fbb36bb9fb126e2cfefb9ffeecb92e6a22758707
+  metadata.gz: 495e11ae1c807812075cda07c951c7b35fb58fc40be8f5c13fd46d431a55db2b187009c43e0f9589aaaa9aa3d6468fe9200df7e5691698339ab5754573c12658
+  data.tar.gz: a68bd323f3c6eff4acd86b0c20e7ee2daeb0a7269712b5d9fd36d80f3bb93ebdd92827bcafe97231e4af65a4d66b875a965090768d3c039c0c3c4e7f4f997ecd

data/app/controllers/mascot/site_controller.rb

@@ -3,20 +3,54 @@ module Mascot
     rescue_from Mascot::PageNotFoundError, with: :page_not_found
 
     def show
-      mascot.render mascot.find_resource
+      render inline: current_page.body,
+        type: current_page.asset.template_extensions.last,
+        layout: current_page.data.fetch("layout", controller_layout),
+        content_type: current_page.mime_type.to_s
     end
 
     protected
-    def resources
-      @_mascot_resources ||= Mascot.configuration.resources
+    def current_page
+      @_current_page ||= find_resource
     end
+    helper_method :current_page
 
-    def mascot
-      @_mascot_context ||= Mascot::ActionControllerContext.new(controller: self, resources: resources)
+    def root
+      @_root ||= Mascot.configuration.root
     end
+    helper_method :root
 
     def page_not_found(e)
       raise ActionController::RoutingError, e.message
     end
+
+    private
+
+    # Mascot::PageNotFoundError is handled in the default Mascot::SiteController
+    # with an execption that Rails can use to display a 404 error.
+    def get_resource(path)
+      resource = root.get_resource(path)
+      if resource.nil?
+        # TODO: Display error in context of Reources class root.
+        raise Mascot::PageNotFoundError, "No such page: #{path}"
+      else
+        resource
+      end
+    end
+
+    # Default finder of the resource for the current controller context.###
+    def find_resource
+      get_resource params[:resource_path]
+    end
+
+    # Returns the current layout for the inline Mascot renderer.
+    def controller_layout
+      layout = self.send(:_layout)
+      if layout.instance_of? String
+        layout
+      else
+        File.basename(layout.identifier).split('.').first
+      end
+    end
   end
 end

data/lib/mascot/engine.rb

@@ -1,4 +1,7 @@
 module Mascot
   class Engine < ::Rails::Engine
+    initializer "Add site root to view paths" do |app|
+      ActionController::Base.prepend_view_path Mascot.configuration.site.root_path
+    end
   end
 end

data/lib/mascot/extensions/index_request_path.rb

@@ -10,11 +10,11 @@ module Mascot
       end
 
       def process_resources(node)
-        node.each do |r|
+        node.resources.each do |r|
           asset = r.asset
           if asset.path.basename.to_s.start_with? @file_name
             request_path = Pathname.new("/").join(r.request_path).dirname.cleanpath.to_s
-            node.remove_resource(r)
+            node.formats.remove(r)
             node.add(path: request_path, asset: asset)
           end
         end

data/lib/mascot/extensions/partials_remover.rb

@@ -5,8 +5,8 @@ module Mascot
       # Partial rails prefix.
       PARTIAL_PREFIX = "_".freeze
 
-      def process_resources(resources)
-        resources.each do |r|
+      def process_resources(node)
+        node.resources.each do |r|
           r.node.remove if self.class.partial? r.asset.path # Looks like a smiley face, doesn't it?
         end
       end

data/lib/mascot/extensions/rails_request_paths.rb

@@ -3,12 +3,12 @@ module Mascot
     # Removes the file extension from the file so that /hi/there/fun.html can be
     # resolved via /hi/there/fun.
     class RailsRequestPaths
-      def process_resources(resources)
-        resources.each do |r|
+      def process_resources(node)
+        node.resources.each do |r|
           asset = r.asset
           request_path = r.request_path
           r.node.remove
-          resources.add path: self.class.format_path(request_path), asset: asset
+          node.add path: self.class.format_path(request_path), asset: asset
         end
       end
 

data/lib/mascot/rails.rb

@@ -7,7 +7,6 @@ module Mascot
   # Rescued by ActionController to display page not found error.
   PageNotFoundError = Class.new(StandardError)
 
-  autoload :ActionControllerContext,  "mascot/action_controller_context"
   autoload :RailsConfiguration,       "mascot/rails_configuration"
   autoload :RouteConstraint,          "mascot/route_constraint"
   module Extensions

data/lib/mascot/rails_configuration.rb

@@ -15,17 +15,17 @@ module Mascot
     end
 
     def site
-      @site ||= Site.new(root: default_root).tap do |site|
+      @site ||= Site.new(root_path: default_root).tap do |site|
         site.resources_pipeline << Extensions::PartialsRemover.new unless partials
         site.resources_pipeline << Extensions::RailsRequestPaths.new
       end
     end
 
-    def resources
-      # Production will cache resources globally. This drastically speeds up
-      # the speed at which resources are served, but if they change it won't be updated.
-      @resources = nil unless cache_resources?
-      @resources ||= site.resources
+    def root
+      # Production will cache root globally. This drastically speeds up
+      # the speed at which root are served, but if they change it won't be updated.
+      @root = nil unless cache_resources?
+      @root ||= site.root
     end
 
     def cache_resources?

data/lib/mascot/route_constraint.rb

@@ -1,12 +1,12 @@
 module Mascot
   # Route constraint for rails routes.rb file.
   class RouteConstraint
-    def initialize(resources: Mascot.configuration.resources)
-      @resources = resources
+    def initialize(root: Mascot.configuration.root)
+      @root = root
     end
 
     def matches?(request)
-      !!@resources.get(request.path)
+      !!@root.get(request.path)
     end
   end
 end

data/spec/dummy/app/pages/time.html.erb

@@ -1,4 +1,5 @@
 ---
+layout: mascot_test_layout
 title: Tick tock, tick tock
 ---
 

data/spec/dummy/app/views/layouts/mascot_test_layout.html.erb

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Test layout</title>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>