opi 0.3 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d14b10a860811f91e4d861947341d296ab2420a6
-  data.tar.gz: 086b83d0e8918ae26cde595aaa34e34e220d9d36
+  metadata.gz: f6c22ba2d07075d6abcab27a8214a92141d2f479
+  data.tar.gz: be7fc8d6a27381d7292b844768409e6d7cab1461
 SHA512:
-  metadata.gz: 7328546ad02aaa19bedeb5f220b39b18bc0910f7da8068318c0eb7e895506e9ac9c7b6e0573ca49be9ef36bf48718521bc14bccdba3964ad5bdd9ba17d5bc438
-  data.tar.gz: 14747631c52650d4710daccbdece06c9d12c9607598c270038e1233a961c50705ceaa99ef500a9b4e8398805e2004e05f07cdb93e94ffa4155469edf82460ca4
+  metadata.gz: aa4c5d2e6a3e40cbed0d4a629db0c6dca998b20beba5aa5d6716545b22d0adfce82511dd54056ee9a6d159b602a64b957182c8d68e324371a922328afb63088f
+  data.tar.gz: 82d97454308f21225b1833b9f079eb3c1011eb6d2ed6a7141b180e5ea3085fdf14aefa15f958bcf7cc1f3ba737b45de883dd455760d1c1eafade4743abc267f2

data/README.md

@@ -12,9 +12,7 @@ so opinionated it is very likely to offend.  But that is alright.
 Opi was born out of frustration with writing too much boilerplate code for api
 services.
 
-**JSON-only**.  The server CANNOT respond with anything else other than JSON.
-All error responses are JSON out of the box.  You CANNOT respond with HTML.
-The response content type is hardcoded to JSON.
+**JSON-default**.  All responses default to JSON.  Error responses are json-aware.
 
 **No Controllers**.  Well.. there are route blocks which are the equivalent
 of the controller but you are strongly encouraged to only ever execute actions

data/lib/opi.rb

@@ -1,6 +1,7 @@
 require 'rack'
 require 'colored'
 require 'json'
+require 'logger'
 
 require_relative './opi/version'
 require_relative './opi/router'

data/lib/opi/api.rb

@@ -3,8 +3,6 @@ module Opi
 
     class << self
 
-      puts "* Opi Version: #{Opi::VERSION}".green
-
       def get(path, options={}, &block)
         route 'GET', path, options, block
       end
@@ -54,25 +52,41 @@ module Opi
 
     end
 
+    attr_reader :logger
+
+    def initialize(options={})
+      puts "* Opi Version: #{Opi::VERSION} initializing".green
+      @logger = options[:logger] || Logger.new(STDOUT)
+      @logger.level = options[:debug] ? Logger::DEBUG : Logger::WARN
+    end
+
     def call(env)
+      logger.debug env.inspect.cyan
+
+      request = Request.new(env)
+      response = Response.new
+
       begin
         Loader.reload!
 
-        request = Request.new(env)
-
         route, params = self.class.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
 
-        return [404, {'Content-Type' => 'application/json; charset=utf-8'}, ["{\"error\":\"404 Not Found\"}", "\n"]] unless route
+        if route
+          logger.debug "#{request.method} #{request.path} => route #{route.inspect}".green
+          context = Context.new(env, route, request, response, self.class.before_filters, self.class.after_filters)
+          response = context.run
+        else
+          logger.debug "#{request.method} #{request.path} => route not found".red
+          response.not_found!
+        end
 
-        context = Context.new(env, route, request, self.class.before_filters, self.class.after_filters)
-        response = context.run
-
-        [response.status, response.header, response.body]
       rescue Exception => e
-        return [500, {'Content-Type' => 'application/json; charset=utf-8'}, ["{\"error\":\"500 Internal Server Error\", \"message\":\"#{e.message}\"}", "\n"]]
+        response.internal_server_error!(e)
       end
+
+      [response.status, response.header, response.body]
     end
 
   end

data/lib/opi/context.rb

@@ -3,11 +3,11 @@ module Opi
 
     attr_reader :env, :route, :request, :response, :before, :after, :error
 
-    def initialize(env, route, request, before, after)
+    def initialize(env, route, request, response, before, after)
       @env = env
       @route = route
       @request = request
-      @response = Response.new
+      @response = response
       @before = before
       @after = after
       @error = nil
@@ -56,6 +56,11 @@ module Opi
         response.body = [action.to_json, "\n"]
       end
 
+      if self.error
+        response.status = error[:status]
+        response.body = [error[:message].to_json, "\n"]
+      end
+
       response
     end
 

data/lib/opi/loader.rb

@@ -31,7 +31,7 @@ module Opi
 
       def reload!
         Dir["#{@prefix}lib/*.rb"].each { |x| funkyload x }
-        Dir["#{@prefix}actions/**/*.rb"].each { |x| funkyload x }
+        Dir["#{@prefix}app/**/*.rb"].each { |x| funkyload x }
         Dir["#{@prefix}*.rb"].each { |x| funkyload x unless x == 'Rakefile.rb' }
       end
 

data/lib/opi/request.rb

@@ -10,7 +10,7 @@ module Opi
     end
 
     def path
-      @env["REQUEST_PATH"]
+      @env["REQUEST_PATH"] || @env["PATH_INFO"]
     end
 
     def uri

data/lib/opi/response.rb

@@ -9,5 +9,15 @@ module Opi
       })
     end
 
+    def not_found!
+      @status = 404
+      @body = ["{\"error\":\"404 Not Found\"}", "\n"]
+    end
+
+    def internal_server_error!(exception)
+      @status = 500
+      @body = ["{\"error\":\"500 Internal Server Error\", \"message\":\"#{exception.message}\"}", "\n"]
+    end
+
   end
 end

data/lib/opi/version.rb

@@ -1,3 +1,3 @@
 module Opi
-  VERSION = "0.3"
+  VERSION = "0.3.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opi
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.9
 platform: ruby
 authors:
 - Richard Taylor
@@ -14,6 +14,9 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
@@ -28,20 +34,23 @@ dependencies:
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
@@ -49,10 +58,14 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
-description: The very opinionated API service library.
+description: A Ruby library for creating API services.  The very opinionated API service
+  library.
 email: moomerman@gmail.com
 executables: []
 extensions: []
@@ -69,7 +82,8 @@ files:
 - lib/opi/router.rb
 - lib/opi/version.rb
 homepage: http://github.com/moomerman/opi
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -89,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: opi
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The very opinionated API service library.