Changeset 207 for ruby

Timestamp:

Aug 16, 2009, 7:14:16 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #54

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/data_structures/item_structure.rb (modified) (2 diffs)
• spec/lib/open_ehr/rm/data_structures/item_structure/item_list_spec.rb (modified) (1 diff)
• spec/lib/open_ehr/rm/data_structures/item_structure/item_table_spec.rb (modified) (1 diff)

ruby/branches/0.5/lib/open_ehr/rm/data_structures/item_structure.rb

@@ -57 +57 @@
 
           def ith_item(i)
-            return @items[i]
+            raise ArgumentError, 'index invalid' if i <= 0
+            return @items[i - 1]
           end
 
@@ -82 +83 @@
             end
           end
+
+          def column_count
+            if @rows.nil?
+              return 0
+            else
+              return @rows[0].items.count
+            end
+          end
+
+          def row_names
+            if @rows.nil?
+              return []
+            else
+              return @rows.collect{|r| r.name}
+            end
+          end
+
+          def column_names
+            if @rows.nil?
+              return []
+            else
+              return @rows[0].items.collect{|i| i.name}
+            end
+          end
+
+          def ith_row(i)
+            raise ArgumentError, 'invalid index' if i<=0 or i>@rows.size
+            if @rows.nil?
+              return []
+            else
+              return @rows[i - 1]
+            end
+          end
         end
       end # of ItemStructure

ruby/branches/0.5/spec/lib/open_ehr/rm/data_structures/item_structure/item_list_spec.rb

@@ -40 +40 @@
 
   it 'retrieve the ith item with number' do
-    @item_list.ith_item(1).name.value.should == 'two'
+    @item_list.ith_item(1).name.value.should == 'one'
   end
 

ruby/branches/0.5/spec/lib/open_ehr/rm/data_structures/item_structure/item_table_spec.rb

@@ -32 +32 @@
   end
 
-  it 'row count should be 2' do
+  it 's row count should be 2' do
     @item_table.row_count.should be_equal 2
   end
 
-  it 'column_count should be 3' do
+  it 's row_count should be 0 when rows are nil' do
+    @item_table.rows = nil
+    @item_table.row_count.should be_equal 0
+  end
+
+  it 's column_count should be 3' do
     @item_table.column_count.should be_equal 3
   end
 
-  it 'row_names should be cluster cluster' do
+
+  it 's row_names should be cluster cluster' do
     @item_table.row_names.should == %w{cluster cluster}.collect{|n| DvText.new(n)}
   end
+
+  it 's row_names should be empty when items are nil' do
+    @item_table.rows = nil
+    @item_table.row_names.should == []
+  end
+
+  it 's column_names should one two three' do
+    @item_table.column_names.should == %w{one two three}.collect{|s| DvText.new(s)}
+  end
+
+  it 's column_names should empty when items aer nil' do
+    @item_table.rows = nil
+    @item_table.column_names.should == []
+  end
+
+  it 's ith_row(integer) should be ith row' do
+    @item_table.ith_row(2).items[1].name.value.should == 'five'
+  end
+
+  it 'should be invalid index under 0' do
+    lambda {@item_table.ith_row(0) }.should raise_error(ArgumentError)
+  end
 end