Depend on sinatra-authorization

* Get rid of vendored sinatra-ditties * Update gemspec dependencies
lacco · Mar 19, 2009 · d2a7724 · d2a7724
1 parent ee1f23e
commit d2a7724
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 225 deletions.
diff --git a/integrity.gemspec b/integrity.gemspec
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.rubygems_version  = "1.3.1"
 
   s.add_dependency "sinatra", [">= 0.9.1.1"]
+  s.add_dependency "sinatra-authorization"
   s.add_dependency "haml",    [">= 2.0.0"]
   s.add_dependency "data_mapper", [">= 0.9.10"]
   s.add_dependency "uuidtools"   # required by dm-types

diff --git a/lib/integrity.rb b/lib/integrity.rb
@@ -1,5 +1,4 @@
-$:.unshift File.expand_path(File.dirname(__FILE__)),
-  File.expand_path(File.dirname(__FILE__) + "/../vendor/sinatra-ditties/lib")
+$:.unshift File.expand_path(File.dirname(__FILE__))
 
 require "json"
 require "haml"

diff --git a/lib/integrity/helpers/authorization.rb b/lib/integrity/helpers/authorization.rb
@@ -1,4 +1,4 @@
-require "sinatra/ditties"
+require "sinatra/authorization"
 
 module Integrity
   module Helpers

diff --git a/vendor/sinatra-ditties/README.rdoc b/vendor/sinatra-ditties/README.rdoc
diff --git a/vendor/sinatra-ditties/lib/sinatra/ditties.rb b/vendor/sinatra-ditties/lib/sinatra/ditties.rb
diff --git a/vendor/sinatra-ditties/lib/sinatra/ditties/authorization.rb b/vendor/sinatra-ditties/lib/sinatra/ditties/authorization.rb
diff --git a/vendor/sinatra-ditties/lib/sinatra/ditties/mailer.rb b/vendor/sinatra-ditties/lib/sinatra/ditties/mailer.rb