opi 0.3.13 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09b8df30901e0e79a902246bc575f64e1c864659
-  data.tar.gz: a84fb9fbe8d3230683b9229ef57e45a7752565f2
+  metadata.gz: 154b71e2b501ee4c31cadf2d4565912b4b2fb28f
+  data.tar.gz: aebcc97537ef16ce7f7eaa1cf6d050850cc37226
 SHA512:
-  metadata.gz: 87ee5a7dd3d2b495ac2ed08dba3055d14291a760e212f85c4c0d5813018c51eec7dc8ababc34cb08805312a3b76dedb0627a087f3d94914f45e383066af7582d
-  data.tar.gz: 397f07bd4faf2c386f6f63d442b8ee68dd013a07db3f468da778d44d19185b338db8cf2e5d1594c2beae35d02304db18e5676e058fd431b5235f02b2e6531f06
+  metadata.gz: 4258a8d8ca649e147103b918948e98e74bbab94b45320eee8f3caae54093880bf0de58cbb7a51f12ba4a2e0dc2969c62731dd58e38539758322b59ea1bd73b84
+  data.tar.gz: f382eafd4e539be20464227f177caf5e474693bf87dd23b44dff102ace7e260548f51c82bcb6fc597112ac296d7a3b138cb0cf585cef33adab01e5569ca193cf

data/lib/opi.rb

@@ -10,6 +10,7 @@ require_relative './opi/request'
 require_relative './opi/response'
 require_relative './opi/context'
 require_relative './opi/loader'
+require_relative './opi/resource'
 
 module Opi
-end
+end

data/lib/opi/api.rb

@@ -3,45 +3,12 @@ module Opi
 
     class << self
 
-      def get(path, options={}, &block)
-        route 'GET', path, options, block
+      def root
+        @root ||= Resource.new
       end
 
-      def post(path, options={}, &block)
-        route 'POST', path, options, block
-      end
-
-      def put(path, options={}, &block)
-        route 'PUT', path, options, block
-      end
-
-      def delete(path, options={}, &block)
-        route 'DELETE', path, options, block
-      end
-
-      def route(method, path, options={}, block)
-        # TODO: remove&replace existing routes (on reload)
-        router.routes.unshift({:method => method, :path => path, :options => options, :block => block})
-      end
-
-      def before(method)
-        before_filters << method
-      end
-
-      def after(method)
-        after_filters << method
-      end
-
-      def before_filters
-        @before_filters ||= []
-      end
-
-      def after_filters
-        @after_filters ||= []
-      end
-
-      def router
-        @router ||= Router.new
+      def method_missing(method, *args, &block)
+        root.respond_to?(method) ? root.send(method, *args, &block) : super
       end
 
       def helpers(&block)
@@ -58,6 +25,7 @@ module Opi
       puts "* Opi Version: #{Opi::VERSION} initializing".green
       @logger = options[:logger] || Logger.new(STDOUT)
       @logger.level = options[:debug] ? Logger::DEBUG : Logger::INFO
+      @router = Router.new(self.class.root)
     end
 
     def call(env)
@@ -69,17 +37,17 @@ module Opi
       begin
         Loader.reload!
 
-        route, params = self.class.router.route(request.method, request.path)
+        route, params = @router.route(request.method, request.path)
         request.params.merge!(params) if params and params.is_a? Hash
         request.params.merge!('splat' => params.join(',')) if params and params.is_a? Array
 
         start_time = Time.now
-        logger.info " Started #{request.method} \"#{request.path}\" for #{request.ip} at #{start_time.to_s(:short)}"
+        logger.info " Started #{request.method} \"#{request.path}\" for #{request.ip} at #{start_time.strftime('%d %b %H:%M')}"
         logger.info " Parameters: #{request.params}"
-        
+
         if route
           logger.debug "#{request.method} #{request.path} => route #{route.inspect}".green
-          context = Context.new(env, logger, route, request, response, self.class.before_filters, self.class.after_filters)
+          context = Context.new(env, logger, route, request, response)
           response = context.run
         else
           logger.debug "#{request.method} #{request.path} => route not found".red

data/lib/opi/context.rb

@@ -1,16 +1,14 @@
 module Opi
   class Context
 
-    attr_reader :env, :logger, :route, :request, :response, :before, :after, :error
+    attr_reader :env, :logger, :route, :request, :response, :error
 
-    def initialize(env, logger, route, request, response, before, after)
+    def initialize(env, logger, route, request, response)
       @env = env
       @logger = logger
       @route = route
       @request = request
       @response = response
-      @before = before
-      @after = after
       @error = nil
     end
 
@@ -29,7 +27,7 @@ module Opi
       route_before = route[:options][:before] || []
       route_before = [route_before] unless route_before.is_a? Array
 
-      (self.before + route_before).each do |before|
+      (route[:before] + route_before).each do |before|
         next if skip.include? before
 
         self.send before # execute before filter

data/lib/opi/resource.rb

@@ -0,0 +1,64 @@
+module Opi
+  class Resource
+    attr_reader :root, :options, :resources, :before_filters, :after_filters, :routes
+
+    def initialize(root='', options={}, before=[], after=[], block=nil)
+      @root = root
+      @options = options
+      @before_filters = before
+      @after_filters = after
+      @resources = []
+      @routes = []
+      instance_eval &block if block
+    end
+
+    def get(path=nil, options={}, &block)
+      route 'GET', path, options, block
+    end
+
+    def post(path=nil, options={}, &block)
+      route 'POST', path, options, block
+    end
+
+    def put(path=nil, options={}, &block)
+      route 'PUT', path, options, block
+    end
+
+    def delete(path=nil, options={}, &block)
+      route 'DELETE', path, options, block
+    end
+
+    def before(method)
+      before_filters << method
+    end
+
+    def after(method)
+      after_filters << method
+    end
+
+    def resource(path, options={}, &block)
+      resources << Resource.new(
+        "#{self.root}/#{path}",
+        self.options.merge(options),
+        self.before_filters.dup,
+        self.after_filters.dup,
+        block
+      )
+    end
+
+    private
+      def route(method, path, options={}, block)
+        full_path = "#{self.root}/#{path}".gsub(/\/\//, '/')
+        full_path.gsub!(/\/$/, '') unless full_path == '/'
+        routes.unshift({
+          :method => method,
+          :path => full_path,
+          :options => self.options.merge(options),
+          :before => self.before_filters,
+          :after => self.after_filters,
+          :block => block
+        })
+      end
+
+  end
+end

data/lib/opi/router.rb

@@ -1,32 +1,47 @@
-class Router
-  attr_accessor :routes
+module Opi
+  class Router
+    attr_accessor :routes
 
-  WILDCARD_PATTERN = /\/\*/
-  NAMED_SEGMENTS_PATTERN = /\/:([^$\/]+)/
-  NAMED_SEGMENTS_REPLACEMENT_PATTERN = /\/:([^$\/]+)/
+    WILDCARD_PATTERN = /\/\*/
+    NAMED_SEGMENTS_PATTERN = /\/:([^$\/]+)/
+    NAMED_SEGMENTS_REPLACEMENT_PATTERN = /\/:([^$\/]+)/
 
-  def initialize(routes=[])
-    @routes = routes
-  end
+    def initialize(root)
+      @root = root
+      @routes = []
+      compile_routes(@root)
+    end
 
-  def route(method, path)
-    method_routes = self.routes.find_all{|x| x[:method] == method}
-    method_routes.each do |route|
-      if route[:path] =~ WILDCARD_PATTERN
-        src = "\\A#{route[:path].gsub('*','(.*)')}\\Z"
-        if match = path.match(Regexp.new(src))
-          return [route, match[1].split('/')]
-        end
-      elsif route[:path] =~ NAMED_SEGMENTS_PATTERN
-        src = "\\A#{route[:path].gsub(NAMED_SEGMENTS_REPLACEMENT_PATTERN, '/(?<\1>[^$/]+)')}\\Z"
-        if match = path.match(Regexp.new(src))
-          return [route, Hash[match.names.zip(match.captures)]]
+    # def route(method, path, options={}, block)
+    #   # TODO: remove&replace existing routes (on reload)
+    #   router.routes.unshift({:method => method, :path => path, :options => options, :block => block})
+    # end
+
+    def route(method, path)
+      method_routes = self.routes.find_all{|x| x[:method] == method}
+      method_routes.each do |route|
+        if route[:path] =~ WILDCARD_PATTERN
+          src = "\\A#{route[:path].gsub('*','(.*)')}\\Z"
+          if match = path.match(Regexp.new(src))
+            return [route, match[1].split('/')]
+          end
+        elsif route[:path] =~ NAMED_SEGMENTS_PATTERN
+          src = "\\A#{route[:path].gsub(NAMED_SEGMENTS_REPLACEMENT_PATTERN, '/(?<\1>[^$/]+)')}\\Z"
+          if match = path.match(Regexp.new(src))
+            return [route, Hash[match.names.zip(match.captures)]]
+          end
+        elsif path == route[:path]
+          return [route]
         end
-      elsif path == route[:path]
-        return [route]
       end
+      nil
     end
-    nil
-  end
 
-end
+    private
+      def compile_routes(root)
+        root.routes.each{|x| self.routes.unshift x}
+        root.resources.each{|x| compile_routes(x)}
+      end
+
+  end
+end

data/lib/opi/version.rb

@@ -1,3 +1,3 @@
 module Opi
-  VERSION = "0.3.13"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opi
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.4.1
 platform: ruby
 authors:
 - Richard Taylor
@@ -78,6 +78,7 @@ files:
 - lib/opi/context.rb
 - lib/opi/loader.rb
 - lib/opi/request.rb
+- lib/opi/resource.rb
 - lib/opi/response.rb
 - lib/opi/router.rb
 - lib/opi/version.rb