Changeset 101 for ruby/trunk

Timestamp:

Sep 2, 2008, 11:42:37 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

fixed #39

Location:

ruby/trunk/lib/models

Files:

• rm/support/identification.rb (modified) (4 diffs)
• tests/test_reference_model.rb (modified) (1 diff)

ruby/trunk/lib/models/rm/support/identification.rb

@@ -177 +177 @@
           def type=(type)
             parties = ['PERSON', 'ORGANISATION', 'GROUP', 'AGENT', 'ROLE','PARTY', 'ACTOR']
-            raise ArgumentError, 'type invalid' if !parties.include? type
+            raise ArgumentError, 'type invalid' unless parties.include? type
             @type = type
           end
@@ -184 +184 @@
         class Access_Group_Ref < Object_Ref
           def type=(type)
-            raise ArgumentError, 'type invalid' if !(type == 'ACCESS_GROUP')
+            raise ArgumentError, 'type invalid' unless type == 'ACCESS_GROUP'
             @type = type
           end
@@ -203 +203 @@
             raise ArgumentError, 'value invalid' if value.nil? or value.empty?
             @value = value
+            @trunk_version = @branch_number = @branch_version = nil
             (trunk_version, branch_number, branch_version) = value.split '.'
             self.trunk_version = trunk_version
@@ -210 +211 @@
 
           def trunk_version=(trunk_version)
-            raise ArgumentError, 'trunk_version invalid' if trunk_version.nil? and trunk_version.to_i >= 0
+            raise ArgumentError, 'trunk_version invalid' if trunk_version.nil? and !trunk_version.to_i >= 1
             @trunk_version = trunk_version
+            set_value
           end
 
           def branch_number=(branch_number)
-            raise ArgumentError, 'branch number invalid' if branch_number.nil?
+            raise ArgumentError, 'branch number invalid' unless branch_number.nil? or branch_number.to_i >= 1
             @branch_number = branch_number
+            set_value
           end
 
           def branch_version=(branch_version)
-            raise ArgumentError, 'branch version invalid' if branch_version.nil?
+            raise ArgumentError, 'branch version invalid' if (!branch_version.nil? and !( branch_version.to_i >= 1)) or (!branch_version.nil? and @branch_number.nil?)
             @branch_version = branch_version
+            set_value
           end
           def is_branch?
-            !@branch_version.nil?
-          end
+            !@branch_version.nil? and !@branch_number.nil?
+          end
+
+          def is_first?
+            trunk_version == '1'
+          end
+
           private
-          def value_valid
-            
+          def set_value
+            @value = trunk_version
+            @value = @value + '.' + @branch_number unless @branch_number.nil?
+            @value = @value + '.' + @branch_version unless @branch_version.nil?
           end
         end

ruby/trunk/lib/models/tests/test_reference_model.rb

@@ -396 +396 @@
     assert_equal '2', @version_tree_id.branch_number
     assert_equal '3', @version_tree_id.branch_version
+    assert @version_tree_id.is_first?
+    assert @version_tree_id.is_branch?
+    assert_nothing_raised(Exception){@version_tree_id.value = '2'}
+    assert_equal '2', @version_tree_id.trunk_version
+    assert !@version_tree_id.is_first?
+    assert !@version_tree_id.is_branch?
+    assert_nil @version_tree_id.branch_number
+    assert_nil @version_tree_id.branch_version
+    assert_raise(ArgumentError){@version_tree_id.branch_version = '5'}
   end
 end