www 0.0.2 → 0.0.3

data/.gitignore

@@ -0,0 +1,23 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+.bundle
+*.gemspec

data/Gemfile

@@ -0,0 +1,9 @@
+# encoding: utf-8
+source 'http://rubygems.org'
+
+gem 'tilt'
+gem 'haml'
+gem 'guard-livereload'
+gem 'rspec'
+gem 'rack-test'
+gem 'rr'

data/Gemfile.lock

@@ -0,0 +1,58 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.2)
+    diff-lcs (1.1.2)
+    em-websocket (0.1.4)
+      addressable (>= 2.1.1)
+      eventmachine (>= 0.12.9)
+    eventmachine (0.12.10)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    growl (1.0.3)
+    guard (0.1.1)
+      bundler (~> 1.0.2)
+      growl (~> 1.0.3)
+      libnotify (~> 0.1.3)
+      rb-inotify (~> 0.8.1)
+      sys-uname (~> 0.8.4)
+      thor (~> 0.14.3)
+    guard-livereload (0.1.1)
+      em-websocket (~> 0.1.3)
+      guard (~> 0.1.1)
+      json (~> 1.4.6)
+    haml (3.0.18)
+    json (1.4.6)
+    libnotify (0.1.4)
+      ffi (>= 0.6.2)
+    rack (1.2.1)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rake (0.8.7)
+    rb-inotify (0.8.1)
+      ffi (>= 0.5.0)
+    rr (1.0.0)
+    rspec (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+      rspec-mocks (= 2.0.0)
+    rspec-core (2.0.0)
+    rspec-expectations (2.0.0)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+    sys-uname (0.8.4)
+    thor (0.14.3)
+    tilt (1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  guard-livereload
+  haml
+  rack-test
+  rr
+  rspec
+  tilt

data/Guardfile

@@ -0,0 +1,6 @@
+# A sample Guardfile
+# More info at http://github.com/guard/guard#readme
+
+guard 'livereload' do
+  watch('.+\.rb')
+end

data/README.md

@@ -1,4 +1,4 @@
-WWW
+Www
 ====
 
 World Wide Web
@@ -11,7 +11,7 @@ app.rb
     # encoding: utf-8
     require 'www'
 
-    class Foo < Www
+    class Foo < Www::Base
       before do
         # do something
       end
@@ -23,24 +23,36 @@ app.rb
 
       get '/foo'
       def foo(params)
-        params
+        haml :title => 'foo'
       end
 
-      get %r{/regexp/?(.*)} # ex: /regexp/foo
+      get '/regexp/?(.*)' # ex: /regexp/foo
       def regexp(arg, params)
         "#{arg} - #{params.inspect}"
       end
 
-      get %r{/(\d{4})/(\d{2})/(\d{2})} # ex: /2009/10/10
+      get '/(\d{4})/(\d{2})/(\d{2})' # ex: /2009/10/10
       def entry(year, month, date)
         [year, month, date]
       end
+
+      def helper
+        'bar'
+      end
     end
 
+views/foo.haml
+
+    !!!
+    %html
+      %body
+        %h1= title
+        %p= helper
+
 config.ru
 
     require 'app'
-    run Www
+    run Www::App
 
 rackup
 
@@ -49,6 +61,7 @@ rackup
 TODO
 ----
 
+* specs
 * handle static files
 * view
 * redirect
@@ -57,10 +70,11 @@ TODO
 * url helper
 * namespace
 
-Run Examples
+Run Example
 ----
 
-    shotgun -Ilib example/config.ru
+    % cd example
+    % shotgun -I../lib config.ru
 
 Note on Patches/Pull Requests
 ----

data/Rakefile

@@ -10,7 +10,9 @@ begin
     gem.email = "jugyo.org@gmail.com"
     gem.homepage = "http://github.com/jugyo/www"
     gem.authors = ["jugyo"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_dependency "rack", ">= 1.2.1"
+    gem.add_dependency "tilt", ">= 1.1"
+    gem.add_development_dependency "rspec", ">= 2.0.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -18,16 +20,10 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/example/app.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'www'
 
-class Foo < Www
+class Foo < Www::Base
   before do
     # do something
   end
@@ -13,16 +13,20 @@ class Foo < Www
 
   get '/foo'
   def foo(params)
-    params
+    haml :title => 'foo'
   end
 
-  get %r{/regexp/?(.*)} # ex: /regexp/foo
+  get '/regexp/?(.*)' # ex: /regexp/foo
   def regexp(arg, params)
     "#{arg} - #{params.inspect}"
   end
 
-  get %r{/(\d{4})/(\d{2})/(\d{2})} # ex: /2009/10/10
+  get '/(\d{4})/(\d{2})/(\d{2})' # ex: /2009/10/10
   def entry(year, month, date)
     [year, month, date]
   end
+
+  def helper
+    'bar'
+  end
 end

data/example/config.ru

@@ -1,4 +1,4 @@
 # encoding: utf-8
 $:.unshift File.dirname(__FILE__)
 require 'app'
-run Www
+run Www::App

data/example/foo.haml

@@ -0,0 +1,5 @@
+!!!
+%html
+  %body
+    %h1= title
+    %p= helper

data/lib/www/app.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+module Www
+  class App
+    def self.call(env)
+      Base.call(env)
+    end
+  end
+end

data/lib/www/base.rb

@@ -0,0 +1,89 @@
+# encoding: utf-8
+module Www
+  class Base
+    include View
+
+    class << self
+      @@current_route = nil
+      @@routes = []
+
+      def routes
+        @@routes
+      end
+
+      def route(pattern, methods = [:get])
+        @@current_route = Route.new(pattern, methods, self)
+      end
+      alias_method :_, :route
+
+      def get(pattern)    _(pattern, :get)    end
+      def post(pattern)   _(pattern, :post)   end
+      def put(pattern)    _(pattern, :put)    end
+      def delete(pattern) _(pattern, :delete) end
+
+      def before(*route_names, &block)
+        before_blocks << [route_names.map{ |i| i.to_sym }, block]
+      end
+
+      def before_blocks
+        @before_blocks ||= []
+      end
+
+      def method_added(name)
+        return unless @@current_route
+        @@current_route.name = name
+        @@routes << @@current_route
+        @@current_route = nil
+
+        class_eval do
+          alias_method :"www_#{name}", name
+          define_method name do |*args|
+            self.class.before_blocks.each do |route_names, block|
+              if route_names.empty? || route_names.include?(name)
+                instance_eval(&block)
+              end
+            end
+
+            @route_name = name
+            body = send(:"www_#{name}", *args) || ''
+            body = body.inspect unless body.is_a?(String)
+            [@response.status, @response.header, [body].flatten]
+          end
+        end
+      end
+
+      def error(code)
+        [code, {"Content-Type" => "text/html"}, []]
+      end
+
+      def find_route(path, request_method)
+        [@@routes.detect { |route|
+            path.match(route.pattern) && route.request_methods.include?(request_method.downcase.to_sym) }, $~]
+      end
+
+      def call(env)
+        request = Rack::Request.new(env)
+        route, match = find_route(request.path_info, request.request_method)
+        if route
+          handler = route.clazz.new(request)
+          args = match[1..-1] << request.params
+          args = adjust_args_for(args, handler.method(:"www_#{route.name}").arity)
+          # puts "#{route.clazz}##{route.name}(#{args.map{|i| "'#{i}'"}.join(', ')})"
+          handler.send(route.name, *args)
+        else
+          error 404
+        end
+      end
+
+      def adjust_args_for(args, arity)
+        args = args[0, arity] if arity >= 0
+      end
+    end
+
+    def initialize(request = nil)
+      # TODO: @_ で始まるようにした方がいいかもしれない
+      @request = request
+      @response = Rack::Response.new
+    end
+  end
+end

data/lib/www/route.rb

@@ -1,24 +1,16 @@
 # encoding: utf-8
-class Www
+module Www
   class Route
     attr_accessor :pattern, :request_methods, :name, :clazz
     def initialize(pattern, request_methods, clazz)
-      case pattern
-      when Regexp then @pattern = /^#{pattern}$/
-      when String then @pattern = /^#{Regexp.quote(pattern)}$/
-      else
-        raise 'pattern must be Regexp or String'
-      end
-      @request_methods = [request_methods].flatten.map { |m| m.to_s.upcase }
+      @pattern = "^#{pattern}$"
+      @request_methods = [request_methods].flatten.map { |m| m.to_s.downcase.to_sym }
       @clazz = clazz
     end
 
-    def to_s
-      inspect
-    end
-
     def inspect
       "#<#{self.class}: #{pattern}, [#{request_methods.join(',')}] => #{clazz}##{name} >"
     end
+    alias_method :to_s, :inspect
   end
 end

data/lib/www/view.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+require 'tilt'
+
+module Www
+  module View
+    def self.included(base)
+      base.send(:extend, ClassMethods)
+    end
+
+    module ClassMethods
+      def view_dir(dir)
+        @view_dir = dir
+      end
+
+      def view_dir_path
+        @view_dir || '.'
+      end
+    end
+
+    Tilt.mappings.keys.map { |key| key.to_sym }.each do |name|
+      define_method(name) do |*args|
+        render name, *args
+      end
+    end
+
+    def render(type, *args)
+      name = args[0].is_a?(String) ? args.shift : @route_name
+      values = args[0]
+      path = File.join(self.class.view_dir_path, "#{name}.#{type}")
+      template = Tilt.new(path)
+      template.render self, values # TODO: helper class instead of Object.new
+    end
+  end
+end

data/lib/www.rb

@@ -1,79 +1,7 @@
 # encoding: utf-8
-require 'www/route'
-
-class Www
-  @@current_route = nil
-  @@routes = []
-
-  class << self
-    def routes
-      @@routes
-    end
-
-    def route(pattern, methods = [:get])
-      @@current_route = Route.new(pattern, methods, self)
-    end
-    alias_method :_, :route
-
-    def get(pattern) _(pattern, :get) end
-    def post(pattern) _(pattern, :post) end
-    def put(pattern) _(pattern, :put) end
-    def delete(pattern) _(pattern, :delete) end
-
-    def before(&block)
-      @before_block = block
-    end
-
-    def before_block
-      @before_block
-    end
-
-    def method_added(name)
-      return unless @@current_route
-      @@current_route.name = name
-      @@routes << @@current_route
-      @@current_route = nil
-
-      class_eval do
-        alias_method :"www_#{name}", name
-        define_method name do |*args|
-          instance_eval(&self.class.before_block)
-          body = send(:"www_#{name}", *args) || ''
-          body = body.inspect unless body.is_a?(String)
-          [@response.status, @response.header, [body].flatten]
-        end
-      end
-    end
-
-    def error(code)
-      [code, {"Content-Type" => "text/html"}, []]
-    end
-
-    def find_route(path, request_method)
-      [@@routes.detect { |route|
-          route.pattern =~ path && route.request_methods.include?(request_method) }, $~]
-    end
-
-    def call(env)
-      request = Rack::Request.new(env)
-      route, match = find_route(request.path_info, request.request_method)
-      if route
-        handler = route.clazz.new(request)
-        args = match[1..-1]
-        args << request.params
-        # adjust args
-        arity = handler.method(:"www_#{route.name}").arity
-        args = arity == 0 ? [] : args[0..(arity-1)]
-        puts "#{route.clazz}##{route.name}(#{args.map{|i| "'#{i}'"}.join(', ')})" # TODO: use logger
-        handler.send(route.name, *args)
-      else
-        error 404
-      end
-    end
-  end
-
-  def initialize(request = nil)
-    @request = request
-    @response = Rack::Response.new
-  end
+module Www
+  autoload :Base, 'www/base'
+  autoload :Route, 'www/route'
+  autoload :App, 'www/app'
+  autoload :View, 'www/view'
 end

data/spec/spec_helper.rb

@@ -1,9 +1,12 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'www'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
+require 'rack/test'
 
-Spec::Runner.configure do |config|
-  
+include Rack::Test::Methods
+
+RSpec.configure do |config|
+  config.mock_with :rr
 end

data/spec/views/foo.haml

@@ -0,0 +1 @@
+= params.inspect

data/spec/www_spec.rb

@@ -1,7 +1,63 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+class Foo < Www::Base
+  view_dir 'spec/views'
+
+  before {}
+  before(:foo, :index) {}
+
+  get '/'
+  def index
+    "index"
+  end
+
+  get '/foo'
+  def foo(params)
+    haml :params => params
+  end
+
+  get '/regexp/?(.*)'
+  def regexp(arg, params)
+    "#{arg} - #{params.inspect}"
+  end
+
+  get '/(\d{4})/(\d{2})/(\d{2})'
+  def entry(year, month, date)
+    [year, month, date]
+  end
+end
+
+def app
+  Www::App
+end
 
 describe "Www" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+  it 'should call before block' do
+    foo = Foo.new
+    2.times do
+      mock.proxy(foo).instance_eval(&Foo.before_blocks[0][1])
+      mock.proxy(foo).instance_eval(&Foo.before_blocks[1][1])
+      foo.index
+    end
+  end
+
+  it 'should call index as "/"' do
+    get('/').body.should == "index"
+  end
+
+  it 'should call foo as "/foo" with params' do
+    params = {'foo' => 'bar'}
+    get('/foo', params).body.chomp.should == params.inspect
+  end
+
+  it 'should call regexp as "/regexp/..."' do
+    get('/regexp/foo').body.should == "foo - #{{}.inspect}"
+  end
+
+  it 'should call regexp as "/regexp/..." with params' do
+    params = {'foo' => 'bar'}
+    get('/regexp/foo', params).body.should == "foo - #{params.inspect}"
+  end
+
+  it 'should call entry as "/2010/10/15"' do
+    get('/2010/10/15').body.should == ['2010', '10', '15'].inspect
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - jugyo
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 +09:00
+date: 2010-10-16 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -28,10 +28,39 @@ dependencies:
         segments: 
         - 1
         - 2
-        - 9
-        version: 1.2.9
-  type: :development
+        - 1
+        version: 1.2.1
+  type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: tilt
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id003
 description: A World Wide Web Application Framework
 email: jugyo.org@gmail.com
 executables: []
@@ -43,16 +72,24 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
+- .gitignore
+- Gemfile
+- Gemfile.lock
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - VERSION
 - example/app.rb
 - example/config.ru
+- example/foo.haml
 - lib/www.rb
+- lib/www/app.rb
+- lib/www/base.rb
 - lib/www/route.rb
-- spec/spec.opts
+- lib/www/view.rb
 - spec/spec_helper.rb
+- spec/views/foo.haml
 - spec/www_spec.rb
 has_rdoc: true
 homepage: http://github.com/jugyo/www

data/spec/spec.opts

@@ -1 +0,0 @@
---color