flatrack 1.3.3 → 1.4.1

data/spec/lib/flatrack/cli_spec.rb

@@ -25,12 +25,13 @@ describe Flatrack::CLI do
           retries = 0
           begin
             Net::HTTP.get URI.parse 'http://localhost:5959'
-            thread.kill
           rescue Errno::ECONNREFUSED => error
             retries += 1
             sleep 0.1
             retry unless retries > 100
             raise error
+          ensure
+            thread.kill
           end
         end
       end.to_not raise_error
@@ -45,16 +46,41 @@ describe Flatrack::CLI do
           retries = 0
           begin
             Net::HTTP.get URI.parse 'http://localhost:8282'
-            thread.kill
           rescue Errno::ECONNREFUSED => error
             retries += 1
             sleep 0.1
             retry unless retries > 100
             raise error
+          ensure
+            thread.kill
           end
         end
       end.to_not raise_error
     end
+
+    context 'without a boot.rb' do
+      it 'should start the rack server' do
+        expect do
+          site do
+            FileUtils.rm 'boot.rb'
+            thread  = Thread.new do
+              Flatrack::CLI.start(%w(start --port 8283 --verbose false))
+            end
+            retries = 0
+            begin
+              Net::HTTP.get URI.parse 'http://localhost:8283'
+            rescue Errno::ECONNREFUSED => error
+              retries += 1
+              sleep 0.1
+              retry unless retries > 100
+              raise error
+            ensure
+              thread.kill
+            end
+          end
+        end.to_not raise_error
+      end
+    end
   end
 
   describe '--version' do

data/spec/lib/flatrack/middleware_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Flatrack::Middleware do
+  include Flatrack::SiteHelper
+
+  def request(path)
+    url      = URI.parse 'http://example.com'
+    url.path = File.join '/', path
+    env      = Rack::MockRequest.env_for url.to_s
+    middleware.call env
+  end
+
+  let(:flatrack_app) { Flatrack::Site }
+  let(:app) { ->(_) { [200, {}, ['OK']] } }
+  let(:middleware) { described_class.new app, flatrack_app: flatrack_app }
+
+  context 'given a status of 404' do
+    it 'should call the original app' do
+      site do
+        expect(app).to receive(:call)
+        request '/nothing_here'
+      end
+    end
+  end
+
+  context 'when a NotFound error is raised' do
+    it 'should call the original app' do
+      site do
+        Flatrack.config { |site| site.raise_errors = true }
+        expect(app).to receive(:call)
+        request '/nothing_here'
+      end
+    end
+  end
+
+  context 'when the response is 200' do
+    it 'should not call the original app' do
+      site do
+        expect(app).to_not receive(:call)
+        request '/'
+      end
+    end
+  end
+
+  context 'when the response is 500' do
+    it 'should not call the original app' do
+      site do
+        write :page, 'bad_render.html.ggr', ''
+        expect(app).to_not receive(:call)
+        request '/bad_render'
+      end
+    end
+  end
+
+end

data/spec/lib/flatrack/site_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Flatrack::Site do
   let(:mock_app) { ->(env) { [200, {}, ['ok']] } }
-  let(:mock_env) { Rack::MockRequest.env_for('example.org', {}) }
+  let(:mock_env) { Flatrack.mock_env_for('example.org', {}) }
 
   it 'should be a rack app' do
     expect(described_class).to respond_to :call
@@ -26,9 +26,7 @@ describe Flatrack::Site do
     Flatrack.config do |site|
       middlewares.each do |middleware|
         expect_any_instance_of(middleware)
-        .to receive(:call)
-            .with(mock_env)
-            .and_call_original
+            .to receive(:call).with(mock_env).and_call_original
         site.use middleware
       end
     end
@@ -38,7 +36,7 @@ describe Flatrack::Site do
 
   it 'should formulate a proper response' do
     expect(Flatrack::Request).to receive(:new).and_call_original
-    expect_any_instance_of(Flatrack::Request).to receive(:response)
+    expect_any_instance_of(Flatrack::Request).to receive(:response).and_call_original
     Flatrack::Site.call(mock_env)
   end
 end

data/spec/lib/flatrack/view/render_helper_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Flatrack::View::RenderHelper do
+end

data/spec/lib/flatrack/view/set_layout_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Flatrack::View do
   def render_template(fixture)
     path = File.join Flatrack.gem_root, '../spec/fixtures/templates', fixture
-    env = Rack::MockRequest.env_for 'http://example.com'
+    env = Flatrack.mock_env_for 'http://example.com'
     req = Flatrack::Request.new env
     _, _, body = Flatrack::Response.new(req).render(file: path)
     body.first.lines.map(&:strip).join

data/spec/lib/flatrack/view/tag_helper_spec.rb

@@ -20,6 +20,15 @@ describe Flatrack::View::TagHelper do
       end
     end
 
+    context 'with in invalid number of arguments' do
+      it 'should raise an error' do
+        mock = double
+        mock.extend Flatrack::View::TagHelper
+        expect { mock.html_tag :foo, 'bar', { baz: :raz }, false, true }
+          .to raise_error ArgumentError
+      end
+    end
+
   end
 
   describe '#image_tag' do

data/spec/lib/flatrack/view_spec.rb

@@ -4,7 +4,7 @@ describe Flatrack::View do
   include Flatrack::SiteHelper
 
   let(:uri) { URI.parse 'http://example.org/index.html' }
-  let(:env) { Rack::MockRequest.env_for uri.to_s }
+  let(:env) { Flatrack.mock_env_for uri.to_s }
   let(:request) { Flatrack::Request.new env }
   let(:response) { Flatrack::Response.new request }
   subject(:view) { described_class.new response }

data/spec/lib/flatrack_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Flatrack do
+  include Flatrack::SiteHelper
 
   describe '.gem_root' do
     it 'should be the root of the gem' do
@@ -25,4 +26,76 @@ describe Flatrack do
     end
   end
 
+  describe '.redirect' do
+    it 'should redirect requests with a 301' do
+      site do
+        Flatrack.config do |site|
+          site.redirect '/foo', to: '/bar'
+        end
+        status, headers, _ = get_page_response '/foo'
+        expect(status).to eq 301
+        expect(headers['location']).to eq '/bar'
+      end
+    end
+
+    context 'when an argument is not a string' do
+      it 'should raise an error' do
+        Flatrack.config do |site|
+          expect { site.redirect :bar, to: '/' }
+            .to raise_error ArgumentError
+        end
+      end
+    end
+
+    context 'with type :permanent' do
+      it 'should redirect requests with a 301' do
+        site do
+          Flatrack.config do |site|
+            site.redirect '/foo', to: '/bar', type: :permanent
+          end
+          status, headers, _ = get_page_response '/foo'
+          expect(status).to eq 301
+          expect(headers['location']).to eq '/bar'
+        end
+      end
+    end
+
+    context 'with type :temporary' do
+      it 'should redirect requests with a 302' do
+        site do
+          Flatrack.config do |site|
+            site.redirect '/foo', to: '/bar', type: :temporary
+          end
+          status, headers, _ = get_page_response '/foo'
+          expect(status).to eq 302
+          expect(headers['location']).to eq '/bar'
+        end
+      end
+    end
+  end
+
+  describe '.rewrite' do
+    it 'should rewrite a path' do
+      site do
+        write :page, 'bar.html.rb', '"page is #{current_page}"'
+        Flatrack.config do |site|
+          site.raise_errors = true
+          site.rewrite '/foo', to: '/bar.html'
+        end
+        status, _, body = get_page_response '/foo'
+        expect(status).to eq 200
+        expect(body.body.first).to include 'page is /bar.html'
+      end
+    end
+
+    context 'when an argument is not a string' do
+      it 'should raise an error' do
+        Flatrack.config do |site|
+          expect { site.rewrite :bar, to: '/' }
+            .to raise_error ArgumentError
+        end
+      end
+    end
+  end
+
 end

data/spec/lib/rake/asset_tasks_spec.rb

@@ -6,7 +6,7 @@ describe Rake::AssetTasks do
   include FileUtils
   include Flatrack::SiteHelper
 
-  before(:all) do
+  before(:each) do
     @sha = site(clean: false) do
       @rake            = Rake::Application.new
       Rake.application = @rake
@@ -21,7 +21,7 @@ describe Rake::AssetTasks do
     end
   end
 
-  after(:all) do
+  after(:each) do
     Rake.application = nil
     cleanup(@sha)
     rm_rf(@dir)

data/spec/spec_helper.rb

@@ -21,4 +21,5 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run focus: true
   config.before(:each) { Flatrack.reset! }
+  config.after(:suite){ FileUtils.rm_rf 'tmp' }
 end

data/spec/support/fixture_helper.rb

@@ -24,7 +24,7 @@ class Flatrack
     end
 
     def env
-      Rack::MockRequest.env_for 'http://example.org/index.html'
+      Flatrack.mock_env_for 'http://example.org/index.html'
     end
   end
 end

data/spec/support/site_helper.rb

@@ -33,7 +33,9 @@ class Flatrack
     end
 
     def get_page_response(page)
-      env = Rack::MockRequest.env_for "http://example.org/#{page}.html"
+      url = URI.parse 'http://example.org'
+      url.path = File.join '', page
+      env = Rack::MockRequest.env_for url.to_s
       Flatrack::Site.call(env)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flatrack
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.1
 platform: ruby
 authors:
 - Jason Waldrip
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rack-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +75,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,21 +85,21 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +151,7 @@ dependencies:
         version: 0.8.7
     - - "<"
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: '10.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -147,7 +161,7 @@ dependencies:
         version: 0.8.7
     - - "<"
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -328,6 +342,7 @@ files:
 - error_pages/404.html
 - error_pages/500.html
 - flatrack.gemspec
+- lib/custom-extensions/sprockets-sass.rb
 - lib/flatrack.rb
 - lib/flatrack/asset_extensions.rb
 - lib/flatrack/cli.rb
@@ -342,8 +357,12 @@ files:
 - lib/flatrack/cli/templates/logo.png
 - lib/flatrack/cli/templates/page.html.erb
 - lib/flatrack/cli/templates/stylesheet.css.scss
+- lib/flatrack/domain_parser.rb
+- lib/flatrack/middleware.rb
+- lib/flatrack/redirector.rb
 - lib/flatrack/request.rb
 - lib/flatrack/response.rb
+- lib/flatrack/rewriter.rb
 - lib/flatrack/sass.rb
 - lib/flatrack/sass/functions.rb
 - lib/flatrack/sass/importer.rb
@@ -390,10 +409,12 @@ files:
 - spec/fixtures/templates/stylesheet_tag.html.rb
 - spec/lib/flatrack/asset_extensions_spec.rb
 - spec/lib/flatrack/cli_spec.rb
+- spec/lib/flatrack/middleware_spec.rb
 - spec/lib/flatrack/request_spec.rb
 - spec/lib/flatrack/response_spec.rb
 - spec/lib/flatrack/site_spec.rb
 - spec/lib/flatrack/view/link_helper_spec.rb
+- spec/lib/flatrack/view/render_helper_spec.rb
 - spec/lib/flatrack/view/set_layout_spec.rb
 - spec/lib/flatrack/view/tag_helper_spec.rb
 - spec/lib/flatrack/view_spec.rb
@@ -422,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Deliver static files with style.
@@ -450,10 +471,12 @@ test_files:
 - spec/fixtures/templates/stylesheet_tag.html.rb
 - spec/lib/flatrack/asset_extensions_spec.rb
 - spec/lib/flatrack/cli_spec.rb
+- spec/lib/flatrack/middleware_spec.rb
 - spec/lib/flatrack/request_spec.rb
 - spec/lib/flatrack/response_spec.rb
 - spec/lib/flatrack/site_spec.rb
 - spec/lib/flatrack/view/link_helper_spec.rb
+- spec/lib/flatrack/view/render_helper_spec.rb
 - spec/lib/flatrack/view/set_layout_spec.rb
 - spec/lib/flatrack/view/tag_helper_spec.rb
 - spec/lib/flatrack/view_spec.rb