sitepress-rails 2.0.0.beta3 → 2.0.0.beta8

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

@@ -48,8 +48,8 @@ describe Sitepress::SiteController, type: :controller do
     it "renders body" do
       expect(response.body).to include("<h1>Hi!</h1>")
     end
-    it "does not render layout" do
-      expect(response.body).to_not include("<title>Dummy</title>")
+    it "renders default 'layouts/application' layout" do
+      expect(response.body).to include("<title>Dummy</title>")
     end
     it "responds with content type" do
       expect(response.content_type).to include("text/html")
@@ -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.beta3
+  version: 2.0.0.beta8
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-24 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.beta3
+        version: 2.0.0.beta8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta3
+        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
@@ -115,8 +115,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - README.md
 - Rakefile
+- bin/rails
 - lib/sitepress-rails.rb
 - lib/sitepress/build_paths/directory_index_path.rb
 - lib/sitepress/build_paths/index_path.rb
@@ -129,6 +131,10 @@ files:
 - lib/sitepress/renderers/server.rb
 - lib/sitepress/route_constraint.rb
 - lib/tasks/sitepress_tasks.rake
+- rails/app/controllers/concerns/sitepress/site_pages.rb
+- rails/app/controllers/sitepress/site_controller.rb
+- rails/config/routes.rb
+- sitepress-rails.gemspec
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
@@ -137,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
@@ -178,6 +185,8 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/config/spring.rb
+- 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
@@ -216,77 +225,80 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 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
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/content/helpers/sample_helper.rb
+- spec/spec_helper.rb
+- 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
 - spec/dummy/app/content/pages/partials/_really_stupid.html.erb
-- spec/dummy/app/content/pages/time.html.erb
+- spec/dummy/app/content/helpers/sample_helper.rb
+- spec/dummy/app/jobs/application_job.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/baseline_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/jobs/application_job.rb
-- spec/dummy/app/mailers/application_mailer.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
 - spec/dummy/app/views/layouts/mailer.text.erb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/app/assets/javascripts/cable.js
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/bin/update
 - spec/dummy/bin/rake
 - spec/dummy/bin/setup
-- spec/dummy/bin/update
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/config/cable.yml
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/spring.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/puma.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/application_controller_renderer.rb
-- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/null_logger.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/puma.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/spring.rb
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config.ru
-- spec/dummy/log/test.log
-- spec/dummy/public/404.html
+- spec/dummy/Rakefile
+- spec/dummy/public/favicon.ico
 - spec/dummy/public/422.html
+- spec/dummy/public/apple-touch-icon.png
 - spec/dummy/public/500.html
+- spec/dummy/public/404.html
 - spec/dummy/public/apple-touch-icon-precomposed.png
-- spec/dummy/public/apple-touch-icon.png
-- spec/dummy/public/favicon.ico
-- spec/sitepress/compiler_spec.rb
-- spec/sitepress/rails_configuration_spec.rb
-- spec/sitepress/route_constraint_spec.rb
-- spec/sitepress/routes_spec.rb
-- spec/sitepress/sitepress_site_controller_spec.rb
-- spec/sitepress-rails_spec.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/log/test.log
+- spec/dummy/log/production.log
 - spec/sites/sample/pages/index.html.erb
-- spec/sites/sample/pages/nothing
+- spec/sites/sample/pages/test.html.haml
 - spec/sites/sample/pages/sin_frontmatter.html.haml
 - spec/sites/sample/pages/super.duper/index.html
-- spec/sites/sample/pages/test.html.haml
+- spec/sites/sample/pages/nothing
 - spec/sites/sample/pages/text.txt
-- spec/spec_helper.rb
+- spec/sitepress/sitepress_site_controller_spec.rb
+- spec/sitepress/rails_configuration_spec.rb
+- spec/sitepress/routes_spec.rb
+- spec/sitepress/route_constraint_spec.rb
+- spec/sitepress/compiler_spec.rb