openehr 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25bb1088a748632a3c49a91baa2d7d7851e14dbe
-  data.tar.gz: a5737fec858751805a134c214c36d6cc3894f1fc
+  metadata.gz: 9006b327e8d84275550081cf698751c6331b12f8
+  data.tar.gz: 58f770649e2463e7351227bd72781ae0dcf0f61f
 SHA512:
-  metadata.gz: 99b27154f9c3a897e44c5c8583ef11975d6e1ce9baa2ed056282c4c63fd6357cd433e048dce3e77dd42c66e18cc2f64ad40054ce7b6359be8049494f16e79f6a
-  data.tar.gz: 4b18acd91c8b25d047d63dc127e5b5039846857be4b5be0f8df5f71cb4ae7914e51aeec8c68f276e6b923457f0fdcaabaafdaddb3815b36fdd077a0d4e92c70f
+  metadata.gz: ea0d574aa811b2b081830146e34e16c04633d8ebc11bf406488a28da47cb6dbbde5502078ef7b7d222b884eee1c8856c55c96a39b6dc5d2760ede4bafc1ded72
+  data.tar.gz: 8eb160eda53ec3069c0fe9ff2aeed6f5d886cdb69c60ef044d55fe3a7b218dea291ea43f0e90c84781a2b9c7f910d15f84b2830a8adf47e271a967563506cd16

data/README.rdoc

@@ -1,3 +1,4 @@
+{<img src="https://travis-ci.org/skoba/openehr-ruby.png?branch=master" alt="Build Status" />}[https://travis-ci.org/skoba/openehr-ruby]
 = Synopsis
 
 A Ruby implementation of the openEHR specifications
@@ -6,10 +7,9 @@ A Ruby implementation of the openEHR specifications
 
 = Requirements
 
-* Supports Ruby 1.9.3, 2.0.0 or equivalent
+* Supports Ruby 1.9.3, 2.0.0 or equivalents.
 * Developed with CRuby 2.0.0, 1.9.3 on FreeBSD and Linux.
-* It would work with some adjustment on Ruby 1.8 or earlier,
-  but not confirmed.
+* Ruby 1.8 or earlier are not supported.
 
 == DESCRIPTION:
 
@@ -22,8 +22,6 @@ as open_ehr, but changed to openehr from release 1.1.0. 1.0.x versions
 are obsoleted.
 The intention is to have a sample EHR to utilize all over the world
 quickly with Ruby on Rails for many other porject.
-From this release we changed license from MPL 1.1 to Apache 2.0 license,
-as regards to the other openEHR artefact license.
 
 This package includes:
 * ADL 1.4 parser
@@ -54,7 +52,7 @@ openEHR.jp, <http://openehr.jp>
 reference implementation project of the openEHR.
 
 = Contributors
-Thanks for pull request on GitHub.
+Thanks for pull requests on GitHub.
 
 * Michael Deryugin
 * Dmitry Lavrov
@@ -69,7 +67,7 @@ All Rights Reserved.
 
 = License
 
-This product is under Apache 2.0 license
+This product is released under Apache 2.0 license
 
    Copyright [2012,2013] Shinji Kobayashi, Akimichi Tatsukawa, openEHR.jp
 

data/lib/openehr/assumed_library_types.rb

@@ -33,6 +33,7 @@ module OpenEHR
         if (lower == nil) && (lower_included != nil)
           raise ArgumentError, "lower is not set"
         end
+        lower_included = true if !lower.nil? && lower_included.nil?
         @lower_included = lower_included
       end
       
@@ -48,6 +49,7 @@ module OpenEHR
         if (@upper.nil?) && (upper_included != nil)
           raise ArgumentError, "upper is not set"
         end
+        upper_included = true if !upper.nil? && upper_included.nil?
         @upper_included = upper_included
       end
 

data/lib/openehr/version.rb

@@ -1,3 +1,3 @@
 module OpenEHR
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

data/spec/lib/openehr/assumed_library_types/interval_spec.rb

@@ -43,12 +43,12 @@ describe Interval do
     @interval.has?(-1).should_not be_true
   end
 
-  it 'should not have 10' do
-    @interval.has?(10).should_not be_true
+  it 'should have 10' do
+    @interval.has?(10).should be_true
   end
 
-  it 'should not have 1' do
-    @interval.has?(1).should_not be_true
+  it 'should have 1' do
+    @interval.has?(1).should be_true
   end
 
   it 'should be equal lower and upper is same' do

data/spec/lib/openehr/serializer/openEHR-EHR-SECTION.test.v1.xml

@@ -29,6 +29,8 @@
   <definition>
     <rm_type_name>SECTION</rm_type_name>
     <occurrence>
+      <lower_included>true</lower_included>
+      <upper_included>true</upper_included>
       <lower_unbounded>false</lower_unbounded>
       <upper_unbounded>false</upper_unbounded>
       <lower>1</lower>

data/spec/lib/openehr/serializer/xml_serializer_spec.rb

@@ -16,8 +16,8 @@ describe XMLSerializer do
     end
     @sample_header = xml.unindent(2, 11, 2)
     @sample_description = xml.unindent(12, 27, 2)
-    @sample_definition = xml.unindent(28, 37, 2)
-    @sample_ontology = xml.unindent(38, 56, 2)
+    @sample_definition = xml.unindent(28, 39, 2)
+    @sample_ontology = xml.unindent(40, 58, 2)
     @sample_xml = xml.join
     xml_file.close
     @archetype = sample_archetype

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openehr
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Shinji KOBAYASHI
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake