herbert 0.0.3 → 0.0.5

data/lib/herbert.rb

@@ -9,7 +9,7 @@ require 'active_support'
 class Sinatra::Base
 	def call(env)
 		begin
-			call!(env)
+			dup.call!(env)
 		rescue => e
 			res = [500,{},[]]
 			if (ENV['HERBERT_DEBUG'].to_i==1) || (ENV['RACK_ENV'] =~ /debug/) then

data/lib/herbert/ApplicationError.rb

@@ -9,21 +9,21 @@ module Herbert
 
       # Code to text translation
       Translation = {
-        "1000" => ["Malformated JSON", 400],
-        "1001" => ["Non-unicode encoding",400],
-        "1002" => ["Non-acceptable Accept header", 406],
-        "1003" => ["Not found", 404],
-        "1010" => ["Missing request body", 400],
-        "1011" => ["Missign required parameter", 400],
-        "1012" => ["Invalid request body", 400],
-        "1020" => ["Unspecified error occured", 500]
+        1000 => ["Malformated JSON", 400],
+        1001 => ["Non-unicode encoding",400],
+        1002 => ["Non-acceptable Accept header", 406],
+        1003 => ["Not found", 404],
+        1010 => ["Missing request body", 400],
+        1011 => ["Missign required parameter", 400],
+        1012 => ["Invalid request body", 400],
+        1020 => ["Unspecified error occured", 500]
       }
 
       def initialize(errno, http_code = nil, errors = [])
-        raise ArgumentError, "Unknown error code: #{errno}" unless Translation.has_key?(errno.to_s)
-        @code = errno
-        @message = Translation[@code.to_s][0]
-        @http_code = (http_code || Translation[@code.to_s][1])
+        raise ArgumentError, "Unknown error code: #{errno}" unless Translation.has_key?(errno.to_i)
+        @code = errno.to_i
+        @message = Translation[@code][0]
+        @http_code = (http_code || Translation[@code][1])
         @errors = errors.to_a
       end
 

data/lib/herbert/Configurator.rb

@@ -7,9 +7,15 @@ module Herbert
 			#
       def self.registered(app)
         # Enable envs such as development;debug, where debug is herberts debug flag
-        env = ENV['RACK_ENV'].split(';')
-        ENV['RACK_ENV'], ENV['HERBERT_DEBUG'] = (env[0].empty? ? 'development' :  env[0]), (env[1] == 'debug' ? 1:0).to_s
-        app.set :environment, ENV['RACK_ENV'].downcase.to_sym
+        if ENV['RACK_ENV'] === nil then
+          app.set :environment, :test
+          ENV['HERBERT_DEBUG'] = '1'
+        end
+        if ! app.test? then
+          env = ENV['RACK_ENV'].split(';')
+          ENV['RACK_ENV'], ENV['HERBERT_DEBUG'] = (env[0].empty? ? 'development' :  env[0]), (env[1] == 'debug' ? 1:0).to_s
+          app.set :environment, ENV['RACK_ENV'].downcase.to_sym
+        end
       end
     end
     
@@ -19,7 +25,7 @@ module Herbert
       end
 
       def development?
-        ENV['RACK_ENV'] == 'development' || (ENV['RACK_ENV'].empty?)
+        ENV['RACK_ENV'] == 'development' || (ENV['RACK_ENV']===nil)
       end
 
       def debug?
@@ -30,6 +36,7 @@ module Herbert
     def self.registered(app)
       app.enable :logging if app.development?
       #Assume loading by rackup...
+      puts app.settings.root
       app.settings.root ||= File.join(Dir.getwd, 'lib')
       path = File.join(app.settings.root, 'config')
       # Load and evaluate common.rb and appropriate settings
@@ -43,10 +50,10 @@ module Herbert
           log.h_warn("Configuration file #{cpath} not found")
         end
       end
-    # So, we have all our settings... Please note that configure
-    # block inside an App can overwrite our settings, but Herbert's
-    # services are being created right now, so they only take in account
-    # previous declarations
+      # So, we have all our settings... Please note that configure
+      # block inside an App can overwrite our settings, but Herbert's
+      # services are being created right now, so they only take in account
+      # previous declarations
     end
 
   end

data/lib/herbert/Jsonify.rb

@@ -1,9 +1,15 @@
 class True
-  def to_json
+  def as_json
     return 1
   end
 end
 
+class BSON::ObjectId
+  def as_json(*a)
+    to_s
+  end
+end
+
 module Sinatra
 
   # Makes JSON the default DDL of HTTP communication

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|\.yml)/.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

@@ -1,3 +1,11 @@
+class Hash
+  def delete_all(*names)
+    names.each {|name| delete(name)}
+    self
+  end
+end
+
+
 module Herbert
   module Utils
     # Assert v<major>.<minor>.<etc> tags
@@ -12,8 +20,15 @@ module Herbert
         Utils.version
       end
       
-      def nonce(length = 8)
-        ActiveSupport::SecureRandom.hex(length)
+      Range = [('0'..'9').to_a,('a'..'z').to_a].flatten
+      def nonce(length = 16)
+        res = ''
+        length.times  {res += Range[rand(36)]}
+        res
+      end
+      
+      def db_id(source)
+        BSON::ObjectId.from_string(source.to_s)
       end
     end
   end

data/lib/herbert/loader.rb

@@ -2,6 +2,7 @@ require 'logger'
 require 'mongo'
 require 'memcache'
 require 'kwalify'
+require 'yaml'
 $:.unshift(File.dirname(__FILE__))
 require 'version'
 
@@ -42,12 +43,12 @@ module Herbert
       app.enable :append_log_id # If logs go to Mongo, IDs will be appended to responses
       ## register the ;debug flag patch first to enable proper logging
       app.register Herbert::Configurator::Prepatch
+      app.register Herbert::Configurator::Helpers
+      app.helpers Herbert::Configurator::Helpers
       # the logger
-      log.level = app.development? ? Logger::DEBUG : Logger::INFO
+      log.level = app.debug? ? Logger::DEBUG : Logger::INFO
       # the extensions
       app.register Herbert::Configurator
-      app.register Herbert::Configurator::Helpers
-      app.helpers Herbert::Configurator::Helpers
       app.register Herbert::Error
       app.helpers Herbert::Error::Helpers
       app.register Sinatra::Jsonify
@@ -63,7 +64,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
+      app.helpers Herbert::Utils::Helpers
     end
   end
 end

data/lib/herbert/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Pavel Kalvoda
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-25 00:00:00 +02:00
+date: 2011-07-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency