sinatra_warden 0.3.1 → 0.3.2

data/Gemfile

@@ -1,22 +1,3 @@
-source 'http://rubygems.org'
+source :rubygems 
 
-group :runtime do
-  gem 'sinatra',        '>= 0.9.4'
-  gem 'warden',         '>= 0.10.3'
-end
-
-group :test do
-  gem 'rake'
-  gem 'jeweler',        '~> 1.3.0'
-  gem 'bundler',        '~> 0.9.7'
-  gem 'rspec',          '~> 1.2.9', :require => 'spec'
-  gem 'yard',           '>= 0.5.4'
-  gem 'rack-test',      '~> 0.5.0', :require => 'rack/test'
-  gem 'rcov'
-
-  gem 'do_sqlite3',     '~> 0.10.0'
-  gem 'dm-core',        '~> 0.10.1'
-  gem 'bcrypt-ruby',                :require => 'bcrypt'
-  gem 'haml'
-  gem 'rack-flash',     '~> 0.1.1', :require => 'rack-flash'
-end
+gemspec

data/Gemfile.lock

@@ -0,0 +1,64 @@
+PATH
+  remote: .
+  specs:
+    sinatra_warden (0.3.2)
+      sinatra (>= 1.0.0)
+      warden (~> 1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.2)
+    bcrypt-ruby (2.1.2)
+    data_objects (0.10.2)
+      addressable (~> 2.1)
+    dm-core (1.0.2)
+      addressable (~> 2.2)
+      extlib (~> 0.9.15)
+    dm-do-adapter (1.0.2)
+      data_objects (~> 0.10.2)
+      dm-core (~> 1.0.2)
+    dm-migrations (1.0.2)
+      dm-core (~> 1.0.2)
+    dm-sqlite-adapter (1.0.2)
+      dm-do-adapter (~> 1.0.2)
+      do_sqlite3 (~> 0.10.2)
+    do_sqlite3 (0.10.2)
+      data_objects (= 0.10.2)
+    extlib (0.9.15)
+    haml (3.0.23)
+    rack (1.2.1)
+    rack-flash (0.1.1)
+      rack
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rake (0.8.7)
+    rcov (0.9.9)
+    rspec (1.2.9)
+    sinatra (1.1.0)
+      rack (~> 1.1)
+      tilt (~> 1.1)
+    tilt (1.1)
+    warden (1.0.1)
+      rack (>= 1.0.0)
+    yard (0.6.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bcrypt-ruby
+  dm-core (~> 1.0)
+  dm-migrations
+  dm-sqlite-adapter
+  do_sqlite3 (~> 0.10.0)
+  haml
+  rack-flash (~> 0.1.1)
+  rack-test (~> 0.5.0)
+  rake
+  rcov
+  rspec (~> 1.2.9)
+  sinatra (>= 1.0.0)
+  sinatra_warden!
+  warden (~> 1.0)
+  yard (>= 0.5.4)

data/README.rdoc

@@ -43,6 +43,7 @@ Please read the wiki (http://wiki.github.com/jsmestad/sinatra_warden) for more i
 * Justin Smestad (http://github.com/jsmestad)
 * Daniel Neighman (http://github.com/hassox)
 * Shane Hanna (http://github.com/shanna)
+* Alex - crhym3 (http://github.com/crhym3)
 
 == Copyright
 

data/Rakefile

@@ -1,26 +1,6 @@
-require 'rake'
 require 'bundler'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "sinatra_warden"
-    gem.summary = %Q{authentication system for using warden with sinatra}
-    gem.description = %Q{basic helpers and authentication methods for using warden with sinatra also providing some hooks into Rack::Flash}
-    gem.email = "justin.smestad@gmail.com"
-    gem.homepage = "http://github.com/jsmestad/sinatra_warden"
-    gem.authors = ["Justin Smestad", "Daniel Neighman"]
-
-    bundle = Bundler::Definition.from_gemfile('Gemfile')
-    bundle.dependencies.each do |dep|
-      next unless dep.groups.include?(:runtime)
-      gem.add_dependency(dep.name, dep.version_requirements.to_s)
-    end
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+Bundler::GemHelper.install_tasks
+Bundler.setup :development
 
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/sinatra_warden/sinatra.rb

@@ -1,3 +1,5 @@
+require 'sinatra/base'
+
 module Sinatra
   module Warden
     module Helpers
@@ -30,7 +32,7 @@ module Sinatra
       #
       # @param [Symbol] the session scope to terminate
       def logout(scopes=nil)
-        scopes ? warden.logout(scopes) : warden.logout
+        scopes ? warden.logout(scopes) : warden.logout(warden.config.default_scope)
       end
 
       # Access the user from the current session
@@ -79,7 +81,7 @@ module Sinatra
 
       app.set :auth_error_message,   "Could not log you in."
       app.set :auth_success_message, "You have logged in successfully."
-      app.set :auth_use_erb, false
+      app.set :auth_template_renderer, :haml
       app.set :auth_login_template, :login
 
       # OAuth Specific Settings
@@ -89,7 +91,7 @@ module Sinatra
         status 401
         warden.custom_failure! if warden.config.failure_app == self.class
         env['x-rack.flash'][:error] = options.auth_error_message if defined?(Rack::Flash)
-        options.auth_use_erb ? erb(options.auth_login_template) : haml(options.auth_login_template)
+        self.send(options.auth_template_renderer, options.auth_login_template)
       end
 
       app.get '/login/?' do
@@ -98,7 +100,7 @@ module Sinatra
           session[:request_token_secret] = @auth_oauth_request_token.secret
           redirect @auth_oauth_request_token.authorize_url
         else
-          options.auth_use_erb ? erb(options.auth_login_template) : haml(options.auth_login_template)
+          self.send(options.auth_template_renderer, options.auth_login_template)
         end
       end
 

data/lib/sinatra_warden/version.rb

@@ -0,0 +1,3 @@
+module SinatraWarden
+  VERSION = "0.3.2"
+end

data/sinatra_warden.gemspec

@@ -3,65 +3,40 @@
 # Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
+require File.expand_path("../lib/sinatra_warden/version", __FILE__)
+
 Gem::Specification.new do |s|
   s.name = %q{sinatra_warden}
-  s.version = "0.3.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.version     = SinatraWarden::VERSION
+  s.platform    = Gem::Platform::RUBY
   s.authors = ["Justin Smestad", "Daniel Neighman"]
-  s.date = %q{2010-04-23}
-  s.description = %q{basic helpers and authentication methods for using warden with sinatra also providing some hooks into Rack::Flash}
   s.email = %q{justin.smestad@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/sinatra_warden.rb",
-     "lib/sinatra_warden/sinatra.rb",
-     "sinatra_warden.gemspec",
-     "spec/fixtures/basic_strategy.rb",
-     "spec/fixtures/testing_login.rb",
-     "spec/fixtures/user.rb",
-     "spec/fixtures/views/login.haml",
-     "spec/sinatra_warden_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/jsmestad/sinatra_warden}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
   s.summary = %q{authentication system for using warden with sinatra}
-  s.test_files = [
-    "spec/fixtures/basic_strategy.rb",
-     "spec/fixtures/testing_login.rb",
-     "spec/fixtures/user.rb",
-     "spec/sinatra_warden_spec.rb",
-     "spec/spec_helper.rb"
-  ]
+  s.description = %q{basic helpers and authentication methods for using warden with sinatra also providing some hooks into Rack::Flash}
+
+  s.required_rubygems_version = ">= 1.3.6"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rdoc_options = ["--charset=UTF-8"]
+  
+  s.add_dependency 'sinatra', '>= 1.0.0'
+  s.add_dependency 'warden',  '~> 1.0'
+  
+  s.add_development_dependency 'rspec', '~> 1.2.9'
+  s.add_development_dependency 'yard', '>= 0.5.4'
+  s.add_development_dependency 'rack-test', '~> 0.5.0'
+  s.add_development_dependency 'rcov'
+  s.add_development_dependency 'rake'
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
-      s.add_runtime_dependency(%q<warden>, [">= 0.10.3"])
-    else
-      s.add_dependency(%q<sinatra>, [">= 0.9.4"])
-      s.add_dependency(%q<warden>, [">= 0.10.3"])
-    end
-  else
-    s.add_dependency(%q<sinatra>, [">= 0.9.4"])
-    s.add_dependency(%q<warden>, [">= 0.10.3"])
-  end
+  s.add_development_dependency 'do_sqlite3', '~> 0.10.0'
+  s.add_development_dependency 'dm-core', '~> 1.0'
+  s.add_development_dependency 'dm-sqlite-adapter'
+  s.add_development_dependency 'dm-migrations'
+  s.add_development_dependency 'bcrypt-ruby'
+  s.add_development_dependency 'haml'
+  s.add_development_dependency 'rack-flash', '~> 0.1.1'
+  
+  s.files        = `git ls-files`.split("\n")
+  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.require_path = 'lib'
 end
 

data/spec/fixtures/testing_login.rb

@@ -1,3 +1,6 @@
+require 'rack/flash'
+require "rack/test"
+
 Warden::Strategies.add(:password) do
   def valid?
     # params['email'] && params['password']

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-Bundler.require(:default, :runtime, :test)
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
@@ -7,7 +6,8 @@ ENV['RACK_ENV'] ||= 'test'
 require 'sinatra_warden'
 require 'spec'
 require 'spec/autorun'
-
+require 'dm-core'
+require 'dm-migrations'
 DataMapper.setup(:default, 'sqlite3::memory:')
 
 %w(fixtures support).each do |path|

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_warden
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Justin Smestad
@@ -15,36 +16,218 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-25 00:00:00 -06:00
+date: 2010-11-07 01:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: sinatra
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 9
-        - 4
-        version: 0.9.4
+        - 0
+        version: 1.0.0
   requirement: *id001
+  type: :runtime
+  name: sinatra
   prerelease: false
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  requirement: *id002
   type: :runtime
   name: warden
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
+  requirement: *id003
+  type: :development
+  name: rspec
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 5
+        - 4
+        version: 0.5.4
+  requirement: *id004
+  type: :development
+  name: yard
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  requirement: *id005
+  type: :development
+  name: rack-test
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
+  type: :development
+  name: rcov
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
+  type: :development
+  name: rake
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 55
         segments: 
         - 0
         - 10
-        - 3
-        version: 0.10.3
-  requirement: *id002
+        - 0
+        version: 0.10.0
+  requirement: *id008
+  type: :development
+  name: do_sqlite3
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  requirement: *id009
+  type: :development
+  name: dm-core
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id010
+  type: :development
+  name: dm-sqlite-adapter
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id011
+  type: :development
+  name: dm-migrations
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id012
+  type: :development
+  name: bcrypt-ruby
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id013
+  type: :development
+  name: haml
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
+        version: 0.1.1
+  requirement: *id014
+  type: :development
+  name: rack-flash
   prerelease: false
 description: basic helpers and authentication methods for using warden with sinatra also providing some hooks into Rack::Flash
 email: justin.smestad@gmail.com
@@ -52,19 +235,20 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - lib/sinatra_warden.rb
 - lib/sinatra_warden/sinatra.rb
+- lib/sinatra_warden/version.rb
 - sinatra_warden.gemspec
 - spec/fixtures/basic_strategy.rb
 - spec/fixtures/testing_login.rb
@@ -74,7 +258,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/jsmestad/sinatra_warden
+homepage: 
 licenses: []
 
 post_install_message: 
@@ -83,29 +267,31 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: authentication system for using warden with sinatra
-test_files: 
-- spec/fixtures/basic_strategy.rb
-- spec/fixtures/testing_login.rb
-- spec/fixtures/user.rb
-- spec/sinatra_warden_spec.rb
-- spec/spec_helper.rb
+test_files: []
+