sssmoke 0.0.6 → 0.0.7

data/README.md

@@ -12,7 +12,7 @@ Go to a folder containing erb templates, and:
 
     sssmoke
 
-For example, a template named _foo.erb_ will be available at _http://localhost:4567/foo_. (The port number could be different if you use a web server other than WEBrick).
+For example, a template named _foo.erb_ will be available at _http://localhost:8888/foo_.
 
 ## Pro Usage for Powah Usahs
 
@@ -20,6 +20,6 @@ If you want to sssmoke a directory other than the current directory:
 
     sssmoke <directory name>
 
-To smoke a single erb template at _http://localhost:4567_:
+To smoke a single erb template at _http://localhost:8888_:
 
     sssmoke <file name>

data/Rakefile

@@ -1 +1,4 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new {|t| t.test_files = FileList['test/test*.rb'] }

data/bin/sssmoke

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
 
-require "sssmoke"
+require 'sssmoke'
+Sssmoke::Base.run!

data/lib/sssmoke.rb

@@ -1,35 +1,25 @@
-require "sssmoke/version"
+require 'sssmoke/version'
+require 'sinatra/base'
+require 'erb'
+require 'tilt'
 
 module Sssmoke
-  FOUR_O_FOUR = [404, "404 - Page not found"]
-  require 'sinatra/base'
-
   class Base < Sinatra::Base
-    require 'erb'
-    require 'tilt'
-    
-    def show(template)
-      template = "#{template}.erb" unless template.end_with? '.erb'
-      File.exist?(template) ? Tilt::ERBTemplate.new(template).render : FOUR_O_FOUR
-    end
-  end
-  
-  def self.app
-    filename = ARGV.shift || "."
+    get '/*' do
+      url_path = params[:splat].first
+      filename = ENV['filename'] || '.'
 
-    if File.directory? filename
-      Class.new(Sssmoke::Base) do
-        set :views, filename
-        get('/') { show 'index' }
-        get('/:template') {|template| show template }
-      end
-    else
-      Class.new(Sssmoke::Base) do
-        get('/') { show filename }
-        error(404) { FOUR_O_FOUR }
+      if File.directory? filename
+        dir = filename
+        template = "#{dir}/#{url_path.empty? ? "index" : url_path}.erb"
+        return 404 unless File.exist?(template)
+        Tilt.new(template).render
+      else
+        url_path.empty? ? Tilt.new(filename).render : 404
       end
     end
+    
+    configure { set :port, 8888 }
+    error(404) { [404, "404 - Page not found"] }
   end
-  
-  app.run!
 end

data/lib/sssmoke/version.rb

@@ -1,3 +1,3 @@
 module Sssmoke
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/sssmoke.gemspec

@@ -16,5 +16,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rack-test'
   gem.add_dependency 'sinatra'
 end

data/test/data/error.erb

@@ -0,0 +1 @@
+<% 1/ 0 %>

data/test/data/index.erb

@@ -0,0 +1 @@
+<%= "Index page" %>

data/test/data/simple.erb

@@ -0,0 +1 @@
+<%= "Simple page" %>

data/test/data/subdir/file.erb

@@ -0,0 +1 @@
+<%= "File in folder" %>

data/test/test_sssmoke.rb

@@ -0,0 +1,75 @@
+require 'sssmoke'
+require 'test/unit'
+require 'rack/test'
+
+class SssmokeTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  def app
+    Sssmoke::Base
+  end
+
+  def teardown
+    ENV['filename'] = nil
+  end
+end
+
+class RenderFileTest < SssmokeTest
+  def setup
+    ENV['filename'] = "test/data/simple.erb"
+  end
+  
+  def test_render_root
+    get '/'
+    assert_equal 'Simple page', last_response.body
+  end
+  
+  def test_disable_routes
+    get '/time'
+    assert_equal 404, last_response.status
+    assert_equal '404 - Page not found', last_response.body
+  end
+end
+
+class RenderFolderTest < SssmokeTest
+  def setup
+    ENV['filename'] = 'test/data/'
+  end
+  
+  def test_render_file
+    get '/simple'
+    assert_equal 'Simple page', last_response.body
+  end
+
+  def test_render_file_in_folder
+    get '/subdir/file'
+    assert_equal 'File in folder', last_response.body
+  end
+
+  def test_render_index
+    get '/'
+    assert_equal 'Index page', last_response.body
+  end
+  
+  def test_404
+    get '/unknown'
+    assert_equal 404, last_response.status
+    assert_equal '404 - Page not found', last_response.body
+  end
+end
+
+class RenderDefaultFolderTest < SssmokeTest
+  def test_default_folder
+    ENV['filename'] = nil
+    get '/test/data/simple'
+    assert_equal 'Simple page', last_response.body
+  end
+end
+
+class SecurityTest < SssmokeTest
+  def test_hide_external_folders
+    ENV['filename'] = 'test/data/subdir'
+    get '/../simple'
+    assert_equal 404, last_response.status
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sssmoke
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -57,11 +73,14 @@ files:
 - README.md
 - Rakefile
 - bin/sssmoke
-- index.erb
 - lib/sssmoke.rb
 - lib/sssmoke/version.rb
 - sssmoke.gemspec
-- test.erb
+- test/data/error.erb
+- test/data/index.erb
+- test/data/simple.erb
+- test/data/subdir/file.erb
+- test/test_sssmoke.rb
 homepage: https://github.com/nusco/sssmoke
 licenses: []
 post_install_message: 
@@ -87,4 +106,9 @@ signing_key:
 specification_version: 3
 summary: Put erb templates in a folder and run them in a server with the 'sssmoke'
   command.
-test_files: []
+test_files:
+- test/data/error.erb
+- test/data/index.erb
+- test/data/simple.erb
+- test/data/subdir/file.erb
+- test/test_sssmoke.rb

data/index.erb

@@ -1 +0,0 @@
-The index works.

data/test.erb

@@ -1 +0,0 @@
-<%= Time.now%>