open_ehr 0.9.4 → 0.9.5

data/lib/open_ehr/parser/shared_token_grammar.tt

@@ -1,4 +1,5 @@
 require 'open_ehr/assumed_library_types'
+require 'open_ehr/rm/data_types/quantity'
 
 module OpenEHR
   module Parser
@@ -45,7 +46,7 @@ module OpenEHR
           def value
             true
           end
-        }
+          }
       / SYM_FALSE {
           def value
             false
@@ -71,7 +72,7 @@ module OpenEHR
       end
 
       rule integer_value
-        ('+' / '-')? V_INTEGER {
+        [+-]? V_INTEGER '' {
           def value
             text_value.to_i
           end
@@ -79,7 +80,7 @@ module OpenEHR
       end
 
       rule integer_list_value
-        integer_value (',' white_space more_i:(integer_value))* {
+        integer_value more_i:(',' white_space integer_value)+ {
           def value
             integers.map { |i| i.value }
           end
@@ -152,10 +153,10 @@ module OpenEHR
                   :lower_included => false)
           end
         }
-      / SYM_INTERVAL_DELIM SYM_GE integer_value SYM_INTERVAL_DELIM {
+      / SYM_INTERVAL_DELIM SYM_GE iv:integer_value SYM_INTERVAL_DELIM {
           def value
             OpenEHR::AssumedLibraryTypes::Interval.new(
-                  :lower => up.value,
+                  :lower => iv.value,
                   :upper_unbounded => true,
                   :lower_included => true)
           end
@@ -164,7 +165,7 @@ module OpenEHR
           def value
             OpenEHR::AssumedLibraryTypes::Interval.new(
                   :lower => val.value,
-                  :lower => val.value,
+                  :upper => val.value,
                   :upper_included => true,
                   :lower_included => true)
           end
@@ -180,7 +181,7 @@ module OpenEHR
       end
 
       rule real_list_value
-        real_value (',' white_space more_i:(real_value) '')* {
+        real_value  more_i:(',' white_space real_value)* {
           def value
             reals.map { |i| i.value }
           end
@@ -265,7 +266,7 @@ module OpenEHR
           def value
             OpenEHR::AssumedLibraryTypes::Interval.new(
                   :lower => val.value,
-                  :lower => val.value,
+                  :upper => val.value,
                   :upper_included => true,
                   :lower_included => true)
           end
@@ -323,9 +324,10 @@ module OpenEHR
       end
 
       rule date_value
-        V_ISO8601_EXTENDED_DATE '' {
+        ed:V_ISO8601_EXTENDED_DATE '' {
           def value
-            OpenEHR::AssumedLibraryTypes::ISO8601Date.new(V_ISO8601_EXTENDED_DATE.text_value)
+            ::OpenEHR::RM::DataTypes::Quantity::DateTime::DvDate.new(
+              :value => ed.text_value)
           end
         }
       end
@@ -340,7 +342,7 @@ module OpenEHR
             [date_value] + more_dates.elements.map {|d| d.date_value}
           end
         }
-      / date_value ',' SYM_LIST_CONTINUE {
+      / date_value ',' white_space SYM_LIST_CONTINUE {
           def value
             [date_value.value]
           end
@@ -404,10 +406,10 @@ module OpenEHR
                   :lower_included => false)
           end
         }
-      / SYM_INTERVAL_DELIM SYM_GE date_value SYM_INTERVAL_DELIM {
+      / SYM_INTERVAL_DELIM SYM_GE val:date_value SYM_INTERVAL_DELIM {
           def value
             OpenEHR::AssumedLibraryTypes::Interval.new(
-                  :lower => up.value,
+                  :lower => val.value,
                   :upper_unbounded => true,
                   :lower_included => true)
           end
@@ -416,7 +418,7 @@ module OpenEHR
           def value
             OpenEHR::AssumedLibraryTypes::Interval.new(
                   :lower => val.value,
-                  :lower => val.value,
+                  :upper => val.value,
                   :upper_included => true,
                   :lower_included => true)
           end
@@ -424,15 +426,16 @@ module OpenEHR
       end
 
       rule time_value
-        V_ISO8601_EXTENDED_TIME '' {
+        ti:V_ISO8601_EXTENDED_TIME '' {
           def value
-            OpenEHR::AssumedLibraryTypes::ISO8601Time(V_ISO8601_EXTENDED_TIME.text_value)
+            ::OpenEHR::RM::DataTypes::Quantity::DateTime::DvTime.new(
+              :value => ti.text_value)
           end
         }
       end
 
       rule time_list_value
-        time_value more_t:(',' time_value)+ {
+        time_value more_t:(',' white_space time_value)+ {
           def value
             times.map {|t| t.value}
           end
@@ -441,7 +444,7 @@ module OpenEHR
             [time_value] + more_t.elements.map {|t| t.time_value}
           end
         }
-      / time_value ',' SYM_LIST_CONTINUE {
+      / time_value ',' white_space SYM_LIST_CONTINUE {
           def value
             [time_value.value]
           end
@@ -505,10 +508,10 @@ module OpenEHR
                   :lower_included => false)
           end
         }
-      / SYM_INTERVAL_DELIM SYM_GE time_value SYM_INTERVAL_DELIM {
+      / SYM_INTERVAL_DELIM SYM_GE tv:time_value SYM_INTERVAL_DELIM {
           def value
             OpenEHR::AssumedLibraryTypes::Interval.new(
-                  :lower => up.value,
+                  :lower => tv.value,
                   :upper_unbounded => true,
                   :lower_included => true)
           end
@@ -517,7 +520,7 @@ module OpenEHR
           def value
             OpenEHR::AssumedLibraryTypes::Interval.new(
                   :lower => val.value,
-                  :lower => val.value,
+                  :upper => val.value,
                   :upper_included => true,
                   :lower_included => true)
           end
@@ -527,13 +530,14 @@ module OpenEHR
       rule date_time_value
         dt:V_ISO8601_EXTENDED_DATE_TIME '' {
           def value
-            OpenEHR::AssumedLibraryTypes::ISO8601DateTime.new(dt.text_value)
+            ::OpenEHR::RM::DataTypes::Quantity::DateTime::DvDateTime.new(
+              :value => dt.text_value)
           end
         }
       end
 
       rule date_time_list_value
-        date_time_value more_dt:(',' date_time_value)+ {
+        date_time_value (',' more_dt:date_time_value)+ {
           def value
             date_times.map {|t| t.value}
           end
@@ -606,10 +610,10 @@ module OpenEHR
                   :lower_included => false)
           end
         }
-      / SYM_INTERVAL_DELIM SYM_GE date_time_value SYM_INTERVAL_DELIM {
+      / SYM_INTERVAL_DELIM SYM_GE dt:date_time_value SYM_INTERVAL_DELIM {
           def value
             OpenEHR::AssumedLibraryTypes::Interval.new(
-                  :lower => up.value,
+                  :lower => dt.value,
                   :upper_unbounded => true,
                   :lower_included => true)
           end
@@ -618,7 +622,7 @@ module OpenEHR
           def value
             OpenEHR::AssumedLibraryTypes::Interval.new(
                   :lower => val.value,
-                  :lower => val.value,
+                  :upper => val.value,
                   :upper_included => true,
                   :lower_included => true)
           end
@@ -626,9 +630,10 @@ module OpenEHR
       end
 
       rule duration_value
-        V_ISO8601_DURATION '' {
+        du:V_ISO8601_DURATION '' {
           def value
-            OpenEHR::AssumedLibraryTypes::ISO8601Duration(V_ISO8601_DURATION.text_value)
+            ::OpenEHR::RM::DataTypes::Quantity::DateTime::DvDuration.new(
+              :value => du.text_value)
           end
         }
       end
@@ -645,7 +650,7 @@ module OpenEHR
         }
       / duration_value ',' SYM_LIST_CONTINUE {
           def value
-            [duration_valuel.value]
+            [duration_value.value]
           end
         }
       end
@@ -707,10 +712,10 @@ module OpenEHR
                   :lower_included => false)
           end
         }
-      / SYM_INTERVAL_DELIM SYM_GE duration_value SYM_INTERVAL_DELIM {
+      / SYM_INTERVAL_DELIM SYM_GE val:duration_value SYM_INTERVAL_DELIM {
           def value
             OpenEHR::AssumedLibraryTypes::Interval.new(
-                  :lower => up.value,
+                  :lower => val.value,
                   :upper_unbounded => true,
                   :lower_included => true)
           end
@@ -718,7 +723,7 @@ module OpenEHR
       / SYM_INTERVAL_DELIM val:duration_value SYM_INTERVAL_DELIM {
           def value
             OpenEHR::AssumedLibraryTypes::Interval.new(
-                  :lower => val.value,
+                  :upper => val.value,
                   :lower => val.value,
                   :upper_included => true,
                   :lower_included => true)
@@ -839,11 +844,11 @@ module OpenEHR
       end
 
       rule SYM_GE
-        '=>' / '>=' white_space
+        ('=>' / '>=') white_space
       end
 
       rule SYM_LE
-        '<=' / '=>' white_space
+        ('<=' / '=>') white_space
       end
 
       rule SYM_LT
@@ -867,7 +872,7 @@ module OpenEHR
       end
 
       rule SYM_END_CBLOCK
-        '}' space
+        '}'
       end
 
       rule SYM_ELLIPSIS
@@ -955,7 +960,7 @@ module OpenEHR
       end
 
       rule SYM_UNIQUE
-        [Uu] [Nn] [Ii] [Qq] [Uu] [Ee] white_space
+        [Uu] [Nn] [Ii] [Qq] [Uu] [Ee] space
       end
 
       rule SYM_INFINITY
@@ -1098,12 +1103,21 @@ module OpenEHR
         }
       end
 
+      rule V_TERM_CODE
+        '[' code:([a-zA-Z0-9()._\-]+) '::' white_space {
+          def value
+            ::OpenEHR::RM::Support::Identification::TerminologyID.new(
+              :value => code.text_value)
+          end
+        }
+      end
+
       rule V_ISO8601_EXTENDED_DATE_TIME
         ([0-9] 4..4 '-' [0-1] [0-9] '-' [0-3] [0-9] 'T' [0-2] [0-9] ':' [0-6] [0-9] ':' [0-6] [0-9] (',' [0-9]+)? ('Z' / [+-] [0-9] 4..4)? ) / ([0-9] 4..4 '-' [0-1] [0-9] '-' [0-3] [0-9] 'T' [0-2] [0-9] ':' [0-6] [0-9] ('Z' / [+-] [0-9] 4..4)?) / ([0-9] 4..4 '-' [0-1] [0-9] '-' [0-3] [0-9] 'T' [0-2] [0-9] ('Z' / [+-] [0-9] 4..4)?)
       end
 
       rule V_ISO8601_EXTENDED_TIME
-        [0-2] [0-9] ':' [0-6] [0-9] ':' [0-6] [0-9] (',' [0-9]+)? ('Z' / [+-] [0-9] 4..4)? / [0-2] [0-9] ':' [0-6] [0-9] (Z / [+-] [0-9] 4..4)?
+        [0-2] [0-9] ':' [0-6] [0-9] ':' [0-6] [0-9] (',' [0-9]+)? ('Z' / [+-] [0-9] 4..4)? / [0-2] [0-9] ':' [0-6] [0-9] ('Z' / [+-] [0-9] 4..4)?
       end
 
       rule V_ISO8601_EXTENDED_DATE
@@ -1111,7 +1125,7 @@ module OpenEHR
       end
 
       rule V_ISO8601_DURATION
-        'P' ([0-9]+ [yY])? ([0-9]+ [mM])? ([0-9]+ [wW])? ([0-9]+ [dD])? 'T' ([0-9]+ [hH])? ([0-9]+ [mM])? ([0-9]+ [sS])?
+        'P' ([0-9]+ [yY])? ([0-9]+ [mM])? ([0-9]+ [wW])? ([0-9]+ [dD])? ('T' ([0-9]+ [hH])? ([0-9]+ [mM])? ([0-9]+ ('.' [0-9]+)? [sS])?)?
       end
 
       rule V_ISO8601_DATE_CONSTRAINT_PATTERN
@@ -1123,11 +1137,17 @@ module OpenEHR
       end
 
       rule V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN
-        [yY] [yY] [yY] [yY] '-' [mM?X] [mM?X] '-' [dD?X] [dD?X] [Tt] [hH?X] [hH?X] ':' [mM?X] [mM?X] ':' [sS?X] [sS?X]
+        [yY] [yY] [yY] [yY] '-' [mM?X] [mM?X] '-' [dD?X] [dD?X] [Tt ] [hH?X] [hH?X] ':' [mM?X] [mM?X] ':' [sS?X] [sS?X]
       end
 
       rule V_ISO8601_DURATION_CONSTRAINT_PATTERN
-        'P' [yY]? [mM]? [wW]? [dD]? 'T' [hH]? [mM]? [sS]? / 'P' [yY]? [mM]? [wW]? [dD]?
+        'P' [yY]? [mM]? [wW]? [dD]? 'T' [hH] [mM]? [sS]?
+      / 'P' [yY]? [mM]? [wW]? [dD]? 'T' [hH]? [mM] [sS]?
+      / 'P' [yY]? [mM]? [wW]? [dD]? 'T' [hH]? [mM]? [sS]
+      / 'P' [yY] [mM]? [wW]? [dD]?
+      / 'P' [yY]? [mM] [wW]? [dD]?
+      / 'P' [yY]? [mM]? [wW] [dD]?
+      / 'P' [yY]? [mM]? [wW]? [dD]
       end
 
       rule V_TYPE_IDENTIFIER
@@ -1155,7 +1175,7 @@ module OpenEHR
       end
 
       rule V_INTEGER
-        [0-9] {
+        [0-9]+ [eE] [+-]? [0-9] {
           def value
             text_value.to_i
           end
@@ -1165,7 +1185,7 @@ module OpenEHR
             text_value.to_i
           end
         }	
-      / [0-9]+ [eE] [+-]? [0-9] {
+      / [0-9] {
           def value
             text_value.to_i
           end
@@ -1173,7 +1193,7 @@ module OpenEHR
       end
 
       rule V_REAL
-        [0-9] '.' [0-9]+ / [1-9] [0-9]+ '.' [0-9]+ / [0-9]+ '.' [0-9]+ [eE] [+-]? [0-9]+ {
+        [0-9]+ '.' [0-9]+ [eE] [+-]? [0-9]+ / [1-9] [0-9]+ '.' [0-9]+ / [0-9] '.' [0-9]+ {
           def value
             text_value.to_f
           end

data/lib/open_ehr/rm/data_types/quantity/date_time.rb

@@ -96,13 +96,18 @@ module OpenEHR
               @minute = iso8601_time.minute
               @second = iso8601_time.second
               @fractional_second = iso8601_time.fractional_second
+              @timezone = iso8601_time.timezone
             end
 
             def magnitude
-              if @fractional_second.nil?
+              if @fractional_second.nil? && @second.nil? && @minute.nil?
+                return @hour * 60 * 60
+              elsif @fractional_second.nil? && @second.nil?
+                return @hour * 60 * 60 + @minute * 60
+              elsif @fractional_second.nil?
                 return @hour * 60 * 60 + @minute * 60 + @second
               else
-                return @hour * 60 * 60 + @minute * 60 + @second + @fractional_second
+                return @hour*60*60+@minute* 60 + @second + @fractional_second
               end
             end
 
@@ -187,16 +192,12 @@ module OpenEHR
             end
           end
 
-          class DvDuration < DvAmount
+          class DvDuration < DvTemporal
             include AssumedLibraryTypes::ISO8601DurationModule
             attr_reader :value
             
             def initialize(args = { })
-              self.value = args[:value]
-              self.magnitude_status = args[:magnitude_status]
-              self.normal_range = args[:normal_range]
-              self.normal_status = args[:normal_status]
-              self.other_reference_ranges = args[:other_reference_ranges]
+              super
             end
 
             def value=(value)
@@ -214,13 +215,25 @@ module OpenEHR
             end
 
             def magnitude
-              return ((((@year + @month/MONTH_IN_YEAR)*NOMINAL_DAYS_IN_MONTH) +
-                @week * DAYS_IN_WEEK + @days) * HOURS_IN_DAY * MINUTES_IN_HOUR*
-                SECONDS_IN_MINUTE) + @second + @fractional_second
+              months = 0
+              months += @months if @months
+              months += @years * MONTH_IN_YEAR if @years
+              days = 0
+              days += months * NOMINAL_DAYS_IN_MONTH if months
+              days += @weeks * DAYS_IN_WEEK if @weeks
+              days += @days if @days
+              hours = 0
+              hours += days * HOURS_IN_DAY if days
+              hours += @hours if @hours
+              minutes = 0
+              minutes += hours * MINUTES_IN_HOUR if hours
+              minutes += @minutes if @minutes
+              seconds = 0
+              seconds += @seconds if @seconds
+              seconds += @fractional_second if @fractional_second
+              seconds += minutes * SECONDS_IN_MINUTE if minutes
+              return seconds
             end
-            
-            undef magnitude=
-
           end
         end # of DateTime
       end # of Quantity

data/lib/open_ehr.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module OpenEHR
-  VERSION = '0.6.0'
+  VERSION = '0.9.5'
   autoload :AssumedLibraryTypes, 'open_ehr/assumed_library_types'
   autoload :RM, 'open_ehr/rm'
   autoload :AM, 'open_ehr/am'

data/open_ehr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "open_ehr"
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shinji KOBAYASHI", "Akimichi Tatsukawa"]
-  s.date = "2011-11-22"
+  s.date = "2011-12-02"
   s.description = "This project is an implementation of the openEHR specification on Ruby."
   s.email = "skoba@moss.gr.jp"
   s.extra_rdoc_files = [
@@ -28,14 +28,15 @@ Gem::Specification.new do |s|
     "lib/open_ehr.rb",
     "lib/open_ehr/am.rb",
     "lib/open_ehr/am/archetype.rb",
-    "lib/open_ehr/am/archetype/archetype_description/archetype_description.rb",
     "lib/open_ehr/am/archetype/assertion.rb",
     "lib/open_ehr/am/archetype/constraint_model.rb",
     "lib/open_ehr/am/archetype/constraint_model/primitive.rb",
     "lib/open_ehr/am/archetype/ontology.rb",
-    "lib/open_ehr/am/open_ehr_profile/data_types/basic.rb",
-    "lib/open_ehr/am/open_ehr_profile/data_types/quantity.rb",
-    "lib/open_ehr/am/open_ehr_profile/data_types/text.rb",
+    "lib/open_ehr/am/openehr_profile.rb",
+    "lib/open_ehr/am/openehr_profile/data_types.rb",
+    "lib/open_ehr/am/openehr_profile/data_types/basic.rb",
+    "lib/open_ehr/am/openehr_profile/data_types/quantity.rb",
+    "lib/open_ehr/am/openehr_profile/data_types/text.rb",
     "lib/open_ehr/assumed_library_types.rb",
     "lib/open_ehr/parser.rb",
     "lib/open_ehr/parser/adl.rb",
@@ -124,6 +125,7 @@ Gem::Specification.new do |s|
     "spec/lib/open_ehr/am/archetype/ontology/archetype_ontology_spec.rb",
     "spec/lib/open_ehr/am/archetype/ontology/archetype_term_spec.rb",
     "spec/lib/open_ehr/am/archetype/validity_kind_spec.rb",
+    "spec/lib/open_ehr/am/openehr_profile/data_types/text/c_code_phrase_spec.rb",
     "spec/lib/open_ehr/assumed_library_types/interval_spec.rb",
     "spec/lib/open_ehr/assumed_library_types/iso8601_date_spec.rb",
     "spec/lib/open_ehr/assumed_library_types/iso8601_date_time_spec.rb",
@@ -227,6 +229,9 @@ Gem::Specification.new do |s|
     "spec/lib/open_ehr/parser/adl_archetype_internal_ref_with_generics_spec.rb",
     "spec/lib/open_ehr/parser/adl_archetype_ontology_binding_spec.rb",
     "spec/lib/open_ehr/parser/adl_archetype_ontology_spec.rb",
+    "spec/lib/open_ehr/parser/adl_archetype_slot_cluster_spec.rb",
+    "spec/lib/open_ehr/parser/adl_archetype_slot_spec.rb",
+    "spec/lib/open_ehr/parser/adl_archetype_uncommon_term_keys_spec.rb",
     "spec/lib/open_ehr/parser/adl_description_spec.rb",
     "spec/lib/open_ehr/parser/adl_identification_spec.rb",
     "spec/lib/open_ehr/parser/adl_language_no_accreditation_spec.rb",
@@ -237,6 +242,11 @@ Gem::Specification.new do |s|
     "spec/lib/open_ehr/parser/adl_parser_spec.rb",
     "spec/lib/open_ehr/parser/adl_path_spec.rb",
     "spec/lib/open_ehr/parser/base_spec.rb",
+    "spec/lib/open_ehr/parser/basic_generic_type_spec.rb",
+    "spec/lib/open_ehr/parser/basic_type_spec.rb",
+    "spec/lib/open_ehr/parser/code_phrase_spec.rb",
+    "spec/lib/open_ehr/parser/date_time_spec.rb",
+    "spec/lib/open_ehr/parser/duration_spec.rb",
     "spec/lib/open_ehr/parser/parser_spec_helper.rb",
     "spec/lib/open_ehr/rm/common/archetyped/archetyped_spec.rb",
     "spec/lib/open_ehr/rm/common/archetyped/feeder_audit_details_spec.rb",
@@ -295,6 +305,7 @@ Gem::Specification.new do |s|
     "spec/lib/open_ehr/rm/data_types/encapsulated/dv_parsable_spec.rb",
     "spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_date_spec.rb",
     "spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_date_time_spec.rb",
+    "spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_duration_spec.rb",
     "spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_tempral_spec.rb",
     "spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_time_spec.rb",
     "spec/lib/open_ehr/rm/data_types/quantity/dv_absolute_quantity_spec.rb",

data/spec/lib/open_ehr/am/archetype/assertion/operator_kind_spec.rb

@@ -26,6 +26,10 @@ describe OperatorKind do
     OperatorKind::OP_GT.should be_equal 2006
   end
 
+  it 'op_matches should be equal 2007' do
+    OperatorKind::OP_MATCHES.should be_equal 2007
+  end
+
   it 'op_not should be equal 2010' do
     OperatorKind::OP_NOT.should be_equal 2010
   end

data/spec/lib/open_ehr/am/archetype/constraint_model/primitive/c_date_spec.rb

@@ -1,20 +1,17 @@
 require File.dirname(__FILE__) + '/../../../../../../spec_helper'
 include OpenEHR::AM::Archetype
 include OpenEHR::AM::Archetype::ConstraintModel::Primitive
-include OpenEHR::AssumedLibraryTypes
+include OpenEHR::RM::DataTypes::Quantity::DateTime
 
 describe CDate do
-  before(:each) do
-    default_value = ISO8601Date.new('2010-01-18')
-    assumed_value = ISO8601Date.new('2007-02-19')
-    range = Interval.new(:lower => ISO8601Date.new('2001-01-01'),
-                         :upper => ISO8601Date.new('2010-12-31'))
+  before(:all) do
+    default_value = DvDate.new(:value => '2010-01-18')
+    assumed_value = DvDate.new(:value => '2007-02-19')
+    range = Interval.new(:lower => DvDate.new(:value => '2001-01-01'),
+                         :upper => DvDate.new(:value => '2010-12-31'))
     @c_date = CDate.new(:default_value => default_value,
                         :assumed_value => assumed_value,
-                        :range => range,
-                        :month_validity => ValidityKind::MANDATORY,
-                        :day_validity => ValidityKind::OPTIONAL,
-                        :timezone_validity => ValidityKind::DISALLOWED)
+                        :range => range)
   end
 
   it 'should be an instance of CDate' do
@@ -25,56 +22,31 @@ describe CDate do
     @c_date.range.upper.month.should be_equal 12
   end
 
-  it 'month_validity should be assigned properly by constructor' do
-    @c_date.month_validity.should be_equal ValidityKind::MANDATORY
-  end
-
   it 'validity_is_range should be true if range is assigned' do
     @c_date.should be_validity_is_range
   end
 
-  it 'validity_is_range should not be true if range is nil' do
-    @c_date.range = nil
-    @c_date.should_not be_validity_is_range
+  it 'raise ArgumentError unless range xor pattern' do
+    @c_date.range.should raise_error
   end
 
-  it 'day_validity should be assigned properly by constructor' do
-    @c_date.day_validity.should be_equal ValidityKind::OPTIONAL
-  end
-
-  it 'timezone should be assigned properly' do
-    @c_date.timezone_validity.should be_equal ValidityKind::DISALLOWED
-  end
-
-  describe 'method' do
-    it 'month_validity should be assigned by method properly' do
-      @c_date.month_validity = ValidityKind::OPTIONAL
-      @c_date.month_validity.should be_equal ValidityKind::OPTIONAL
-    end
-
-    it 'day_validity should be assigned by method properly' do
-      @c_date.day_validity = ValidityKind::MANDATORY
-      @c_date.day_validity.should be_equal ValidityKind::MANDATORY
+  describe 'pattern attribute' do
+    before(:all) do
+      @c_date = CDate.new(:pattern => 'yyyy-mm-dd')
     end
 
-    it 'should raise ArgumentError if month_validity is optional and day validity is mandatory' do
-      @c_date.day_validity = ValidityKind::MANDATORY
-      lambda {
-        @c_date.month_validity = ValidityKind::OPTIONAL
-      }.should raise_error ArgumentError
+    it 'pattern should be yyyy-mm-dd' do
+      @c_date.pattern.should == 'yyyy-mm-dd'
     end
+  end
 
-    it 'should raise ArgumentError if month_validity is disallowed and day_validity is mandatory' do
-      @c_date.day_validity = ValidityKind::MANDATORY
-      lambda {
-        @c_date.month_validity = ValidityKind::DISALLOWED
-      }.should raise_error ArgumentError
+  describe 'list attribute' do
+    before(:all) do
+      @c_date = CDate.new(:list => [DvDate.new(:value => '2011-11-28')])
     end
 
-    it 'should raise ArgumentError if month_validity is disallowed and day_validity is optional' do
-      lambda {
-        @c_date.month_validity = ValidityKind::DISALLOWED
-      }.should raise_error ArgumentError
+    it 'head of list is 2011-11-28' do
+      @c_date.list[0].value.should == '2011-11-28'
     end
   end
 end