couple of small cleanups for load paths and such

Gemfile

@@ -20,7 +20,7 @@ only :test do
   gem 'dm-sweatshop',  '~>0.9.11'
   gem 'randexp'
   gem 'ParseTree',                :require_as => 'parse_tree'
-  gem 'bundler',       '>=0.6.0'
+  gem 'bundler',       '>=0.7.0'
 end
 
 disable_system_gems

lib/hancock.rb

@@ -13,14 +13,10 @@
 require 'json'
 require 'rack/contrib/accept_format'
 
-lib_dir = File.expand_path(File.join(File.dirname(__FILE__), 'hancock'))
+$:.push File.expand_path(File.join(File.dirname(__FILE__)))
 
-%w(sessions sso).each do |lib|
-  require File.join(lib_dir, 'sso', 'helpers', lib)
-  require File.join(lib_dir, 'sso', lib)
-end
-require File.join(lib_dir, 'api')
-require File.join(lib_dir, 'sso')
-require File.join(lib_dir, 'models', 'model')
-require File.join(lib_dir, 'models', 'user')
-require File.join(lib_dir, 'models', 'consumer')
+require 'hancock/api'
+require 'hancock/sso'
+require 'hancock/models/model'
+require 'hancock/models/user'
+require 'hancock/models/consumer'

lib/hancock/api/consumer.rb

@@ -1,7 +1,7 @@
 module Hancock
   module API
     module Consumers
-      class App < Hancock::API::JSON::App
+      class App < JSON::App
         get '/consumers.json' do
           Hancock::Consumer.all.map { |consumer| consumer.attributes_for_api }.to_json
         end

lib/hancock/api/user.rb

@@ -1,7 +1,7 @@
 module Hancock
   module API
     module Users
-      class App < Hancock::API::JSON::App
+      class App < JSON::App
         get '/users.json' do
           Hancock::User.all.map { |user| user.attributes_for_api }.to_json
         end

lib/hancock/sso.rb

@@ -1,12 +1,16 @@
+require 'hancock/sso/helpers/sessions'
+require 'hancock/sso/sessions'
+
+require 'hancock/sso/helpers/sso'
+require 'hancock/sso/sso'
+
 module Hancock
   module SSO
     def self.app
       @app ||= Rack::Builder.app do
         run ::Hancock::SSO::App
       end
     end
-    class ConfigurationError < StandardError; end
-
     class App < Sinatra::Base
       disable :show_exceptions
 

spec/helpers/app.rb

@@ -14,7 +14,6 @@ def landing_page
     end
     def self.registered(app)
       app.helpers Helpers
-      app.set :sessions, true
       app.get '/' do
         ensure_authenticated
         @consumers = ::Hancock::Consumer.visible

spec/helpers/fixtures.rb

@@ -38,5 +38,5 @@
 
 Hancock::Consumer.fix(:hidden) {{
   :url      => 'http://localhost:9292/login',
-  :internal => false
+  :internal => true
 }}