pakada 0.1.0 → 0.2.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Lars Gierth
+Copyright (c) 2011 Lars Gierth
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/pakada/module.rb

@@ -6,7 +6,7 @@ class Pakada
       attr_reader :descendants
       
       def included(klass)
-        klass.send :include, Hooked::Container
+        klass.send :include, Hooked
         
         class << klass
           attr_reader :module_name, :path
@@ -63,5 +63,9 @@ class Pakada
     def path
       self.class.path
     end
+    
+    def boot; end
+    
+    def hooks; end
   end
 end

data/lib/pakada/version.rb

@@ -1,3 +1,3 @@
 class Pakada
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/pakada.rb

@@ -5,13 +5,9 @@ require "pakada/module"
 require "pakada/version"
 
 class Pakada
-  include Hooked::Container
+  DEFAULT_APP = proc {|req_env| Pakada.request req_env }
 
-  DEFAULT_APP = proc do |req_env|
-    Rack::Response.new("Hi, I'm Pakada #{VERSION}").finish
-  end
-
-  attr_reader :env, :modules, :hooking, :middleware
+  attr_reader :env, :modules, :middleware
   attr_accessor :app
   
   def initialize
@@ -37,9 +33,9 @@ class Pakada
   def boot
     load_env
     load_modules
-    load_hooking
+    load_hooks
     
-    hooking.invoke(:boot) unless testing?
+    modules.each_value {|m| m.boot } unless testing?
   end
   
   def load_env
@@ -52,32 +48,23 @@ class Pakada
     end
   end
   
-  def load_hooking
-    raise "modules have not been loaded" unless modules.respond_to? :values
-    @hooking = Hooked::Controller.new self, *modules.values
+  def load_hooks
+    modules.each_value {|m| m.hooks } unless testing?
   end
   
   def call(req_env)
-    to_app.call(req_env)
+    to_app.call req_env 
   end
   
   def to_app
     builder = Rack::Builder.new
     middleware.each {|mw| builder.use *(Array === mw ? mw : [mw]) }
-    builder.run proc {|req_env| handle_request(req_env) }
-    builder
+    builder.run app || DEFAULT_APP
+    builder.to_app
   end
   
-  def handle_request(req_env)
-    req = Rack::Request.new req_env
-    hooking.invoke(:request, req).finish
-  end
-  
-  hookable :boot do |nothing|; end
-  
-  hookable :request do |ctx|
-    resp = (app || DEFAULT_APP).call ctx.args.env
-    ctx.result = Rack::Response.new resp[2], *resp[0..1]
+  def request(req_env)
+    Rack::Response.new("Hi, I'm Pakada #{VERSION}").finish
   end
   
   class << self

data/pakada.gemspec

@@ -8,17 +8,16 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Lars Gierth"]
   s.email       = ["lars.gierth@gmail.com"]
-  s.homepage    = "http://rubygems.org/gems/pakada"
+  s.homepage    = "https://rubygems.org/gems/pakada"
   s.summary     = %q{Very Extensible HTTP Container For Ruby}
   #s.description = %q{TODO: Write a gem description}
 
-  s.add_dependency "rack", "~> 1.2.1"
-  s.add_dependency "hooked", "~> 0.1.0"
+  s.add_dependency "rack"
+  s.add_dependency "hooked", "~> 0.2"
 
-  s.add_development_dependency "rspec", "~> 2.3"
-  s.add_development_dependency "mocha", "~> 0.9.10"
-  s.add_development_dependency "fakefs", "~> 0.3.1"
-  s.add_development_dependency "fakefs-require", "~> 0.2.1"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "fakefs"
+  s.add_development_dependency "fakefs-require"
 
   s.files         = `git ls-files`.split("\n") - [".gitignore", ".rvmrc", "config.ru"]
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/module_spec.rb

@@ -140,10 +140,11 @@ describe "SomeModule" do
     Pakada::Module.descendants.clear
   end
   
-  it "is a hooking container" do
+  it "can hook its methods" do
+    @obj.should respond_to(:before)
+    @obj.should respond_to(:after)
+    @obj.should respond_to(:around)
     @obj.should respond_to(:hooked)
-    @obj.should respond_to(:hooked=)
-    @obj.should respond_to(:hookable)
   end
   
   describe ".module_name" do
@@ -177,4 +178,16 @@ describe "SomeModule" do
       @obj.path.should == @klass.path
     end
   end
+  
+  describe "#hooks" do
+    it "is a placeholder" do
+      @obj.should respond_to(:hooks)
+    end
+  end
+  
+  describe "#boot" do
+    it "is a placeholder" do
+      @obj.should respond_to(:boot)
+    end
+  end
 end

data/spec/pakada_spec.rb

@@ -3,12 +3,6 @@ require "spec_helper"
 describe Pakada do
   subject { Pakada.instance }
   
-  it "is a hooking container" do
-    Pakada.should respond_to(:hookables)
-    Pakada.should respond_to(:hooks)
-    Pakada.instance.should respond_to(:hooked=)
-  end
-  
   it "forwards all messages to the Singleton instance" do
     Pakada.instance.should_receive(:message)
     Pakada.message
@@ -24,12 +18,6 @@ describe Pakada do
     Pakada.respond_to?(:instance)
   end
   
-  describe "::DEFAULT_APP" do
-    it "prints a tender welcome greeting" do
-      Pakada::DEFAULT_APP.call({})[2].body.to_s.should =~ /Pakada #{Pakada::VERSION}/
-    end
-  end
-  
   describe ".instance" do
     it "creates a new Singleton instance and returns it" do
       Pakada.stub(:new) { double "a Pakada instance" }
@@ -46,53 +34,45 @@ describe Pakada do
   end
   
   describe ".boot" do
-    def stub_load_methods
+    before :each do
       subject.stub :load_env
       subject.stub :load_modules
-      subject.stub :load_hooking
-      subject.stub(:hooking) { double "hooks", :invoke => 123 }
+      subject.stub :load_hooks
+      
+      modules = [:foo, :bar, :baz].inject({}) do |modules, name|
+        modules[name] = stub "#{name} module", :boot => nil
+        modules
+      end
+      subject.stub(:modules).and_return modules
     end
     
     it "calls .load_env" do
-      stub_load_methods
       subject.should_receive :load_env
       subject.boot
     end
 
     it "calls .load_modules" do
-      stub_load_methods
       subject.should_receive :load_modules
       subject.boot
     end
     
-    it "calls .load_hooking" do
-      stub_load_methods
-      subject.should_receive :load_hooking
+    it "calls .load_hooks" do
+      subject.should_receive :load_hooks
       subject.boot
     end
     
-    it "invokes the :boot hookable" do
-      stub_load_methods
-      obj = Object.new
-      subject.stub(:hooking) { obj }
-      subject.hooking.should_receive(:invoke).with(:boot)
+    it "calls #boot on each module" do
+      subject.modules.each_value {|m| m.should_receive :boot }
       subject.boot
     end
     
-    it "doesn't invoke the :boot hookable in testing environment" do
-      stub_load_methods
-      subject.stub(:env) { :testing }
-      obj = Object.new
-      subject.stub(:hooking) { obj }
-      subject.hooking.should_not_receive(:invoke).with(:boot)
+    it "doesn't call #boot in testing environments" do
+      subject.stub(:env).and_return :testing
+      subject.modules.each_value {|m| m.should_not_receive :boot }
       subject.boot
     end
   end
   
-  describe ".hookable(:boot)" do
-    it "does nothing" do; end
-  end
-  
   describe ".load_env" do
     before :each do
       @env = ENV["RACK_ENV"]
@@ -127,40 +107,30 @@ describe Pakada do
     end
   end
   
-  describe ".[]" do
-    it "forwards to .modules" do
-      mod = stub "module"
-      subject.stub(:modules) { {:some_module => mod} }
-      subject[:some_module].should == subject.modules[:some_module]
-    end
-  end
-  
-  describe ".load_hooking" do
-    it "initializes the hooking controller" do
-      subject.stub(:modules) { {} }
-      subject.load_hooking
-      subject.hooking.should respond_to(:invoke)
+  describe ".load_hooks" do
+    before :each do
+      subject.stub(:modules).and_return({})
+      [:foo, :bar].each do |m|
+        subject.modules[m] = stub("#{m} module")
+      end
     end
     
-    it "adds itself to the hooking controller" do
-      subject.stub(:modules) { {} }
-      subject.load_hooking
-      subject.hooking.should have(1).containers
-      subject.hooking.containers[0].should == subject
+    it "calls #hooks on each module" do
+      subject.modules.each_value {|m| m.should_receive :hooks }
+      subject.load_hooks
     end
     
-    it "adds the modules to the hooking controller" do
-      modcls = double "module klass", :hookables => [], :hooks => {}
-      mod = double "module", :hooked= => nil, :class => modcls
-      subject.stub(:modules) { {:foo => mod} }
-      subject.load_hooking
-      subject.hooking.should have(2).containers
-      subject.hooking.containers[1].should == mod
+    it "doesn't call #hooks in testing environments" do
+      subject.stub(:env).and_return :testing
+      subject.modules.each_value {|m| m.should_not_receive :hooks }
+      subject.load_hooks
     end
-    
-    it "fails if the modules have not been loaded" do
-      subject.stub(:modules) { nil }
-      proc { subject.load_hooking }.should raise_error(RuntimeError, "modules have not been loaded")
+  end
+  
+  describe ".[]" do
+    it "forwards to .modules" do
+      subject.stub(:modules).and_return :some_module => stub("module")
+      subject[:some_module].should == subject.modules[:some_module]
     end
   end
   
@@ -205,76 +175,61 @@ describe Pakada do
   end
   
   describe ".to_app" do
-    it "builds a Rack endpoint with .middleware and .handle_request" do
-      @builder = Rack::Builder.new
-      Rack::Builder.stub(:new) { @builder }
-      
-      mw1 = Class.new do
-        attr_reader :app
-        def initialize(app); @app = app; end
+    before :each do
+      @builder = stub "builder"
+      Rack::Builder.stub(:new).and_return @builder
+    end
+
+    it "builds a Rack endpoint" do
+      mw = proc do |pos|
+        Class.new do
+          attr_reader :app, :pos
+          def initialize(app); @app, @pos = app, pos; end
+        end
       end
-      mw2 = mw1.clone
-      subject.middleware << mw1 << mw2
+      subject.stub(:middleware).and_return [mw.call(0), mw.call(1)]
       
-      prc = nil
-      @builder.should_receive(:use).with(mw1).once
-      @builder.should_receive(:use).with(mw2).once
-      @builder.should_receive(:run).with(duck_type(:call)).once {|p| prc = p }
-      subject.to_app
+      pending "what about middleware insertion order?"
+    end
+    
+    it "handles middleware arguments" do
+      @builder.stub(:run)
+      @builder.stub(:to_app)
       
-      req_env = {"key" => "value"}
-      res = [200, {}, ""]
-      subject.should_receive(:handle_request).with(req_env) {|r_e| res }
-      prc.call(req_env).should == res
+      mw = [
+        [stub("mw#0"), stub("mw arg#0"), stub("mw arg#1")],
+        stub("mw#1")
+      ]
+      subject.stub(:middleware).and_return mw
+      
+      @builder.should_receive(:use).with *mw[0]
+      @builder.should_receive(:use).with mw[1]
+      subject.to_app
     end
   end
   
   describe ".call" do
     it "forwards to .to_app.call" do
-      req = {"key" => "value"}
-      resp = Rack::Response.new("hello!").finish
-      app = double "app"
-      subject.should_receive(:to_app) { app }
-      app.should_receive(:call).with(req) { resp }
+      req, resp = stub("request"), stub("response")
+      subject.stub(:to_app).and_return stub("app")
+      
+      subject.to_app.should_receive(:call).with(req).and_return resp
       subject.call(req).should == resp
     end
   end
   
-  describe ".handle_request" do
-    it "invokes the :request hookable" do
-      req = Rack::Request.new "key" => "value"
-      Rack::Request.stub(:new).with(req.env) { req }
-      res = Rack::Response.new
-      subject.boot
-      subject.hooking.should_receive(:invoke).with(:request, req) {|n, r_e| res }
-      subject.handle_request(req.env).should == res.finish
+  describe "::DEFAULT_APP" do
+    it "calls .request" do
+      req, resp = stub("request"), stub("response")
+      Pakada.should_receive(:request).with(req).and_return resp
+      
+      Pakada::DEFAULT_APP.call(req).should == resp
     end
   end
   
-  describe ".hookable(:request)" do
-    before :each do
-      subject.boot
-      @req = Rack::Request.new "key" => "value"
-      @resp = Rack::Response.new("foo!", 201)
-    end
-    
-    it "calls .app's return value with the request environment" do
-      subject.app = stub "app"
-      subject.app.should_receive(:call).with(@req.env) { @resp.finish }
-      subject.hooking.invoke(:request, @req)
-    end
-    
-    it "calls DEFAULT_APP if .app isn't set" do
-      Pakada::DEFAULT_APP.should_receive(:call).with(@req.env) { @resp.finish }
-      subject.hooking.invoke(:request, @req)
-    end
-    
-    it "returns a Rack-compliant response" do
-      Pakada.app = stub "app", :call => @resp.finish
-      resp = subject.hooking.invoke(:request, @req)
-      resp.status.should == @resp.status
-      resp.headers.should == @resp.headers
-      resp.body.to_s.should == @resp.body.to_s
+  describe ".request" do
+    it "prints a tender welcome greeting" do
+      Pakada.request({})[2].body.to_s.should =~ /Pakada #{Pakada::VERSION}/
     end
   end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: pakada
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors: 
 - Lars Gierth
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +01:00
+date: 2011-04-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,13 +18,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 1
-        version: 1.2.1
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -39,11 +31,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
+        version: "0.2"
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -52,60 +40,34 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: fakefs
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 10
-        version: 0.9.10
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: fakefs
+  name: fakefs-require
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 1
-        version: 0.3.1
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: fakefs-require
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 1
-        version: 0.2.1
-  type: :development
-  prerelease: false
-  version_requirements: *id006
 description: 
 email: 
 - lars.gierth@gmail.com
@@ -129,7 +91,7 @@ files:
 - spec/pakada_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://rubygems.org/gems/pakada
+homepage: https://rubygems.org/gems/pakada
 licenses: []
 
 post_install_message: 
@@ -142,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -268766609
+      hash: 895770369
       segments: 
       - 0
       version: "0"
@@ -151,14 +113,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -268766609
+      hash: 895770369
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Very Extensible HTTP Container For Ruby