ols 0.3.0 → 0.3.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.3.1 2011-11-08
+
+* Renamed the OLS::Term.detach_* methods to much more sensible names.
+
 === 0.3.0 2011-11-08
 
 * Addition of new functions to deatch graphs from parents/children.

data/lib/ols/term.rb

@@ -401,44 +401,50 @@ module OLS
 
     # Remove the children from this ontology graph.
     #
-    # @see #detach_parents
-    # @since 0.3.0
-    def detach_parents!
-      self.really_detach_parents!
+    # @see #remove_children
+    # @since 0.3.1
+    def remove_children!
+      self.really_remove_children!
     end
 
     # Returns a copy of this ontology term object with the children removed.
     #
     # @return [OLS::Term] A copy of this term with the children removed
     #
-    # @see #detach_parents!
-    # @since 0.3.0
-    def detach_parents
+    # @see #remove_children!
+    # @since 0.3.1
+    def remove_children
       copy = self.dup
-      copy.really_detach_parents!
+      copy.really_remove_children!
       copy
     end
 
+    alias :detach_parents! :remove_children!
+    alias :detach_parents :remove_children
+
     # Removes the parents from this ontology graph.
     #
-    # @see #detach_children
-    # @since 0.3.0
-    def detach_children!
-      self.really_detach_children!
+    # @see #remove_parents
+    # @since 0.3.1
+    def remove_parents!
+      self.really_remove_parents!
     end
 
     # Returns a copy of this ontology term object with the parents removed.
     #
     # @return [OLS::Term] A copy of this term with the parents removed
     #
-    # @see #detach_children!
-    # @since 0.3.0
-    def detach_children
+    # @see #remove_parents!
+    # @since 0.3.1
+    def remove_parents
       copy = self.dup
-      copy.really_detach_children!
+      copy.really_remove_parents!
       copy
     end
 
+    alias :detach_children! :remove_parents!
+    alias :detach_children :remove_parents
+
     # Pretty prints the (sub)graph rooted at this ontology term.
     #
     # @param [Number] level The indentation level (4 spaces) to start with.
@@ -618,23 +624,23 @@ module OLS
       self.flush_graph( [self.term_id] + self.all_parent_ids + self.all_child_ids )
     end
 
-    # Utility function for #detach_parents and #detach_parents! that
+    # Utility function for #remove_children and #remove_children! that
     # actually does the work of removing children.
     #
-    # @see #detach_parents
-    # @see #detach_parents!
-    def really_detach_parents!
+    # @see #remove_children
+    # @see #remove_children!
+    def really_remove_children!
       self.children = []
       self.lock_children
       self.flush_graph( [self.term_id] + self.all_parent_ids )
     end
 
-    # Utility function for #detach_children and #detach_children! that
+    # Utility function for #remove_parents and #remove_parents! that
     # actually does the work of removing parents.
     #
-    # @see #detach_children
-    # @see #detach_children!
-    def really_detach_children!
+    # @see #remove_parents
+    # @see #remove_parents!
+    def really_remove_parents!
       self.parents = []
       self.lock_parents
       self.flush_graph( [self.term_id] + self.all_child_ids )
@@ -675,7 +681,7 @@ module OLS
       names_to_merge = names2 - names1
       names_to_merge.each do |name|
         # puts "--- MERGING #{name} INTO #{graph1.term_id} ---"
-        new_child = graph2[name].detach_children
+        new_child = graph2[name].remove_parents
 
         # replace the new_child's graph
         graph1_graph             = graph1.graph

data/lib/ols/version.rb

@@ -2,5 +2,5 @@
 
 module OLS
   # OLS::VERSION - The OLS gem version
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/test_ols_term.rb

@@ -281,7 +281,7 @@ class OLSTermTest < Test::Unit::TestCase
         #                 |---+ EMAP:3018
 
         @emap_term.focus_graph!
-        @emap_term.detach_parents!
+        @emap_term.remove_children!
 
         assert_equal 'EMAP:3018', @emap_term.term_id
         assert_equal 'EMAP:0', @emap_term.root.term_id
@@ -290,7 +290,7 @@ class OLSTermTest < Test::Unit::TestCase
 
         # Test the copy variant of this function
         @mp_term.focus_graph!
-        new_term = @mp_term.detach_parents
+        new_term = @mp_term.remove_children
 
         assert new_term.object_id != @mp_term.object_id
         assert new_term.is_leaf?
@@ -321,7 +321,7 @@ class OLSTermTest < Test::Unit::TestCase
         #         |---> EMAP:3021
 
         @emap_term.focus_graph!
-        @emap_term.detach_children!
+        @emap_term.remove_parents!
 
         assert_equal 'EMAP:3018', @emap_term.term_id
         assert @emap_term.is_root?
@@ -330,7 +330,7 @@ class OLSTermTest < Test::Unit::TestCase
 
         # Test the copy variant of this function
         @mp_term.focus_graph!
-        new_term = @mp_term.detach_children
+        new_term = @mp_term.remove_parents
 
         assert new_term.object_id != @mp_term.object_id
         assert_equal 96, new_term.size

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ols
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &2157089040 !ruby/object:Gem::Requirement
+  requirement: &2157249240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157089040
+  version_requirements: *2157249240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157088600 !ruby/object:Gem::Requirement
+  requirement: &2157248800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157088600
+  version_requirements: *2157248800
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2157088180 !ruby/object:Gem::Requirement
+  requirement: &2157248380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157088180
+  version_requirements: *2157248380
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2157087760 !ruby/object:Gem::Requirement
+  requirement: &2157247960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157087760
+  version_requirements: *2157247960
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2157087340 !ruby/object:Gem::Requirement
+  requirement: &2157247540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157087340
+  version_requirements: *2157247540
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2157086920 !ruby/object:Gem::Requirement
+  requirement: &2157247120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157086920
+  version_requirements: *2157247120
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2157086500 !ruby/object:Gem::Requirement
+  requirement: &2157246700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157086500
+  version_requirements: *2157246700
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2157086080 !ruby/object:Gem::Requirement
+  requirement: &2157246280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157086080
+  version_requirements: *2157246280
 description: ! "\n    OLS provides a simple interface to the EBI's Ontology Lookup
   Service (http://www.ebi.ac.uk/ontology-lookup/).\n    It provides an easy lookup
   of ontology terms and automagically builds up ontology trees for you.\n  "