flatrack 1.1.1 → 1.2.0

data/lib/rake/asset_tasks.rb

@@ -17,6 +17,33 @@ module Rake
 
     delegate :paths, to: :environment
 
+    DEFINED_TASKS = proc do
+
+      namespace :assets do
+        desc 'precompile assets'
+        task :precompile do
+          with_logger do
+            manifest.compile(assets)
+          end
+        end
+
+        desc 'Remove all assets'
+        task :clobber do
+          with_logger do
+            manifest.clobber
+          end
+        end
+
+        desc 'Clean old assets'
+        task :clean do
+          with_logger do
+            manifest.clean(keep)
+          end
+        end
+      end
+
+    end
+
     # Number of old assets to keep.
 
     # Logger to use during rake tasks. Defaults to using stderr.
@@ -56,7 +83,9 @@ module Rake
     end
 
     def assets
-      files = paths.reduce([]) { |a, p| a + Dir[File.join p, '**', '*'] }
+      files = paths.reduce([]) do |ary, path|
+        ary + Dir[File.join path, '**', '*']
+      end
       files.map do |file|
         file_basename = File.basename file
         parts         = file_basename.split('.').size
@@ -67,28 +96,7 @@ module Rake
 
     # Define tasks
     def define
-      namespace :assets do
-        desc 'precompile assets'
-        task :precompile do
-          with_logger do
-            manifest.compile(assets)
-          end
-        end
-
-        desc 'Remove all assets'
-        task :clobber do
-          with_logger do
-            manifest.clobber
-          end
-        end
-
-        desc 'Clean old assets'
-        task :clean do
-          with_logger do
-            manifest.clean(keep)
-          end
-        end
-      end
+      instance_eval(&DEFINED_TASKS)
     end
 
     private

data/spec/fixtures/assets/sample.css.scss

@@ -0,0 +1,2 @@
+//= require_self
+//= require_tree

data/spec/fixtures/assets/{application.js.coffee → sample.js.coffee}

@@ -1,2 +1,2 @@
 #= require_self
-#= require_tree
+#= require_tree

data/spec/fixtures/templates/html_tag.html

@@ -0,0 +1,5 @@
+<div>something amazing</div>
+<div data-enabled="true">something amazing</div>
+<div default="default">something amazing</div>
+<div>Hello World</div>
+<div>Goodbye Humanity</div>

data/spec/fixtures/templates/html_tag.html.erb

@@ -0,0 +1,9 @@
+<%== html_tag :div, 'something amazing' %>
+<%= html_tag :div, 'something amazing', data: { enabled: true } %>
+<%= html_tag :div, 'something amazing', default: true %>
+<%= html_tag(:div) do %>
+    Hello World
+<% end %>
+<%== html_tag(:div) do %>
+    Goodbye Humanity
+<% end %>

data/spec/fixtures/templates/html_tag.html.rb

@@ -0,0 +1,5 @@
+html_tag(:div, 'something amazing') +
+  html_tag(:div, 'something amazing', data: { enabled: true }) +
+  html_tag(:div, 'something amazing', default: true) +
+  html_tag(:div) { 'Hello World' } +
+  html_tag(:div) { 'Goodbye Humanity' }

data/spec/fixtures/templates/image_tag.html

@@ -0,0 +1,2 @@
+<img src="http://example.com/image.jpg"/>
+<img src="/assets/logo.png"/>

data/spec/fixtures/templates/image_tag.html.erb

@@ -0,0 +1,2 @@
+<%= image_tag 'http://example.com/image.jpg' %>
+<%= image_tag 'logo.png' %>

data/spec/fixtures/templates/image_tag.html.rb

@@ -0,0 +1,2 @@
+image_tag('http://example.com/image.jpg') +
+  image_tag('logo.png')

data/spec/fixtures/templates/javascript_tag.html

@@ -0,0 +1,2 @@
+<script src="http://example.com/example.js" type="application/javascript"></script>
+<script src="/assets/main.js" type="application/javascript"></script>

data/spec/fixtures/templates/javascript_tag.html.erb

@@ -0,0 +1,2 @@
+<%= javascript_tag 'http://example.com/example.js' %>
+<%= javascript_tag :main %>

data/spec/fixtures/templates/javascript_tag.html.rb

@@ -0,0 +1,2 @@
+javascript_tag('http://example.com/example.js') +
+  javascript_tag(:main)

data/spec/fixtures/templates/link_to.html

@@ -0,0 +1,9 @@
+<a href="http://example1.org">example</a>
+<a href="http://example2.org">http://example2.org</a>
+<a href="http://example3.org">Hello World</a>
+<a href="http://example4.org">
+    <img src="http://example.org/sample.jpg"/>
+</a>
+<a href="http://example5.org">
+    <img src="/assets/sample.jpg"/>
+</a>

data/spec/fixtures/templates/link_to.html.erb

@@ -0,0 +1,11 @@
+<%= link_to('example', 'http://example1.org') %>
+<%= link_to('http://example2.org') %>
+<%= link_to('http://example3.org') do %>
+    Hello World
+<% end %>
+<%= link_to('http://example4.org') do %>
+    <%= image_tag('http://example.org/sample.jpg') %>
+<% end %>
+<%= link_to('http://example5.org') do %>
+    <%= image_tag('sample.jpg') %>
+<% end %>

data/spec/fixtures/templates/link_to.html.rb

@@ -0,0 +1,7 @@
+link_to('example', 'http://example1.org') +
+  link_to('http://example2.org') +
+  link_to('http://example3.org') { 'Hello World' } +
+  link_to('http://example4.org') do
+    image_tag('http://example.org/sample.jpg')
+  end +
+  link_to('http://example5.org') { image_tag('sample.jpg') }

data/spec/fixtures/templates/stylesheet_tag.html

@@ -0,0 +1,2 @@
+<link href="http://example.com/example.css" rel="stylesheet" type="text/css"/>
+<link href="/assets/main.css" rel="stylesheet" type="text/css"/>

data/spec/fixtures/templates/stylesheet_tag.html.erb

@@ -0,0 +1,2 @@
+<%= stylesheet_tag 'http://example.com/example.css' %>
+<%= stylesheet_tag :main %>

data/spec/fixtures/templates/stylesheet_tag.html.rb

@@ -0,0 +1,2 @@
+stylesheet_tag('http://example.com/example.css') +
+ stylesheet_tag(:main)

data/spec/lib/flatrack/asset_extensions_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Flatrack::AssetExtensions do
 
-  subject(:instance){ double.extend described_class }
+  subject(:instance) { double.extend described_class }
 
   describe '#asset_path' do
     it 'should be a path to the asset' do
@@ -10,4 +10,4 @@ describe Flatrack::AssetExtensions do
     end
   end
 
-end
+end

data/spec/lib/flatrack/cli_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Flatrack::CLI do
   extend FileUtils
-  include SiteHelper
+  include Flatrack::SiteHelper
 
   describe '#new' do
     it 'should create a new site' do
@@ -20,7 +20,7 @@ describe Flatrack::CLI do
       expect do
         site do
           thread  = Thread.new do
-            Flatrack::CLI.start(['start', '--verbose', 'false'])
+            Flatrack::CLI.start(%w(start --verbose false))
           end
           retries = 0
           begin
@@ -28,7 +28,8 @@ describe Flatrack::CLI do
             thread.kill
           rescue Errno::ECONNREFUSED => error
             retries += 1
-            sleep 0.1 and retry unless retries > 100
+            sleep 0.1
+            retry unless retries > 100
             raise error
           end
         end
@@ -39,7 +40,7 @@ describe Flatrack::CLI do
       expect do
         site do
           thread  = Thread.new do
-            Flatrack::CLI.start(['start', '--port', '8282', '--verbose', 'false'])
+            Flatrack::CLI.start(%w(start --port 8282 --verbose false))
           end
           retries = 0
           begin
@@ -47,7 +48,8 @@ describe Flatrack::CLI do
             thread.kill
           rescue Errno::ECONNREFUSED => error
             retries += 1
-            sleep 0.1 and retry unless retries > 100
+            sleep 0.1
+            retry unless retries > 100
             raise error
           end
         end
@@ -55,4 +57,4 @@ describe Flatrack::CLI do
     end
   end
 
-end
+end

data/spec/lib/flatrack/request_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe Flatrack::Request do
-  include SiteHelper
+  include Flatrack::SiteHelper
 
   describe '#response' do
     it 'should return a 404 for page not found' do
       site do
-        status, headers, body = get_page_response('cant_find_me')
+        status, _, _ = get_page_response('cant_find_me')
         expect(status).to eq 404
       end
     end
@@ -14,9 +14,9 @@ describe Flatrack::Request do
     it 'should render a page without a layout' do
       site do
         touch 'pages/bad_renderer.html.bad'
-        status, headers, body = get_page_response('bad_renderer')
+        status, _, _ = get_page_response('bad_renderer')
         expect(status).to eq 500
       end
     end
   end
-end
+end

data/spec/lib/flatrack/response_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe Flatrack::Response do
-  include SiteHelper
+  include Flatrack::SiteHelper
 
   describe '#render' do
     it 'should render a page with a layout' do
       site do
-        status, headers, body = get_page_response('index')
+        status, _, _ = get_page_response('index')
         expect(status).to eq 200
       end
     end
@@ -14,9 +14,9 @@ describe Flatrack::Response do
     it 'should render a page without a layout' do
       site do
         rm_rf 'layouts/layout.html.erb'
-        status, headers, body = get_page_response('index')
+        status, _, _ = get_page_response('index')
         expect(status).to eq 200
       end
     end
   end
-end
+end

data/spec/lib/flatrack/site_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe Flatrack::Site do
-  let(:mock_app){ ->(env){ [200,{},['ok']]} }
-  let(:mock_env){ Rack::MockRequest.env_for('example.org', {}) }
+  let(:mock_app) { ->(env) { [200, {}, ['ok']] } }
+  let(:mock_env) { Rack::MockRequest.env_for('example.org', {}) }
 
   it 'should be a rack app' do
     expect(described_class).to respond_to :call
@@ -13,8 +13,13 @@ describe Flatrack::Site do
 
     middlewares = 2.times.map do
       Class.new do
-        def initialize(app) @app = app end
-        def call(env) @app.call(env) end
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          @app.call(env)
+        end
       end
     end
 
@@ -36,4 +41,4 @@ describe Flatrack::Site do
     expect_any_instance_of(Flatrack::Request).to receive(:response)
     Flatrack::Site.call(mock_env)
   end
-end
+end

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

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Flatrack::View::LinkHelper do
+  include Flatrack::FixtureHelper
+
+  describe '#link_to' do
+
+    context 'using erb' do
+      it 'should properly render' do
+        template_content = render_template 'link_to.html.erb'
+        expected_content = render_template 'link_to.html'
+        expect(template_content).to eq expected_content
+      end
+    end
+
+    context 'using rb' do
+      it 'should properly render' do
+        template_content = render_template 'link_to.html.rb'
+        expected_content = render_template 'link_to.html'
+        expect(template_content).to eq expected_content
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+describe Flatrack::View::TagHelper do
+  include Flatrack::FixtureHelper
+
+  describe '#html_tag' do
+    let(:expected) { render_template 'html_tag.html' }
+
+    context 'using erb' do
+      it 'should properly render' do
+        template_content = render_template 'html_tag.html.erb'
+        expect(template_content).to eq expected
+      end
+    end
+
+    context 'using rb' do
+      it 'should properly render' do
+        template_content = render_template 'html_tag.html.rb'
+        expect(template_content).to eq expected
+      end
+    end
+
+  end
+
+  describe '#image_tag' do
+    let(:expected) { render_template 'image_tag.html' }
+
+    context 'using erb' do
+      it 'should properly render' do
+        template_content = render_template 'image_tag.html.erb'
+        expect(template_content).to eq expected
+      end
+    end
+
+    context 'using rb' do
+      it 'should properly render' do
+        template_content = render_template 'image_tag.html.rb'
+        expect(template_content).to eq expected
+      end
+    end
+
+  end
+
+  describe '#javascript_tag' do
+    let(:expected) { render_template 'javascript_tag.html' }
+
+    context 'using erb' do
+      it 'should properly render' do
+        template_content = render_template 'javascript_tag.html.erb'
+        expect(template_content).to eq expected
+      end
+    end
+
+    context 'using rb' do
+      it 'should properly render' do
+        template_content = render_template 'javascript_tag.html.rb'
+        expect(template_content).to eq expected
+      end
+    end
+
+  end
+
+  describe '#stylesheet_tag' do
+    let(:expected) { render_template 'stylesheet_tag.html' }
+
+    context 'using erb' do
+      it 'should properly render' do
+        template_content = render_template 'stylesheet_tag.html.erb'
+        expect(template_content).to eq expected
+      end
+    end
+
+    context 'using rb' do
+      it 'should properly render' do
+        template_content = render_template 'stylesheet_tag.html.rb'
+        expect(template_content).to eq expected
+      end
+    end
+
+  end
+end

data/spec/lib/flatrack/view_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+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(:request) { Flatrack::Request.new env }
+  let(:response) { Flatrack::Response.new request }
+  subject(:view) { described_class.new response }
+
+  describe '#initialize' do
+    it 'should set the response' do
+      view = described_class.allocate
+      expect do
+        view.send :initialize, response
+      end.to change {
+        view.instance_variable_get :@response
+      }.to response
+    end
+  end
+
+  describe '#params' do
+    let(:uri) { URI.parse 'http://example.org/index.html?foo=bar' }
+    it 'should be extracted from the uri path' do
+      expect(view.params).to include foo: 'bar'
+    end
+  end
+
+  describe '#path' do
+    it 'should be extracted from the uri path' do
+      expect(view.path).to eq uri.path
+    end
+  end
+
+  describe '#render' do
+    let(:template) do
+      <<-ERB
+<%= 'Hello World'.reverse %>
+      ERB
+    end
+
+    it 'should properly render a partial' do
+      site do
+        write(:partial, 'sample.erb', template)
+        result = view.render(:sample)
+        expect(result).to include 'Hello World'.reverse
+      end
+    end
+  end
+
+end

data/spec/lib/flatrack_spec.rb

@@ -25,4 +25,4 @@ describe Flatrack do
     end
   end
 
-end
+end

data/spec/lib/rake/asset_tasks_spec.rb

@@ -4,7 +4,7 @@ require 'rake/asset_tasks'
 
 describe Rake::AssetTasks do
   include FileUtils
-  include SiteHelper
+  include Flatrack::SiteHelper
 
   before(:all) do
     @sha = site(clean: false) do
@@ -12,7 +12,7 @@ describe Rake::AssetTasks do
       Rake.application = @rake
 
       @env = Flatrack.assets
-      @dir = File.join(Dir::tmpdir, 'sprockets/manifest')
+      @dir = File.join(Dir.tmpdir, 'sprockets/manifest')
 
       Rake::AssetTasks.new do |t|
         t.output    = @dir
@@ -43,7 +43,7 @@ describe Rake::AssetTasks do
 
   describe 'tasks' do
 
-    it "should precompile" do
+    it 'should precompile' do
       digest_path = @env['main.js'].digest_path
       expect(File.exist? "#{@dir}/#{digest_path}").to be false
 
@@ -53,7 +53,7 @@ describe Rake::AssetTasks do
       expect(File.exist? "#{@dir}/#{digest_path}").to be true
     end
 
-    it "should clobber" do
+    it 'should clobber' do
       digest_path = @env['main.js'].digest_path
 
       @rake['assets:precompile'].invoke
@@ -63,11 +63,11 @@ describe Rake::AssetTasks do
       expect(File.exist? "#{@dir}/#{digest_path}").to be false
     end
 
-    it "should clean" do
-      expect {
+    it 'should clean' do
+      expect do
         @rake['assets:clean'].invoke
-      }.to_not raise_error
+      end.to_not raise_error
     end
 
   end
-end
+end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift File.expand_path File.dirname(__FILE__)
 
 require 'simplecov'
 require 'coveralls'
+require 'pry'
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
@@ -12,10 +13,10 @@ SimpleCov.start do
 end
 
 require 'flatrack'
-Dir["./spec/support/**/*.rb"].sort.each {|f| require f}
+Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run focus: true
-  config.before(:each){ Flatrack.reset! }
+  config.before(:each) { Flatrack.reset! }
 end

data/spec/support/fixture_helper.rb

@@ -0,0 +1,29 @@
+class Flatrack
+  module FixtureHelper
+    extend FileUtils
+    include FileUtils
+
+    def render_template(fixture)
+      path = File.join Flatrack.gem_root, '../spec/fixtures/templates', fixture
+      view.render(path).lines.map(&:strip).join
+    end
+
+    private
+
+    def response
+      Flatrack::Response.new request
+    end
+
+    def request
+      Flatrack::Request.new env
+    end
+
+    def view
+      Flatrack::View.new response
+    end
+
+    def env
+      Rack::MockRequest.env_for 'http://example.org/index.html'
+    end
+  end
+end