sitepress-rails 0.1.27 → 0.1.28

data/spec/sitepress-rails_spec.rb

@@ -4,41 +4,48 @@ 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
+    app.initialize!
     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)
+      expect(Rails.configuration.middleware).to include(Sitepress::Middleware::RequestCache)
     end
   end
   context "Rails.configuration.paths" do

data/spec/sitepress/sitepress_site_controller_spec.rb

@@ -1,9 +1,18 @@
 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
+
   context "templated page" do
     render_views
-    before { get :show, resource_path: "/time" }
+    before { get_resource "/time" }
     let(:resource) { Sitepress.site.get("/time") }
     it "is status 200" do
       expect(response.status).to eql(200)
@@ -30,7 +39,7 @@ describe Sitepress::SiteController, type: :controller do
 
   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
@@ -48,7 +57,7 @@ describe Sitepress::SiteController, type: :controller do
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitepress-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - Brad Gessler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -56,14 +56,14 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.27
+        version: 0.1.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.27
+        version: 0.1.28
 description: 
 email:
 - bradgessler@gmail.com
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Sitepress rails integration.