sitepress-rails 2.0.0 → 3.1.1

data/spec/sitepress/model_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+require "tmpdir"
+require "fileutils"
+
+describe Sitepress::Model do
+  let(:model) { PageModel }
+
+  describe "#all" do
+    subject { model.all }
+    context "models" do
+      it "has correct count" do
+        expect(subject.count).to eql 3
+      end
+      it "is instances of model" do
+        expect(subject.first).to be_instance_of PageModel
+      end
+    end
+    describe "#resources" do
+      subject { model.all.resources }
+      it "has correct count" do
+        expect(subject.count).to eql 3
+      end
+      it "is instances of pages" do
+        expect(subject.first).to be_instance_of Sitepress::Resource
+      end
+    end
+  end
+
+  describe ".data" do
+    subject { model.first }
+    it "defines #title method" do
+      expect(subject).to respond_to :title
+    end
+  end
+end

data/spec/sitepress/routes_spec.rb

@@ -1,28 +1,13 @@
 require "spec_helper"
 
 describe "Sitepress routes", type: :routing do
-  context "routes enabled" do
-    before do
-      Sitepress.configuration.routes = true
-      Rails.application.reload_routes!
-    end
-    it "generates link" do
-      expect(page_path("hi")).to eql("/hi")
-    end
-    it "is routable" do
-      expect(get("/hi")).to route_to(controller: "sitepress/site", action: "show", resource_path: "hi")
-    end
+  before do
+    Rails.application.reload_routes!
   end
-  context "routes disabled" do
-    before do
-      Sitepress.configuration.routes = false
-      Rails.application.reload_routes!
-    end
-    it "is not routable" do
-      expect(get("/hi")).to_not be_routable
-    end
-    it "does not generate link" do
-      expect{page_path("hi")}.to raise_exception(NoMethodError)
-    end
+  it "generates link" do
+    expect(page_path("hi")).to eql("/hi")
+  end
+  it "is routable" do
+    expect(get("/hi")).to route_to(controller: "sitepress/site", action: "show", resource_path: "hi")
   end
 end

data/spec/sitepress-rails_spec.rb

@@ -2,31 +2,16 @@ require "spec_helper"
 require "sitepress-rails"
 
 describe "Sitepress.configuration" do
+  let(:app) { Rails.application }
   subject { Sitepress.configuration }
-  let(:app) { Dummy::Application.new }
-  before do
-    # Why set to true? Because according to Rails:
-    #
-    #  .config.eager_load is set to nil. Please update your config/environments/*.rb files accordingly:
-    #
-    #    * development - set it to false
-    #    * test - set it to false (unless you use a tool that preloads your test environment)
-    #   * production - set it to true
-    #
-    # The view initializer for haml runs in a `ActiveSupport.on_load(:action_view)`, which requires
-    # `eager_load = true` to test.
-    app.config.eager_load = true
-  end
+
   it "has Rails.application as parent engine" do
-    app.initialize!
     expect(subject.parent_engine).to eql(app)
   end
-  it "has routes enabled by default" do
-    app.initialize!
-    expect(subject.routes).to be true
-  end
-  it "sets Sitepress::Path.template_extensions" do
-    app.initialize!
-    expect(Sitepress::Path.handler_extensions).to eql([:raw, :erb, :html, :builder, :ruby])
+
+  describe "Sitepress::Path.template_extensions" do
+    subject { Sitepress::Path.handler_extensions }
+    it { is_expected.to eql ActionView::Template::Handlers.extensions }
+    it { is_expected.to_not be_empty }
   end
 end

data/spec/spec_helper.rb

@@ -6,6 +6,21 @@ require File.expand_path("../dummy/config/environment.rb", __FILE__)
 require "rspec/rails"
 require "pry"
 
+Rails.application.configure do
+  # Why set to true? Because according to Rails:
+  #
+  #  .config.eager_load is set to nil. Please update your config/environments/*.rb files accordingly:
+  #
+  #    * development - set it to false
+  #    * test - set it to false (unless you use a tool that preloads your test environment)
+  #   * production - set it to true
+  #
+  # The view initializer for haml runs in a `ActiveSupport.on_load(:action_view)`, which requires
+  # `eager_load = true` to test.
+  config.eager_load = true
+end
+
+# Suppress error output during testing.
 Rails.backtrace_cleaner.remove_silencers!
 
 # Load support files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitepress-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: sitepress-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -125,16 +125,28 @@ files:
 - lib/sitepress/build_paths/root_path.rb
 - lib/sitepress/compiler.rb
 - lib/sitepress/engine.rb
+- lib/sitepress/model.rb
+- lib/sitepress/models/collection.rb
 - lib/sitepress/rails.rb
 - lib/sitepress/rails_configuration.rb
 - lib/sitepress/renderers/controller.rb
 - lib/sitepress/renderers/server.rb
 - lib/sitepress/rendition.rb
 - lib/sitepress/route_constraint.rb
+- lib/sitepress/routing_mapper.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
+- rails/lib/generators/sitepress/controller/USAGE
+- rails/lib/generators/sitepress/controller/controller_generator.rb
+- rails/lib/generators/sitepress/controller/templates/controllers/site_controller.rb
+- rails/lib/generators/sitepress/install/USAGE
+- rails/lib/generators/sitepress/install/install_generator.rb
+- rails/lib/generators/sitepress/install/templates/helpers/page_helper.rb
+- rails/lib/generators/sitepress/install/templates/models/page_model.rb
+- rails/lib/generators/sitepress/install/templates/pages/index.html.erb
+- rails/test/lib/generators/sitepress/controller_generator_test.rb
+- rails/test/lib/generators/sitepress/install_generator_test.rb
 - sitepress-rails.gemspec
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
@@ -143,6 +155,7 @@ files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/content/helpers/sample_helper.rb
 - spec/dummy/app/content/layouts/sitepress_test_layout.html.erb
+- spec/dummy/app/content/models/page_model.rb
 - spec/dummy/app/content/pages/_stupid.html.erb
 - spec/dummy/app/content/pages/all_pages.html.erb
 - spec/dummy/app/content/pages/hi.html
@@ -186,8 +199,6 @@ 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
@@ -197,6 +208,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/sitepress-rails_spec.rb
 - spec/sitepress/compiler_spec.rb
+- spec/sitepress/model_spec.rb
 - spec/sitepress/rails_configuration_spec.rb
 - spec/sitepress/route_constraint_spec.rb
 - spec/sitepress/routes_spec.rb
@@ -227,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Sitepress rails integration.
@@ -239,6 +251,7 @@ test_files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/content/helpers/sample_helper.rb
 - spec/dummy/app/content/layouts/sitepress_test_layout.html.erb
+- spec/dummy/app/content/models/page_model.rb
 - spec/dummy/app/content/pages/_stupid.html.erb
 - spec/dummy/app/content/pages/all_pages.html.erb
 - spec/dummy/app/content/pages/hi.html
@@ -282,8 +295,6 @@ test_files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/config/spring.rb
 - spec/dummy/config.ru
-- 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
@@ -292,6 +303,7 @@ test_files:
 - spec/dummy/public/apple-touch-icon.png
 - spec/dummy/public/favicon.ico
 - spec/sitepress/compiler_spec.rb
+- spec/sitepress/model_spec.rb
 - spec/sitepress/rails_configuration_spec.rb
 - spec/sitepress/route_constraint_spec.rb
 - spec/sitepress/routes_spec.rb

data/rails/config/routes.rb

@@ -1,12 +0,0 @@
-Sitepress.configuration.parent_engine.routes.draw do
-  if Sitepress.configuration.routes
-    constraints Sitepress::RouteConstraint.new do
-      get "*resource_path", controller: "sitepress/site", action: "show", as: :page, format: false
-      if has_named_route? :root
-        Rails.logger.warn 'Sitepress tried to configure `root to: "sitepress/site#show"`, but a root route was already defined.'
-      else
-        root to: "sitepress/site#show"
-      end
-    end
-  end
-end