hobbit 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a40ad5190f62122b017865652dd404d685679bbd
-  data.tar.gz: 68ab170cf365e621b439e3c95c37d68b27391213
+  metadata.gz: f680a28141ffc906e11a72dd899d9dc21defb1d5
+  data.tar.gz: a6296b3812d60e4a72927dc6ec59d97d524bc763
 SHA512:
-  metadata.gz: 655b5ebd8ff4cb2df724c477ab376c801f9d3a2c303a0ad417ad0670600d4900bba76eb0404ca0879df63ffc9323ffdc1d64abcb45b802289d04e8c868ac4d46
-  data.tar.gz: 3024565ad30b77a25403b7f7863667293101ba3bbbf7960d9f15f99733e28128f87bc29e3fc877cc1938f69b5a75519581aa83287718e9fe9ff7b6e692813fe8
+  metadata.gz: ae7659b05503edeac4b9659893ee95a3b5b3600ac4fd84b800c0a4561f41b9482ecfad567792cb6f0d4f55a75122e9a5e3407ceb2e2a5ba190fb8045ef34ca34
+  data.tar.gz: 88d899534b1103ef23cec457d48c13d210c4dddbbbad85e57296d0fcd569767066dd1e41f2be9134f3f736d379010fe0f1bfb449b46ac6eff0d1f44241f0716c

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec
+gemspec

data/LICENSE

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -31,8 +31,6 @@ $ gem install hobbit
 * Extensible with standard ruby classes and modules, with no extra logic. See
 [hobbit-contrib](https://github.com/patriciomacadden/hobbit-contrib).
 * Zero configuration.
-* Request and response classes could be injected (Defaults to `Rack::Request`
-and `Hobbit::Response`, respectively).
 
 ## Philosophy
 
@@ -42,7 +40,7 @@ its extensions instead of providing such functionality.
 
 ## Usage
 
-`Hobbit` applications are just instances of classes that inherits from
+Hobbit applications are just instances of classes that inherits from
 `Hobbit::Base`, which complies the
 [Rack SPEC](http://rack.rubyforge.org/doc/SPEC.html).
 
@@ -120,6 +118,8 @@ When a route gets called you have this methods available:
 * `request`: a `Rack::Request` instance.
 * `response`: a `Hobbit::Response` instance.
 
+And any other method defined in your application.
+
 #### Available methods
 
 * `delete`
@@ -176,7 +176,7 @@ end
 
 ### Built on top of rack
 
-Each hobbit application is a Rack stack (See this
+Each Hobbit application is a Rack stack (See this
 [blog post](http://m.onkey.org/ruby-on-rack-2-the-builder) for more
 information).
 
@@ -212,10 +212,13 @@ You can add any Rack middleware to the stack by using the `use` class method:
 require 'hobbit'
 
 class App < Hobbit::Base
-  include Hobbit::Session
   use Rack::Session::Cookie, secret: SecureRandom.hex(64)
   use Rack::ShowExceptions
 
+  def session
+    env['rack.session']
+  end
+
   get '/' do
     session[:name] = 'hobbit'
   end
@@ -226,23 +229,9 @@ end
 run App.new
 ```
 
-### Request and response classes
-
-You can inject the request (`Rack::Request`) and response (`Hobbit::Response`)
-classes for your application. Do it like this:
-
-```ruby
-class App < Hobbit::Base
-  settings[:request_class] = MyRequest
-  settings[:response_class] = MyResponse
-
-  # the rest of your app...
-end
-```
-
 ### Security
 
-By default, `hobbit` (nor Rack) comes without any protection against web
+By default, Hobbit (nor Rack) comes without any protection against web
 attacks. The use of [rack-protection](https://github.com/rkh/rack-protection)
 is highly recommended:
 
@@ -261,7 +250,7 @@ class App < Hobbit::Base
 end
 ```
 
-Please see the [rack-protection](https://github.com/rkh/rack-protection)
+See the [rack-protection](https://github.com/rkh/rack-protection)
 documentation for futher information.
 
 ### Testing
@@ -305,12 +294,12 @@ describe App do
 end
 ```
 
-Please see the [rack-test](https://github.com/brynary/rack-test) documentation
+See the [rack-test](https://github.com/brynary/rack-test) documentation
 for futher information.
 
 ### Extensions
 
-You can extend hobbit by creating standard ruby modules. See an example:
+You can extend Hobbit by creating standard ruby modules. See an example:
 
 ```ruby
 module MyExtension
@@ -334,8 +323,7 @@ end
 [hobbit-contrib](https://github.com/patriciomacadden/hobbit-contrib) is a ruby
 gem that comes with a lot of hobbit extensions, such as:
 
-* `Hobbit::Render`: provides a (very) basic template rendering module.
-* `Hobbit::EnhancedRender`: provides an enhanced template rendering module.
+* `Hobbit::Render`: provides basic template rendering.
 * `Hobbit::Session`: provides helper methods for handling user sessions.
 * `Hobbit::Environment`: provides helper methods for handling application
 environments.
@@ -346,10 +334,10 @@ Sinatra-like error handling.
 
 ... And many more!
 
-## Futher documentation
+## Community
 
-The [hobbit wiki](https://github.com/patriciomacadden/hobbit/wiki) contains
-guides, how-tos and recipes for a better hobbit experience.
+* [Wiki](https://github.com/patriciomacadden/hobbit/wiki): Guides, how-tos and recipes
+* IRC: [#hobbitrb](irc://chat.freenode.net/#hobbitrb) on [http://freenode.net](http://freenode.net)
 
 ## Contributing
 
@@ -361,4 +349,4 @@ guides, how-tos and recipes for a better hobbit experience.
 
 ## License
 
-See the [LICENSE](https://github.com/patriciomacadden/hobbit/blob/master/LICENSE).
+See the [LICENSE](https://github.com/patriciomacadden/hobbit/blob/master/LICENSE).

data/Rakefile

@@ -6,4 +6,4 @@ Rake::TestTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
 
-task default: :test
+task default: :test

data/lib/hobbit/base.rb

@@ -2,16 +2,16 @@ module Hobbit
   class Base
     class << self
       %w(DELETE GET HEAD OPTIONS PATCH POST PUT).each do |verb|
-        define_method(verb.downcase) { |path = '', &block| routes[verb] << compile_route!(path, &block) }
+        define_method(verb.downcase) { |path = '', &block| routes[verb] << compile_route(path, &block) }
       end
 
       def map(path, &block)
         stack.map(path, &block)
       end
 
-      alias :new! :new
+      alias :_new :new
       def new(*args, &block)
-        stack.run new!(*args, &block)
+        stack.run _new(*args, &block)
         stack
       end
 
@@ -19,10 +19,6 @@ module Hobbit
         @routes ||= Hash.new { |hash, key| hash[key] = [] }
       end
 
-      def settings
-        @settings ||= { request_class: Rack::Request, response_class: Hobbit::Response }
-      end
-
       def stack
         @stack ||= Rack::Builder.new
       end
@@ -33,7 +29,7 @@ module Hobbit
 
       private
 
-      def compile_route!(path, &block)
+      def compile_route(path, &block)
         route = { block: block, compiled_path: nil, extra_params: [], path: path }
 
         compiled_path = path.gsub(/:\w+/) do |match|
@@ -54,8 +50,8 @@ module Hobbit
 
     def _call(env)
       @env = env
-      @request = self.class.settings[:request_class].new(@env)
-      @response = self.class.settings[:response_class].new
+      @request = Rack::Request.new(@env)
+      @response = Hobbit::Response.new
       route_eval
       @response.finish
     end

data/lib/hobbit/version.rb

@@ -1,3 +1,3 @@
 module Hobbit
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/base_spec.rb

@@ -5,6 +5,10 @@ describe Hobbit::Base do
   include Rack::Test::Methods
 
   def app
+    @app
+  end
+
+  before do
     mock_app do
       %w(DELETE GET HEAD OPTIONS PATCH POST PUT).each do |verb|
         class_eval "#{verb.downcase} { '#{verb}' }"
@@ -33,33 +37,20 @@ EOS
     class_eval str
   end
 
-  describe '::settings' do
-    let(:settings) { app.to_app.class.settings }
-
-    it 'must return a hash with (at least) a request_class and response_class keys' do
-      settings.must_be_kind_of Hash
-      settings.must_include :request_class
-      settings.must_include :response_class
-    end
-
-    it 'must be initialized with request_class as Rack::Request' do
-      settings[:request_class].must_equal Rack::Request
-    end
-
-    it 'must be initialized with request_class as Hobbit::Response' do
-      settings[:response_class].must_equal Hobbit::Response
-    end
-  end
+  describe '::map' do
+    before do
+      mock_app do
+        map '/map' do
+          run Proc.new { |env| [200, {}, ['from map']] }
+        end
 
-  describe '::stack' do
-    it 'must return an instance of Rack::Builder' do
-      app.to_app.class.stack.must_be_kind_of Rack::Builder
+        get('/') { 'hello world' }
+      end
     end
-  end
 
-  describe '::map' do
     it 'must mount a application to the rack stack' do
-      skip '::map'
+      get '/map'
+      last_response.body.must_equal 'from map'
     end
   end
 
@@ -75,9 +66,101 @@ EOS
     end
   end
 
+  describe '::stack' do
+    it 'must return an instance of Rack::Builder' do
+      app.to_app.class.stack.must_be_kind_of Rack::Builder
+    end
+  end
+
   describe '::use' do
+    before do
+      mock_app do
+        middleware = Class.new do
+          def initialize(app = nil)
+            @app = app
+          end
+
+          def call(env)
+            request = Rack::Request.new(env)
+            @app.call(env) unless request.path_info == '/use'
+            [200, {}, 'from use']
+          end
+        end
+
+        use middleware
+
+        get('/') { 'hello world' }
+      end
+    end
+
     it 'must add a middleware to the rack stack' do
-      skip '::use'
+      get '/use'
+      last_response.body.must_equal 'from use'
+    end
+  end
+
+  describe '::compile_route' do
+    let(:block) { block = Proc.new { |env| [200, {}, []] } }
+
+    it 'must compile an empty string' do
+      path = ''
+      route = Hobbit::Base.send :compile_route, path, &block
+      route[:block].call({}).must_equal block.call({})
+      route[:compiled_path].to_s.must_equal /^$/.to_s
+      route[:extra_params].must_equal []
+      route[:path].must_equal path
+    end
+
+    it 'must compile /' do
+      path = '/'
+      route = Hobbit::Base.send :compile_route, path, &block
+      route[:block].call({}).must_equal block.call({})
+      route[:compiled_path].to_s.must_equal /^\/$/.to_s
+      route[:extra_params].must_equal []
+      route[:path].must_equal path
+    end
+
+    it 'must compile with .' do
+      path = '/route.json'
+      route = Hobbit::Base.send :compile_route, path, &block
+      route[:block].call({}).must_equal block.call({})
+      route[:compiled_path].to_s.must_equal /^\/route.json$/.to_s
+      route[:extra_params].must_equal []
+      route[:path].must_equal path
+    end
+
+    it 'must compile with -' do
+      path = '/hello-world'
+      route = Hobbit::Base.send :compile_route, path, &block
+      route[:block].call({}).must_equal block.call({})
+      route[:compiled_path].to_s.must_equal /^\/hello-world$/.to_s
+      route[:extra_params].must_equal []
+      route[:path].must_equal path
+    end
+
+    it 'must compile with params' do
+      path = '/hello/:name'
+      route = Hobbit::Base.send :compile_route, path, &block
+      route[:block].call({}).must_equal block.call({})
+      route[:compiled_path].to_s.must_equal /^\/hello\/([^\/?#]+)$/.to_s
+      route[:extra_params].must_equal [:name]
+      route[:path].must_equal path
+
+      path = '/say/:something/to/:someone'
+      route = Hobbit::Base.send :compile_route, path, &block
+      route[:block].call({}).must_equal block.call({})
+      route[:compiled_path].to_s.must_equal /^\/say\/([^\/?#]+)\/to\/([^\/?#]+)$/.to_s
+      route[:extra_params].must_equal [:something, :someone]
+      route[:path].must_equal path
+    end
+
+    it 'must compile with . and params' do
+      path = '/route/:id.json'
+      route = Hobbit::Base.send :compile_route, path, &block
+      route[:block].call({}).must_equal block.call({})
+      route[:compiled_path].to_s.must_equal /^\/route\/([^\/?#]+).json$/.to_s
+      route[:extra_params].must_equal [:id]
+      route[:path].must_equal path
     end
   end
 
@@ -129,4 +212,4 @@ EOS
   it 'must respond to call' do
     app.to_app.must_respond_to :call
   end
-end
+end

data/spec/minitest_helper.rb

@@ -16,7 +16,7 @@ module Hobbit
   module Mock
     def mock_app(&block)
       app = Class.new Hobbit::Base, &block
-      app.new
+      @app = app.new
     end
   end
 end

data/spec/version_spec.rb

@@ -4,4 +4,4 @@ describe Hobbit::VERSION do
   it 'wont be nil' do
     Hobbit::VERSION.wont_be_nil
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobbit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Patricio Mac Adden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,7 +150,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: A minimalistic microframework built on top of rack