hobbit-contrib 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55fab9ef331ed253a8f11ec44ae25fc53da572dd
-  data.tar.gz: 089a7b5a8fbbbb5454d48980c982cc89b6a7db82
+  metadata.gz: b7605fffd9d4c2602f35c6556529d11bafb64883
+  data.tar.gz: 58af370162d53892f0f966e18b0fd8daaf49c1e7
 SHA512:
-  metadata.gz: 72e7ecc6ea472c0003dc5b0ccd7f11c9e7b414d73e914cc283b5aeef0692c4da20b97b887375052142e0c751a813b04ff2f263b52383160d41087632a8d23ea5
-  data.tar.gz: 852457cfe4f155c9c81d8750d9d7b7f3a3aa6577b28aece8dd1369cf0243055cd854d28b627ca2575fdb21eb088d735a81d4edc327ddd29dfcbff292cc854b8f
+  metadata.gz: 9ccf2711a81fd56a5405cf9989843263261a8436d40e984b23e5b9500a3591f9a73dc25d597cb91507e847bfaeecb3f47b2903181b975a663cb17755f624d684
+  data.tar.gz: 239c9527fbdd4485e311414b319f75d7ba8764e64368dd28f72daafeb8c6449b5348ba0079f3335393cb1cb62aae3820bfb3e271bbe5876a07aacd374874b1ed

data/.travis.yml

@@ -3,3 +3,7 @@ rvm:
   - 2.0.0
   - 2.1.0
   - ruby-head
+addons:
+  code_climate:
+    repo_token:
+      secure: "L2qK51BSckPkJpBqSEIdiGZzd/iBebueZh3Vn5C14uBGfJasfq1cp7rwBvoaJRZ4kYPl6ZvyD9KGIbfzzhYFgC0cMwNaMsk2koV37IB+kKCek7JTOqEmvdHW8mfWAtaVL4HMm+MhXJq6JhxUvSmFLDMLtmtlwm77gTWKvT2afyE="

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.5.2
+
+* Add `Hobbit::Mote`
+
 # 0.5.1
 
 * Fix broken tests.

data/README.md

@@ -1,4 +1,4 @@
-# Hobbit::Contrib [![Build Status](https://travis-ci.org/patriciomacadden/hobbit-contrib.png?branch=master)](https://travis-ci.org/patriciomacadden/hobbit-contrib) [![Code Climate](https://codeclimate.com/github/patriciomacadden/hobbit-contrib.png)](https://codeclimate.com/github/patriciomacadden/hobbit-contrib) [![Coverage Status](https://coveralls.io/repos/patriciomacadden/hobbit-contrib/badge.png?branch=master)](https://coveralls.io/r/patriciomacadden/hobbit-contrib) [![Dependency Status](https://gemnasium.com/patriciomacadden/hobbit-contrib.png)](https://gemnasium.com/patriciomacadden/hobbit-contrib) [![Gem Version](https://badge.fury.io/rb/hobbit-contrib.png)](http://badge.fury.io/rb/hobbit-contrib)
+# Hobbit::Contrib [![Build Status](http://img.shields.io/travis/patriciomacadden/hobbit-contrib.svg)](https://travis-ci.org/patriciomacadden/hobbit-contrib) [![Code Climate](http://img.shields.io/codeclimate/github/patriciomacadden/hobbit-contrib.svg)](https://codeclimate.com/github/patriciomacadden/hobbit-contrib) [![Code Climate Coverage](http://img.shields.io/codeclimate/coverage/github/patriciomacadden/hobbit-contrib.svg)](https://codeclimate.com/github/patriciomacadden/hobbit-contrib) [![Dependency Status](http://img.shields.io/gemnasium/patriciomacadden/hobbit-contrib.svg)](https://gemnasium.com/patriciomacadden/hobbit-contrib) [![Gem Version](http://img.shields.io/gem/v/hobbit-contrib.svg)](http://badge.fury.io/rb/hobbit-contrib)
 
 Contributed Hobbit extensions.
 
@@ -144,6 +144,39 @@ run App.new
 **Note**: It is recommended to include `Hobbit::Filter` before
 `Hobbit::ErrorHandling` if you want to use both extensions.
 
+### Hobbit::Mote
+
+This module provides rendering to your hobbit application using [mote](https://github.com/soveran/mote).
+To use this extension just include the module:
+
+```ruby
+require 'hobbit'
+require 'hobbit/contrib'
+
+class App < Hobbit::Base
+  include Hobbit::Mote
+
+  get '/' do
+    # will render views/index.mote using views/layouts/application.mote as layout
+    render 'index'
+  end
+end
+```
+
+#### Available methods
+
+* `default_layout`: Returns the name of the default layout (Override to use
+another layout).
+* `find_template`: Returns the path to a template (Override for multiple views
+paths lookup).
+* `layouts_path`: Returns the layouts path (Override to change the layouts
+directory).
+* `partial`: Renders the given template using tilt (without a layout).
+* `render`: Renders the given template using tilt. You can pass a `layout`
+option to change the layout (or set to `false` to not use one).
+* `views_path`: Returns the views path (Override to change the views
+directory).
+
 ### Hobbit::Render
 
 This module provides rendering to your hobbit application. To use this

data/hobbit-contrib.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['patriciomacadden@gmail.com']
   spec.description   = %q{Contributed Hobbit extensions}
   spec.summary       = %q{Contributed Hobbit extensions}
-  spec.homepage      = ''
+  spec.homepage      = 'https://github.com/patriciomacadden/hobbit-contrib'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
@@ -19,12 +19,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'rake'
 
+  spec.add_runtime_dependency 'erubis'
   spec.add_runtime_dependency 'hobbit'
+  spec.add_runtime_dependency 'mote'
   spec.add_runtime_dependency 'tilt'
-  spec.add_runtime_dependency 'erubis'
 end

data/lib/hobbit/contrib.rb

@@ -2,5 +2,6 @@ require 'hobbit/contrib/version'
 require 'hobbit/environment'
 require 'hobbit/error_handling'
 require 'hobbit/filter'
+require 'hobbit/mote'
 require 'hobbit/render'
 require 'hobbit/session'

data/lib/hobbit/contrib/version.rb

@@ -1,5 +1,5 @@
 module Hobbit
   module Contrib
-    VERSION = '0.5.1'
+    VERSION = '0.5.2'
   end
 end

data/lib/hobbit/mote.rb

@@ -0,0 +1,44 @@
+require 'mote'
+
+module Hobbit
+  module Mote
+    def self.included(othermod)
+      othermod.send :include, ::Mote::Helpers
+    end
+
+    def default_layout
+      "#{layouts_path}/application.mote"
+    end
+
+    def find_template(template)
+      "#{views_path}/#{template}.mote"
+    end
+
+    def layouts_path
+      "#{views_path}/layouts"
+    end
+
+    def partial(template, params = {}, context = self)
+      template = find_template "_#{template}"
+      mote template, params, context
+    end
+
+    def render(template, params = {}, context = self)
+      template = find_template template
+      layout = default_layout
+      if params.include? :layout
+        layout = params.delete :layout
+      end
+      if layout
+        params = params.merge content: mote(template, params, context)
+        mote layout, params, context
+      else
+        mote template, params, context
+      end
+    end
+
+    def views_path
+      'views'
+    end
+  end
+end

data/lib/hobbit/render.rb

@@ -23,8 +23,7 @@ module Hobbit
       template = find_template template
       layout = default_layout
       if options.include? :layout
-        layout = options[:layout]
-        options.delete :layout
+        layout = options.delete :layout
       end
       if layout
         _render(layout) { _render(template) }

data/spec/environment_spec.rb

@@ -3,7 +3,7 @@ require 'minitest_helper'
 describe Hobbit::Environment do
   include Hobbit::Contrib::Mock
 
-  let(:app) do
+  let :app do
     mock_app do
       include Hobbit::Environment
     end

data/spec/error_handling_and_filter_spec.rb

@@ -5,7 +5,7 @@ describe 'combine Hobbit::ErrorHandling and Hobbit::Filter' do
   include Rack::Test::Methods
 
   describe 'when the exception ocurrs in a route' do
-    let(:app) do
+    let :app do
       mock_app do
         include Hobbit::Filter
         include Hobbit::ErrorHandling
@@ -39,7 +39,7 @@ describe 'combine Hobbit::ErrorHandling and Hobbit::Filter' do
   end
 
   describe 'when the exception ocurrs in a before filter' do
-    let(:app) do
+    let :app do
       mock_app do
         include Hobbit::Filter
         include Hobbit::ErrorHandling
@@ -72,7 +72,7 @@ describe 'combine Hobbit::ErrorHandling and Hobbit::Filter' do
   end
 
   describe 'when the exception ocurrs in an after filter' do
-    let(:app) do
+    let :app do
       mock_app do
         include Hobbit::Filter
         include Hobbit::ErrorHandling
@@ -106,7 +106,7 @@ describe 'combine Hobbit::ErrorHandling and Hobbit::Filter' do
 
   describe 'the order of the modules inclusion matters' do
     describe 'when ErrorHandling is included before Filter' do
-      let(:app) do
+      let :app do
         mock_app do
           include Hobbit::ErrorHandling
           include Hobbit::Filter

data/spec/error_handling_spec.rb

@@ -9,7 +9,7 @@ describe Hobbit::ErrorHandling do
   class UnknownException < Exception ; end
   class MustUseResponseException < Exception ; end
 
-  let(:app) do
+  let :app do
     mock_app do
       include Hobbit::ErrorHandling
 

data/spec/filter_spec.rb

@@ -5,7 +5,7 @@ describe Hobbit::Filter do
   include Rack::Test::Methods
 
   describe 'basic specs' do
-    let(:app) do
+    let :app do
       mock_app do
         include Hobbit::Filter
 
@@ -110,8 +110,35 @@ EOS
     end
   end
 
+  describe 'filters with parameters' do
+    let :app do
+      mock_app do
+        include Hobbit::Filter
+
+        before '/:name' do
+          env['hobbit.before'] = 'this is before'
+        end
+
+        after '/:name' do
+          env['hobbit.after'] = 'this is after'
+        end
+
+        get('/:name') { env['hobbit.before'] }
+      end
+    end
+
+    it 'must call the before and after filters' do
+      get '/hobbit'
+      last_response.must_be :ok?
+      last_request.env.must_include 'hobbit.before'
+      last_request.env['hobbit.before'].must_equal 'this is before'
+      last_request.env.must_include 'hobbit.after'
+      last_request.env['hobbit.after'].must_equal 'this is after'
+    end
+  end
+
   describe 'when multiple filters are declared' do
-    let(:app) do
+    let :app do
       mock_app do
         include Hobbit::Filter
 

data/spec/fixtures/mote/views/_partial.mote

@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<html>
+  <head><title>Hello World!</title></head>
+  <body>Hello World!</body>
+</html>

data/spec/fixtures/mote/views/hello.mote

@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<html>
+  <head><title>Hello {{ name }}!</title></head>
+  <body>Hello {{ name }}!</body>
+</html>

data/spec/fixtures/mote/views/index.mote

@@ -0,0 +1 @@
+<h1>Hello World!</h1>

data/spec/fixtures/mote/views/layouts/application.mote

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>From application.mote</title>
+  </head>
+  <body>
+    {{ content }}
+  </body>
+</html>

data/spec/minitest_helper.rb

@@ -1,11 +1,11 @@
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
 ENV['RACK_ENV'] ||= 'test'
 
 require 'bundler'
 Bundler.require :default, ENV['RACK_ENV'].to_sym
 
-require 'coveralls'
-Coveralls.wear!
-
 require 'minitest/autorun'
 require 'rack'
 require 'rack/test'

data/spec/mote_spec.rb

@@ -0,0 +1,89 @@
+require 'minitest_helper'
+
+describe Hobbit::Mote do
+  include Hobbit::Contrib::Mock
+  include Rack::Test::Methods
+
+  def app
+    mock_app do
+      include Hobbit::Mote
+
+      def views_path
+        File.expand_path '../fixtures/mote/views/', __FILE__
+      end
+
+      def name
+        'Hobbit'
+      end
+
+      get('/') { render 'index' }
+      get('/partial') { partial 'partial' }
+      get('/using-context') { render 'hello' }
+      get('/without-layout') { render '_partial', layout: false }
+    end
+  end
+
+  describe '#default_layout' do
+    it 'defaults to application.mote' do
+      app.to_app.default_layout.must_equal "#{app.to_app.layouts_path}/application.mote"
+    end
+  end
+
+  describe '#find_template' do
+    it 'must return a template path' do
+      app.to_app.find_template('index').must_equal "#{app.to_app.views_path}/index.mote"
+    end
+  end
+
+  describe '#layouts_path' do
+    it 'must return the path to the layouts directory' do
+      app.to_app.layouts_path.must_equal "#{app.to_app.views_path}/layouts"
+    end
+  end
+
+  describe '#partial' do
+    it 'must render a template without a layout' do
+      get '/partial'
+      last_response.must_be :ok?
+      last_response.body.wont_match /From application.mote/
+      last_response.body.must_match /Hello World!/
+    end
+  end
+
+  describe '#render' do
+    it 'must render a template (using a layout)' do
+      get '/'
+      last_response.must_be :ok?
+      last_response.body.must_match /From application.mote/
+      last_response.body.must_match /Hello World!/
+    end
+
+    it 'must render a template (not using a layout)' do
+      get '/without-layout'
+      last_response.must_be :ok?
+      last_response.body.wont_match /From application.mote/
+      last_response.body.must_match /Hello World!/
+    end
+
+    it 'must render a template using the app as context' do
+      get '/using-context'
+      last_response.must_be :ok?
+      last_response.body.must_match /From application.mote/
+      last_response.body.must_match /Hello Hobbit!/
+    end
+  end
+
+  describe '#views_path' do
+    it 'must return the path to the views directory' do
+      app.to_app.views_path.must_equal File.expand_path('../fixtures/mote/views', __FILE__)
+    end
+
+    it 'defaults to "views"' do
+      a = mock_app do
+        include Hobbit::Mote
+      end
+
+      a.to_app.views_path.must_equal 'views'
+    end
+  end
+end

data/spec/render_spec.rb

@@ -1,4 +1,5 @@
 require 'minitest_helper'
+require 'tilt/erubis'
 
 describe Hobbit::Render do
   include Hobbit::Contrib::Mock
@@ -83,5 +84,13 @@ describe Hobbit::Render do
     it 'must return the path to the views directory' do
       app.to_app.views_path.must_equal File.expand_path('../fixtures/render/views', __FILE__)
     end
+
+    it 'defaults to "views"' do
+      a = mock_app do
+        include Hobbit::Render
+      end
+
+      a.to_app.views_path.must_equal 'views'
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobbit-contrib
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Patricio Mac Adden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hobbit
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: mote
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -142,20 +156,26 @@ files:
 - lib/hobbit/environment.rb
 - lib/hobbit/error_handling.rb
 - lib/hobbit/filter.rb
+- lib/hobbit/mote.rb
 - lib/hobbit/render.rb
 - lib/hobbit/session.rb
 - spec/environment_spec.rb
 - spec/error_handling_and_filter_spec.rb
 - spec/error_handling_spec.rb
 - spec/filter_spec.rb
+- spec/fixtures/mote/views/_partial.mote
+- spec/fixtures/mote/views/hello.mote
+- spec/fixtures/mote/views/index.mote
+- spec/fixtures/mote/views/layouts/application.mote
 - spec/fixtures/render/views/_partial.erb
 - spec/fixtures/render/views/hello.erb
 - spec/fixtures/render/views/index.erb
 - spec/fixtures/render/views/layouts/application.erb
 - spec/minitest_helper.rb
+- spec/mote_spec.rb
 - spec/render_spec.rb
 - spec/session_spec.rb
-homepage: ''
+homepage: https://github.com/patriciomacadden/hobbit-contrib
 licenses:
 - MIT
 metadata: {}
@@ -175,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Contributed Hobbit extensions
@@ -184,10 +204,15 @@ test_files:
 - spec/error_handling_and_filter_spec.rb
 - spec/error_handling_spec.rb
 - spec/filter_spec.rb
+- spec/fixtures/mote/views/_partial.mote
+- spec/fixtures/mote/views/hello.mote
+- spec/fixtures/mote/views/index.mote
+- spec/fixtures/mote/views/layouts/application.mote
 - spec/fixtures/render/views/_partial.erb
 - spec/fixtures/render/views/hello.erb
 - spec/fixtures/render/views/index.erb
 - spec/fixtures/render/views/layouts/application.erb
 - spec/minitest_helper.rb
+- spec/mote_spec.rb
 - spec/render_spec.rb
 - spec/session_spec.rb