trilby 0.1 → 0.2

data/lib/trilby.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'sinatra/base'
+require 'trilby/controller'
 
 class Trilby < Sinatra::Base
     
@@ -8,6 +9,7 @@ class Trilby < Sinatra::Base
         alias :super_put :put
         alias :super_post :post
         alias :super_delete :delete
+        alias :super_before :before
     end
 
 
@@ -29,7 +31,7 @@ class Trilby < Sinatra::Base
         route = "#{controller}.#{method_name}"
         route += ".#{args[:format]}" if args[:format]
 
-        path = @@routes[route]
+        path = @@routes[route].clone
 
         raise "Could not find route for #{controller}.#{method_name}" unless path
         path.gsub!(/:([a-z_])*/) { |p| args[p[1..-1].to_sym] || p }
@@ -45,6 +47,7 @@ class Trilby < Sinatra::Base
 
     def self.modify_path http_method, path, controller, method_name, args
         
+        return unless path
 
         # Add the pretty route to the @@routes hash
         if path.is_a? String
@@ -62,21 +65,40 @@ class Trilby < Sinatra::Base
         path
     end
 
-
     def self.get path, controller, method_name, args={}
         path = modify_path :get, path, controller, method_name, args
-        instance_eval("super_get(path) { controller.new(self).#{method_name} }")
+        instance_eval("super_get(path) do 
+            c = controller.new(self)
+            c.before_filter unless args[:skip_filter]
+            c.#{method_name} 
+        end")
     end
     def self.put path, controller, method_name, args={}
         path = modify_path :put, path, controller, method_name, args
-        instance_eval("super_put(path) { controller.new(self).#{method_name} }")
+        instance_eval("super_put(path) do 
+            c = controller.new(self)
+            c.before_filter unless args[:skip_filter]
+            c.#{method_name} 
+        end")
     end
     def self.post path, controller, method_name, args={}
         path = modify_path :post, path, controller, method_name, args
-        instance_eval("super_post(path) { controller.new(self).#{method_name} }")
+        instance_eval("super_post(path)do 
+            c = controller.new(self)
+            c.before_filter unless args[:skip_filter]
+            c.#{method_name} 
+        end")
     end
     def self.delete path, controller, method_name, args={}
         path = modify_path :delete, path, controller, method_name, args
-        instance_eval("super_delete(path) { controller.new(self).#{method_name} }")
+        instance_eval("super_delete(path) do 
+            c = controller.new(self)
+            c.before_filter unless args[:skip_filter]
+            c.#{method_name} 
+        end")
+    end
+    def self.before path, controller, method_name, args={}
+        path = modify_path :before, path, controller, method_name, args
+        instance_eval("super_before(path) {controller.new(self).#{method_name} }")
     end
 end 

data/lib/trilby/controller.rb

@@ -0,0 +1,59 @@
+
+class TrilbyController
+    def initialize(sinatra)
+        @sinatra = sinatra
+    end
+
+    def before
+        # Empty passthru
+    end
+
+    def before_filter
+        if self.respond_to? :get_parent_controller
+            Kernel.const_get(get_parent_controller).new(@sinatra).before_filter
+        end
+        before
+    end
+
+    def self.parent_controller controller
+        define_method(:get_parent_controller) do |method|
+            return controller
+        end
+    end
+
+    def method_missing(meth, *args, &block)
+        if @sinatra.respond_to? meth
+          @sinatra.send(meth, *args, &block)
+        else
+          super
+        end
+    end
+
+    #
+    # This magic sauce is what makes trilby work with views.
+    #
+    def put_on_a_hat
+
+        # set all instance variables we have in the sinatra request object
+        self.instance_variables.each { |v|  @sinatra.instance_variable_set(v, self.instance_variable_get(v)) }
+
+    end
+        
+    #
+    # If a template dir is specified, use that (or don't use one if 
+    # nil is specified). Otherwise, if the controller has a default 
+    # view directory, use that.
+    #
+    def render template, options={}
+        put_on_a_hat
+
+        if options.has_key? :dir
+            template = :"#{options[:dir]}/#{template}" if options[:dir]
+
+        elsif view_dir
+            template = :"#{view_dir}/#{template}"
+        end
+
+        return erubis template, options
+    end
+end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: trilby
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Kaleb Pomeroy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-04 00:00:00 Z
+date: 2013-03-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -40,6 +40,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/trilby.rb
+- lib/trilby/controller.rb
 homepage: https://github.com/KalebPomeroy/trilby
 licenses: []