openehr 1.1.3 → 1.1.4

data/History.txt

@@ -1,3 +1,6 @@
+=== 1.1.4
+Parser bug fixed around  DvDuration pattern/interval.
+
 === 1.1.3
 am/openehr_profile/quantity hierachy
 

data/README.rdoc

@@ -5,7 +5,7 @@ Ruby openEHR implementation project.
 
 = Version
 
-Release-1.1.3
+Release-1.1.4
 
 = Requirements
 

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/lib/openehr/parser/adl_grammar.tt

@@ -975,7 +975,8 @@ module OpenEHR
       rule c_duration_constraint
         duration_pattern '/' duration_interval_value '' {
           def value
-            {:pattern => duration_pattern.value}
+            {:pattern => duration_pattern.value,
+	     :range => duration_interval_value.value}
           end
         }
      / duration_pattern '' {

data/openehr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "openehr"
-  s.version = "1.1.3"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shinji KOBAYASHI", "Akimichi Tatsukawa"]
-  s.date = "2012-06-27"
+  s.date = "2012-07-31"
   s.description = "This project is an implementation of the openEHR specification on Ruby."
   s.email = "skoba@moss.gr.jp"
   s.extra_rdoc_files = [
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
     "lib/openehr/parser/adl_parser.rb",
     "lib/openehr/parser/exception.rb",
     "lib/openehr/parser/validator.rb",
-    "lib/openehr/parser/xml_perser.rb",
+    "lib/openehr/parser/xml_parser.rb",
     "lib/openehr/rm.rb",
     "lib/openehr/rm/common.rb",
     "lib/openehr/rm/common/archetyped.rb",

data/spec/lib/openehr/am/openehr_profile/data_types/quantity/c_quantity_item_spec.rb

@@ -1,5 +1,5 @@
 # ticket 203
-require 'openehr/am/openehr_profile/data_types/quantity'
+require File.dirname(__FILE__) + '/../../../../../../spec_helper'
 include OpenEHR::AssumedLibraryTypes
 include ::OpenEHR::AM::OpenEHRProfile::DataTypes::Quantity
 

data/spec/lib/openehr/parser/adl14/adl-test-entry.durations.test.adl

@@ -53,6 +53,9 @@ definition
                 	}
 					ELEMENT[at1013] matches {	-- duration with fractional seconds
                 		value matches {|PT1.1s|}
+                	}
+					ELEMENT[at1014] matches {	-- duration with fractional seconds
+                		value matches {PTMS/|>=PT0S|}
                 	}
                 	-- matches {PT30s, PT45s, PT1m0s, PT2m0s} -- Not currently in ADL syntax
                 	-- matches {|P1d +/PT4h|}

data/spec/lib/openehr/parser/duration_spec.rb

@@ -304,6 +304,32 @@ describe ADLParser do
           @at.range.should be_lower_included
         end
       end
+
+      context '15th attribute' do
+        before(:all) do
+          @at = attr(15)
+        end
+
+        it 'has PTMS pattern' do
+          @at.pattern.should == 'PTMS'
+        end
+
+        it 'range is lower included' do
+          @at.range.should be_lower_included
+        end
+
+        it 'lower range is PT0S' do
+          @at.range.lower.value.should == 'PT0S'
+        end
+
+        it 'lower range second is 0' do
+          @at.range.lower.seconds.should == 0
+        end
+
+        it 'is not upper included' do
+          @at.range.should_not be_upper_included
+        end
+      end
     end
 
     context 'Duration with assumed value' do

data/spec/lib/openehr/parser/empty_use_spec.rb

@@ -15,27 +15,15 @@ shared_examples 'empty use archetypes' do
   end
 end
 
-describe 'openEHR-EHR-OBSERVATION.operation_record.v1.adl' do
-  subject { adl14_archetype('openEHR-EHR-OBSERVATION.operation_record.v1.adl') }
-  it_should_behave_like 'empty use archetypes'
-end
-
-describe 'openEHR-EHR-CLUSTER.exam-abdomen.v1.adl' do
-  subject { adl14_archetype('openEHR-EHR-CLUSTER.exam-abdomen.v1.adl') }
-  it_should_behave_like 'empty use archetypes'
-end
-
-describe 'openEHR-EHR-OBSERVATION.uterine_contractions.v1.adl' do
-  subject { adl14_archetype('openEHR-EHR-OBSERVATION.uterine_contractions.v1.adl') }
-  it_should_behave_like 'empty use archetypes'
-end
-
-describe 'openEHR-EHR-CLUSTER.exam-uterine_cervix.v1.adl' do
-  subject { adl14_archetype('openEHR-EHR-CLUSTER.exam-uterine_cervix.v1.adl') }
-  it_should_behave_like 'empty use archetypes'
-end
+describe 'Archetypes, which has empty use' do
+  adls = ['openEHR-EHR-OBSERVATION.operation_record.v1.adl',
+         'openEHR-EHR-CLUSTER.exam-abdomen.v1.adl',
+         'openEHR-EHR-OBSERVATION.uterine_contractions.v1.adl',
+         'openEHR-EHR-CLUSTER.exam-uterine_cervix.v1.adl',
+         'openEHR-EHR-CLUSTER.exam-uterus.v1.adl']
 
-describe 'openEHR-EHR-CLUSTER.exam-uterus.v1.adl' do
-  subject { adl14_archetype('openEHR-EHR-CLUSTER.exam-uterus.v1.adl') }
-  it_should_behave_like 'empty use archetypes'
+  adls.each do |adl|
+    subject { adl14_archetype(adl) }
+    it_should_behave_like 'empty use archetypes'
+  end
 end

data/spec/lib/openehr/rm/support/terminology_service_spec.rb

@@ -4,11 +4,9 @@ include OpenEHR::RM::Support::Terminology
 describe TerminologyService do
   before(:each) do
     @ts ||= TerminologyService.new
-    @terminology_mock = mock('terminology')
   end
 
-  it 'should get terminology by its name' do
-  end
+  it 'should get terminology by its name'
 
   it 'should get code_set by its name'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openehr
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
@@ -337,7 +337,7 @@ files:
 - lib/openehr/parser/adl_parser.rb
 - lib/openehr/parser/exception.rb
 - lib/openehr/parser/validator.rb
-- lib/openehr/parser/xml_perser.rb
+- lib/openehr/parser/xml_parser.rb
 - lib/openehr/rm.rb
 - lib/openehr/rm/common.rb
 - lib/openehr/rm/common/archetyped.rb
@@ -704,7 +704,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2519081392044828336
+      hash: -3026411643743733801
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: