flatrack 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02f38974206178dab428bdc7d4b7a0c2aa92dc03
-  data.tar.gz: b6b70a1a6ea5ddd2a9a4c344c547228715d499c3
+  metadata.gz: c19e4a9f13cab919d16beac789e1030adc8484ef
+  data.tar.gz: e28d6c79ef1c3fde4e1a117c160d0c339b4b9f52
 SHA512:
-  metadata.gz: 4a2cd97cdcdcd578d7a3af3278ef743c7fbd838eb1d195e7233e406c4cf9a74d0a26c932852fc4c04cf402cdb2a3f55af753911487325de9cfdf6d11c6e32888
-  data.tar.gz: 22a927232f2f038a3297ef20e78dd5a605950a032ec411b5cb8796720c461a7faefd9be9c152518f25f345c58c1c2c52d12c2ddda12bcbe9363213ff82f5d3f7
+  metadata.gz: ccafe9a3cfc1b91d6cbce338062f6d71767e8840cbcc81a0fb5aa15b0aec8a114b27f1a7a10a26aa2e5604de61976f91b8af32b1d6ca370c6e11c0a586484fa0
+  data.tar.gz: 5de8c2db8beea1d99f89db153f38b0c4ebe4ea573da2a879bbb2a082a32cb3fed458265f2a9d7ff1f293679c5481b2f5c53b8aff3bdfc10425d3041841eec29f

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# Flatrack 1.1.0 (March 05, 2014)
+
+*   Added support for rendering partials in views
+
+    *Jason Waldrip*
+
+# Flatrack 1.0.0 (March 04, 2014)
+
+*   Initial Release
+
+    *Jason Waldrip*

data/lib/flatrack/cli.rb

@@ -18,7 +18,8 @@ class Flatrack
       'assets/javascripts',
       'assets/images',
       'pages',
-      'layouts'
+      'layouts',
+      'partials'
     ]
 
     FILES = {

data/lib/flatrack/renderer.rb

@@ -4,11 +4,10 @@ class Flatrack
 
     autoload :Base
 
-    def find(file)
-      template = File.exists?(file) ? file : [*pages(file), *layouts(file)][0]
+    def find(type, file)
+      template = find_by_type type, file
       fail FileNotFound, "could not find #{file}" unless template
       ext = File.extname(template).sub(/\./, '')
-
       renderer = Base.descendants.find do |descendant|
         descendant.renders?(ext)
       end || fail(RendererNotFound, "could not find a renderer for #{file}")
@@ -18,14 +17,14 @@ class Flatrack
 
     private
 
-    def pages(file)
-      Dir[File.join 'pages', "#{file}*"]
-    end
-
-    def layouts(file)
-      Dir[File.join 'layouts', "#{file}*"]
+    def find_by_type(type, file)
+      if File.exists?(file)
+        file
+      else
+        Dir[File.join type.to_s.pluralize, "#{file}*"].first
+      end
     end
 
-    module_function :find, :pages, :layouts
+    module_function :find, :find_by_type
   end
 end

data/lib/flatrack/response.rb

@@ -23,10 +23,10 @@ class Flatrack
     end
 
     def render(file: file_for(request.path), status: 200, layout: :layout)
-      page_content = proc { renderer_for(file).render(view_context) }
+      page_content = proc { renderer_for_page(file).render(view_context) }
       set_content_type
       body << begin
-        layout_for(layout).render(view_context, &page_content)
+        renderer_for_layout(layout).render(view_context, &page_content)
       rescue Flatrack::FileNotFound
         page_content.call
       end
@@ -47,12 +47,12 @@ class Flatrack
       end
     end
 
-    def renderer_for(file)
-      Renderer.find file
+    def renderer_for_page(file)
+      Renderer.find :page, file
     end
 
-    def layout_for(file)
-      Renderer.find File.join("#{file}.#{request.format}")
+    def renderer_for_layout(file)
+      Renderer.find :layout, File.join("#{file}.#{request.format}")
     end
 
     def view_context

data/lib/flatrack/response/view_context.rb

@@ -46,6 +46,10 @@ class Flatrack
         @response.request.path
       end
 
+      def render(file)
+        Renderer.find(:partial, file.to_s).render(self)
+      end
+
       def stylesheet_tag(uri)
         uri = asset_path(uri) + '.css' if uri.is_a? Symbol
         html_tag(:link, rel: 'stylesheet', type: 'text/css', href: uri)

data/lib/flatrack/version.rb

@@ -1,3 +1,3 @@
 class Flatrack
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/lib/flatrack/response/view_context_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Flatrack::Response::ViewContext do
+  include SiteHelper
 
   let(:uri) { URI.parse 'http://example.org/index.html' }
   let(:env){ Rack::MockRequest.env_for uri.to_s }
@@ -66,6 +67,22 @@ describe Flatrack::Response::ViewContext do
     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
+
   describe '#stylesheet_tag' do
     it 'should be a proper stylesheet tag' do
       expect(view.stylesheet_tag :test)

data/spec/renderers/erb_spec.rb

@@ -12,7 +12,7 @@ describe Flatrack::Renderer::ERB do
   it 'should render properly' do
     sha = SecureRandom.hex
     site do
-      write_page("#{sha}.html.erb", template)
+      write(:page, "#{sha}.html.erb", template)
       status, headers, body = get_page_response(sha)
       expect(body.first).to include 'Hello World'.reverse
     end

data/spec/renderers/html_spec.rb

@@ -12,7 +12,7 @@ describe Flatrack::Renderer::Html do
   it 'should render properly' do
     sha = SecureRandom.hex
     site do
-      write_page("#{sha}.html.html", template)
+      write(:page, "#{sha}.html.html", template)
       status, headers, body = get_page_response(sha)
       expect(body.first).to include template
     end

data/spec/renderers/rb_spec.rb

@@ -12,7 +12,7 @@ describe Flatrack::Renderer::Rb do
   it 'should render properly' do
     sha = SecureRandom.hex
     site do
-      write_page("#{sha}.html.rb", template)
+      write(:page, "#{sha}.html.rb", template)
       status, headers, body = get_page_response(sha)
       expect(body.first).to include 'Hello World'.reverse
     end

data/spec/support/site_helper.rb

@@ -27,8 +27,8 @@ module SiteHelper
     end
   end
 
-  def write_page(filename, contents)
-    Dir.chdir('pages') do
+  def write(type, filename, contents)
+    Dir.chdir(type.to_s.pluralize) do
       File.open(filename, 'w') do |file|
         file.write(contents)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flatrack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jason Waldrip
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -236,6 +236,7 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -263,7 +264,6 @@ files:
 - spec/lib/flatrack/asset_extensions_spec.rb
 - spec/lib/flatrack/cli_spec.rb
 - spec/lib/flatrack/renderer/base_spec.rb
-- spec/lib/flatrack/renderer_spec.rb
 - spec/lib/flatrack/request_spec.rb
 - spec/lib/flatrack/response/view_context_spec.rb
 - spec/lib/flatrack/response_spec.rb
@@ -316,7 +316,6 @@ test_files:
 - spec/lib/flatrack/asset_extensions_spec.rb
 - spec/lib/flatrack/cli_spec.rb
 - spec/lib/flatrack/renderer/base_spec.rb
-- spec/lib/flatrack/renderer_spec.rb
 - spec/lib/flatrack/request_spec.rb
 - spec/lib/flatrack/response/view_context_spec.rb
 - spec/lib/flatrack/response_spec.rb

data/spec/lib/flatrack/renderer_spec.rb

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