sanford 0.10.0 → 0.10.1

data/lib/sanford/service_handler.rb

@@ -1,7 +1,12 @@
+require 'sanford/sanford_runner'
+require 'sanford/template_source'
+
 module Sanford
 
   module ServiceHandler
 
+    DISALLOWED_TEMPLATE_EXTS = Sanford::TemplateSource::DISALLOWED_ENGINE_EXTS
+
     def self.constantize(class_name)
       names = class_name.to_s.split('::').reject{|name| name.empty? }
       klass = names.inject(Object) do |constant, name|
@@ -85,7 +90,9 @@ module Sanford
       end
 
       def get_template(path, source)
-        Dir.glob("#{Pathname.new(source.path).join(path.to_s)}.*").first.to_s
+        files = Dir.glob("#{Pathname.new(source.path).join(path.to_s)}.*")
+        files = files.reject{ |p| DISALLOWED_TEMPLATE_EXTS.include?(File.extname(p)) }
+        files.first.to_s
       end
 
     end

data/lib/sanford/template_source.rb

@@ -4,6 +4,10 @@ module Sanford
 
   class TemplateSource
 
+    DISALLOWED_ENGINE_EXTS = [ '.rb' ]
+
+    DisallowedEngineExtError = Class.new(ArgumentError)
+
     attr_reader :path, :engines
 
     def initialize(path)
@@ -13,6 +17,10 @@ module Sanford
     end
 
     def engine(input_ext, engine_class, registered_opts = nil)
+      if DISALLOWED_ENGINE_EXTS.include?(".#{input_ext}")
+        raise DisallowedEngineExtError, "`#{input_ext}` is disallowed as an"\
+                                        " engine extension."
+      end
       engine_opts = @default_opts.merge(registered_opts || {})
       @engines[input_ext.to_s] = engine_class.new(engine_opts)
     end

data/lib/sanford/version.rb

@@ -1,3 +1,3 @@
 module Sanford
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/test/support/service_handlers.rb

@@ -129,7 +129,7 @@ class RenderHandler
   include Sanford::ServiceHandler
 
   def run!
-    render 'test_template'
+    render params['template_name']
   end
 end
 

data/test/unit/service_handler_tests.rb

@@ -2,6 +2,7 @@ require 'assert'
 require 'sanford/service_handler'
 
 require 'bson'
+require 'sanford/template_source'
 require 'sanford/test_helpers'
 require 'test/support/service_handlers'
 
@@ -27,6 +28,11 @@ module Sanford::ServiceHandler
     should have_imeths :prepend_before_init, :prepend_after_init
     should have_imeths :prepend_before_run,  :prepend_after_run
 
+    should "disallow certain template extensions" do
+      exp = Sanford::TemplateSource::DISALLOWED_ENGINE_EXTS
+      assert_equal exp, subject::DISALLOWED_TEMPLATE_EXTS
+    end
+
     should "allow running a handler class with the class method #run" do
       response = HaltServiceHandler.run({
         'code'    => 648,
@@ -328,10 +334,16 @@ module Sanford::ServiceHandler
     desc "render helper method"
 
     should "render template files" do
-      response = test_runner(RenderHandler).run
+      response = test_runner(RenderHandler, 'template_name' => 'test_template').run
       assert_equal ['test_template', 'RenderHandler', {}], response.data
     end
 
+    should "not render any template files with a disallowed template ext" do
+      assert_raises ArgumentError do
+        test_runner(RenderHandler, 'template_name' => 'test_disallowed_template').run
+      end
+    end
+
   end
 
   class RunHandlerTests < UnitTests

data/test/unit/template_source_tests.rb

@@ -7,6 +7,16 @@ class Sanford::TemplateSource
 
   class UnitTests < Assert::Context
     desc "Sanford::TemplateSource"
+    subject{ Sanford::TemplateSource }
+
+    should "disallow certain engine extensions" do
+      exp = [ '.rb' ]
+      assert_equal exp, subject::DISALLOWED_ENGINE_EXTS
+    end
+
+  end
+
+  class InitTests < Assert::Context
     setup do
       @source_path = File.join(ROOT, 'test/support')
       @source = Sanford::TemplateSource.new(@source_path)
@@ -22,7 +32,7 @@ class Sanford::TemplateSource
 
   end
 
-  class EngineRegistrationTests < UnitTests
+  class EngineRegistrationTests < InitTests
     desc "when registering an engine"
     setup do
       @empty_engine = Class.new(Sanford::TemplateEngine) do
@@ -53,6 +63,14 @@ class Sanford::TemplateSource
       assert_equal exp_opts, subject.engines['empty'].opts
     end
 
+    should "complain if registering a disallowed temp" do
+      assert_kind_of Sanford::NullTemplateEngine, subject.engines['rb']
+      assert_raises DisallowedEngineExtError do
+        subject.engine 'rb', @empty_engine
+      end
+      assert_kind_of Sanford::NullTemplateEngine, subject.engines['rb']
+    end
+
   end
 
   class NullTemplateSourceTests < Assert::Context

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sanford
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Collin Redding
@@ -144,6 +144,7 @@ files:
 - test/support/services.rb
 - test/support/simple_client.rb
 - test/support/template.json
+- test/support/test_disallowed_template.rb
 - test/support/test_template.test
 - test/system/request_handling_tests.rb
 - test/unit/config_tests.rb
@@ -203,6 +204,7 @@ test_files:
 - test/support/services.rb
 - test/support/simple_client.rb
 - test/support/template.json
+- test/support/test_disallowed_template.rb
 - test/support/test_template.test
 - test/system/request_handling_tests.rb
 - test/unit/config_tests.rb