wd_sinatra 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Weasel Diesel Sinatra Changelog
 
+## 0.2.0
+
+* moved `hooks.rb` and `app.rb` to `/lib`
+
+* Automatically load the hooks in the loader if available
+
 
 ## 0.1.0
 

data/lib/wd_sinatra/app_loader.rb

@@ -19,6 +19,7 @@ module WDSinatra
         load_middleware
         set_sinatra_routes
         set_sinatra_settings
+        load_hooks
       end
     end
 
@@ -30,7 +31,7 @@ module WDSinatra
         set_loadpath
         load_environment
         load_lib_dependencies
-        load_app_config
+        load_app_file
         load_models
         load_apis
         @booted =  true
@@ -84,11 +85,10 @@ module WDSinatra
       require 'weasel_diesel'
       require 'sinatra'
       require 'wd_sinatra/sinatra_ext'
-      # TODO: hook to custom app dependencies
     end
 
-    def load_app_config
-      require File.join(root_path, 'config', 'app')
+    def load_app_file
+      require File.join(root_path, 'lib', 'app')
     end
 
     def load_models
@@ -116,5 +116,12 @@ module WDSinatra
       require File.join(root_path, 'config', 'sinatra_config')
     end
 
+    def load_hooks
+      hooks_file = File.join(root_path, 'lib', 'hooks.rb')
+      if File.exist?(hooks_file)
+        require 'hooks'
+      end
+    end
+
   end
 end

data/lib/wd_sinatra/test_helpers.rb

@@ -4,9 +4,11 @@ require 'rack'
 require 'rack/test'
 require 'json'
 require 'weasel_diesel'
+require 'wd_sinatra/app_loader'
 require 'json_response_verification'
 
 WeaselDiesel.send(:include, JSONResponseVerification)
+ENV['DONT_PRINT_ROUTES'] = 'true'
 
 class Requester
   include ::Rack::Test::Methods
@@ -19,12 +21,26 @@ end
 module TestApi
   module_function
 
-  URL_PLACEHOLDER   = /\/*(:[a-z A-Z _]+)\/*/
-  if defined?(AuthHelpers::INTERNAL_X_HEADER)
-    INTERNAL_X_HEADER = AuthHelpers::INTERNAL_X_HEADER[/HTTP_(.*)/, 1] # strip the header marker added by Rack
+  URL_PLACEHOLDER = /\/*(:[a-z A-Z _]+)\/*/
+
+  # Sets the X header name to make auth'd requests.
+  def auth_request_x_header=(val)
+    @auth_request_x_header = val
+  end
+
+  # getter for the auth X header
+  def auth_request_x_header
+    @auth_request_x_header
   end
-  if defined?(AuthHelpers::MOBILE_X_HEADER)
-    MOBILE_X_HEADER   = AuthHelpers::MOBILE_X_HEADER[/HTTP_(.*)/, 1]   # strip the header marker added by Rack
+
+  # Sets the X header name for mobile auth'd requests
+  def mobile_request_x_header=(val)
+    @mobile_request_x_header = val
+  end
+
+  # getter for the mobile X header
+  def mobile_request_x_header
+    @mobile_request_x_header
   end
 
   def request(verb, uri, params={}, headers=nil)
@@ -121,16 +137,15 @@ module TestApi
     @json_response.rest_response if @json_response
   end
 
+  # Define this method in your test helpers
   def valid_internal_api_headers(headers)
-    custom_headers = {INTERNAL_X_HEADER => AuthHelpers::ALLOWED_API_KEYS[0]}
-    custom_headers.merge!(headers) if headers
-    custom_headers
+    raise 'NotImplemented, You need to implement this method yourself'
   end
 
+  # Define this method in your test helpers
+
   def mobile_headers(headers)
-    custom_headers = {MOBILE_X_HEADER => @account ? Base64.urlsafe_encode64(@account.mobile_token) : nil}
-    custom_headers.merge!(headers) if headers
-    custom_headers
+    raise 'NotImplemented, You need to implement this method yourself'
   end
 
 end

data/lib/wd_sinatra/version.rb

@@ -1,5 +1,5 @@
 module WD
   module Sinatra
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/templates/config/sinatra_config.rb

@@ -13,6 +13,6 @@ use Rack::ContentLength
 
 # Store the caught exception in the rack env so it can be used
 # by 3rd party apps like airbrake.
-error(Sinatra::Base::Exception) do |exception|
+error(::Exception) do |exception|
   @env['rack.exception'] = exception
 end

data/templates/{config → lib}/hooks.rb

@@ -72,3 +72,4 @@ module WDSinatraHooks
 end
 
 Sinatra::Helpers.send(:include, WDSinatraHooks)
+WeaselDiesel::RequestHandler.send(:include, WDSinatraHooks)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wd_sinatra
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matt Aimonetti
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-03 00:00:00 Z
+date: 2012-05-09 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: weasel_diesel
@@ -74,14 +75,14 @@ files:
 - templates/api/hello_world.rb
 - templates/bin/console
 - templates/config.ru
-- templates/config/app.rb
 - templates/config/environments/default.rb
 - templates/config/environments/production.rb
 - templates/config/environments/test.rb
-- templates/config/hooks.rb
 - templates/config/middleware.rb
 - templates/config/sinatra_config.rb
+- templates/lib/app.rb
 - templates/lib/body_parser.rb
+- templates/lib/hooks.rb
 - templates/lib/tasks/doc.rake
 - templates/lib/tasks/doc_generator/bootstrap/.gitignore
 - templates/lib/tasks/doc_generator/bootstrap/LICENSE
@@ -140,6 +141,7 @@ files:
 - templates/lib/tasks/doc_generator/template.erb
 - templates/public/favicon.ico
 - wd-sinatra.gemspec
+has_rdoc: true
 homepage: https://github.com/mattetti/wd_sinatra
 licenses: []
 
@@ -169,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra apps using the Weasel Diesel DSL