hobbit-contrib 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 774186fdc100731a772b7134afc48cae8d824154
-  data.tar.gz: 96380c2994f125c6594170f75b52e16434e2cee3
+  metadata.gz: 160bf219184ef2cdbcd0a5447498bb174bed1d1f
+  data.tar.gz: ac07c279356e39dc84f49411b7889cb1de3b5361
 SHA512:
-  metadata.gz: 8e969363d5fd33c76f57c147e498abf4efa1a284290420ff9f1b96136f2c8e9823793e9f7357dc30207337481e93fd17241944a03602f1eab926623aa34704ad
-  data.tar.gz: e9336cee1b8c292a8d6e82913b6a1f6c813105416c25b8a6b0353722ab915a9299002baf3a59e730f9a112a265472f4c5dae254fab30f23c0a2a4c124c25559b
+  metadata.gz: 877a329df35df6e31de1687f427faf5dbb91a033111925de889406223f461fa70bb845f79cf51146345a82e655112f8a6cb9801a2a1382d70f516d245a31a984
+  data.tar.gz: bd72e44636f80a4b8d4d83cae8a3b538e65fd5819e4f279064d7b61d68d7813b16bc92812787a40a37d9495be39baa2b7c432ee5a13ec516b198e5f47fe0dc32

data/README.md

@@ -61,7 +61,7 @@ class App < Hobbit::Base
   # * public/stylesheets
   use Rack::Static, root: 'public', urls: ['/images', '/javascripts', '/stylesheets']
   include Hobbit::AssetTag
-  include Hobbit::EnhancedRender # see below
+  include Hobbit::Render # see below
 
   get '/' do
     render 'index', {}, layout: 'layout'
@@ -142,7 +142,6 @@ run App.new
 
 * `environment`: Returns the current environment. By default is
 `ENV['RACK_ENV']`.
-* `environment=()`: Sets the environment.
 * `development?`: Returns true if the current environment is `:development`.
 * `production?`: Returns true if the current environment is `:production`.
 * `test?`: Returns true if the current environment is `:test`.

data/lib/hobbit/asset_tag.rb

@@ -20,4 +20,4 @@ module Hobbit
       url =~ /^http(s)?:\/\// ? url : "/stylesheets/#{url}.css"
     end
   end
-end
+end

data/lib/hobbit/contrib/version.rb

@@ -1,5 +1,5 @@
 module Hobbit
   module Contrib
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/lib/hobbit/environment.rb

@@ -1,15 +1,11 @@
 module Hobbit
   module Environment
     def environment
-      self.class.settings[:environment] || ENV['RACK_ENV'].to_sym
+      ENV['RACK_ENV'].to_sym
     end
 
-    def environment=(environment)
-      self.class.settings[:environment] = environment.to_sym
-    end
-
-    %w(development production test).each do |environment|
-      define_method("#{environment}?") { self.class.settings[:environment] == environment.to_sym }
+    %w(development production test).each do |env|
+      define_method("#{env}?") { environment == env.to_sym }
     end
   end
 end

data/lib/hobbit/error_handling.rb

@@ -12,9 +12,11 @@ module Hobbit
 
     def _call(env)
       super
-    rescue Exception => e
-      body = instance_eval { self.class.errors[e.class].call(e) }
-      response.body = [body] if self.class.errors.include? e.class
+    rescue *self.class.errors.keys => e
+      rescued = self.class.errors.keys.detect { |k| e.kind_of?(k)}
+
+      body = instance_eval { self.class.errors[rescued].call(e) }
+      response.body = [body]
       response.finish
     end
 
@@ -22,4 +24,4 @@ module Hobbit
       othermod.extend ClassMethods
     end
   end
-end
+end

data/lib/hobbit/filter.rb

@@ -2,7 +2,7 @@ module Hobbit
   module Filter
     module ClassMethods
       %w(after before).each do |kind|
-        define_method(kind) { |path = '', &block| filters[kind.to_sym] << compile_filter!(path, &block) }
+        define_method(kind) { |path = '', &block| filters[kind.to_sym] << compile_filter(path, &block) }
       end
 
       def filters
@@ -11,7 +11,7 @@ module Hobbit
 
       private
 
-      def compile_filter!(path, &block)
+      def compile_filter(path, &block)
         filter = { block: block, compiled_path: nil, extra_params: [], path: path }
 
         compiled_path = path.gsub(/:\w+/) do |match|
@@ -26,11 +26,11 @@ module Hobbit
 
     def _call(env)
       @env = env
-      @request = self.class.settings[:request_class].new(@env)
-      @response = self.class.settings[:response_class].new
-      filter!(:before)
+      @request = Rack::Request.new(@env)
+      @response = Hobbit::Response.new
+      filter :before
       super
-      filter!(:after)
+      filter :after
       @response.finish
     end
 
@@ -40,7 +40,7 @@ module Hobbit
 
     private
 
-    def filter!(kind)
+    def filter(kind)
       filter = self.class.filters[kind].detect { |f| f[:compiled_path] =~ request.path_info || f[:path] =~ // }
       if filter
         $~.captures.each_with_index do |value, index|
@@ -51,4 +51,4 @@ module Hobbit
       end
     end
   end
-end
+end

data/lib/hobbit/session.rb

@@ -4,4 +4,4 @@ module Hobbit
       env['rack.session']
     end
   end
-end
+end

data/spec/asset_tag_spec.rb

@@ -81,4 +81,4 @@ describe Hobbit::AssetTag do
       end
     end
   end
-end
+end

data/spec/environment_spec.rb

@@ -11,55 +11,45 @@ describe Hobbit::Environment do
 
   describe '#environment' do
     it 'must return the current environment' do
-      app.to_app.environment = :development
+      env, ENV['RACK_ENV'] = ENV['RACK_ENV'], 'development'
       app.to_app.environment.must_equal :development
-    end
-
-    it 'must default to RACK_ENV' do
-      app.to_app.environment.must_equal ENV['RACK_ENV'].to_sym
-    end
-  end
-
-  describe '#environment=()' do
-    it 'must set the environment' do
-      app.to_app.environment = :test
-      app.to_app.environment.must_equal :test
+      ENV['RACK_ENV'] = env
     end
   end
 
   describe '#development?' do
-    it 'must return true if self.class.settings[:environment] = :development' do
-      app.to_app.environment = :development
+    it "must return true if ENV['RACK_ENV'] = :development" do
+      env, ENV['RACK_ENV'] = ENV['RACK_ENV'], 'development'
       app.to_app.development?.must_equal true
+      ENV['RACK_ENV'] = env
     end
 
-    it 'must return false if self.class.settings[:environment] != :development' do
-      app.to_app.environment = :production
+    it "must return false if ENV['RACK_ENV'] != :development" do
       app.to_app.development?.must_equal false
     end
   end
 
   describe '#production?' do
-    it 'must return true if self.class.settings[:environment] = :production' do
-      app.to_app.environment = :production
+    it "must return true if ENV['RACK_ENV'] = :production" do
+      env, ENV['RACK_ENV'] = ENV['RACK_ENV'], 'production'
       app.to_app.production?.must_equal true
+      ENV['RACK_ENV'] = env
     end
 
-    it 'must return false if self.class.settings[:environment] != :production' do
-      app.to_app.environment = :test
+    it "must return false if ENV['RACK_ENV'] != :production" do
       app.to_app.production?.must_equal false
     end
   end
 
   describe '#test?' do
-    it 'must return true if self.class.settings[:environment] = :test' do
-      app.to_app.environment = :test
+    it "must return true if ENV['RACK_ENV'] = :test" do
       app.to_app.test?.must_equal true
     end
 
-    it 'must return false if self.class.settings[:environment] != :test' do
-      app.to_app.environment = :development
+    it "must return false if ENV['RACK_ENV'] != :test" do
+      env, ENV['RACK_ENV'] = ENV['RACK_ENV'], 'development'
       app.to_app.test?.must_equal false
+      ENV['RACK_ENV'] = env
     end
   end
-end
+end

data/spec/error_handling_and_filter_spec.rb

@@ -137,4 +137,4 @@ describe 'combine Hobbit::ErrorHandling and Hobbit::Filter' do
       end
     end
   end
-end
+end

data/spec/error_handling_spec.rb

@@ -4,33 +4,46 @@ describe Hobbit::ErrorHandling do
   include Hobbit::Contrib::Mock
   include Rack::Test::Methods
 
-  class NotFoundException < StandardError ; end
+  class NotFoundException < Exception ; end
+  class SpecificNotFoundException < NotFoundException ; end
+  class UnknownException < Exception ; end
 
   let(:app) do
     mock_app do
       include Hobbit::ErrorHandling
 
-      error Exception do |exception|
-        exception.message
-      end
-
       error NotFoundException do
         'Not Found'
       end
 
+      error StandardError do |exception|
+        exception.message
+      end
+
+
       get '/' do
         'hello'
       end
 
       get '/raises' do
         'not this'
-        raise Exception, 'Exception'
+        raise StandardError, 'StandardError'
       end
 
       get '/other_raises' do
         response.write 'not this'
         raise NotFoundException
       end
+
+      get '/same_other_raises' do
+        response.write 'not this'
+        raise SpecificNotFoundException
+      end
+
+      get '/uncaught_raise' do
+        response.write 'not this'
+        raise UnknownException
+      end
     end
   end
 
@@ -39,11 +52,11 @@ describe Hobbit::ErrorHandling do
       p = Proc.new { 'error' }
       app = mock_app do
         include Hobbit::ErrorHandling
-        error Exception, &p
+        error StandardError, &p
       end
 
-      app.to_app.class.errors.must_include Exception
-      app.to_app.class.errors[Exception].call.must_equal p.call
+      app.to_app.class.errors.must_include StandardError
+      app.to_app.class.errors[StandardError].call.must_equal p.call
     end
   end
 
@@ -53,7 +66,7 @@ describe Hobbit::ErrorHandling do
     end
   end
 
-  describe 'when does not raises an exception' do
+  describe 'when does not raise exception' do
     it 'must work as expected' do
       get '/'
       last_response.must_be :ok?
@@ -61,11 +74,17 @@ describe Hobbit::ErrorHandling do
     end
   end
 
-  describe 'when raises an exception' do
+  describe 'when does raise an unknown exception class' do
+    it 'must not halt default propagation of the unknown class' do
+      proc {get '/uncaught_raise'}.must_raise(UnknownException)
+    end
+  end
+
+  describe 'when raises an known exception class' do
     it 'must call the block set in error' do
       get '/raises'
       last_response.must_be :ok?
-      last_response.body.must_equal 'Exception'
+      last_response.body.must_equal 'StandardError'
     end
 
     it 'must allow to define more than one exception' do
@@ -74,6 +93,12 @@ describe Hobbit::ErrorHandling do
       last_response.body.must_equal 'Not Found'
     end
 
+    it 'must allow to define a general exception class to catch' do
+      get '/same_other_raises'
+      last_response.must_be :ok?
+      last_response.body.must_equal 'Not Found'
+    end
+
     it 'must set the returned value of the error block as the body' do
       get '/other_raises'
       last_response.must_be :ok?
@@ -82,7 +107,7 @@ describe Hobbit::ErrorHandling do
     end
 
     it 'must override a previous block if a new one is passed' do
-      app.to_app.class.error Exception do
+      app.to_app.class.error StandardError do
         'other handler!'
       end
 
@@ -91,4 +116,4 @@ describe Hobbit::ErrorHandling do
       last_response.body.must_equal 'other handler!'
     end
   end
-end
+end

data/spec/filter_spec.rb

@@ -55,6 +55,57 @@ EOS
     end
   end
 
+  describe '::compile_filter' do
+    let(:block) { block = Proc.new { |env| [200, {}, []] } }
+
+    it 'must compile an empty string' do
+      path = ''
+      route = app.to_app.class.send :compile_filter, path, &block
+      route[:block].call({}).must_equal block.call({})
+      route[:compiled_path].to_s.must_equal /^$/.to_s
+    end
+
+    it 'must compile /' do
+      path = '/'
+      route = app.to_app.class.send :compile_filter, path, &block
+      route[:block].call({}).must_equal block.call({})
+      route[:compiled_path].to_s.must_equal /^\/$/.to_s
+    end
+
+    it 'must compile with .' do
+      path = '/route.json'
+      route = app.to_app.class.send :compile_filter, path, &block
+      route[:block].call({}).must_equal block.call({})
+      route[:compiled_path].to_s.must_equal /^\/route.json$/.to_s
+    end
+
+    it 'must compile with -' do
+      path = '/hello-world'
+      route = app.to_app.class.send :compile_filter, path, &block
+      route[:block].call({}).must_equal block.call({})
+      route[:compiled_path].to_s.must_equal /^\/hello-world$/.to_s
+    end
+
+    it 'must compile with params' do
+      path = '/hello/:name'
+      route = app.to_app.class.send :compile_filter, path, &block
+      route[:block].call({}).must_equal block.call({})
+      route[:compiled_path].to_s.must_equal /^\/hello\/([^\/?#]+)$/.to_s
+
+      path = '/say/:something/to/:someone'
+      route = app.to_app.class.send :compile_filter, path, &block
+      route[:block].call({}).must_equal block.call({})
+      route[:compiled_path].to_s.must_equal /^\/say\/([^\/?#]+)\/to\/([^\/?#]+)$/.to_s
+    end
+
+    it 'must compile with . and params' do
+      path = '/route/:id.json'
+      route = app.to_app.class.send :compile_filter, path, &block
+      route[:block].call({}).must_equal block.call({})
+      route[:compiled_path].to_s.must_equal /^\/route\/([^\/?#]+).json$/.to_s
+    end
+  end
+
   it 'must call before and after filters' do
     get '/'
     last_response.must_be :ok?
@@ -98,4 +149,4 @@ EOS
       last_request.env['hobbit.after'].must_equal 'this will match'
     end
   end
-end
+end

data/spec/fixtures/render/views/index.erb

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

data/spec/fixtures/render/views/layouts/application.erb

@@ -6,4 +6,4 @@
   <body>
     <%= yield %>
   </body>
-</html>
+</html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobbit-contrib
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Patricio Mac Adden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Contributed Hobbit extensions