herbert 0.0.2 → 0.0.3

data/herbert.gemspec

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 $:.push File.expand_path("../lib", __FILE__)
 require "herbert/version"
 
@@ -8,14 +8,14 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pavel Kalvoda"]
   s.email       = ["me@pavelkalvoda.com","pavel@drinkwithabraham.com"]
-  #s.homepage    = ""
+  s.homepage    = "https://github.com/PJK/Herbert"
   s.summary     = %q{Sinatra-based toolset for creating JSON API servers backed by Mongo & Memcached}
   s.description = <<-desc
 Herbert makes development of JSON REST API servers ridiculously simple.
-It provides a bunch of useful helpers and conventions to speed up development.
+It provides a set of useful helpers and conventions to speed up development.
 Input validation, logs and advanced AJAX support are baked in.
 Herbert is very lightweight and transparent, making it easy to use & modify.
-desc
+	desc
 
 	s.add_dependency("sinatra","= 1.2.6")
 	s.add_dependency("memcache-client")

data/lib/herbert.rb

@@ -1,3 +1,31 @@
-require 'herbert/loader'
+require 'sinatra/base'
+require 'active_support'
 
+#
+# By default, if there was an error in Herbert, Sinatra would crash without
+# catching the error and Rack would repond with empty 200 response afterwards.
+# This emulates somewhat consistent behaviour and encapsulation.
+#
+class Sinatra::Base
+	def call(env)
+		begin
+			call!(env)
+		rescue => e
+			res = [500,{},[]]
+			if (ENV['HERBERT_DEBUG'].to_i==1) || (ENV['RACK_ENV'] =~ /debug/) then
+				res[1] = {"Content-Type" => "application/json;charset=utf-8"}
+				res[2] = ActiveSupport::JSON.encode({
+						:error => {
+							:code => 1,
+							:message => e.to_s,
+							:backtrace => e.backtrace
+						}
+				
+					})
+			end
+			res
+		end
+	end
+end
 
+require 'herbert/loader'

data/lib/herbert/Jsonify.rb

@@ -1,4 +1,3 @@
-
 class True
   def to_json
     return 1
@@ -43,10 +42,10 @@ module Sinatra
       # Preserves access to underlying @env['rack.input'] #IO.String
       def body(rack = false)
         if rack then
-        super()
+					super()
         else
           ensure_encoded
-        @body_decoded
+					@body_decoded
         end
       end
 

data/lib/herbert/Log.rb

@@ -16,15 +16,14 @@ module Sinatra
         when :stdout
           provider = Herbert::LoggingProviders::StdoutProvider.new
         else
-					app.log_requests.respond_to?(:save) ? provider = app.log_requests : log.h_fatal("Unknown logs storage provider.")
-        end
+					provider = app.log_requests
+				end
         Herbert::AppLogger.provider = provider
         # Make the app automatically inject refernce to iteself into the response,
         # so Sinatra::Response::finish can manipulate it
-        app.before { response.app = self; @timer_start = Time.new }
-        app.after { @timer_stop = Time.new}
-      #app.before { log_request }
-      end
-    end
-  end
+        app.before { response.app = self; @timer_start = Time.new; }
+				app.after { @timer_stop = Time.new}
+			end
+		end
+	end
 end

data/lib/herbert/Resource.rb

@@ -14,7 +14,7 @@ module Herbert
       raise StandardError.new('You are not allowed to instantize this class directly')
     end
 		
-		# Translates Sintra DSL calls
+		# Translates Sinatra DSL calls
     def self.inherited(subclass)
       %w{get post put delete}.each do |verb|
         subclass.define_singleton_method verb.to_sym  do |route, &block|

data/lib/herbert/Services.rb

@@ -59,7 +59,7 @@ module Sinatra
             Dir.new(resource_dir).each do |verb|
               next if %w{.. .}.include? verb
               # And create the <schema_root>::<resource>::<verb_schema> constant
-              validation_module.const_get(resource_name).const_set(/(\w+).yaml/.match(verb)[1].capitalize, YAML.load_file(File.join(resource_dir, verb)))
+              validation_module.const_get(resource_name).const_set(/(\w+)(\.yaml|\.yml)/.match(verb)[1].capitalize, YAML.load_file(File.join(resource_dir, verb)))
             end
           end
         end

data/lib/herbert/Utils.rb

@@ -6,5 +6,15 @@ module Herbert
       version[0] = '' if version[0] == 'v'
       version
     end
+    
+    module Helpers
+      def version
+        Utils.version
+      end
+      
+      def nonce(length = 8)
+        ActiveSupport::SecureRandom.hex(length)
+      end
+    end
   end
 end

data/lib/herbert/loader.rb

@@ -1,9 +1,7 @@
 require 'logger'
 require 'mongo'
 require 'memcache'
-require 'sinatra/base'
 require 'kwalify'
-require 'active_support'
 $:.unshift(File.dirname(__FILE__))
 require 'version'
 
@@ -34,9 +32,8 @@ module Herbert
     log.h_info("Here comes Herbert (v#{Herbert::VERSION}). He's a berserker!")
     # because order matters
     %w{Utils Jsonify Configurator Error Services Ajaxify AppLogger Log Resource}.each {|file|
-      require $HERBERT_PATH + "/#{file}.rb"
+			require file
     }
-		
 		# Sets up some default settings and loads all components
     def self.registered(app)
       # Set some default
@@ -66,6 +63,7 @@ module Herbert
       app.helpers Sinatra::Log
       app.register Sinatra::Log::Extension
 			app.register Herbert::ResourceLoader if app.respond_to?(:resources) && app.resources
+      app.register Herbert::Utils::Helpers
     end
   end
 end

data/lib/herbert/version.rb

@@ -1,3 +1,3 @@
 module Herbert
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

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: 
 - Pavel Kalvoda
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 +02:00
+date: 2011-06-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,7 +116,7 @@ dependencies:
   version_requirements: *id007
 description: |
   Herbert makes development of JSON REST API servers ridiculously simple.
-  It provides a bunch of useful helpers and conventions to speed up development.
+  It provides a set of useful helpers and conventions to speed up development.
   Input validation, logs and advanced AJAX support are baked in.
   Herbert is very lightweight and transparent, making it easy to use & modify.
 
@@ -148,7 +148,7 @@ files:
 - lib/herbert/loader.rb
 - lib/herbert/version.rb
 has_rdoc: true
-homepage: 
+homepage: https://github.com/PJK/Herbert
 licenses: []
 
 post_install_message: