gnarly 0.0.2 → 0.0.3

data/lib/gnarly/application.rb

@@ -1,28 +1,81 @@
-require 'gnarly/provides.rb'
 require 'gnarly/url.rb'
+require 'gnarly/environment.rb'
 
 module Gnarly
 
   class Application
-    include Provides
+    include Status
 
     def initialize()
       @urls = []
+      @environment = Environment.new self
+    end
+
+    def init(&block)
+      @environment.instance_exec &block
     end
 
     def url(url_mask, &block)
       url = Url.new(url_mask)
-      url.instance_eval &block
+      url.instance_eval &block if block
       @urls << url
+      url
+    end
+
+    def helper(helper)
+      (@helpers ||= []) << helper
     end
 
-    def call(env)
-      environment env
+    def get(*args, &block)
+      m = args.shift
+      u = url m
+      u.get *args, &block
+    end
+
+    def put(*args, &block)
+      m = args.shift
+      u = url m
+      u.put *args, &block
+    end
+
+    def post(*args, &block)
+      m = args.shift
+      u = url m
+      u.post *args, &block
+    end
+
+    def delete(*args, &block)
+      m = args.shift
+      u = url m
+      u.delete *args, &block
+    end
+
+    def call(state)
+      environment = @environment.dup
+      environment.extend *@helpers if @helpers
+      environment.state state
+      request = environment.request
       path = request.path
       if url = @urls.detect { |u| u.match? path }
         @responder = url.responder request.method
         if @responder
-          instance_exec *url.parameters, &@responder
+          helpers = url.helpers
+          environment.extend *helpers if helpers
+          if before = url.before
+            environment.instance_exec *url.parameters, &before
+          end
+          keys = url.keys request.method
+          response = environment.instance_exec *url.parameters(*keys), &@responder
+          if after = url.after
+            environment.instance_exec *url.parameters, &after
+          end
+          unless response.is_a? Array and response.size == 3
+            name, line = @responder.source_location
+            msg = "Bad return type for block in  #{name} line #{line}"
+            internal_server_error msg
+          else
+            response
+          end
         else
           method_not_allowed url.allow
         end
@@ -31,6 +84,8 @@ module Gnarly
       end
     end
 
+    private
+
   end
 
   def self.application(&block)

data/lib/gnarly/base.rb

@@ -4,16 +4,20 @@ module Gnarly
 
   module Base
 
-    def environment(env=nil)
-      if env
-        @environment = env
+    def state(state=nil)
+      if state
+        @state = state
         @request = nil
       end
-      @environment
+      @state
     end
 
     def request()
-      @request ||= Request.new @environment
+      @request ||= Request.new @state
+    end
+
+    def logger()
+      @state["rack.logger"]
     end
 
     def body_charset(body)

data/lib/gnarly/environment.rb

@@ -0,0 +1,21 @@
+require 'gnarly/provides.rb'
+require 'gnarly/understands.rb'
+
+module Gnarly
+
+  class Environment
+    include Provides
+    include Understands
+
+    def initialize(app)
+      @application = app
+      push_default_content_type "text/plain"
+    end
+
+    def application()
+      @application
+    end
+
+  end
+
+end

data/lib/gnarly/haml.rb

@@ -0,0 +1,40 @@
+require 'haml'
+
+module Gnarly
+
+  module Haml
+
+    def haml(name, &block)
+      root = application.haml_root
+      template = File.read "#{root}/#{name}.haml"
+      engine = ::Haml::Engine.new template
+      body = engine.render self
+      if block
+        push_default_content_type "text/html"
+        result = block.call body
+        pop_default_content_type
+        result
+      else
+        body
+      end
+    end
+
+  end
+
+  class Application
+
+    def haml_root(haml_root=nil)
+      if haml_root
+        @haml_root = haml_root
+      else
+        @haml_root ||= "haml"
+      end
+    end
+
+  end
+
+  class Environment
+    include Haml
+  end
+
+end

data/lib/gnarly/provides.rb

@@ -11,25 +11,15 @@ module Gnarly
     def provides(*mimes, &block)
       mime = MIMEParse.best_match mimes, request.accept
       if mime
+        push_default_content_type mime
         response = block.call mime if block
-        if response.is_a? Array and response.size == 3
-          status, headers, body = response
-          unless headers.key? "Content-type"
-            charset = body_charset(body)
-            headers["Content-type"] = 
-              charset ? "#{mime}; charset=#{charset}" : mime
-          end
-          response
-        else
-          name, line = @responder.source_location
-          msg = "Bad return type for block in  #{filename} line #{line}"
-          internal_server_error msg
-        end
+        pop_default_content_type
+        response
       else
         not_acceptable
       end
     end
-
+    
   end
-
+  
 end

data/lib/gnarly/request.rb

@@ -3,22 +3,23 @@ require 'rack/utils'
 module Gnarly
 
   class Request
+    attr_reader :state
 
-    def initialize(env)
-      @environment = env
+    def initialize(state)
+      @state = state
       parse_content_type
     end
 
     def path()
-      @path ||= @environment["PATH_INFO"]
+      @path ||= @state["PATH_INFO"]
     end
 
     def method()
-      @method ||= @environment["REQUEST_METHOD"]
+      @method ||= @state["REQUEST_METHOD"].downcase.to_sym
     end
 
     def accept()
-      @accept ||= @environment["HTTP_ACCEPT"]
+      @accept ||= @state["HTTP_ACCEPT"]
     end
 
     def content_type()
@@ -31,7 +32,7 @@ module Gnarly
 
     def body()
       unless @body
-        input = @environment["rack.input"]
+        input = @state["rack.input"]
         @body = input.read
         input.rewind
         @body.force_encoding charset if charset
@@ -40,14 +41,14 @@ module Gnarly
     end
 
     def params()
-      @params ||= ::Rack::Utils.parse_query(@environment["QUERY_STRING"])
+      @params ||= ::Rack::Utils.parse_query(@state["QUERY_STRING"])
     end
 
     private
 
     def parse_content_type()
-      if header = @environment["CONTENT_TYPE"]
-        header =~ /^([^;\s]+)(\s*;\s*charset=(\S+)\s*)$/
+      if header = @state["CONTENT_TYPE"]
+        header =~ /^([^;\s]+)(\s*;\s*charset=(\S+)\s*)?$/
         @content_type = $1
         @charset = $3
       end

data/lib/gnarly/status.rb

@@ -3,11 +3,29 @@ module Gnarly
 
   module Status
 
+    def push_default_content_type(mime)
+      (@default_content_types ||= []).push mime
+    end
+
+    def pop_default_content_type()
+      @default_content_types.pop if @default_content_types
+    end
+      
+    def default_content_type()
+      @default_content_types.last if @default_content_types
+    end
+
     def ok(body, mime=nil)
+      mime = default_content_type unless mime
       headers = mime ? {"Content-type" => mime} : {}
       [200, headers, [body]]
     end
 
+    def created(location)
+      headers = {"Location" => location, "Content-type" => "text/plain"}
+      [201, headers, [""]]
+    end
+
     def not_found(body="Not Found", mime="text/plain")
       [404, {"Content-type" => mime}, [body]]
     end
@@ -25,6 +43,10 @@ module Gnarly
        [body]]
     end
 
+    def unsupported_media_type(body="Unsupported Media Type", mime="text/plain")
+      [415, {"Content-type" => mime}, [body]]
+    end
+
     def internal_server_error(body="Internal Server Error", mime="text/plain")
       [500, {"Content-type" => mime}, [body]]      
     end

data/lib/gnarly/system.rb

@@ -0,0 +1,35 @@
+
+module Gnarly
+
+  class System
+    
+    def initialize(*apps)
+      @apps = apps
+    end
+
+    def +(app)
+      @apps << app
+      self
+    end
+
+    def call(env)
+      response = nil
+      @apps.find do |app|
+        response = app.call(env)
+        status = response.first
+        status != 404 and status < 500
+      end
+      response
+    end
+
+  end
+
+  class Application
+
+    def +(other)
+      System.new self, other
+    end
+
+  end
+
+end

data/lib/gnarly/understands.rb

@@ -0,0 +1,21 @@
+require 'gnarly/base.rb'
+require 'gnarly/status.rb'
+
+module Gnarly
+
+  module Understands
+    include Base
+    include Status
+
+    def understands(*mimes, &block)
+      mime = MIMEParse.best_match [request.content_type], mimes.join(",")
+      if mime
+        block.call mime if block
+      else
+        unsupported_media_type
+      end
+    end
+    
+  end
+
+end

data/lib/gnarly/url.rb

@@ -4,50 +4,147 @@ module Gnarly
   class Url
 
     def initialize(url_mask)
-      @url_mask = url_mask
+      case url_mask
+      when String
+        @url_mask = make_url_mask url_mask
+      when Regexp
+        @url_mask = url_mask      
+      end
       @responders = {}
+      @keys = {}
       @allow = []
     end
 
     def match?(path)
-      @match = @url_mask.match path
+      @match = @url_mask.match path if @url_mask
       @match != nil
     end
 
-    def parameters()
-      a = @match.to_a
-      a.shift
-      a
+    def parameters(*keys)
+      if keys.empty?
+        a = @match.to_a
+        a.shift
+        if @types
+          (0..a.size - 1).collect do |i|
+            case @types[i]
+            when :integer
+              a[i].to_i
+            else
+              a[i]
+            end
+          end 
+        else
+          a
+        end
+      else
+        if @type_map
+          keys.collect do |key|
+            case @type_map[key.to_s]
+            when :integer
+              @match[key].to_i            
+            else
+              @match[key]
+            end
+          end
+        else
+          keys.collect do |key|
+            @match[key]
+          end
+        end
+      end
     end
 
     def responder(method)
       @responders[method]
     end
 
+    def keys(method)
+      @keys[method]
+    end
+
     def allow()
       @allow.join " "
     end
 
-    def get(&block)
-      @responders["GET"] = block
+    def helper(helper)
+      (@helpers ||= []) << helper
+    end
+
+    def helpers()
+      @helpers
+    end
+
+    def get(*keys, &block)
+      @responders[:get] = block
+      @keys[:get] = keys
       @allow << "GET"
     end
 
-    def put(&block)
-      @responders["PUT"] = block
+    def put(*keys, &block)
+      @responders[:put] = block
+      @keys[:put] = keys
       @allow << "PUT"
     end
 
-    def post(&block)
-      @responders["POST"] = block
+    def post(*keys, &block)
+      @responders[:post] = block
+      @keys[:post] = keys
       @allow << "POST"
     end
 
-    def delete(&block)
-      @responders["DELETE"] = block
+    def delete(*keys, &block)
+      @responders[:delete] = block
+      @keys[:delete] = keys
       @allow << "DELETE"
     end
 
+    def before(&block)
+      if block
+        @before = block
+      else
+        @before
+      end
+    end
+
+    def after(&block)
+      if block
+        @after = block
+      else
+        @after
+      end
+    end
+
+    def make_url_mask(template)
+      types = []
+      type_map = {}
+      has_types = false
+      s = template.gsub(/\{([^\}]*)\}/) do
+        name, type = $1.split ":"
+        t = nil
+        p = case type
+            when "integer", "index"
+              has_types = true
+              t = :integer
+              types << t
+              '\d+'
+            else
+              types << nil
+              '[^/]+'
+            end
+        nc = ""
+        if name and name != "" 
+          nc = "?<#{name}>"
+          type_map[name] = t
+        end
+        "(#{nc}#{p})"
+      end
+      if has_types
+        @types = types
+        @type_map = type_map
+      end
+      Regexp.new "^#{s}$"
+    end
+
   end
 
 end

data/lib/gnarly.rb

@@ -1,4 +1,5 @@
 require 'gnarly/application.rb'
+require 'gnarly/system.rb'
 
 module Gnarly
 

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: 
 - Kim Dalsgaard
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 +01:00
+date: 2010-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -29,10 +29,14 @@ extra_rdoc_files: []
 files: 
 - lib/gnarly/application.rb
 - lib/gnarly/base.rb
+- lib/gnarly/environment.rb
+- lib/gnarly/haml.rb
 - lib/gnarly/mimeparse.rb
 - lib/gnarly/provides.rb
 - lib/gnarly/request.rb
 - lib/gnarly/status.rb
+- lib/gnarly/system.rb
+- lib/gnarly/understands.rb
 - lib/gnarly/url.rb
 - lib/gnarly/uuid.rb
 - lib/gnarly.rb