sitepress-rails 2.0.0.beta1 → 2.0.0.beta6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ef7991baba77ba1d9f5686ec4f8570e60b9ecfbd4d56c9daf0af7a4eef835cfa
4
- data.tar.gz: 20c870b3d71fb594dbc8c904a74a084d8b67c90b4f5c2f7f7b02c71be69b1ce1
3
+ metadata.gz: 56f5e9a3099ff4ed2482dc64bb279b4d6bae6490f9730160b6aca70ce49fdab2
4
+ data.tar.gz: dc5b8207d25bee40911b6e03443efcd9a7f0c447a8835072f5427846580c617e
5
5
  SHA512:
6
- metadata.gz: d4b6f85510e7fe4078679203d2f86ac04ac22428463714ce236f06220513443fa64998598c35ac5fdbd6494ff7547743dd4b0539d48d04824e8c775a638d07dc
7
- data.tar.gz: 16174ec324144ffa5b3b3ea8bc67a93c724713af7a4269a48859653d2cab09db366dd597d0fce3c5fd4418b1948687a79d61e89077b0d04475f1d25d2c0a42d9
6
+ metadata.gz: 9efc2c72960749d48d3efbea750eafa2aac4ddd6127f19f8f2a71ad0f8b149b1a901d35ea7830b4860b4d1950524e9786b21f915655b7526af8caa20c7c03a36
7
+ data.tar.gz: 4479ffc29e860ff98b6eb06ad6ff04bbd580a92d2fe74ec286cf98ac421d6bb6d723b07fc5a95db9fd5bf64d6e08340b7da4e6ff6a73b4344650f9bb3fee6bd2
data/.gitignore ADDED
@@ -0,0 +1,7 @@
1
+ .bundle/
2
+ log/*.log
3
+ pkg/
4
+ test/dummy/db/*.sqlite3
5
+ test/dummy/db/*.sqlite3-journal
6
+ test/dummy/log/*.log
7
+ test/dummy/tmp/
data/bin/rails ADDED
@@ -0,0 +1,13 @@
1
+ #!/usr/bin/env ruby
2
+ # This command will automatically be run when you run "rails" with Rails gems
3
+ # installed from the root of your application.
4
+
5
+ ENGINE_ROOT = File.expand_path('../..', __FILE__)
6
+ ENGINE_PATH = File.expand_path('../../lib/sitepress-rails/engine', __FILE__)
7
+
8
+ # Set up gems listed in the Gemfile.
9
+ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
10
+ require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
11
+
12
+ require 'rails/all'
13
+ require 'rails/engine/commands'
@@ -6,6 +6,8 @@ module Sitepress
6
6
  class Compiler
7
7
  include FileUtils
8
8
 
9
+ RenderingError = Class.new(RuntimeError)
10
+
9
11
  class ResourceCompiler
10
12
  attr_reader :resource
11
13
 
@@ -2,6 +2,9 @@ require "rails/engine"
2
2
 
3
3
  module Sitepress
4
4
  class Engine < ::Rails::Engine
5
+ # Set the root of the engine to the gems rails directory.
6
+ config.root = File.expand_path("../../rails", __dir__)
7
+
5
8
  # Set the path for the site configuration file.
6
9
  paths.add "config/site.rb", with: [
7
10
  File.expand_path("./config/site.rb"), # When Sitepress is launched via `sitepress server`.
@@ -1,5 +1,7 @@
1
1
  module Sitepress
2
2
  module Renderers
3
+ # This would be the ideal way to render Sitepress pages, but there's a lot
4
+ # of hackery involved in getting it to work properly.
3
5
  class Controller
4
6
  attr_reader :controller, :page
5
7
 
@@ -1,5 +1,10 @@
1
1
  module Sitepress
2
2
  module Renderers
3
+ # Renders pages by invoking a rack call to the Rails application. From my
4
+ # experiments rendering as of 2021, this is the most reliable way to render
5
+ # pages. Rendering via `Renderers::Controller` has lots of various subtle issues
6
+ # that are surprising. People don't like surprises, so I opted to render through a
7
+ # slightly heavier stack.
3
8
  class Server
4
9
  attr_reader :rails_app, :page
5
10
 
@@ -11,8 +16,11 @@ module Sitepress
11
16
  def render
12
17
  code, headers, response = rails_app.routes.call env
13
18
  response.body
19
+ rescue => e
20
+ raise Compiler::RenderingError.new "Error rendering #{page.request_path.inspect} at #{page.asset.path.expand_path.to_s.inspect}:\n#{e.message}"
14
21
  end
15
22
 
23
+ private
16
24
  def env
17
25
  {
18
26
  "PATH_INFO"=> page.request_path,
@@ -1,5 +1,5 @@
1
1
  module Sitepress
2
- class SiteController < ActionController::Base
2
+ class SiteController < ::ApplicationController
3
3
  # Extracted into a module because other controllers may need
4
4
  # to be capable of serving Sitepress pages.
5
5
  include Sitepress::SitePages
File without changes
@@ -0,0 +1,32 @@
1
+ # coding: utf-8
2
+ lib = File.expand_path('../lib', __FILE__)
3
+ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
+ require File.expand_path('../../sitepress-core/lib/sitepress/version', __FILE__)
5
+
6
+ Gem::Specification.new do |spec|
7
+ spec.name = "sitepress-rails"
8
+ spec.version = Sitepress::VERSION
9
+ spec.authors = ["Brad Gessler"]
10
+ spec.email = ["bradgessler@gmail.com"]
11
+
12
+ spec.summary = %q{Sitepress rails integration.}
13
+ spec.homepage = "https://github.com/sitepress/sitepress"
14
+
15
+ spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
16
+ spec.bindir = "exe"
17
+ spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
18
+ spec.require_paths = ["lib"]
19
+ spec.test_files = Dir["spec/**/*"]
20
+
21
+ spec.add_development_dependency "rspec-rails"
22
+ spec.add_development_dependency "pry"
23
+ spec.add_development_dependency "rails", ">= 4.0"
24
+
25
+ spec.add_runtime_dependency "sitepress-core", spec.version
26
+
27
+ # We don't need every single rals rependency, so grab the subset here.
28
+ rails_version = ">= 5.0"
29
+ spec.add_dependency "railties", rails_version
30
+ spec.add_dependency "actionpack", rails_version
31
+ spec.add_dependency "sprockets-rails", ">= 2.0.0"
32
+ end
@@ -3048,3 +3048,387 @@ WARNING: Sitepress could not enable Sprockets because it could not find a manife
3048
3048
  WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3049
3049
  WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3050
3050
  WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3051
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3052
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3053
+ Processing by Sitepress::SiteController#show as HTML
3054
+ Parameters: {"resource_path"=>"time"}
3055
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3056
+ Rendering inline template within layouts/sitepress_test_layout
3057
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.3ms | Allocations: 99)
3058
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.2ms | Allocations: 71)
3059
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 3.6ms | Allocations: 1118)
3060
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 3.9ms | Allocations: 1303)
3061
+ Completed 200 OK in 14ms (Views: 11.5ms | Allocations: 4225)
3062
+ Processing by Sitepress::SiteController#show as HTML
3063
+ Parameters: {"resource_path"=>"hi"}
3064
+ Rendering inline template
3065
+ Rendered inline template (Duration: 0.1ms | Allocations: 65)
3066
+ Completed 200 OK in 1ms (Views: 0.4ms | Allocations: 588)
3067
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3068
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3069
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3070
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3071
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3072
+ Processing by Sitepress::SiteController#show as HTML
3073
+ Parameters: {"resource_path"=>"/non-existent"}
3074
+ Completed 404 Not Found in 1ms (Allocations: 406)
3075
+ Processing by Sitepress::SiteController#show as HTML
3076
+ Parameters: {"resource_path"=>"/time"}
3077
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3078
+ Rendering inline template within layouts/sitepress_test_layout
3079
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3080
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.2ms | Allocations: 49)
3081
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3082
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.1ms | Allocations: 46)
3083
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 2.8ms | Allocations: 812)
3084
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3085
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 3.0ms | Allocations: 889)
3086
+ Completed 200 OK in 17ms (Views: 5.2ms | Allocations: 5065)
3087
+ Processing by Sitepress::SiteController#show as HTML
3088
+ Parameters: {"resource_path"=>"/time"}
3089
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3090
+ Rendering inline template within layouts/sitepress_test_layout
3091
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3092
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.1ms | Allocations: 47)
3093
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3094
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.1ms | Allocations: 46)
3095
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.8ms | Allocations: 381)
3096
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3097
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 1.0ms | Allocations: 458)
3098
+ Completed 200 OK in 3ms (Views: 1.4ms | Allocations: 1682)
3099
+ Processing by Sitepress::SiteController#show as HTML
3100
+ Parameters: {"resource_path"=>"/hi"}
3101
+ Rendering inline template
3102
+ Rendered inline template (Duration: 0.2ms | Allocations: 64)
3103
+ Completed 200 OK in 2ms (Views: 0.7ms | Allocations: 949)
3104
+ Processing by Sitepress::SiteController#show as HTML
3105
+ Parameters: {"resource_path"=>"/hi"}
3106
+ Rendering inline template
3107
+ Rendered inline template (Duration: 0.4ms | Allocations: 64)
3108
+ Completed 200 OK in 3ms (Views: 1.0ms | Allocations: 947)
3109
+ Processing by Sitepress::SiteController#show as HTML
3110
+ Parameters: {"resource_path"=>"/hi"}
3111
+ Rendering inline template
3112
+ Rendered inline template (Duration: 0.3ms | Allocations: 64)
3113
+ Completed 200 OK in 2ms (Views: 0.6ms | Allocations: 947)
3114
+ Processing by Sitepress::SiteController#show as HTML
3115
+ Parameters: {"resource_path"=>"/hi"}
3116
+ Rendering inline template
3117
+ Rendered inline template (Duration: 0.2ms | Allocations: 64)
3118
+ Completed 200 OK in 3ms (Views: 0.7ms | Allocations: 947)
3119
+ Processing by Sitepress::SiteController#show as HTML
3120
+ Parameters: {"resource_path"=>"/time"}
3121
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3122
+ Rendering inline template within layouts/sitepress_test_layout
3123
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.2ms | Allocations: 71)
3124
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.2ms | Allocations: 69)
3125
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 1.0ms | Allocations: 395)
3126
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 1.4ms | Allocations: 544)
3127
+ Completed 200 OK in 4ms (Views: 1.9ms | Allocations: 1501)
3128
+ Processing by Sitepress::SiteController#show as HTML
3129
+ Parameters: {"resource_path"=>"/time"}
3130
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3131
+ Rendering inline template within layouts/sitepress_test_layout
3132
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3133
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3134
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.7ms | Allocations: 266)
3135
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.9ms | Allocations: 309)
3136
+ Completed 200 OK in 3ms (Views: 1.5ms | Allocations: 1266)
3137
+ Processing by Sitepress::SiteController#show as HTML
3138
+ Parameters: {"resource_path"=>"/time"}
3139
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3140
+ Rendering inline template within layouts/sitepress_test_layout
3141
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3142
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3143
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.6ms | Allocations: 266)
3144
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.8ms | Allocations: 309)
3145
+ Completed 200 OK in 3ms (Views: 1.1ms | Allocations: 1266)
3146
+ Processing by Sitepress::SiteController#show as HTML
3147
+ Parameters: {"resource_path"=>"/time"}
3148
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3149
+ Rendering inline template within layouts/sitepress_test_layout
3150
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3151
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3152
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.6ms | Allocations: 266)
3153
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.8ms | Allocations: 309)
3154
+ Completed 200 OK in 3ms (Views: 1.2ms | Allocations: 1266)
3155
+ Processing by Sitepress::SiteController#show as HTML
3156
+ Parameters: {"resource_path"=>"/time"}
3157
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3158
+ Rendering inline template within layouts/sitepress_test_layout
3159
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3160
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3161
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.6ms | Allocations: 269)
3162
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.8ms | Allocations: 312)
3163
+ Completed 200 OK in 3ms (Views: 1.2ms | Allocations: 1272)
3164
+ Processing by Sitepress::SiteController#show as HTML
3165
+ Parameters: {"resource_path"=>"/time"}
3166
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3167
+ Rendering inline template within layouts/sitepress_test_layout
3168
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3169
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3170
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.7ms | Allocations: 266)
3171
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.9ms | Allocations: 309)
3172
+ Completed 200 OK in 4ms (Views: 1.4ms | Allocations: 1266)
3173
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3174
+ Processing by Sitepress::SiteController#show as HTML
3175
+ Parameters: {"resource_path"=>"time"}
3176
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3177
+ Rendering inline template within layouts/sitepress_test_layout
3178
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.5ms | Allocations: 99)
3179
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.2ms | Allocations: 71)
3180
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 4.2ms | Allocations: 1118)
3181
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 4.5ms | Allocations: 1301)
3182
+ Completed 200 OK in 17ms (Views: 11.1ms | Allocations: 4120)
3183
+ Processing by Sitepress::SiteController#show as HTML
3184
+ Parameters: {"resource_path"=>"hi"}
3185
+ Rendering layout layouts/application.html.erb
3186
+ Rendering inline template within layouts/application
3187
+ Rendered inline template within layouts/application (Duration: 0.1ms | Allocations: 65)
3188
+ Rendered layout layouts/application.html.erb (Duration: 0.4ms | Allocations: 216)
3189
+ Completed 200 OK in 1ms (Views: 0.7ms | Allocations: 695)
3190
+ Processing by Sitepress::SiteController#show as HTML
3191
+ Parameters: {"resource_path"=>"/non-existent"}
3192
+ Completed 404 Not Found in 1ms (Allocations: 423)
3193
+ Processing by Sitepress::SiteController#show as HTML
3194
+ Parameters: {"resource_path"=>"/time"}
3195
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3196
+ Rendering inline template within layouts/sitepress_test_layout
3197
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3198
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3199
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.5ms | Allocations: 272)
3200
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.6ms | Allocations: 315)
3201
+ Completed 200 OK in 2ms (Views: 1.3ms | Allocations: 1128)
3202
+ Processing by Sitepress::SiteController#show as HTML
3203
+ Parameters: {"resource_path"=>"/time"}
3204
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3205
+ Rendering inline template within layouts/sitepress_test_layout
3206
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3207
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3208
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.5ms | Allocations: 266)
3209
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.6ms | Allocations: 309)
3210
+ Completed 200 OK in 2ms (Views: 0.9ms | Allocations: 1104)
3211
+ Processing by Sitepress::SiteController#show as HTML
3212
+ Parameters: {"resource_path"=>"/time"}
3213
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3214
+ Rendering inline template within layouts/sitepress_test_layout
3215
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3216
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3217
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.5ms | Allocations: 266)
3218
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.6ms | Allocations: 309)
3219
+ Completed 200 OK in 2ms (Views: 1.1ms | Allocations: 1104)
3220
+ Processing by Sitepress::SiteController#show as HTML
3221
+ Parameters: {"resource_path"=>"/time"}
3222
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3223
+ Rendering inline template within layouts/sitepress_test_layout
3224
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3225
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3226
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.5ms | Allocations: 266)
3227
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.6ms | Allocations: 309)
3228
+ Completed 200 OK in 2ms (Views: 0.9ms | Allocations: 1104)
3229
+ Processing by Sitepress::SiteController#show as HTML
3230
+ Parameters: {"resource_path"=>"/time"}
3231
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3232
+ Rendering inline template within layouts/sitepress_test_layout
3233
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3234
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3235
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.5ms | Allocations: 266)
3236
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.6ms | Allocations: 309)
3237
+ Completed 200 OK in 2ms (Views: 1.0ms | Allocations: 1104)
3238
+ Processing by Sitepress::SiteController#show as HTML
3239
+ Parameters: {"resource_path"=>"/time"}
3240
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3241
+ Rendering inline template within layouts/sitepress_test_layout
3242
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3243
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.1ms | Allocations: 5)
3244
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 2.2ms | Allocations: 266)
3245
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 4.8ms | Allocations: 309)
3246
+ Completed 200 OK in 8ms (Views: 6.5ms | Allocations: 1104)
3247
+ Processing by Sitepress::SiteController#show as HTML
3248
+ Parameters: {"resource_path"=>"/hi"}
3249
+ Rendering layout layouts/application.html.erb
3250
+ Rendering inline template within layouts/application
3251
+ Rendered inline template within layouts/application (Duration: 0.2ms | Allocations: 64)
3252
+ Rendered layout layouts/application.html.erb (Duration: 0.4ms | Allocations: 107)
3253
+ Completed 200 OK in 2ms (Views: 0.8ms | Allocations: 856)
3254
+ Processing by Sitepress::SiteController#show as HTML
3255
+ Parameters: {"resource_path"=>"/hi"}
3256
+ Rendering layout layouts/application.html.erb
3257
+ Rendering inline template within layouts/application
3258
+ Rendered inline template within layouts/application (Duration: 0.2ms | Allocations: 64)
3259
+ Rendered layout layouts/application.html.erb (Duration: 0.4ms | Allocations: 107)
3260
+ Completed 200 OK in 2ms (Views: 0.9ms | Allocations: 856)
3261
+ Processing by Sitepress::SiteController#show as HTML
3262
+ Parameters: {"resource_path"=>"/hi"}
3263
+ Rendering layout layouts/application.html.erb
3264
+ Rendering inline template within layouts/application
3265
+ Rendered inline template within layouts/application (Duration: 0.2ms | Allocations: 66)
3266
+ Rendered layout layouts/application.html.erb (Duration: 0.3ms | Allocations: 109)
3267
+ Completed 200 OK in 1ms (Views: 0.6ms | Allocations: 858)
3268
+ Processing by Sitepress::SiteController#show as HTML
3269
+ Parameters: {"resource_path"=>"/hi"}
3270
+ Rendering layout layouts/application.html.erb
3271
+ Rendering inline template within layouts/application
3272
+ Rendered inline template within layouts/application (Duration: 0.2ms | Allocations: 64)
3273
+ Rendered layout layouts/application.html.erb (Duration: 0.3ms | Allocations: 107)
3274
+ Completed 200 OK in 2ms (Views: 0.6ms | Allocations: 856)
3275
+ Processing by Sitepress::SiteController#show as HTML
3276
+ Parameters: {"resource_path"=>"/time"}
3277
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3278
+ Rendering inline template within layouts/sitepress_test_layout
3279
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3280
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.1ms | Allocations: 49)
3281
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3282
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.1ms | Allocations: 46)
3283
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.7ms | Allocations: 383)
3284
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3285
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.8ms | Allocations: 460)
3286
+ Completed 200 OK in 2ms (Views: 1.2ms | Allocations: 1485)
3287
+ Processing by Sitepress::SiteController#show as HTML
3288
+ Parameters: {"resource_path"=>"/time"}
3289
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3290
+ Rendering inline template within layouts/sitepress_test_layout
3291
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3292
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.1ms | Allocations: 47)
3293
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3294
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.1ms | Allocations: 46)
3295
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.7ms | Allocations: 381)
3296
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3297
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.8ms | Allocations: 458)
3298
+ Completed 200 OK in 2ms (Views: 1.1ms | Allocations: 1410)
3299
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3300
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3301
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3302
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3303
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3304
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3305
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3306
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3307
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3308
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3309
+ WARNING: Sitepress could not enable Sprockets because it could not find a manifest file at "/Users/bradgessler/Projects/sitepress/gems/sitepress-rails/spec/dummy/app/content/assets/config/manifest.js".
3310
+ Processing by Sitepress::SiteController#show as HTML
3311
+ Parameters: {"resource_path"=>"time"}
3312
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3313
+ Rendering inline template within layouts/sitepress_test_layout
3314
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.2ms | Allocations: 99)
3315
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.2ms | Allocations: 71)
3316
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 1.9ms | Allocations: 977)
3317
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 2.3ms | Allocations: 1160)
3318
+ Completed 200 OK in 8ms (Views: 3.6ms | Allocations: 4512)
3319
+ Processing by Sitepress::SiteController#show as HTML
3320
+ Parameters: {"resource_path"=>"hi"}
3321
+ Rendering layout layouts/application.html.erb
3322
+ Rendering inline template within layouts/application
3323
+ Rendered inline template within layouts/application (Duration: 0.2ms | Allocations: 65)
3324
+ Rendered layout layouts/application.html.erb (Duration: 0.5ms | Allocations: 216)
3325
+ Completed 200 OK in 2ms (Views: 0.9ms | Allocations: 740)
3326
+ Processing by Sitepress::SiteController#show as HTML
3327
+ Parameters: {"resource_path"=>"/non-existent"}
3328
+ Completed 404 Not Found in 1ms (Allocations: 423)
3329
+ Processing by Sitepress::SiteController#show as HTML
3330
+ Parameters: {"resource_path"=>"/hi"}
3331
+ Rendering layout layouts/application.html.erb
3332
+ Rendering inline template within layouts/application
3333
+ Rendered inline template within layouts/application (Duration: 0.2ms | Allocations: 64)
3334
+ Rendered layout layouts/application.html.erb (Duration: 0.4ms | Allocations: 107)
3335
+ Completed 200 OK in 2ms (Views: 0.9ms | Allocations: 913)
3336
+ Processing by Sitepress::SiteController#show as HTML
3337
+ Parameters: {"resource_path"=>"/hi"}
3338
+ Rendering layout layouts/application.html.erb
3339
+ Rendering inline template within layouts/application
3340
+ Rendered inline template within layouts/application (Duration: 0.2ms | Allocations: 64)
3341
+ Rendered layout layouts/application.html.erb (Duration: 0.3ms | Allocations: 107)
3342
+ Completed 200 OK in 2ms (Views: 0.6ms | Allocations: 901)
3343
+ Processing by Sitepress::SiteController#show as HTML
3344
+ Parameters: {"resource_path"=>"/hi"}
3345
+ Rendering layout layouts/application.html.erb
3346
+ Rendering inline template within layouts/application
3347
+ Rendered inline template within layouts/application (Duration: 0.2ms | Allocations: 66)
3348
+ Rendered layout layouts/application.html.erb (Duration: 0.4ms | Allocations: 109)
3349
+ Completed 200 OK in 2ms (Views: 0.7ms | Allocations: 903)
3350
+ Processing by Sitepress::SiteController#show as HTML
3351
+ Parameters: {"resource_path"=>"/hi"}
3352
+ Rendering layout layouts/application.html.erb
3353
+ Rendering inline template within layouts/application
3354
+ Rendered inline template within layouts/application (Duration: 0.1ms | Allocations: 64)
3355
+ Rendered layout layouts/application.html.erb (Duration: 0.3ms | Allocations: 107)
3356
+ Completed 200 OK in 1ms (Views: 0.5ms | Allocations: 901)
3357
+ Processing by Sitepress::SiteController#show as HTML
3358
+ Parameters: {"resource_path"=>"/time"}
3359
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3360
+ Rendering inline template within layouts/sitepress_test_layout
3361
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3362
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.1ms | Allocations: 49)
3363
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3364
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.1ms | Allocations: 47)
3365
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.7ms | Allocations: 384)
3366
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3367
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.9ms | Allocations: 461)
3368
+ Completed 200 OK in 2ms (Views: 1.2ms | Allocations: 1573)
3369
+ Processing by Sitepress::SiteController#show as HTML
3370
+ Parameters: {"resource_path"=>"/time"}
3371
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3372
+ Rendering inline template within layouts/sitepress_test_layout
3373
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3374
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.1ms | Allocations: 47)
3375
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3376
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.1ms | Allocations: 46)
3377
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.7ms | Allocations: 381)
3378
+ Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.
3379
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.8ms | Allocations: 458)
3380
+ Completed 200 OK in 2ms (Views: 1.1ms | Allocations: 1503)
3381
+ Processing by Sitepress::SiteController#show as HTML
3382
+ Parameters: {"resource_path"=>"/time"}
3383
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3384
+ Rendering inline template within layouts/sitepress_test_layout
3385
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3386
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3387
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.6ms | Allocations: 269)
3388
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.7ms | Allocations: 312)
3389
+ Completed 200 OK in 2ms (Views: 1.1ms | Allocations: 1156)
3390
+ Processing by Sitepress::SiteController#show as HTML
3391
+ Parameters: {"resource_path"=>"/time"}
3392
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3393
+ Rendering inline template within layouts/sitepress_test_layout
3394
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3395
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3396
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.5ms | Allocations: 266)
3397
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.6ms | Allocations: 309)
3398
+ Completed 200 OK in 3ms (Views: 1.4ms | Allocations: 1149)
3399
+ Processing by Sitepress::SiteController#show as HTML
3400
+ Parameters: {"resource_path"=>"/time"}
3401
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3402
+ Rendering inline template within layouts/sitepress_test_layout
3403
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3404
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3405
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.5ms | Allocations: 266)
3406
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.6ms | Allocations: 309)
3407
+ Completed 200 OK in 2ms (Views: 0.9ms | Allocations: 1149)
3408
+ Processing by Sitepress::SiteController#show as HTML
3409
+ Parameters: {"resource_path"=>"/time"}
3410
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3411
+ Rendering inline template within layouts/sitepress_test_layout
3412
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3413
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3414
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.9ms | Allocations: 266)
3415
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 1.1ms | Allocations: 309)
3416
+ Completed 200 OK in 3ms (Views: 1.6ms | Allocations: 1149)
3417
+ Processing by Sitepress::SiteController#show as HTML
3418
+ Parameters: {"resource_path"=>"/time"}
3419
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3420
+ Rendering inline template within layouts/sitepress_test_layout
3421
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3422
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3423
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.5ms | Allocations: 266)
3424
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.6ms | Allocations: 309)
3425
+ Completed 200 OK in 3ms (Views: 1.0ms | Allocations: 1149)
3426
+ Processing by Sitepress::SiteController#show as HTML
3427
+ Parameters: {"resource_path"=>"/time"}
3428
+ Rendering layout app/content/layouts/sitepress_test_layout.html.erb
3429
+ Rendering inline template within layouts/sitepress_test_layout
3430
+ Rendered app/content/pages/_stupid.html.erb (Duration: 0.0ms | Allocations: 6)
3431
+ Rendered app/content/pages/partials/_really_stupid.html.erb (Duration: 0.0ms | Allocations: 5)
3432
+ Rendered inline template within layouts/sitepress_test_layout (Duration: 0.5ms | Allocations: 266)
3433
+ Rendered layout app/content/layouts/sitepress_test_layout.html.erb (Duration: 0.7ms | Allocations: 309)
3434
+ Completed 200 OK in 2ms (Views: 1.0ms | Allocations: 1149)
@@ -48,8 +48,8 @@ describe Sitepress::SiteController, type: :controller do
48
48
  it "renders body" do
49
49
  expect(response.body).to include("<h1>Hi!</h1>")
50
50
  end
51
- it "does not render layout" do
52
- expect(response.body).to_not include("<title>Dummy</title>")
51
+ it "renders default 'layouts/application' layout" do
52
+ expect(response.body).to include("<title>Dummy</title>")
53
53
  end
54
54
  it "responds with content type" do
55
55
  expect(response.content_type).to include("text/html")
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sitepress-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.beta1
4
+ version: 2.0.0.beta6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brad Gessler
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-02-23 00:00:00.000000000 Z
11
+ date: 2021-03-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec-rails
@@ -58,14 +58,14 @@ dependencies:
58
58
  requirements:
59
59
  - - '='
60
60
  - !ruby/object:Gem::Version
61
- version: 2.0.0.beta1
61
+ version: 2.0.0.beta6
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - '='
67
67
  - !ruby/object:Gem::Version
68
- version: 2.0.0.beta1
68
+ version: 2.0.0.beta6
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: railties
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -115,11 +115,10 @@ executables: []
115
115
  extensions: []
116
116
  extra_rdoc_files: []
117
117
  files:
118
+ - ".gitignore"
118
119
  - README.md
119
120
  - Rakefile
120
- - app/controllers/concerns/sitepress/site_pages.rb
121
- - app/controllers/sitepress/site_controller.rb
122
- - config/routes.rb
121
+ - bin/rails
123
122
  - lib/sitepress-rails.rb
124
123
  - lib/sitepress/build_paths/directory_index_path.rb
125
124
  - lib/sitepress/build_paths/index_path.rb
@@ -132,6 +131,10 @@ files:
132
131
  - lib/sitepress/renderers/server.rb
133
132
  - lib/sitepress/route_constraint.rb
134
133
  - lib/tasks/sitepress_tasks.rake
134
+ - rails/app/controllers/concerns/sitepress/site_pages.rb
135
+ - rails/app/controllers/sitepress/site_controller.rb
136
+ - rails/config/routes.rb
137
+ - sitepress-rails.gemspec
135
138
  - spec/dummy/Rakefile
136
139
  - spec/dummy/app/assets/config/manifest.js
137
140
  - spec/dummy/app/assets/javascripts/application.js