sitepress-rails 0.1.27 → 2.0.0.beta1

data/spec/sitepress-rails_spec.rb

@@ -4,61 +4,39 @@ require "sitepress-rails"
 describe "Sitepress.configuration" do
   subject { Sitepress.configuration }
   let(:app) { Dummy::Application.new }
-  let(:cache_classes) { true }
+  let(:cache_classes) { false }
   before do
     app.config.eager_load = cache_classes # WTF?
-    app.config.cache_classes = cache_classes # This is what I really want to test.
-    app.initialize!
-  end
-  it "has site" do
-    expect(subject.site.root_path).to eql(app.root.join("app/content"))
   end
   it "has Rails.application as parent engine" do
+    app.initialize!
     expect(subject.parent_engine).to eql(app)
   end
   it "has Rails.application as parent engine" do
-    expect(subject.cache_resources).to be true
+    app.initialize!
+    expect(subject.cache_resources).to be_nil
   end
   it "has routes enabled by default" do
+    app.initialize!
     expect(subject.routes).to be true
   end
   context "#cache_resources" do
+    before do
+      app.config.cache_classes = cache_classes # This is what I really want to test.
+    end
     context "Rails.configuration.cache_classes=true" do
       let(:cache_classes) { true }
       it "is true" do
+        app.initialize!
         expect(subject.cache_resources).to eql(true)
       end
     end
     context "Rails.configuration.cache_classes=false" do
       let(:cache_classes) { false }
       it "is false" do
+        app.initialize!
         expect(subject.cache_resources).to eql(false)
       end
     end
   end
-  context "Sitepress::Middleware::RequestCache" do
-    it "is in Rails middleware stack" do
-      expect(app.config.middleware).to include(Sitepress::Middleware::RequestCache)
-    end
-  end
-  context "Rails.configuration.paths" do
-    subject { Rails.configuration.paths[path].to_a }
-    context "views" do
-      let(:path) { "app/views" }
-      it { should include(app.root.join("app/content").to_s) }
-    end
-    context "helpers" do
-      let(:path) { "app/helpers" }
-      it { should include(app.root.join("app/content/helpers").to_s) }
-    end
-    context "assets" do
-      let(:path) { "app/assets" }
-      it { should include(app.root.join("app/content/assets").to_s) }
-    end
-  end
-  context "#partals" do
-    it "excludes partials" do
-      expect(subject.site.resources.size).to eql(2)
-    end
-  end
-end
+end

data/spec/sitepress/compiler_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+require "tmpdir"
+require "fileutils"
+
+describe Sitepress::Compiler do
+  let(:site) { Sitepress.site }
+  let(:target) { Pathname.new(Dir::tmpdir).join("build") }
+  # Write compiler output to /dev/null so our test output remains clean.
+  let(:stdout) { File.open(File::NULL, "w")  }
+  subject { Sitepress::Compiler.new(site: site, stdout: stdout) }
+  describe "#compile" do
+    before { FileUtils.mkdir_p(target) }
+    after { FileUtils.rm_rf(target) }
+    it "writes files to target" do
+      subject.compile(target_path: target)
+      expect(Dir.glob(target.join("**")).size).to eql(2) # 2 items in the site... mkay?
+    end
+  end
+end

data/spec/sitepress/sitepress_site_controller_spec.rb

@@ -1,10 +1,21 @@
 require "spec_helper"
 
 describe Sitepress::SiteController, type: :controller do
+  # Rails 5 introduces a new format of calling the `get` rspec helper method.
+  def get_resource(path)
+    if Gem::Version.new(Rails.version) >= Gem::Version.new("5.0.0")
+      get :show, params: { resource_path: path }
+    else
+      get :show, resource_path: path
+    end
+  end
+
+  let(:site) { Sitepress.configuration.site }
+
   context "templated page" do
     render_views
-    before { get :show, resource_path: "/time" }
-    let(:resource) { Sitepress.site.get("/time") }
+    before { get_resource "/time" }
+    let(:resource) { site.get("/time") }
     it "is status 200" do
       expect(response.status).to eql(200)
     end
@@ -15,7 +26,7 @@ describe Sitepress::SiteController, type: :controller do
       expect(response.body).to include("<title>Test layout</title>")
     end
     it "responds with content type" do
-      expect(response.content_type).to eql("text/html")
+      expect(response.content_type).to include("text/html")
     end
     context "helper methods" do
       subject { @controller }
@@ -23,33 +34,72 @@ describe Sitepress::SiteController, type: :controller do
         expect(subject.send(:current_page).asset.path).to eql(resource.asset.path)
       end
       it "#site" do
-        expect(subject.send(:site)).to eql(Sitepress.site)
+        expect(subject.send(:site)).to eql(site)
       end
     end
   end
 
   context "static page" do
     render_views
-    before { get :show, resource_path: "/hi" }
+    before { get_resource "/hi" }
     it "is status 200" do
       expect(response.status).to eql(200)
     end
     it "renders body" do
       expect(response.body).to include("<h1>Hi!</h1>")
     end
-    it "renders layout" do
-      expect(response.body).to include("<title>Dummy</title>")
+    it "does not render layout" do
+      expect(response.body).to_not include("<title>Dummy</title>")
     end
     it "responds with content type" do
-      expect(response.content_type).to eql("text/html")
+      expect(response.content_type).to include("text/html")
     end
   end
 
   context "non-existent page" do
     it "is status 404" do
       expect {
-        get :show, resource_path: "/non-existent"
+        get_resource "/non-existent"
       }.to raise_exception(ActionController::RoutingError)
     end
   end
+
+  context "paths" do
+    context "view_paths" do
+      subject { Sitepress::SiteController.view_paths.map(&:path) }
+      it { is_expected.to include(site.root_path.to_s) }
+      it { is_expected.to include(site.pages_path.to_s) }
+    end
+    context "helper_paths" do
+      subject{ Sitepress::SiteController.helpers_path }
+      it { is_expected.to include(site.helpers_path.to_s) }
+      it "has site#helper_paths in ActiveSupport::Dependencies.autoload_paths" do
+        expect(ActiveSupport::Dependencies.autoload_paths).to include(site.helpers_path.to_s)
+      end
+    end
+  end
+
+  context "render cache" do
+    context "cache_resources=true" do
+      before { site.cache_resources = true }
+      it "enables cache" do
+        expect(site.cache_resources).to be true
+        expect(site).to receive(:cache_resources=).with(true)
+        expect(site).to receive(:cache_resources=).with(true)
+        get_resource "/time"
+        expect(site.cache_resources).to be true
+      end
+    end
+    context "cache_resources=false" do
+      before { site.cache_resources = false }
+      it "enables cache" do
+        expect(site.cache_resources).to be false
+        expect(site).to receive(:cache_resources=).with(true)
+        expect(site).to receive(:cache_resources=).with(false)
+        get_resource "/time"
+        expect(site.cache_resources).to be false
+      end
+    end
+
+  end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: sitepress-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Brad Gessler
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,48 +39,76 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: sitepress-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 2.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 2.0.0.beta1
 - !ruby/object:Gem::Dependency
-  name: sitepress-core
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.27
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.27
-description: 
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+description:
 email:
 - bradgessler@gmail.com
 executables: []
@@ -91,15 +119,17 @@ files:
 - Rakefile
 - app/controllers/concerns/sitepress/site_pages.rb
 - app/controllers/sitepress/site_controller.rb
-- app/helpers/sitepress/application_helper.rb
 - config/routes.rb
 - lib/sitepress-rails.rb
+- lib/sitepress/build_paths/directory_index_path.rb
+- lib/sitepress/build_paths/index_path.rb
+- lib/sitepress/build_paths/root_path.rb
+- lib/sitepress/compiler.rb
 - lib/sitepress/engine.rb
-- lib/sitepress/extensions/index_request_path.rb
-- lib/sitepress/extensions/partials_remover.rb
-- lib/sitepress/extensions/rails_request_paths.rb
 - lib/sitepress/rails.rb
 - lib/sitepress/rails_configuration.rb
+- lib/sitepress/renderers/controller.rb
+- lib/sitepress/renderers/server.rb
 - lib/sitepress/route_constraint.rb
 - lib/tasks/sitepress_tasks.rake
 - spec/dummy/Rakefile
@@ -118,7 +148,6 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/jobs/application_job.rb
 - spec/dummy/app/mailers/application_mailer.rb
-- spec/dummy/app/models/application_record.rb
 - spec/dummy/app/views/baseline/show.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/layouts/mailer.html.erb
@@ -152,9 +181,6 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/config/spring.rb
-- spec/dummy/db/production.sqlite3
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/production.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -163,9 +189,7 @@ files:
 - spec/dummy/public/apple-touch-icon.png
 - spec/dummy/public/favicon.ico
 - spec/sitepress-rails_spec.rb
-- spec/sitepress/extensions/index_request_path_spec.rb
-- spec/sitepress/extensions/partials_remover_spec.rb
-- spec/sitepress/extensions/rails_request_paths_spec.rb
+- spec/sitepress/compiler_spec.rb
 - spec/sitepress/rails_configuration_spec.rb
 - spec/sitepress/route_constraint_spec.rb
 - spec/sitepress/routes_spec.rb
@@ -180,7 +204,7 @@ files:
 homepage: https://github.com/sitepress/sitepress
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -191,16 +215,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Sitepress rails integration.
 test_files:
+- spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/javascripts/cable.js
@@ -216,7 +240,6 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/jobs/application_job.rb
 - spec/dummy/app/mailers/application_mailer.rb
-- spec/dummy/app/models/application_record.rb
 - spec/dummy/app/views/baseline/show.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/layouts/mailer.html.erb
@@ -250,9 +273,6 @@ test_files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/config/spring.rb
 - spec/dummy/config.ru
-- spec/dummy/db/production.sqlite3
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/production.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -260,10 +280,7 @@ test_files:
 - spec/dummy/public/apple-touch-icon-precomposed.png
 - spec/dummy/public/apple-touch-icon.png
 - spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
-- spec/sitepress/extensions/index_request_path_spec.rb
-- spec/sitepress/extensions/partials_remover_spec.rb
-- spec/sitepress/extensions/rails_request_paths_spec.rb
+- spec/sitepress/compiler_spec.rb
 - spec/sitepress/rails_configuration_spec.rb
 - spec/sitepress/route_constraint_spec.rb
 - spec/sitepress/routes_spec.rb

data/app/helpers/sitepress/application_helper.rb

@@ -1,4 +0,0 @@
-module Sitepress
-  module ApplicationHelper
-  end
-end

data/lib/sitepress/extensions/index_request_path.rb

@@ -1,24 +0,0 @@
-module Sitepress
-  module Extensions
-    # Removes files beginning with "_" from the resource collection.
-    class IndexRequestPath
-      # Name of the file that we'll want to change to a / path
-      FILE_NAME = "index.html".freeze
-
-      def initialize(file_name: FILE_NAME)
-        @file_name = file_name
-      end
-
-      def process_resources(node)
-        node.flatten.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.formats.remove(r)
-            node.add(path: request_path, asset: asset)
-          end
-        end
-      end
-    end
-  end
-end