racket-mvc 0.4.0 → 0.5.0

data/spec/racket.rb

@@ -1,6 +1,5 @@
 require 'simplecov'
 require 'stringio'
-require 'tilt/erb'
 
 SimpleCov.start do
   add_filter 'spec'
@@ -18,6 +17,11 @@ TEST_PLUGIN_APP_DIR = File.join(TEST_DIR, 'test_plugin_app')
 
 require 'racket'
 
+# Force use of ERB (not Erubis) during testing.
+# This is a workaround for Rubinius not finding ERubis.
+# @see https://gist.github.com/jodosha/9662268
+Tilt.register Tilt::ERBTemplate, 'erb'
+
 # Make sure some files that are loaded dynamically get coverage as well.
 require 'racket/helpers/file.rb'
 
@@ -27,6 +31,9 @@ require 'bacon'
 # Method tests should always be run first.
 require File.join(TEST_DIR, '_request.rb')
 
+# Next up, tests for Template caching.
+require File.join(TEST_DIR, '_template_cache.rb')
+
 # Application tests.
 suites = [
   -> { Dir.chdir(TEST_DEFAULT_APP_DIR) { require File.join(TEST_DIR, '_default.rb') } },
@@ -38,17 +45,7 @@ suites = [
 # suites.shuffle!
 
 # Run application tests.
-suites.each do |suite|
-  # Make sure Racket::Application and Racket::Settings::Application is reset between the suites.
-  # Racket::Application@application and Racket::Settings::Application must be pristine on each run!
-  Racket.class_eval { remove_const(:Application) }
-  Racket::Settings.class_eval { remove_const(:Application) }
-  load('lib/racket/application.rb')
-  load('lib/racket/settings/application.rb')
-
-  # Run suite
-  suite.call
-end
+suites.each { |suite| suite.call }
 
 # Invalid application test should always be run last.
-require File.join(TEST_DIR, '_invalid.rb')
+# require File.join(TEST_DIR, '_invalid.rb')

data/spec/test_custom_app/controllers/sub1/custom_sub_controller_1.rb

@@ -15,7 +15,7 @@ class CustomSubController1 < Racket::Controller
   end
 
   def epic_fail
-    fail 'Epic fail!'
+    raise 'Epic fail!'
   end
 
   def send_existing_file_auto_mime

data/spec/test_custom_app/controllers/sub3/custom_sub_controller_3.rb

@@ -15,7 +15,7 @@ class CustomSubController3 < Racket::Controller
   end
 
   after :not_so_secret do
-    fail 'Should not happen!'
+    raise 'Should not happen!'
   end
 
   def render_a_file
@@ -23,4 +23,22 @@ class CustomSubController3 < Racket::Controller
     obj.instance_eval { @secret = 42 }
     render_template('files/secret.erb', obj)
   end
+
+  def render_a_file_with_controller
+    @one = 1
+    @two = 2
+    @three = 3
+    render_template('files/triplet.erb', self)
+  end
+  
+  def render_a_file_with_settings
+    obj = Object.new
+    obj.instance_eval do
+      @one = 1
+      @two = 2
+      @three = 3
+    end
+    settings = { trim: '-' }
+    render_template('files/triplet.erb', obj, settings)
+  end
 end

data/spec/test_custom_app/controllers/sub5/custom_sub_controller_5.rb

@@ -0,0 +1,8 @@
+# Custom sub controller 4
+class CustomSubController5 < Racket::Controller
+  template_setting :trim, '>'
+
+  def text
+    @text = 'Hello World!'
+  end
+end

data/spec/test_custom_app/files/stuff.rb

@@ -0,0 +1,3 @@
+def stuff
+  'Stuff That Dreams Are Made of'
+end

data/spec/test_custom_app/files/triplet.erb

@@ -0,0 +1,5 @@
+<% if true %>
+<%=@one%>
+<%=@two%>
+<%=@three%>
+<% end %>

data/spec/test_custom_app/templates/sub5/text.erb

@@ -0,0 +1,3 @@
+<% if true %>
+<%= @text %>
+<% end %>

data/spec/test_default_app/controllers/default_root_controller.rb

@@ -28,4 +28,7 @@ class DefaultRootController < Racket::Controller
   def session_strings
     [session.inspect, session.to_s, session.to_str].to_json
   end
+  
+  def empty
+  end
 end

data/spec/test_default_app/controllers/sub1/default_sub_controller_1.rb

@@ -13,6 +13,6 @@ class DefaultSubController1 < Racket::Controller
   end
 
   def epic_fail
-    fail 'Epic fail!'
+    raise 'Epic fail!'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: racket-mvc
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Lars Olsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_router
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: racket-registry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.1.5
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -176,13 +204,22 @@ files:
 - lib/racket/settings/application.rb
 - lib/racket/settings/base.rb
 - lib/racket/settings/controller.rb
+- lib/racket/settings/defaults.rb
 - lib/racket/utils.rb
 - lib/racket/utils/application.rb
+- lib/racket/utils/application/handler_stack.rb
+- lib/racket/utils/application/logger.rb
+- lib/racket/utils/application/registry_builder.rb
+- lib/racket/utils/application/stateless_services.rb
 - lib/racket/utils/exceptions.rb
 - lib/racket/utils/file_system.rb
 - lib/racket/utils/helpers.rb
 - lib/racket/utils/routing.rb
 - lib/racket/utils/views.rb
+- lib/racket/utils/views/renderer.rb
+- lib/racket/utils/views/template_cache.rb
+- lib/racket/utils/views/template_locator.rb
+- lib/racket/utils/views/template_resolver.rb
 - lib/racket/version.rb
 - lib/racket/view_manager.rb
 - rake/utils.rb
@@ -191,22 +228,27 @@ files:
 - spec/_invalid.rb
 - spec/_plugin.rb
 - spec/_request.rb
+- spec/_template_cache.rb
 - spec/racket.rb
 - spec/test_custom_app/controllers/sub1/custom_sub_controller_1.rb
 - spec/test_custom_app/controllers/sub2/custom_sub_controller_2.rb
 - spec/test_custom_app/controllers/sub3/custom_sub_controller_3.rb
 - spec/test_custom_app/controllers/sub3/inherited/custom_inherited_controller.rb
 - spec/test_custom_app/controllers/sub4/custom_sub_controller_4.rb
+- spec/test_custom_app/controllers/sub5/custom_sub_controller_5.rb
 - spec/test_custom_app/extra/blob.rb
 - spec/test_custom_app/extra/blob/inner_blob.rb
 - spec/test_custom_app/files/plain_text.txt
 - spec/test_custom_app/files/secret.erb
+- spec/test_custom_app/files/stuff.rb
+- spec/test_custom_app/files/triplet.erb
 - spec/test_custom_app/layouts/sub2/zebra.erb
 - spec/test_custom_app/layouts/sub4/layout.erb
 - spec/test_custom_app/templates/sub2/template.erb
 - spec/test_custom_app/templates/sub4/default.erb
 - spec/test_custom_app/templates/sub4/mybar.erb
 - spec/test_custom_app/templates/sub4/myfoo.erb
+- spec/test_custom_app/templates/sub5/text.erb
 - spec/test_default_app/controllers/default_root_controller.rb
 - spec/test_default_app/controllers/sub1/default_sub_controller_1.rb
 - spec/test_default_app/controllers/sub2/default_sub_controller_2.rb
@@ -219,7 +261,7 @@ files:
 - spec/test_plugin_app/sass/test.scss
 homepage: https://github.com/lasso/racket
 licenses:
-- GNU AFFERO GENERAL PUBLIC LICENSE, version 3
+- AGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -237,9 +279,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Racket - The noisy Rack MVC framework
 test_files: []
-has_rdoc: