sitepress-rails 2.0.0.beta7 → 2.0.0.beta8

data/spec/dummy/log/test.log

@@ -65373,3 +65373,119 @@ Processing by Sitepress::SiteController#show as HTML
   Rendered inline template within layouts/application (Duration: 0.1ms | Allocations: 64)
   Rendered layout layouts/application.html.erb (Duration: 0.3ms | Allocations: 104)
 Completed 200 OK in 1ms (Views: 0.5ms | Allocations: 856)
+Processing by Sitepress::SiteController#show as HTML
+  Parameters: {"resource_path"=>"/all_pages"}
+  Rendering layout layouts/application.html.erb
+  Rendering inline template within layouts/application
+  Rendered inline template within layouts/application (Duration: 0.9ms | Allocations: 196)
+  Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
+  Rendered layout layouts/application.html.erb (Duration: 1.1ms | Allocations: 276)
+Completed 200 OK in 11ms (Views: 5.1ms | Allocations: 3250)
+Processing by Sitepress::SiteController#show as HTML
+  Parameters: {"resource_path"=>"/non-existent"}
+Completed 404 Not Found in 1ms (Allocations: 440)
+Processing by Sitepress::SiteController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendering layout layouts/application.html.erb
+  Rendering inline template within layouts/application
+  Rendered inline template within layouts/application (Duration: 0.2ms | Allocations: 73)
+  Rendered layout layouts/application.html.erb (Duration: 0.8ms | Allocations: 229)
+Completed 200 OK in 4ms (Views: 2.1ms | Allocations: 1001)
+Processing by Sitepress::SiteController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendering layout layouts/application.html.erb
+  Rendering inline template within layouts/application
+  Rendered inline template within layouts/application (Duration: 0.2ms | Allocations: 64)
+  Rendered layout layouts/application.html.erb (Duration: 0.3ms | Allocations: 104)
+Completed 200 OK in 3ms (Views: 1.1ms | Allocations: 875)
+Processing by Sitepress::SiteController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendering layout layouts/application.html.erb
+  Rendering inline template within layouts/application
+  Rendered inline template within layouts/application (Duration: 0.1ms | Allocations: 64)
+  Rendered layout layouts/application.html.erb (Duration: 0.3ms | Allocations: 104)
+Completed 200 OK in 3ms (Views: 1.1ms | Allocations: 875)
+Processing by Sitepress::SiteController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendering layout layouts/application.html.erb
+  Rendering inline template within layouts/application
+  Rendered inline template within layouts/application (Duration: 0.2ms | Allocations: 64)
+  Rendered layout layouts/application.html.erb (Duration: 0.3ms | Allocations: 104)
+Completed 200 OK in 3ms (Views: 1.4ms | Allocations: 875)
+Processing by Sitepress::SiteController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendering layout app/content/layouts/sitepress_test_layout.html.erb
+  Rendering inline template within layouts/sitepress_test_layout
+  Rendered app/content/pages/_stupid.html.erb (Duration: 0.6ms | Allocations: 73)
+  Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.4ms | Allocations: 72)
+  Rendered inline template within layouts/sitepress_test_layout (Duration: 4.2ms | Allocations: 835)
+  Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 4.9ms | Allocations: 984)
+Completed 200 OK in 9ms (Views: 5.9ms | Allocations: 2061)
+Processing by Sitepress::SiteController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendering layout app/content/layouts/sitepress_test_layout.html.erb
+  Rendering inline template within layouts/sitepress_test_layout
+  Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
+  Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
+  Rendered inline template within layouts/sitepress_test_layout (Duration: 0.5ms | Allocations: 265)
+  Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.6ms | Allocations: 305)
+Completed 200 OK in 2ms (Views: 0.9ms | Allocations: 1118)
+Processing by Sitepress::SiteController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendering layout app/content/layouts/sitepress_test_layout.html.erb
+  Rendering inline template within layouts/sitepress_test_layout
+  Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
+  Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
+  Rendered inline template within layouts/sitepress_test_layout (Duration: 0.4ms | Allocations: 262)
+  Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.6ms | Allocations: 302)
+Completed 200 OK in 2ms (Views: 0.8ms | Allocations: 1112)
+Processing by Sitepress::SiteController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendering layout app/content/layouts/sitepress_test_layout.html.erb
+  Rendering inline template within layouts/sitepress_test_layout
+  Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
+  Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
+  Rendered inline template within layouts/sitepress_test_layout (Duration: 0.6ms | Allocations: 263)
+  Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.7ms | Allocations: 303)
+Completed 200 OK in 2ms (Views: 1.0ms | Allocations: 1113)
+Processing by Sitepress::SiteController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendering layout app/content/layouts/sitepress_test_layout.html.erb
+  Rendering inline template within layouts/sitepress_test_layout
+  Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
+  Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
+  Rendered inline template within layouts/sitepress_test_layout (Duration: 0.5ms | Allocations: 262)
+  Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.6ms | Allocations: 302)
+Completed 200 OK in 2ms (Views: 0.9ms | Allocations: 1114)
+Processing by Sitepress::SiteController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendering layout app/content/layouts/sitepress_test_layout.html.erb
+  Rendering inline template within layouts/sitepress_test_layout
+  Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
+  Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
+  Rendered inline template within layouts/sitepress_test_layout (Duration: 0.5ms | Allocations: 262)
+  Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.6ms | Allocations: 302)
+Completed 200 OK in 2ms (Views: 0.9ms | Allocations: 1112)
+Processing by Sitepress::SiteController#show as HTML
+  Parameters: {"resource_path"=>"all_pages"}
+  Rendering layout layouts/application.html.erb
+  Rendering inline template within layouts/application
+  Rendered inline template within layouts/application (Duration: 0.2ms | Allocations: 47)
+  Rendered layout layouts/application.html.erb (Duration: 0.4ms | Allocations: 86)
+Completed 200 OK in 2ms (Views: 0.7ms | Allocations: 570)
+Processing by Sitepress::SiteController#show as HTML
+  Parameters: {"resource_path"=>"time"}
+  Rendering layout app/content/layouts/sitepress_test_layout.html.erb
+  Rendering inline template within layouts/sitepress_test_layout
+  Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
+  Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
+  Rendered inline template within layouts/sitepress_test_layout (Duration: 0.5ms | Allocations: 262)
+  Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.6ms | Allocations: 302)
+Completed 200 OK in 1ms (Views: 0.8ms | Allocations: 778)
+Processing by Sitepress::SiteController#show as HTML
+  Parameters: {"resource_path"=>"hi"}
+  Rendering layout layouts/application.html.erb
+  Rendering inline template within layouts/application
+  Rendered inline template within layouts/application (Duration: 0.1ms | Allocations: 64)
+  Rendered layout layouts/application.html.erb (Duration: 0.2ms | Allocations: 104)
+Completed 200 OK in 1ms (Views: 0.4ms | Allocations: 543)

data/spec/sitepress-rails_spec.rb

@@ -12,31 +12,8 @@ describe "Sitepress.configuration" do
     app.initialize!
     expect(subject.parent_engine).to eql(app)
   end
-  it "has Rails.application as parent engine" do
-    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
 end

data/spec/sitepress/compiler_spec.rb

@@ -4,16 +4,16 @@ require "fileutils"
 
 describe Sitepress::Compiler do
   let(:site) { Sitepress.site }
-  let(:target) { Pathname.new(Dir::tmpdir).join("build") }
+  let(:build_path) { 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) }
+  subject { Sitepress::Compiler.new(site: site, stdout: stdout, root_path: build_path) }
   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?
+    before { FileUtils.mkdir_p(build_path) }
+    after { FileUtils.rm_rf(build_path) }
+    it "writes files to build_path" do
+      subject.compile
+      expect(Dir.glob(build_path.join("**")).size).to eql(3) # 2 items in the site... mkay?
     end
   end
 end

data/spec/sitepress/sitepress_site_controller_spec.rb

@@ -79,27 +79,8 @@ describe Sitepress::SiteController, type: :controller do
     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
-
+  it "builds site once" do
+    allow(site).to receive(:root).once.and_return(site.root)
+    get_resource "/all_pages"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitepress-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta7
+  version: 2.0.0.beta8
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -58,42 +58,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta7
+        version: 2.0.0.beta8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta7
+        version: 2.0.0.beta8
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +143,7 @@ files:
 - spec/dummy/app/content/helpers/sample_helper.rb
 - spec/dummy/app/content/layouts/sitepress_test_layout.html.erb
 - spec/dummy/app/content/pages/_stupid.html.erb
+- spec/dummy/app/content/pages/all_pages.html.erb.html
 - spec/dummy/app/content/pages/hi.html
 - spec/dummy/app/content/pages/partials/_really_stupid.html.erb
 - spec/dummy/app/content/pages/time.html.erb
@@ -233,6 +234,7 @@ test_files:
 - spec/sitepress-rails_spec.rb
 - spec/dummy/app/mailers/application_mailer.rb
 - spec/dummy/app/content/layouts/sitepress_test_layout.html.erb
+- spec/dummy/app/content/pages/all_pages.html.erb.html
 - spec/dummy/app/content/pages/time.html.erb
 - spec/dummy/app/content/pages/_stupid.html.erb
 - spec/dummy/app/content/pages/hi.html