mascot-rails 0.1.12 → 0.1.14

data/spec/mascot/extensions/index_request_path_spec.rb

@@ -2,14 +2,14 @@ require "spec_helper"
 
 describe Mascot::Extensions::IndexRequestPath do
   subject { Mascot::Extensions::IndexRequestPath.new }
-  let(:site) { Mascot::Site.new(root: "spec/pages") }
-  let(:resources) { site.resources }
+  let(:site) { Mascot::Site.new(root_path: "spec/pages") }
+  let(:root) { site.root }
 
   context "#process_resources" do
-    before { subject.process_resources(resources) }
+    before { subject.process_resources(root) }
     it "changes /index.html request_path to /" do
       # require "pry" ; binding.pry
-      expect(resources.get_resource("/").request_path).to eql("/")
+      expect(root.get_resource("/").request_path).to eql("/")
     end
   end
 end

data/spec/mascot/mascot_site_controller_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Mascot::SiteController, type: :controller do
-  context "existing templated page" do
+  context "templated page" do
     render_views
     before { get :show, resource_path: "/time" }
     let(:resource) { Mascot.configuration.site.get("/time") }
@@ -12,23 +12,23 @@ describe Mascot::SiteController, type: :controller do
       expect(response.body).to include("<h1>Tick tock, tick tock</h1>")
     end
     it "renders layout" do
-      expect(response.body).to include("<title>Dummy</title>")
+      expect(response.body).to include("<title>Test layout</title>")
     end
     it "responds with content type" do
       expect(response.content_type).to eql("text/html")
     end
-    context "@_mascot_locals assignment" do
-      subject { assigns(:_mascot_locals) }
-      it ":current_page" do
-        expect(subject[:current_page].asset.path).to eql(resource.asset.path)
+    context "helper methods" do
+      subject { @controller }
+      it "#current_page" do
+        expect(subject.send(:current_page).asset.path).to eql(resource.asset.path)
       end
-      it ":site" do
-        expect(subject[:resources]).to eql(Mascot.configuration.resources)
+      it "#root" do
+        expect(subject.send(:root)).to eql(Mascot.configuration.root)
       end
     end
   end
 
-  context "existing static page" do
+  context "static page" do
     render_views
     before { get :show, resource_path: "/hi" }
     it "is status 200" do

data/spec/mascot/rails_configuration_spec.rb

@@ -8,11 +8,11 @@ describe Mascot::RailsConfiguration do
     end
     it "excludes partials if false" do
       subject.partials = false
-      expect(subject.resources.to_a.size).to eql(2)
+      expect(subject.root.resources.to_a.size).to eql(2)
     end
     it "includes partials if true" do
       subject.partials = true
-      expect(subject.resources.to_a.size).to eql(3)
+      expect(subject.root.resources.to_a.size).to eql(3)
     end
   end
 end

data/spec/mascot-rails_spec.rb

@@ -6,7 +6,7 @@ describe Mascot do
   context "default configuration" do
     subject{ Mascot.configuration }
     it "has site" do
-      expect(subject.site.root).to eql(Rails.root.join("app/pages"))
+      expect(subject.site.root_path).to eql(Rails.root.join("app/pages"))
     end
     it "has Rails.application as parent engine" do
       expect(subject.parent_engine).to eql(Rails.application)
@@ -15,4 +15,7 @@ describe Mascot do
       expect(subject.routes).to be true
     end
   end
+  it "prepends Site#root_path to ActionController::Base.view_paths" do
+    expect(ActionController::Base.view_paths.first.to_s).to eql(Mascot.configuration.site.root_path.to_s)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mascot-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Brad Gessler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.14
 description: 
 email:
 - bradgessler@gmail.com
@@ -79,7 +79,6 @@ files:
 - app/helpers/mascot/application_helper.rb
 - config/routes.rb
 - lib/mascot-rails.rb
-- lib/mascot/action_controller_context.rb
 - lib/mascot/engine.rb
 - lib/mascot/extensions/index_request_path.rb
 - lib/mascot/extensions/partials_remover.rb
@@ -106,6 +105,7 @@ files:
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/layouts/mailer.html.erb
 - spec/dummy/app/views/layouts/mailer.text.erb
+- spec/dummy/app/views/layouts/mascot_test_layout.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -147,7 +147,6 @@ files:
 - spec/dummy/public/apple-touch-icon.png
 - spec/dummy/public/favicon.ico
 - spec/mascot-rails_spec.rb
-- spec/mascot/action_controller_context_spec.rb
 - spec/mascot/extensions/index_request_path_spec.rb
 - spec/mascot/extensions/partials_remover_spec.rb
 - spec/mascot/extensions/rails_request_paths_spec.rb
@@ -203,6 +202,7 @@ test_files:
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/layouts/mailer.html.erb
 - spec/dummy/app/views/layouts/mailer.text.erb
+- spec/dummy/app/views/layouts/mascot_test_layout.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -244,7 +244,6 @@ test_files:
 - spec/dummy/public/apple-touch-icon.png
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
-- spec/mascot/action_controller_context_spec.rb
 - spec/mascot/extensions/index_request_path_spec.rb
 - spec/mascot/extensions/partials_remover_spec.rb
 - spec/mascot/extensions/rails_request_paths_spec.rb

data/lib/mascot/action_controller_context.rb

@@ -1,57 +0,0 @@
-module Mascot
-  # Renders a mascot page via the params path via ActionController.
-  class ActionControllerContext
-    attr_reader :controller, :resources
-
-    def initialize(controller: , resources: )
-      @controller = controller
-      @resources = resources
-    end
-
-    # Renders a mascot page, given a path, and accepts parameters like layout
-    # and locals if the user wants to provide additional context to the rendering
-    # call.
-    def render(resource = find_resource, layout: nil, locals: {})
-      # Users may set the layout from frontmatter.
-      layout ||= resource.data.fetch("layout", controller_layout)
-      type = resource.asset.template_extensions.last
-      locals = locals.merge(current_page: resource, resources: resources)
-
-      # @_mascot_locals variable is used by the wrap_template helper.
-      controller.instance_variable_set(:@_mascot_locals, locals)
-      controller.render inline: resource.body,
-        type: type,
-        layout: layout,
-        locals: locals,
-        content_type: resource.mime_type.to_s
-    end
-
-    # Mascot::PageNotFoundError is handled in the default Mascot::SiteController
-    # with an execption that Rails can use to display a 404 error.
-    def get(path)
-      resource = resources.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 controller.params[:resource_path]
-    end
-
-    private
-    # Returns the current layout for the inline Mascot renderer.
-    def controller_layout
-      layout = controller.send(:_layout)
-      if layout.instance_of? String
-        layout
-      else
-        File.basename(layout.identifier).split('.').first
-      end
-    end
-  end
-end

data/spec/mascot/action_controller_context_spec.rb

@@ -1,23 +0,0 @@
-require "spec_helper"
-
-describe Mascot::ActionControllerContext do
-  subject { Mascot::ActionControllerContext.new(controller: controller, resources: resources) }
-  let(:resources) { Mascot.configuration.resources }
-  let(:site) { Mascot.configuration.site }
-  let(:resource) { site.glob("**.erb*").first }
-  context "#render" do
-    let(:controller) { instance_double("Controller", render: true, _layout: "application") }
-    it "calls render" do
-      expect(controller).to receive(:render).with(inline: resource.body,
-        type: "erb",
-        layout: "flipper",
-        locals: {
-          current_page: resource,
-          cat: "in-a-hat",
-          resources: resources
-        },
-        content_type: resource.mime_type.to_s)
-      subject.render(resource, locals: {cat: "in-a-hat"}, layout: "flipper")
-    end
-  end
-end