omniauth_crowd 1.0.1 → 2.0.0

data/.gitignore

@@ -0,0 +1,43 @@
+.rvmrc
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+#
+# For TextMate
+#*.tmproj
+#tmtags
+#
+# For emacs:
+#*~
+#\#*
+#.\#*
+#
+# For vim:
+#*.swp

data/Gemfile

@@ -1,16 +1,7 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem 'oa-core'
-gem 'nokogiri'
+# Specify your gem's dependencies in omniauth-github.gemspec
+gemspec
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem 'rack'
-  gem 'rake'
-  gem 'rack-test'
-  gem 'rspec', '~> 2.5.0'
-  gem 'webmock', '~> 1.3.4'
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-end
+group :development, :test do
+end

data/Gemfile.lock

@@ -1,17 +1,21 @@
+PATH
+  remote: .
+  specs:
+    omniauth_crowd (2.0.0)
+      nokogiri (>= 1.4.4)
+      omniauth (~> 1.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.4)
     crack (0.1.8)
     diff-lcs (1.1.2)
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    nokogiri (1.4.4)
-    oa-core (0.2.0)
-      rack (~> 1.1)
+    hashie (1.2.0)
+    nokogiri (1.5.0)
+    omniauth (1.0.0)
+      hashie (~> 1.2)
+      rack
     rack (1.2.2)
     rack-test (0.5.7)
       rack (>= 1.0)
@@ -33,9 +37,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  nokogiri
-  oa-core
+  omniauth_crowd!
   rack
   rack-test
   rake

data/Rakefile

@@ -1,44 +1,12 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "omniauth_crowd"
-  gem.homepage = "http://github.com/robdimarco/omniauth_crowd"
-  gem.license = "MIT"
-  gem.summary = %Q{An OmniAuth provider for Atlassian Crowd REST API}
-  gem.description = %Q{This is an OmniAuth provider for Atlassian Crowd's REST API.  It allows you to easily integrate your Rack application in with Atlassian Crowd.}
-  gem.email = "rob@innovationontherun.com"
-  gem.authors = ["Rob Di Marco"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_runtime_dependency 'oa-core'
-  gem.add_runtime_dependency 'nokogiri'
-  gem.add_development_dependency 'rspec', '~> 2.5.0'
-end
-Jeweler::RubygemsDotOrgTasks.new
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
+desc 'Default: run specs.'
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+desc "Run specs"
+RSpec::Core::RakeTask.new
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "omniauth_crowd #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |s|
-  s.rspec_opts = "--format=#{ENV['RSPEC_FORMAT'] || 'nested'} --colour"
-end
+desc 'Run specs'
+task :default => :spec

data/lib/omniauth/strategies/crowd.rb

@@ -1,18 +1,19 @@
-require 'omniauth/core'
+require 'omniauth'
 
 module OmniAuth
   module Strategies
     class Crowd
       include OmniAuth::Strategy
+    
       autoload :Configuration, 'omniauth/strategies/crowd/configuration'
       autoload :CrowdValidator, 'omniauth/strategies/crowd/crowd_validator'
       def initialize(app, options = {}, &block)
-        super(app, options[:name] || :crowd, options.dup, &block)
+        super(app, {:name=> :crowd}.merge(options), &block)
         @configuration = OmniAuth::Strategies::Crowd::Configuration.new(options)
       end
       
       protected
-      
+
       def request_phase
         if env['REQUEST_METHOD'] == 'GET'
           get_credentials
@@ -21,14 +22,14 @@ module OmniAuth
           redirect callback_path
         end
       end
-
-  	  def get_credentials
+    
+      def get_credentials
         OmniAuth::Form.build(:title => (options[:title] || "Crowd Authentication")) do
           text_field 'Login', 'username'
           password_field 'Password', 'password'
         end.to_response
       end
-
+    
       def callback_phase 
         creds = session.delete 'omniauth.crowd'
         return fail!(:no_credentials, 'No Credentials') unless creds
@@ -36,10 +37,10 @@ module OmniAuth
         @user_info = validator.user_info
         
         return fail!(:invalid_credentials) if @user_info.nil? || @user_info.empty?
-
+    
         super
       end
-
+    
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => @user_info.delete("user"),

data/lib/omniauth_crowd.rb

@@ -0,0 +1,2 @@
+require "omniauth_crowd/version"
+require 'omniauth/strategies/crowd'

data/lib/omniauth_crowd/version.rb

@@ -0,0 +1,5 @@
+module OmniAuth
+  module Crowd
+    VERSION = "2.0.0"
+  end
+end

data/omniauth_crowd.gemspec

@@ -1,91 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/omniauth_crowd/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = "omniauth_crowd"
-  s.version = "1.0.1"
+Gem::Specification.new do |gem|
+  gem.authors = ["Robert Di Marco"]
+  gem.email = ["rob@innovationontherun.com"]
+  gem.description = "This is an OmniAuth provider for Atlassian Crowd's REST API.  It allows you to easily integrate your Rack application in with Atlassian Crowd."
+  gem.summary = "An OmniAuth provider for Atlassian Crowd REST API"
+  gem.homepage = "http://github.com/robdimarco/omniauth_crowd"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Rob Di Marco"]
-  s.date = "2011-09-23"
-  s.description = "This is an OmniAuth provider for Atlassian Crowd's REST API.  It allows you to easily integrate your Rack application in with Atlassian Crowd."
-  s.email = "rob@innovationontherun.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/omniauth/crowd.rb",
-    "lib/omniauth/strategies/crowd.rb",
-    "lib/omniauth/strategies/crowd/configuration.rb",
-    "lib/omniauth/strategies/crowd/crowd_validator.rb",
-    "omniauth_crowd.gemspec",
-    "spec/fixtures/success.xml",
-    "spec/omniauth/strategies/crowd_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/robdimarco/omniauth_crowd"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "An OmniAuth provider for Atlassian Crowd REST API"
-  s.test_files = [
-    "spec/omniauth/strategies/crowd_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files = `git ls-files`.split("\n")
+  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.name = "omniauth_crowd"
+  gem.require_paths = ["lib"]
+  gem.version = OmniAuth::Crowd::VERSION
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<oa-core>, [">= 0"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_development_dependency(%q<rack>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rack-test>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
-      s.add_development_dependency(%q<webmock>, ["~> 1.3.4"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_runtime_dependency(%q<oa-core>, [">= 0"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
-    else
-      s.add_dependency(%q<oa-core>, [">= 0"])
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<rack>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rack-test>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.5.0"])
-      s.add_dependency(%q<webmock>, ["~> 1.3.4"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<oa-core>, [">= 0"])
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.5.0"])
-    end
-  else
-    s.add_dependency(%q<oa-core>, [">= 0"])
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<rack>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rack-test>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.5.0"])
-    s.add_dependency(%q<webmock>, ["~> 1.3.4"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<oa-core>, [">= 0"])
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.5.0"])
-  end
+  gem.add_dependency 'omniauth', '~> 1.0'
+  gem.add_dependency 'nokogiri', '>= 1.4.4'
+  gem.add_development_dependency(%q<rack>, [">= 0"])
+  gem.add_development_dependency(%q<rake>, [">= 0"])
+  gem.add_development_dependency(%q<rack-test>, [">= 0"])
+  gem.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
+  gem.add_development_dependency(%q<webmock>, ["~> 1.3.4"])
+  gem.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
 end
-

data/spec/omniauth/strategies/crowd_spec.rb

@@ -54,7 +54,7 @@ describe OmniAuth::Strategies::Crowd, :type=>:strategy do
             auth.should be_kind_of(Hash)
           end
           it 'should have good data' do
-            auth = last_request.env['omniauth.auth']['provider'].should == 'crowd'
+            auth = last_request.env['omniauth.auth']['provider'].should == :crowd
             auth = last_request.env['omniauth.auth']['uid'].should == 'foo'
             auth = last_request.env['omniauth.auth']['user_info'].should be_kind_of(Hash)
           end

data/spec/spec_helper.rb

@@ -7,6 +7,6 @@ require 'webmock/rspec'
 include Rack::Test::Methods
 include WebMock
 
-require 'omniauth/crowd'
+require 'omniauth_crowd'
 
-WebMock.disable_net_connect!
+WebMock.disable_net_connect!

metadata

@@ -1,51 +1,56 @@
 --- !ruby/object:Gem::Specification 
 name: omniauth_crowd
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: 
   segments: 
-  - 1
+  - 2
   - 0
-  - 1
-  version: 1.0.1
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
-- Rob Di Marco
+- Robert Di Marco
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 Z
+date: 2011-11-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: omniauth
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 1
         - 0
-        version: "0"
-  version_requirements: *id001
-  name: oa-core
-  prerelease: false
+        version: "1.0"
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
-  name: nokogiri
-  prerelease: false
+        - 1
+        - 4
+        - 4
+        version: 1.4.4
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -55,11 +60,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
-  name: rack
-  prerelease: false
   type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -69,11 +74,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
-  name: rake
-  prerelease: false
   type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -83,11 +88,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
-  name: rack-test
-  prerelease: false
   type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -99,11 +104,11 @@ dependencies:
         - 5
         - 0
         version: 2.5.0
-  version_requirements: *id006
-  name: rspec
-  prerelease: false
   type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -115,11 +120,11 @@ dependencies:
         - 3
         - 4
         version: 1.3.4
-  version_requirements: *id007
-  name: webmock
-  prerelease: false
   type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -131,98 +136,38 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id008
-  name: bundler
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  version_requirements: *id009
-  name: jeweler
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id010
-  name: oa-core
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id011
-  name: nokogiri
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
-  version_requirements: *id012
-  name: rspec
-  prerelease: false
   type: :development
+  version_requirements: *id008
 description: This is an OmniAuth provider for Atlassian Crowd's REST API.  It allows you to easily integrate your Rack application in with Atlassian Crowd.
-email: rob@innovationontherun.com
+email: 
+- rob@innovationontherun.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/omniauth/crowd.rb
 - lib/omniauth/strategies/crowd.rb
 - lib/omniauth/strategies/crowd/configuration.rb
 - lib/omniauth/strategies/crowd/crowd_validator.rb
+- lib/omniauth_crowd.rb
+- lib/omniauth_crowd/version.rb
 - omniauth_crowd.gemspec
 - spec/fixtures/success.xml
 - spec/omniauth/strategies/crowd_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/robdimarco/omniauth_crowd
-licenses: 
-- MIT
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -254,5 +199,6 @@ signing_key:
 specification_version: 3
 summary: An OmniAuth provider for Atlassian Crowd REST API
 test_files: 
+- spec/fixtures/success.xml
 - spec/omniauth/strategies/crowd_spec.rb
 - spec/spec_helper.rb

data/lib/omniauth/crowd.rb

@@ -1,6 +0,0 @@
-require 'omniauth/core'
-module OmniAuth
-  module Strategies
-    autoload :Crowd, 'omniauth/strategies/crowd'
-  end
-end