openehr 1.2.13 → 1.2.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fd68d06f20abc59dbc6c1d4646a881d60e3d70e4
+  data.tar.gz: e4b4b7ef4d904033900a4a703d3cfd43633e05a2
+SHA512:
+  metadata.gz: 46b5bacfd54c2fdf799f670e3a907979278397e433f513aefed32763655191f629dca547aad841a382d4b393a5f36d89f70eafe8509a720a5462f54295b8a4f8
+  data.tar.gz: 243c0fe34c0d351aff28ba217abfc1acf00aa12795a2500dd2e69759d84bfdca2b7c0cb54ac438ed5249c992b804cc089b4c1ceae463e1f4150a4af65b62fa09

data/README.rdoc

@@ -9,7 +9,7 @@ A Ruby implementation of the openEHR specifications
 
 * Supports Ruby 1.9.3, 2.0.0 or equivalents.
 * Developed with CRuby 2.0.0, 1.9.3 on FreeBSD and Linux.
-* Ruby 1.8 or earlier are not supported.
+* Ruby 1.8 or earlier are no longer supported.
 
 == DESCRIPTION:
 
@@ -43,7 +43,7 @@ and so on. We postponed to implement such classes.
 Terminology and Demographic server will be implemented in other
 projects.
 
-= Authors
+= Original authors
 * Main codes
 Shinji Kobayashi, Akimichi Tatsukawa
 openEHR.jp, <http://openehr.jp>
@@ -60,8 +60,8 @@ Thanks for pull requests on GitHub.
 
 = Copyright
 The software, including all files in this directory and
-subdirectories is copyrighted to the original authors and
-contributors, 2011-2013.
+subdirectories except ADL files is copyrighted to the
+original authors and contributors, 2011-2013.
 
 All Rights Reserved.
 
@@ -69,7 +69,7 @@ All Rights Reserved.
 
 This product is released under Apache 2.0 license
 
-   Copyright [2012,2013] Shinji Kobayashi, Akimichi Tatsukawa, openEHR.jp
+   Copyright [2012,2013] openEHR Ruby implementation project.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/lib/openehr/am/archetype/constraint_model.rb

@@ -161,6 +161,10 @@ module OpenEHR
             end if children
           end
 
+          def has_children?
+            !@children.nil? and !@children.empty?
+          end
+
           def path
             @path || calculate_path
           end
@@ -244,6 +248,10 @@ module OpenEHR
             @attributes = [] if attributes.nil?
           end
 
+          def has_attributes?
+            !attributes.nil? and !attributes.empty?
+          end
+
           def any_allowed?
             return (@attributes.nil? or @attributes.empty?)
           end

data/lib/openehr/am/archetype/constraint_model/primitive.rb

@@ -192,6 +192,23 @@ module OpenEHR
               self.day_validity = args[:day_validity]
               self.month_validity = args[:month_validity]
             end
+
+            def range=(range)
+              consistency(@pattern, range)
+              @range = range
+            end
+
+            def pattern=(pattern)
+              consistency(pattern, @range)
+              @pattern = pattern
+            end
+
+            protected
+            def consistency(pattern, range)
+              if pattern.nil? == range.nil?
+                raise ArgumentError, 'consistency invaild'
+              end
+            end
           end
 
           module CTimeModule

data/lib/openehr/parser.rb

@@ -11,6 +11,11 @@ module OpenEHR
         raise NotImplementedError
       end
     end
+
+    class ParseError < StandardError
+
+    end
+
     require_relative 'parser/adl_parser'
   end
 end

data/lib/openehr/parser/adl_grammar.tt

@@ -159,7 +159,7 @@ module OpenEHR
               details[lang] = item
             end
             oc = params['other_contributors']
-	    if oc.instance_of? Hash
+            if oc.instance_of? Hash
               oc = oc.values
             end
             OpenEHR::RM::Common::Resource::ResourceDescription.new(

data/lib/openehr/version.rb

@@ -1,3 +1,3 @@
 module OpenEHR
-  VERSION = "1.2.13"
+  VERSION = "1.2.14"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openehr
 version: !ruby/object:Gem::Version
-  version: 1.2.13
-  prerelease: 
+  version: 1.2.14
 platform: ruby
 authors:
 - Shinji KOBAYASHI
@@ -13,12 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -26,7 +24,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -34,7 +31,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -42,7 +38,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -50,7 +45,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -58,7 +52,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -66,7 +59,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: locale
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -74,7 +66,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -82,7 +73,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -90,7 +80,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -98,7 +87,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -106,7 +94,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -114,23 +101,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.12
 - !ruby/object:Gem::Dependency
   name: polyglot
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -138,7 +122,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -146,7 +129,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -154,7 +136,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -162,7 +143,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -170,7 +150,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -178,7 +157,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -186,7 +164,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -194,7 +171,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -202,7 +178,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -210,23 +185,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -234,7 +206,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -242,7 +213,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: spork
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>'
       - !ruby/object:Gem::Version
@@ -250,7 +220,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>'
       - !ruby/object:Gem::Version
@@ -258,7 +227,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-spork
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -266,7 +234,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -274,7 +241,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -282,7 +248,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -290,23 +255,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-kqueue
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -314,7 +276,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -322,7 +283,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: libnotify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -330,7 +290,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -398,27 +357,26 @@ files:
 homepage: http://openehr.jp
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby implementation of the openEHR specification
 test_files: []
 has_rdoc: