jgrouper 0.0.2 → 0.0.3

data/HISTORY.md

@@ -0,0 +1,30 @@
+JGrouper History
+================
+
+JGrouper v0.0.3
+---------------
+* Add *JGrouper::Shell*
+* Add *bin/jgrouper* interactive shell
+* Rename *JGrouper::Stem#root_stem* to *JGrouper::Stem#root*
+* Rename *JGrouper::Subject#root_subject* to *JGrouper::Subject#root*
+* Add *JGrouper::GroupType.delete(name)*
+* Add *JGrouper::Stem.create( name, display_name = nil )*
+* Add *JGrouper::Stem#add_stem( name, display_name = nil )*
+* Add *JGrouper::Stem.find(name)*
+* Add *JGrouper::Subject::TestCase*
+* Add *JGrouper::GroupType::TestCase*
+* Add *JGrouper::Stem::TestCase*
+
+
+2012-08-10 JGrouper v0.0.2
+--------------------------
+* Add *JGrouper::GroupType*
+* Add *JGrouper::Stem#to_json*
+* Add *JGrouper::Subject#to_json*
+
+
+2012-08-10 JGrouper v0.0.1
+--------------------------
+* Add *JGrouper::Stem.root_stem*
+* Add *JGrouper::Subject.root_subject*
+

data/README.rdoc

@@ -10,7 +10,7 @@
 === Subjects
 
   # Find root subject
-  JGrouper::Subject.root_subject do |subject|
+  JGrouper::Subject.root do |subject|
     subject.id     # Subject identifier
     subject.name   # Subject name
     subject.source # Subject source identifier
@@ -20,12 +20,21 @@
 === Stems
 
   # Find root stem
-  JGrouper::Stem.root_stem do |stem|
+  JGrouper::Stem.root do |stem|
     stem.display_name # Stem display name
     stem.name         # Stem name
     stem.uuid         # Stem UUID
   end
 
+  # Find by name
+  stem = JGrouper::Stem.find(name) { |stem| ... }
+
+  # Create stem(s)
+  stem = JGrouper::Stem.create 'foo:bar:baz', 'Foo:Bar:Baz'
+
+  # Create child stem(s)
+  child = stem.create 'foo:bar:baz'
+
 === Group Types
 
   # Create group type
@@ -43,6 +52,8 @@
   JGrouper::GroupType.find(name)
 
   # Delete group type
+  JGrouper::GroupType.delete(name)
+  # ... or ...
   JGrouper::GroupType.find(name).delete
 
 == Installation
@@ -77,5 +88,5 @@ https://github.com/blairc/jgrouper
 
 == See Also
 
-https://github.com/blairc/jgrouper-server, http://grouper.internet2.edu
+JGrouper::Shell, https://github.com/blairc/jgrouper-server, http://grouper.internet2.edu
 

data/TODO.md

@@ -1,61 +1,53 @@
 JGrouper To Do
 ==============
 
-JGrouper v0.0.3
+JGrouper v0.0.4
 ---------------
+* Add *JGrouper::Group*
+* Add *JGrouper::Group.find(name)*
+* Add *JGrouper::Stem#add_group( name, display_name = nil )*
+* Add *JGrouper::Group.create( name, display_name = nil )*
+* Add *JGrouper::Group#types*
+* Add *JGrouper::Group#add_type*
+* Add *JGrouper::Group#members*
+* Add *JGrouper::Group#add_member(?)*
+
+
+Future
+------
+* Add *JGrouper::Stem#delete( recurse = false )*
+* Add *JGrouper::Stem.delete( name, recurse = false )*
+* Add *JGrouper::Stem.find(uuid)*
+* Add *JGrouper::Stem.exists?(name)*
+* Add *JGrouper::Group.exists?(name)*
+* Add *JGrouper::Stem#root?(name)*
+* Add *JGrouper::Group*
+* Add *JGrouper::Group.find(name)*
 * Implement *JGrouper::Subject.sources* (using *edu.internet2.middleware.subject.provider.SourceManager*)
 * Implement *JGrouper::Subject.source(id)* (using *edu.internet2.middleware.subject.provider.SourceManager*)
 * Implement *JGrouper::Subject::Source#to_json* (for "jgrouper-server")
-
-
-JJGrouper v0.0.4
----------------
 * Add child stem
 * Get child stems
 * Delete child stem
-* Update *JGrouper::Stem#to_json* as appropriate
-
-
-JGrouper v0.0.5
----------------
 * Add child group
 * Get child groups
 * Delete child group
-* Update *JGrouper::Group#to_json* as appropriate
-
-
-JGrouper v0.0.6
----------------
 * Add group member
 * Get group members
 * Remove group member
-* Update *JGrouper::Group#to_json* as appropriate
-
-
-JGrouper v0.0.7
----------------
 * Grant stem privileges
 * Get stem privileges
 * Revoke stem privileges
-* Update *JGrouper::Stem#to_json* as appropriate
-
-
-JGrouper v0.0.8
----------------
 * Grant group privileges
 * Get group privileges
 * Revoke group privileges
-* Update *JGrouper::Group#to_json* as appropriate
-
-
-Future
-------
-* Create command line executable (and remove embedded code from *lib/jgrouper.rb*)
 * Add privilege to stem and all children
 * Add privilege to all groups beneath a stem
 * JGrouper::TestCase
 * JGrouper::Subject::TestCase
 * JGrouper::Subject::TestCase
-
-# vim: syntax=markdown textwidth=0
+* Make *JGrouper::Shell* startup less chatty
+* Extract *JGrouper::Shell* to own gem?
+* Add *gsh* compatibility commands to *JGrouper::Shell*?
+* Should *JGrouper::Shell* be able to run scripts?
 

data/bin/jgrouper

@@ -0,0 +1,9 @@
+#!/usr/bin/env jruby
+
+# TODO Will this work post-installation?
+
+require_relative '../lib/jgrouper/shell'
+JGrouper::Shell.run!
+
+# vim: syntax=ruby
+

data/jgrouper.gemspec

@@ -16,7 +16,9 @@ Gem::Specification.new do |gem|
   gem.version       = JGrouper::VERSION
 
   gem.add_dependency 'json'
+  gem.add_dependency 'pry'
 
+  gem.add_development_dependency 'factory_girl', "~> 4.0"
   gem.add_development_dependency 'mocha'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rdoc'

data/lib/jgrouper/group_type/test_case.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+require 'test/unit'
+require 'factory_girl'
+
+
+module JGrouper #: :nodoc:
+  #
+  # = JGrouper::GroupType::TestCase - For testing JGrouper::GroupType
+  #
+  class GroupType::TestCase < Test::Unit::TestCase
+
+    def grouper_type
+      FactoryBuild :jgrouper_grouper_tyype
+    end
+
+    def jgrouper_type_as_json
+      FactoryGirl.attributes_for(:jgrouper_type).to_json
+    end
+
+  end
+end
+

data/lib/jgrouper/group_type.rb

@@ -16,6 +16,10 @@ module JGrouper # :nodoc:
     #
     # Find all group types.
     #
+    #    group_types = JGrouper::GroupType.all do |group_type|
+    #      ...
+    #    end
+    #
     def self.all
       group_types = Java::EduInternet2MiddlewareGrouper::GroupTypeFinder.findAll.collect { |gt| from_grouper gt }
       group_types.each { |_| yield _ } if block_given?
@@ -33,9 +37,22 @@ module JGrouper # :nodoc:
       group_type
     end
 
+    #
+    # Delete group type.  Returns +false+ on failure.
+    #
+    #    JGrouper::GroupType.delete(name)
+    #
+    def self.delete(name)
+      group_type = find(name)
+      return false if group_type.nil?
+      group_type.delete
+    end
+
     #
     # Delete group type.  Sets +error+ and returns +false+ on failure.
     #
+    #     group_type.delete
+    #
     def delete
       begin
         @grouper_group_type.delete GrouperSession.startRootSession # XXX How to handle sessions?
@@ -49,6 +66,8 @@ module JGrouper # :nodoc:
     #
     # Find a group type by name.
     #
+    #    group_type = JGrouper::GroupType.find(name)
+    #
     def self.find(name)
       group_type = from_grouper Java::EduInternet2MiddlewareGrouper::GroupTypeFinder.find(name, false)
       yield group_type if block_given?

data/lib/jgrouper/shell.rb

@@ -0,0 +1,75 @@
+require_relative '../jgrouper'
+
+require 'pry'
+
+module JGrouper # :nodoc:
+  #
+  # = JGrouper::Shell - JGrouper interactive shell
+  #
+  # == Usage
+  #
+  #   # Launch
+  #   % jgrouper
+  #
+  # === Group Types
+  #
+  # Any JGrouper::GroupType methods, such as:
+  #
+  #   JGrouper::Shell:0> group_type.all
+  #
+  # === Stems
+  #
+  # Any JGrouper::Stem methods, such as:
+  #
+  #   JGrouper::Shell:0> stem.root_stem
+  #
+  # === Subjects
+  #
+  # Any JGrouper::Subject methods, such as:
+  #
+  #   JGrouper::Shell:0> subject.root_subject
+  #
+  class Shell
+
+    def initialize
+      yield self if block_given?
+      self
+    end
+
+    #
+    # Access JGrouper::GroupType commands
+    #
+    def group_type
+      JGrouper::GroupType
+    end
+
+    #
+    # Start JGrouper shell
+    #
+    def self.run!
+      JGrouper.home ENV['GROUPER_HOME'] if ENV['GROUPER_HOME']
+      shell = new do |shell|
+        Pry.start shell,
+                  :prompt => [ proc { |obj, nest_level| "#{obj.class.name}:#{nest_level}> " },
+                               proc { "> " }
+                             ]
+      end
+    end
+
+    #
+    # Access JGrouper::Stem commands
+    #
+    def stem
+      JGrouper::Stem
+    end
+
+    #
+    # Access JGrouper::Subject commands
+    #
+    def subject
+      JGrouper::Subject
+    end
+
+  end
+end
+

data/lib/jgrouper/stem/test_case.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+require 'test/unit'
+require 'factory_girl'
+
+
+module JGrouper #: :nodoc:
+  #
+  # = JGrouper::Stem::TestCase - For testing JGrouper::Stem
+  #
+  class Stem::TestCase < Test::Unit::TestCase
+
+    def grouper_root_stem
+      FactoryGirl.build :grouper_root_stem
+    end
+
+    def grouper_stem(name)
+      case name.to_sym
+      when :foo
+        FactoryGirl.build :grouper_stem_foo
+      when :"foo:bar"
+        FactoryGirl.build :grouper_stem_foo_bar
+      end
+      raise ArgumentError, "invalid name: #{name}"
+    end
+
+    def root_stem_as_json
+      FactoryGirl.attributes_for(:root_stem).to_json
+    end
+
+  end
+end
+

data/lib/jgrouper/stem.rb

@@ -12,6 +12,64 @@ module JGrouper # :nodoc:
       self
     end
 
+    #
+    # Create child stem (along with missing intermediaries).
+    #
+    #   # Create child stem 'foo'
+    #   child = stem.add_stem 'foo'
+    #
+    #   # Create child stem 'foo' with display name of 'Foo'
+    #   child = stem.add_stem 'foo', 'Foo'
+    #
+    #   # Create child stem 'foo:bar:baz' along with any missing intermediaries
+    #   child = stem.add_stem 'foo:bar:baz'
+    #
+    #
+    def add_stem( name, display_name = nil )
+      # TODO What if names.size != display_names.size?
+      names         = name.split ':'
+      display_names = display_name.nil? ? names.clone.split : display_name.split(':')
+
+      name, display_name = names.shift, display_names.shift
+
+      child = JGrouper::Stem.find self.name.empty? ? name : [ self.name, name ].join(':') # TODO Yuck
+      child = JGrouper::Stem.from_grouper @grouper_stem.addChildStem(name, display_name) if child.nil?
+
+      # TODO What if child can't be created?
+      child = child.add_stem( names.join(':'), display_names.join(':') ) unless names.empty?
+      yield child if block_given?
+      child
+    end
+
+    #
+    # Create stem (along with missing intermediaries).
+    #
+    #   # Create top-level 'foo' stem
+    #   stem = JGrouper::Stem.create 'foo'
+    #
+    #   # Create top-level 'foo' stem with display name of 'Foo'
+    #   stem = JGrouper::Stem.create 'foo', 'Foo'
+    #
+    #   # Create 'foo:bar:baz' stem, along with any missing intermediaries
+    #   stem = JGrouper::Stem.create 'foo:bar:baz'
+    #
+    def self.create( name, display_name = nil )
+      stem = root.add_stem name, display_name
+      yield stem if block_given?
+      stem
+    end
+
+    #
+    # Find stem by name or returns +nil+.
+    #
+    #   stem = JGrouper::Stem.find(name)
+    #   
+    def self.find(name)
+      stem = from_grouper StemFinder.findByName( GrouperSession.startRootSession, name, false ) # XXX How to handle sessions?
+      yield stem if block_given?
+      stem
+    end
+
     #
     # Generate JGrouper::Stem instance from JSON by calling +JSON.parse(json_string)+
     # 
@@ -26,9 +84,9 @@ module JGrouper # :nodoc:
     #
     # Return root stem.
     #
-    #   root_stem = JGrouper::Stem.root_stem
+    #   root_stem = JGrouper::Stem.root
     #
-    def self.root_stem
+    def self.root
       stem = from_grouper StemFinder.findRootStem( GrouperSession.startRootSession ) # XXX How to handle sessions?
       yield stem if block_given?
       stem
@@ -57,6 +115,7 @@ module JGrouper # :nodoc:
     private
 
     def self.from_grouper(grouper)
+      return nil if grouper.nil?
       new do |stem|
         stem.instance_variable_set :@grouper_stem, grouper # XXX Is this even needed?
 

data/lib/jgrouper/subject/test_case.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+require 'test/unit'
+require 'factory_girl'
+
+
+module JGrouper #: :nodoc:
+  #
+  # = JGrouper::Subject::TestCase - For testing JGrouper::Subject
+  #
+  class Subject::TestCase < Test::Unit::TestCase
+
+    def grouper_root_subject
+      FactoryGirl.build :grouper_root_subject
+    end
+
+    def root_subject_as_json
+      FactoryGirl.attributes_for(:root_subject).to_json
+    end
+
+  end
+end
+

data/lib/jgrouper/subject.rb

@@ -27,9 +27,9 @@ module JGrouper #: :nodoc:
     #
     # Return root subject.
     #
-    #   root_subject = JGrouper::Subject.root_subject
+    #   root_subject = JGrouper::Subject.root
     #
-    def self.root_subject
+    def self.root
       subject = from_grouper SubjectFinder.findRootSubject
       yield subject if block_given?
       subject

data/lib/jgrouper/version.rb

@@ -1,3 +1,3 @@
 module JGrouper
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/jgrouper.rb

@@ -20,7 +20,7 @@ require_relative 'jgrouper/version'
 # === Subjects
 #
 #   # Find root subject
-#   JGrouper::Subject.root_subject do |subject|
+#   JGrouper::Subject.root do |subject|
 #     subject.id     # Subject identifier
 #     subject.name   # Subject name
 #     subject.source # Subject source identifier
@@ -30,12 +30,21 @@ require_relative 'jgrouper/version'
 # === Stems
 #
 #   # Find root stem
-#   JGrouper::Stem.root_stem do |stem|
+#   JGrouper::Stem.root do |stem|
 #     stem.display_name # Stem display name
 #     stem.name         # Stem name
 #     stem.uuid         # Stem UUID
 #   end
 #
+#   # Find by name
+#   stem = JGrouper::Stem.find(name) { |stem| ... }
+#
+#   # Create stem(s)
+#   stem = JGrouper::Stem.create 'foo:bar:baz', 'Foo:Bar:Baz'
+#
+#   # Create child stem(s)
+#   child = stem.create 'foo:bar:baz'
+#
 # === Group Types
 #
 #   # Create group type
@@ -53,6 +62,8 @@ require_relative 'jgrouper/version'
 #   JGrouper::GroupType.find(name)
 #
 #   # Delete group type
+#   JGrouper::GroupType.delete(name)
+#   # ... or ...
 #   JGrouper::GroupType.find(name).delete
 #
 # == Installation
@@ -87,7 +98,7 @@ require_relative 'jgrouper/version'
 #
 # == See Also
 #
-# https://github.com/blairc/jgrouper-server, http://grouper.internet2.edu
+# JGrouper::Shell, https://github.com/blairc/jgrouper-server, http://grouper.internet2.edu
 #
 module JGrouper
 
@@ -115,11 +126,3 @@ module JGrouper
 
 end
 
-
-# XXX Extract! Remove! Whatever!
-if __FILE__ == $0
-  JGrouper.home ENV['GROUPER_HOME'] if ENV['GROUPER_HOME']
-  JGrouper::Subject.root_subject { |subject| puts "root_subject => #{subject}" }
-  JGrouper::Stem.root_stem       { |stem|    puts "root_stem => #{stem}"       }
-end
-

data/test/factories.rb

@@ -0,0 +1,64 @@
+# encoding: utf-8
+
+require 'factory_girl'
+
+
+FactoryGirl.define do
+  # Group Types
+  factory :jgrouper_type, class: OpenStruct do
+    json_class JGrouper::GroupType
+    name       'jgrouper'
+    uuid       'some-fake-uuid'
+  end
+
+  factory :jgrouper_grouper_type, class: OpenStruct do
+    getName 'jgrouper'
+    getUuid 'some-fake-uuid'
+  end
+
+
+  # Stems
+  factory :grouper_root_stem, class: OpenStruct do
+    getDisplayName ''
+    getName        ''
+    getUuid        'some-fake-uuid'
+  end
+
+  factory :grouper_stem_foo, class: OpenStruct do
+    getDisplayName 'foo'
+    getName        'foo'
+    getUuid        'stem-foo'
+  end
+
+  factory :grouper_stem_foo_bar, class: OpenStruct do
+    getDisplayName 'foo:Bar'
+    getName        'foo:bar'
+    getUuid        'stem-foo-bar'
+  end
+
+  factory :root_stem, class: OpenStruct do
+    json_class   JGrouper::Stem
+    display_name ''
+    name         ''
+    uuid         'some-fake-uuid'
+  end
+
+
+  # Subjects
+  factory :grouper_root_subject, class: OpenStruct do
+    getId    'GrouperSystem'
+    getName  'GrouperSysAdmin'
+    sourceId 'g:isa'
+    typeName 'application' 
+  end
+
+  factory :root_subject, class: OpenStruct do
+    json_class JGrouper::Subject
+    id         'GrouperSystem'
+    name       'GrouperSysAdmin'
+    source     'g:isa'
+    type       'application'
+  end
+
+end
+

data/test/helper.rb

@@ -7,6 +7,7 @@ require 'mocha'
 require 'ostruct'
 
 require_relative '../lib/jgrouper'
+require_relative 'factories'
 
 require 'simplecov'
 SimpleCov.start

data/test/test_group_type.rb

@@ -3,22 +3,11 @@
 require_relative 'helper'
 
 
-# TODO JGrouper::GroupType::TestCase
-class TestGroupType < Test::Unit::TestCase
-
-  def setup
-    @json = { 'json_class' => JGrouper::GroupType,
-              'name'       => 'jgrouper',
-              'uuid'       => 'some-fake-uuid'
-            }.to_json
-    @type = OpenStruct.new :getName => 'jgrouper',
-                           :getUuid => 'some-fake-uuid'
-  end
-
+class JGrouper::GroupType::TestCase
 
   def test_mocked_create_group_type
     Java::EduInternet2MiddlewareGrouper::GrouperSession.expects(:startRootSession).returns true
-    Java::EduInternet2MiddlewareGrouper::GroupType.expects(:createType).returns @type
+    Java::EduInternet2MiddlewareGrouper::GroupType.expects(:createType).returns grouper_type
     JGrouper::GroupType.create('jgrouper') do |group_type|
       assert_not_nil group_type
       assert         group_type.kind_of? JGrouper::GroupType
@@ -29,12 +18,12 @@ class TestGroupType < Test::Unit::TestCase
 
   def test_mocked_group_type_to_json
     Java::EduInternet2MiddlewareGrouper::GrouperSession.expects(:startRootSession).returns true
-    Java::EduInternet2MiddlewareGrouper::GroupType.expects(:createType).returns @type
-    assert_equal @json, JGrouper::GroupType.create('jgrouper').to_json
+    Java::EduInternet2MiddlewareGrouper::GroupType.expects(:createType).returns grouper_type
+    assert_equal jgrouper_type_as_json, JGrouper::GroupType.create('jgrouper').to_json
   end
 
   def test_group_type_from_json
-    group_type = JSON.parse @json
+    group_type = JSON.parse jgrouper_type_as_json
     assert_not_nil group_type
     assert         group_type.kind_of? JGrouper::GroupType
     assert_equal   'jgrouper',       group_type.name
@@ -42,7 +31,7 @@ class TestGroupType < Test::Unit::TestCase
   end
 
   def test_mocked_find_all
-    Java::EduInternet2MiddlewareGrouper::GroupTypeFinder.expects(:findAll).returns [ @type ]
+    Java::EduInternet2MiddlewareGrouper::GroupTypeFinder.expects(:findAll).returns [ grouper_type ]
     group_types = JGrouper::GroupType.all do |group_type|
       assert_not_nil group_type
       assert         group_type.kind_of? JGrouper::GroupType
@@ -57,7 +46,7 @@ class TestGroupType < Test::Unit::TestCase
   end
 
   def test_mocked_find_by_name
-    Java::EduInternet2MiddlewareGrouper::GroupTypeFinder.expects(:find).returns @type
+    Java::EduInternet2MiddlewareGrouper::GroupTypeFinder.expects(:find).returns grouper_type
     JGrouper::GroupType.find('base') do |group_type|
       assert_not_nil  group_type
       assert          group_type.kind_of? JGrouper::GroupType
@@ -71,22 +60,47 @@ class TestGroupType < Test::Unit::TestCase
     assert_nil JGrouper::GroupType.find('jgrouper')
   end
 
-  def test_mocked_delete
+  def test_mocked_instance_delete
+    type = grouper_type
+
     Java::EduInternet2MiddlewareGrouper::GrouperSession.expects(:startRootSession).returns true
-    Java::EduInternet2MiddlewareGrouper::GroupTypeFinder.expects(:find).returns @type
-    @type.expects(:delete).returns(nil)
+    Java::EduInternet2MiddlewareGrouper::GroupTypeFinder.expects(:find).returns type
+    type.expects(:delete).returns(nil)
+
     assert JGrouper::GroupType.find('jgrouper').delete
   end
 
-  def test_mocked_delete_failure
+  def test_mocked_instance_delete_failure
+    type = grouper_type
+
     Java::EduInternet2MiddlewareGrouper::GrouperSession.expects(:startRootSession).returns true
-    Java::EduInternet2MiddlewareGrouper::GroupTypeFinder.expects(:find).returns @type
-    @type.expects(:delete).raises(Exception, 'Mocked Exception')
+    Java::EduInternet2MiddlewareGrouper::GroupTypeFinder.expects(:find).returns type
+    type.expects(:delete).raises(Exception, 'Mocked Exception')
 
     group_type = JGrouper::GroupType.find('jgrouper')
     assert_equal false,              group_type.delete
     assert_equal 'Mocked Exception', group_type.error.to_s
   end
 
+  def test_mocked_class_delete
+    type = grouper_type
+
+    Java::EduInternet2MiddlewareGrouper::GrouperSession.expects(:startRootSession).returns true
+    Java::EduInternet2MiddlewareGrouper::GroupTypeFinder.expects(:find).returns type
+    type.expects(:delete).returns(nil)
+
+    assert JGrouper::GroupType.delete('jgrouper')
+  end
+
+  def test_mocked_class_delete_failure
+    type = grouper_type
+
+    Java::EduInternet2MiddlewareGrouper::GrouperSession.expects(:startRootSession).returns true
+    Java::EduInternet2MiddlewareGrouper::GroupTypeFinder.expects(:find).returns type
+    type.expects(:delete).raises(Exception, 'Mocked Exception')
+
+    assert_equal false, JGrouper::GroupType.delete('jgrouper')
+  end
+
 end
 

data/test/test_stem.rb

@@ -3,25 +3,13 @@
 require_relative 'helper'
 
 
-# TODO JGrouper::Stem::TestCase
-class TestStem < Test::Unit::TestCase
-
-  def setup
-    @json = { 'json_class'   => JGrouper::Stem,
-              'display_name' => '',
-              'name'         => '',
-              'uuid'         => 'some-fake-uuid'
-            }.to_json
-    @root = OpenStruct.new :getDisplayName => '',
-                           :getName        => '',
-                           :getUuid        => 'some-fake-uuid'
-  end
-
+class JGrouper::Stem::TestCase
 
   def test_mocked_find_root_stem
     Java::EduInternet2MiddlewareGrouper::GrouperSession.expects(:startRootSession).returns true
-    Java::EduInternet2MiddlewareGrouper::StemFinder.expects(:findRootStem).returns @root
-    JGrouper::Stem.root_stem do |stem|
+    Java::EduInternet2MiddlewareGrouper::StemFinder.expects(:findRootStem).returns grouper_root_stem
+
+    JGrouper::Stem.root do |stem|
       assert_not_nil stem
       assert         stem.kind_of? JGrouper::Stem
       assert_equal   '',               stem.display_name
@@ -32,12 +20,13 @@ class TestStem < Test::Unit::TestCase
 
   def test_mocked_stem_to_json
     Java::EduInternet2MiddlewareGrouper::GrouperSession.expects(:startRootSession).returns true
-    Java::EduInternet2MiddlewareGrouper::StemFinder.expects(:findRootStem).returns @root
-    assert_equal @json, JGrouper::Stem.root_stem.to_json
+    Java::EduInternet2MiddlewareGrouper::StemFinder.expects(:findRootStem).returns grouper_root_stem
+
+    assert_equal root_stem_as_json, JGrouper::Stem.root.to_json
   end
 
   def test_stem_from_json
-    stem = JSON.parse @json
+    stem = JSON.parse root_stem_as_json
     assert_not_nil stem
     assert         stem.kind_of? JGrouper::Stem
     assert_equal   '',               stem.display_name
@@ -45,5 +34,57 @@ class TestStem < Test::Unit::TestCase
     assert_equal   'some-fake-uuid', stem.uuid
   end
 
+  def test_mocked_find_by_name
+    Java::EduInternet2MiddlewareGrouper::GrouperSession.expects(:startRootSession).returns true
+    Java::EduInternet2MiddlewareGrouper::StemFinder.expects(:findByName).returns grouper_stem('foo:bar')
+
+    JGrouper::Stem.find('foo:bar') do |stem|
+      assert_not_nil stem
+      assert         stem.kind_of? JGrouper::Stem
+      assert_equal   'foo',      stem.display_name
+      assert_equal   'foo',      stem.name
+      assert_equal   'stem-foo', stem.uuid
+    end
+  end
+
+  def test_mocked_find_by_name_failure
+    Java::EduInternet2MiddlewareGrouper::GrouperSession.expects(:startRootSession).returns true
+    Java::EduInternet2MiddlewareGrouper::StemFinder.expects(:findByName).returns nil
+
+    assert_nil JGrouper::Stem.find('foo:bar')
+  end
+
+  def test_mocked_create_stem_without_display_name_and_without_intermediaries
+    root_stem = grouper_root_stem
+
+    JGrouper::Stem.expects(:root).returns root_stem
+    root_stem.expects(:add_stem).returns JGrouper::Stem.send( :from_grouper, grouper_stem(:foo) )
+
+    JGrouper::Stem.create('foo') do |stem|
+      assert_not_nil  stem
+      assert          stem.kind_of? JGrouper::Stem
+      assert_equal    'foo',  stem.display_name
+      assert_equal    'foo',  stem.name
+      assert_not_nil  stem.uuid
+    end 
+  end
+
+  def test_mocked_create_stem_with_display_name_and_with_intermediaries
+    root_stem = grouper_root_stem
+    stem_foo  = grouper_stem :foo
+
+    JGrouper::Stem.expects(:root).returns root_stem
+    root_stem.expects(:add_stem).returns stem
+    stem.expects(:add_stem).returns JGrouper::Stem.send( :from_grouper, grouper_stem('foo:bar') )
+
+    JGrouper::Stem.create('foo:bar', 'foo:Bar') do |stem|
+      assert_not_nil  stem
+      assert          stem.kind_of? JGrouper::Stem
+      assert_equal    'foo:Bar',  stem.display_name
+      assert_equal    'foo:bar',  stem.name
+      assert_not_nil  stem.uuid
+    end 
+  end
+
 end
 

data/test/test_subject.rb

@@ -3,26 +3,11 @@
 require_relative 'helper'
 
 
-# TODO JGrouper::Subject::TestCase
-class TestSubject < Test::Unit::TestCase
-
-  def setup
-    @json = { 'json_class' => JGrouper::Subject,
-              'id'         => 'GrouperSystem',
-              'name'       => 'GrouperSysAdmin',
-              'source'     => 'g:isa',
-              'type'       => 'application'
-            }.to_json
-    @root = OpenStruct.new :getId    => 'GrouperSystem',
-                           :getName  => 'GrouperSysAdmin',
-                           :sourceId => 'g:isa',
-                           :typeName => 'application'
-  end
-
+class JGrouper::Subject::TestCase
 
   def test_mocked_find_root_subject
-    Java::EduInternet2MiddlewareGrouper::SubjectFinder.expects(:findRootSubject).returns @root
-    JGrouper::Subject.root_subject do |subject|
+    Java::EduInternet2MiddlewareGrouper::SubjectFinder.expects(:findRootSubject).returns grouper_root_subject
+    JGrouper::Subject.root do |subject|
       assert_not_nil subject
       assert         subject.kind_of? JGrouper::Subject
       assert_equal   'GrouperSystem',   subject.id 
@@ -33,12 +18,12 @@ class TestSubject < Test::Unit::TestCase
   end
 
   def test_mocked_subject_to_json
-    Java::EduInternet2MiddlewareGrouper::SubjectFinder.expects(:findRootSubject).returns @root
-    assert_equal @json, JGrouper::Subject.root_subject.to_json
+    Java::EduInternet2MiddlewareGrouper::SubjectFinder.expects(:findRootSubject).returns grouper_root_subject
+    assert_equal root_subject_as_json, JGrouper::Subject.root.to_json
   end
 
   def test_subject_from_json
-    subject = JSON.parse @json
+    subject = JSON.parse root_subject_as_json
     assert_not_nil subject
     assert         subject.kind_of? JGrouper::Subject
     assert_equal   'GrouperSystem',   subject.id 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jgrouper
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -27,6 +27,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -110,22 +142,30 @@ dependencies:
 description: JRuby wrapper around the Internet2 Grouper API
 email:
 - blair.christensen@gmail.com
-executables: []
+executables:
+- jgrouper
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- HISTORY.md
 - LICENSE
 - README.rdoc
 - Rakefile
 - TODO.md
+- bin/jgrouper
 - jgrouper.gemspec
 - lib/jgrouper.rb
 - lib/jgrouper/group_type.rb
+- lib/jgrouper/group_type/test_case.rb
+- lib/jgrouper/shell.rb
 - lib/jgrouper/stem.rb
+- lib/jgrouper/stem/test_case.rb
 - lib/jgrouper/subject.rb
+- lib/jgrouper/subject/test_case.rb
 - lib/jgrouper/version.rb
+- test/factories.rb
 - test/helper.rb
 - test/test_group_type.rb
 - test/test_stem.rb
@@ -155,6 +195,7 @@ signing_key:
 specification_version: 3
 summary: JRuby wrapper around the Internet2 Grouper API
 test_files:
+- test/factories.rb
 - test/helper.rb
 - test/test_group_type.rb
 - test/test_stem.rb