opi 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 154b71e2b501ee4c31cadf2d4565912b4b2fb28f
-  data.tar.gz: aebcc97537ef16ce7f7eaa1cf6d050850cc37226
+  metadata.gz: 53ac0fb7d35e2dcbdd535f9f4142f0714abf6735
+  data.tar.gz: 059c4e77a4c7a9b62fd87871081afe080e4d1022
 SHA512:
-  metadata.gz: 4258a8d8ca649e147103b918948e98e74bbab94b45320eee8f3caae54093880bf0de58cbb7a51f12ba4a2e0dc2969c62731dd58e38539758322b59ea1bd73b84
-  data.tar.gz: f382eafd4e539be20464227f177caf5e474693bf87dd23b44dff102ace7e260548f51c82bcb6fc597112ac296d7a3b138cb0cf585cef33adab01e5569ca193cf
+  metadata.gz: 309590e6916000a3c7b1c0f2ee287cd3690be801ea3b3d2d497ae1095b1ff0428ace423b9073a83b816a5b7d1e8d4f8085810460444b6d3ebe8f8f696983d3d4
+  data.tar.gz: d0ab6dc92dd12939fa9975bd8472fe4d75bfbfeeb19b11f7a94c62cfc756009a0e6965e36d3ae9de5bb26b1282ecba03ed411da7ff8ca04e7af530601b564845

data/lib/opi.rb

@@ -4,13 +4,15 @@ require 'json'
 require 'logger'
 
 require_relative './opi/version'
-require_relative './opi/router'
+require_relative './opi/loader'
+
 require_relative './opi/api'
 require_relative './opi/request'
 require_relative './opi/response'
-require_relative './opi/context'
-require_relative './opi/loader'
 require_relative './opi/resource'
+require_relative './opi/route'
+require_relative './opi/router'
+require_relative './opi/context'
 
 module Opi
 end

data/lib/opi/api.rb

@@ -12,6 +12,7 @@ module Opi
       end
 
       def helpers(&block)
+        # TODO: allow argument to be a module
         mod = Module.new
         mod.class_eval &block
         Context.send :include, mod
@@ -26,6 +27,7 @@ module Opi
       @logger = options[:logger] || Logger.new(STDOUT)
       @logger.level = options[:debug] ? Logger::DEBUG : Logger::INFO
       @router = Router.new(self.class.root)
+      @router.routes.collect{|x| @logger.debug "Route: #{x.method} #{x.path}"}
     end
 
     def call(env)
@@ -46,7 +48,7 @@ module Opi
         logger.info " Parameters: #{request.params}"
 
         if route
-          logger.debug "#{request.method} #{request.path} => route #{route.inspect}".green
+          logger.debug "#{request.method} #{request.path} => #{route.inspect}".green
           context = Context.new(env, logger, route, request, response)
           response = context.run
         else

data/lib/opi/context.rb

@@ -21,13 +21,13 @@ module Opi
     end
 
     def run
-      skip = route[:options][:skip] || []
+      skip = route.options[:skip] || []
       skip = [skip] unless skip.is_a? Array
 
-      route_before = route[:options][:before] || []
+      route_before = route.options[:before] || []
       route_before = [route_before] unless route_before.is_a? Array
 
-      (route[:before] + route_before).each do |before|
+      (route.before + route_before).each do |before|
         next if skip.include? before
 
         self.send before # execute before filter
@@ -40,7 +40,7 @@ module Opi
       end
 
       # before filters must have succeeded
-      action = instance_eval &route[:block]
+      action = instance_eval &route.block
 
       if action.respond_to? :success?
         if action.success?

data/lib/opi/resource.rb

@@ -37,8 +37,11 @@ module Opi
     end
 
     def resource(path, options={}, &block)
+      # TODO: clean this up, should be able to determine the child resource path
+      root = "#{self.root}/#{path}"
+      root = "#{self.root}/:id/#{path}" unless self.root.empty?
       resources << Resource.new(
-        "#{self.root}/#{path}",
+        root,
         self.options.merge(options),
         self.before_filters.dup,
         self.after_filters.dup,
@@ -48,16 +51,15 @@ module Opi
 
     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
-        })
+        path = ":#{path}" if path.is_a? Symbol # TODO: maybe not?
+        routes.push Route.new(
+          method,
+          "#{self.root}/#{path}",
+          self.options.merge(options),
+          self.before_filters,
+          self.after_filters,
+          block
+        )
       end
 
   end

data/lib/opi/route.rb

@@ -0,0 +1,22 @@
+module Opi
+  class Route
+    attr_reader :method, :path, :options, :before, :after, :block
+
+    def initialize(method, path, options, before, after, block)
+      @method = method
+      @path = clean_path(path)
+      @options = options
+      @before = before
+      @after = after
+      @block = block
+    end
+
+    private
+      def clean_path(path)
+        path = path.gsub(/\/\//, '/')
+        path = path.gsub(/\/$/, '') unless path == '/'
+        path
+      end
+
+  end
+end

data/lib/opi/router.rb

@@ -18,19 +18,19 @@ module Opi
     # end
 
     def route(method, path)
-      method_routes = self.routes.find_all{|x| x[:method] == method}
+      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 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"
+        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]
+        elsif path == route.path
           return [route]
         end
       end

data/lib/opi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opi
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Richard Taylor
@@ -80,6 +80,7 @@ files:
 - lib/opi/request.rb
 - lib/opi/resource.rb
 - lib/opi/response.rb
+- lib/opi/route.rb
 - lib/opi/router.rb
 - lib/opi/version.rb
 homepage: http://github.com/moomerman/opi