simple_crowd 1.0.1 → 1.0.4

data/.gitignore

@@ -1,26 +1,28 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-doc
-pkg
-.idea
-.yardoc
-.bundle
-
-## PROJECT::SPECIFIC
-test/crowd_config.yml
+Gemfile.lock
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+doc
+pkg
+.idea
+.yardoc
+.bundle
+.rvmrc
+
+## PROJECT::SPECIFIC
+test/crowd_config.yml

data/Gemfile

@@ -2,3 +2,7 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in simple_crowd.gemspec
 gemspec
+
+group :test do
+  gem 'i18n'
+end

data/Rakefile

@@ -4,16 +4,17 @@ require 'rake/rdoctask'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-desc 'Run tests for InheritedResources.'
+desc 'Run tests for simple_crowd.'
 Rake::TestTask.new(:test) do |t|
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << 'test'
+  t.pattern = 'test/**/test_*.rb'
   t.verbose = true
 end
 
-desc 'Generate documentation for InheritedResources.'
+desc 'Generate documentation for simple_crowd.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'InheritedResources'
+  rdoc.title    = 'SimpleCrowd'
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')

data/lib/simple_crowd/client.rb

@@ -1,7 +1,10 @@
 module SimpleCrowd
   class Client
+
+    attr_reader :options
+
     def initialize options = {}
-      @options = SimpleCrowd.soap_options SimpleCrowd.options.merge(options)
+      @options = SimpleCrowd.options options
 
       # TODO: Fix error handling
       # Errors do not contained Exception info so we'll handle the errors ourselves
@@ -231,7 +234,7 @@ module SimpleCrowd
         raise CrowdError.new(response.soap_fault, response.to_hash[:fault]) if response.soap_fault?
         return response
       rescue CrowdError => e
-        if retries && e.type?(:invalid_authorization_token_exception)
+        if retries > 0 && e.type?(:invalid_authorization_token_exception)
           # Clear token to force a refresh
           self.app_token = nil
           retries -= 1

data/lib/simple_crowd/version.rb

@@ -1,3 +1,3 @@
 module SimpleCrowd
-  VERSION = "1.0.1"
+  VERSION = "1.0.4"
 end

data/lib/simple_crowd.rb

@@ -1,5 +1,6 @@
 require 'savon'
 require 'hashie'
+require 'yaml'
 require 'forwardable'
 require 'simple_crowd/crowd_entity'
 require 'simple_crowd/crowd_error'
@@ -14,16 +15,13 @@ module SimpleCrowd
     def config &config_block
       config_block.call(options)
     end
-    # SimpleCrowd default options
-    def options
-      @options ||= {
-        :service_url => "http://localhost:8095/crowd/",
-        :app_name => "crowd",
-        :app_password => ""
-      }
+
+    def options app_options = {}
+      c = soap_options.merge(default_crowd_options).merge(app_options) and
+          c.merge(:service_url => c[:service_url] + 'services/SecurityServer')
     end
-    def soap_options base_options = self.options
-      @soap_options ||= base_options.merge({
+    def soap_options
+      @soap_options ||= {
         :service_ns => "urn:SecurityServer",
         :service_namespaces => {
           'xmlns:auth' => 'http://authentication.integration.crowd.atlassian.com',
@@ -32,10 +30,22 @@ module SimpleCrowd
           'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
           'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance'
         }
-      })
-      @soap_options.merge!({:service_url => base_options[:service_url] + 'services/SecurityServer'})
+      }
+    end
+    def default_crowd_options
+      @default_crowd_options ||= {
+        :service_url => "http://localhost:8095/crowd/",
+        :app_name => "crowd",
+        :app_password => ""
+      }
+      defined?(IRB) ? @default_crowd_options.merge(config_file_options) : @default_crowd_options
+    end
+    def config_file_options
+      @config_file_options ||= begin
+        (File.exists?('config/crowd.yml') &&
+            yml = (YAML.load_file('config/crowd.yml')[ENV["RAILS_ENV"] || "development"] || {}) and
+            yml.symbolize_keys!) || {}
+      end
     end
   end
-end
-
-
+end

data/simple_crowd.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
     test/test_simple_crowd.rb
     test/test_user.rb
   )
-  s.homepage = %q{http://github.com/lapluviosilla/simple_crowd}
+  s.homepage = %q{http://github.com/thinkwell/simple_crowd}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.5.0}
   s.summary = %q{Simple Atlassian Crowd client using REST and SOAP APIs where needed.}
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<forgery>, [">= 0"])
   s.add_development_dependency(%q<webmock>, [">= 0"])
   s.add_development_dependency(%q<rr>, [">= 0"])
+  s.add_development_dependency(%q<rake>, [">= 0"])
   s.add_runtime_dependency(%q<savon>, ["= 0.7.9"])
   s.add_runtime_dependency(%q<hashie>, ["= 1.0.0"])
 end

data/test/test_client.rb

@@ -7,7 +7,7 @@ class TestClient < Test::Unit::TestCase
       @client = SimpleCrowd::Client.new({:service_url => CROWD_CONFIG['service_url'],
                                          :app_name => CROWD_CONFIG['app_name'],
                                          :app_password => CROWD_CONFIG['app_password']})
-      @service_url = SimpleCrowd.soap_options({:service_url => CROWD_CONFIG['service_url']})[:service_url]
+      @service_url = @client.options[:service_url]
       reset_webmock
     end
     should "initialize" do

data/test/test_simple_crowd.rb

@@ -6,14 +6,14 @@ class TestSimpleCrowd < Test::Unit::TestCase
       @default_keys = [:service_url, :service_ns, :service_namespaces, :app_name, :app_password]
     end
     should "return options" do
-      options = SimpleCrowd.soap_options
+      options = SimpleCrowd.options
       options.should_not be nil
       options.empty?.should be false
       @default_keys.each {|v| options[v].should_not be nil}
     end
 
     should "only have default options" do
-      options = SimpleCrowd.soap_options
+      options = SimpleCrowd.options
       options.should_not be nil
       (options.keys - @default_keys).length.should == 0
       (@default_keys - options.keys).length.should == 0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_crowd
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Paul Strong
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 -05:00
-default_executable: 
+date: 2012-03-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -103,9 +102,23 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: savon
+  name: rake
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: savon
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -117,11 +130,11 @@ dependencies:
         - 9
         version: 0.7.9
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: hashie
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -133,7 +146,7 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 description: |-
   Simple Atlassian Crowd client using REST and SOAP APIs where needed.
                            Doesn't do any fancy object mapping, etc.
@@ -165,8 +178,7 @@ files:
 - test/test_client.rb
 - test/test_simple_crowd.rb
 - test/test_user.rb
-has_rdoc: true
-homepage: http://github.com/lapluviosilla/simple_crowd
+homepage: http://github.com/thinkwell/simple_crowd
 licenses: []
 
 post_install_message: 
@@ -195,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Simple Atlassian Crowd client using REST and SOAP APIs where needed.