grouper-rest-client 0.2.6 → 0.2.7

data/HISTORY

@@ -1,3 +1,6 @@
+2011-06-01 v0.2.7
+  - "G::R::C::R#subjects()" now returns [] if no subjects found.
+
 2011-05-31 v0.2.6
   - "G::R::C::R::Group#members()" now returns [] if no members found.
 

data/Rakefile

@@ -1,10 +1,16 @@
 require 'bundler'
+require 'rake/testtask'
 require 'rdoc-readme/rake_task'
-require 'rspec/core/rake_task'
 
 Bundler::GemHelper.install_tasks
 RDoc::Readme::RakeTask.new 'lib/grouper-rest-client.rb', 'README.rdoc'
-RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task :default => :test
+
+Rake::TestTask.new { |t|
+  t.libs    = [ 'test' ]
+  t.pattern = 'test/*_test.rb'
+  t.verbose = true
+  t.warning = true
+}
 

data/grouper-rest-client.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency( %q<json>,         [ ">=1.5.1" ] )
   s.add_dependency( %q<rest-client>,  [ ">=1.6.1" ] )
 
-  s.add_development_dependency( %q<rspec>,  [ ">=2.5.0" ] )
+  s.add_development_dependency( %q<fakeweb>,  [ ">=1.3.0" ]   )
+  s.add_development_dependency( %q<shoulda>,  [ ">=2.11.3" ]  )
 end
 

data/lib/grouper-rest-client/resource.rb

@@ -127,12 +127,15 @@ module Grouper    # :nodoc:
         # +subjects+:: Get subject(s) matching this identifier.
         def subjects(subject)
           raise ArgumentError if subject.nil? || subject.empty?
-          k1, k2 = 'WsGetSubjectsResults', 'wsSubjects'
-          result = call("subjects/#{subject}")
+          k1, k2  = 'WsGetSubjectsResults', 'wsSubjects'
+
+          result  = call("subjects/#{subject}")
           if result.key?(k1) && result[k1].key?(k2)
-            return result[k1][k2].collect { |r| Grouper::Rest::Client::Resource::Subject.new(self, r) }
+            return result[k1][k2].select { |tmp| tmp['success'] == 'T' }.collect do |r|
+              Grouper::Rest::Client::Resource::Subject.new(self, r)
+            end
           end
-          return result # TODO Probably wrong
+          result
         end
 
 

data/lib/grouper-rest-client/version.rb

@@ -1,7 +1,7 @@
 module Grouper  # :nodoc:
   module Rest   # :nodoc:
     module Client
-      VERSION = '0.2.6'
+      VERSION = '0.2.7'
     end
   end
 end

data/test/subjects_test.rb

@@ -0,0 +1,90 @@
+require 'test_helper'
+
+class SubjectsTest < Test::Unit::TestCase
+
+  context '#subjects()' do
+    setup do
+      FakeWeb.allow_net_connect = false
+      @url      = 'http://grouper.example.org'
+      @grouper  = Grouper::Rest::Client::Resource.new @url
+    end
+
+    context 'invalid argument' do
+      should 'raise ArgumentError when query string is nil' do
+        assert_raise(ArgumentError) { @grouper.subjects(nil) }
+      end
+      should 'raise ArgumentError when query string is empty' do
+        assert_raise(ArgumentError) { @grouper.subjects('') }
+      end
+    end
+
+    context 'when subject not found' do
+      setup do  
+        query = 'no_such_subject'
+        mock  = JSON.generate(
+                  {
+                    'WsGetSubjectsResults' => 
+                    {
+                      'wsSubjects' => 
+                      [
+                        {
+                          'id'          => 'no_such_subject',
+                          'resultCode'  => 'SUBJECT_NOT_FOUND',
+                          'success'     => 'F'
+                        }
+                      ]
+                    }
+                  }
+                )
+        FakeWeb.register_uri( :get, "#{@url}/subjects/#{query}", :body => mock )
+        @result   = @grouper.subjects(query)
+        @response = @grouper.response
+      end # setup
+  
+      should 'return an empty array' do
+        assert        @result.instance_of? Array
+        assert_equal  0, @result.size
+      end
+
+    end # context 'when subject not found'
+
+    context 'when subject found' do
+      setup do  
+        query = 'blair'
+        mock  = JSON.generate(
+                  {
+                    'WsGetSubjectsResults' => 
+                    {
+                      'wsSubjects' => 
+                      [
+                        {
+                          'id'          => '12345678A',
+                          'name'        => 'Blair Christensen',
+                          'resultCode'  => 'SUCCESS',
+                          'sourceId'    => 'mcdb',
+                          'success'     => 'T'
+                        }
+                      ]
+                    }
+                  }
+                )
+        FakeWeb.register_uri( :get, "#{@url}/subjects/#{query}", :body => mock )
+        @result   = @grouper.subjects(query)
+        @response = @grouper.response
+      end # setup
+  
+      should 'return an array with one expected entry' do
+        assert        @result.instance_of? Array
+        assert_equal  1, @result.size
+        s = @result.first
+        assert        s.instance_of? Grouper::Rest::Client::Resource::Subject
+        assert_equal  '12345678A',          s['id']
+        assert_equal  'Blair Christensen',  s['name']
+      end
+
+    end # context 'when successful'
+
+  end # context '#subjects()'
+
+end # class SubjectsTest
+

data/{spec/spec_helper.rb → test/test_helper.rb}

@@ -1,2 +1,6 @@
+require 'rubygems'
+require 'fakeweb'
+require 'shoulda'
+require 'test/unit'
 require File.join( File.dirname(__FILE__), '..', 'lib', 'grouper-rest-client' )
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grouper-rest-client
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Blair Christensen
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 -05:00
+date: 2011-06-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 5
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 6
@@ -48,20 +51,37 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: fakeweb
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
-        - 2
-        - 5
+        - 1
+        - 3
         - 0
-        version: 2.5.0
+        version: 1.3.0
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 2
+        - 11
+        - 3
+        version: 2.11.3
+  type: :development
+  version_requirements: *id004
 description: REST client for accessing the Grouper WS API
 email: 
 - blair.christensen@gmail.com
@@ -81,8 +101,8 @@ files:
 - lib/grouper-rest-client.rb
 - lib/grouper-rest-client/resource.rb
 - lib/grouper-rest-client/version.rb
-- spec/resource_spec.rb
-- spec/spec_helper.rb
+- test/subjects_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: https://github.com/blairc/
 licenses: []
@@ -97,6 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -105,16 +126,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: grouper-rest-client
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: REST client for accessing the Grouper WS API
 test_files: 
-- spec/resource_spec.rb
-- spec/spec_helper.rb
+- test/subjects_test.rb
+- test/test_helper.rb

data/spec/resource_spec.rb

@@ -1,110 +0,0 @@
-require 'spec_helper'
-
-describe "Grouper::Rest::Client::Resource initialization" do
-
-  context "with no arguments" do
-    it "should raise ArgumentError" do
-      lambda { Grouper::Rest::Client::Resource.new }.should raise_error(ArgumentError)
-    end
-  end
-
-  context "with one argument" do
-
-    context "that is invalid" do
-      it "should raise ArgumentError when nil" do
-        lambda { Grouper::Rest::Client::Resource.new(nil) }.should raise_error(ArgumentError)
-      end
-      it "should raise ArgumentError when blank" do
-        lambda { Grouper::Rest::Client::Resource.new('') }.should raise_error(ArgumentError)
-      end
-    end
-
-    context "that is valid" do
-      it "should return Grouper::Rest::Client::Resource object" do
-        Grouper::Rest::Client::Resource.new('foo').should be_an_instance_of(Grouper::Rest::Client::Resource)
-      end
-    end
-
-  end
-
-end # describe initialization
-
-
-describe "Grouper::Rest::Client::Resource#groups()" do
-
-  before(:each) do
-    @grouper = Grouper::Rest::Client::Resource.new('foo')
-  end
-
-  context "with no arguments" do
-    it "should raise ArgumentError" do
-      lambda { @grouper.groups }.should raise_error(ArgumentError)
-    end
-  end
-
-  context "with one argument" do
-    context "that is invalid" do
-      it "should raise ArgumentError when nil" do
-        lambda { @grouper.groups(nil) }.should raise_error(ArgumentError)
-      end
-      it "should raise ArgumentError when blank" do
-        lambda { @grouper.groups('') }.should raise_error(ArgumentError)
-      end
-    end
-  end
-
-end # describe #groups()
-
-
-describe "Grouper::Rest::Client::Resource#error?()" do
-  context "before any WS calls have been made" do
-    it "should be false" do
-      Grouper::Rest::Client::Resource.new('foo').error?.should be_false
-    end
-  end
-end # describe #error?()
-
-
-describe "Grouper::Rest::Client::Resource#ok?()" do
-  context "before any WS calls have been made" do
-    it "should be true" do
-      Grouper::Rest::Client::Resource.new('foo').ok?.should be_true
-    end
-  end
-end # describe #ok?()
-
-
-describe "Grouper::Rest::Client::Resource#response" do
-  context "before any WS calls have been made" do
-    it "should be nil" do
-      Grouper::Rest::Client::Resource.new('foo').response.should be_nil
-    end
-  end
-end # describe #response
-
-
-describe "Grouper::Rest::Client::Resource#subjects()" do
-
-  before(:each) do
-    @grouper = Grouper::Rest::Client::Resource.new('foo')
-  end
-
-  context "with no arguments" do
-    it "should raise ArgumentError" do
-      lambda { @grouper.subjects }.should raise_error(ArgumentError)
-    end
-  end
-
-  context "with one argument" do
-    context "that is invalid" do
-      it "should raise ArgumentError when nil" do
-        lambda { @grouper.subjects(nil) }.should raise_error(ArgumentError)
-      end
-      it "should raise ArgumentError when blank" do
-        lambda { @grouper.subjects('') }.should raise_error(ArgumentError)
-      end
-    end
-  end
-
-end # describe #subjects()
-