openehr 1.1.6 → 1.2.0

data/.travis.yml

@@ -1,3 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.0.0
+  - 1.9.3
+  - 1.9.2

data/README.rdoc

@@ -5,12 +5,12 @@ Ruby openEHR implementation project.
 
 = Version
 
-Release-1.1.5
+Release-1.2.0
 
 = Requirements
 
 * Ruby 1.9.2 or later recommended
-* Tested with Ruby 1.9.3 on Linux and FreeBSD.
+* Developed with CRuby 2.0.0, 1.9.3 on Linux and FreeBSD.
 * It would work with some adjustment on Ruby 1.8 or earlier,
   but not confirmed.
 * It should work on other platforms with Ruby
@@ -38,7 +38,7 @@ This package excludes:
 * ADL serializer(in progress)
 * ADL validator(in progress)
 * Data store/retrieve would be separate to the other project.
-* Terminology service(moved to open_terminology package)
+* Terminology service(moved to openehr-terminology package)
 * Rails plugin(moved to openehr-rails package
 
 Almost all classes passed the test constructed by RSpec2. These spec

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'bundler'
 require "bundler/gem_tasks"
-Bundler::GemHelper::install_tasks
 
 require 'rake'
 require 'rspec/core'

data/features/step_definitions/rmfactory_steps.rb

@@ -1,10 +1,9 @@
 Given /^\"DV_TEXT\" in archetype definition with attribute$/ do
   @type= "DV_TEXT"
-  @params = [value: 'text']
 end
 
 When /^RM Factory generates instance$/ do
-  @dv_text = OpenEHR::RM::Factory.create(@type, @params)
+  @dv_text = OpenEHR::RM::Factory.create(@type, value: 'text')
 end
 
 Then /^DvText instance should be available$/ do

data/lib/openehr/am/archetype.rb

@@ -9,8 +9,6 @@ module OpenEHR
       autoload :Ontology, 'archetype/ontology'
 
       module ADLDefinition
-        include OpenEHR::RM::Support::Terminology
-#        include OpenEHR::RM::Support::Terminology::OpenEHR_Code_Set_Identifier
         CURRENT_ADL_VERSION = "1.4"
       end
 

data/lib/openehr/rm/support.rb

@@ -8,7 +8,6 @@ module OpenEHR
       autoload :Definition, 'support/definition'
       autoload :Identification, 'support/identification'
       autoload :Measurement, 'support/measurement'
-      autoload :Terminology, 'support/terminology'
     end
   end
 end

data/lib/openehr/version.rb

@@ -1,3 +1,3 @@
 module OpenEHR
-  VERSION = "1.1.6"
+  VERSION = "1.2.0"
 end

data/lib/openehr.rb

@@ -7,5 +7,4 @@ module OpenEHR
   autoload :AM, 'openehr/am'
   autoload :Parser, 'openehr/parser'
   autoload :Serializer, 'openehr/serializer'
-  autoload :Terminology, 'openehr/terminology'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openehr
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,14 +10,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -25,7 +25,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -33,7 +33,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -41,7 +41,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -49,7 +49,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -57,7 +57,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -65,7 +65,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -73,7 +73,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -81,7 +81,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -89,7 +89,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -97,7 +97,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -105,7 +105,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -113,7 +113,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -121,7 +121,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -129,7 +129,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -137,7 +137,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -145,7 +145,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -153,7 +153,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -161,7 +161,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -169,7 +169,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -177,7 +177,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -185,7 +185,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -193,7 +193,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -201,7 +201,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -209,7 +209,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -217,7 +217,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -225,7 +225,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -233,7 +233,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -257,7 +257,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -265,7 +265,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -273,7 +273,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 1.0rc
   type: :development
@@ -281,7 +281,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 1.0rc
 - !ruby/object:Gem::Dependency
@@ -289,7 +289,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -297,7 +297,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -305,7 +305,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -313,7 +313,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -337,7 +337,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -345,7 +345,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This project is an implementation of the openEHR specification on Ruby.
@@ -424,10 +424,7 @@ files:
 - lib/openehr/rm/support/definition.rb
 - lib/openehr/rm/support/identification.rb
 - lib/openehr/rm/support/measurement.rb
-- lib/openehr/rm/support/terminology.rb
 - lib/openehr/serializer.rb
-- lib/openehr/terminology.rb
-- lib/openehr/terminology/open_ehr_terminology.rb
 - lib/openehr/version.rb
 - lib/openehr/writer.rb
 - openehr.gemspec
@@ -735,14 +732,12 @@ files:
 - spec/lib/openehr/rm/support/identification/uid_spec.rb
 - spec/lib/openehr/rm/support/identification/version_tree_id_spec.rb
 - spec/lib/openehr/rm/support/measurement_service_spec.rb
-- spec/lib/openehr/rm/support/terminology_service_spec.rb
 - spec/lib/openehr/serializer/adl-test-entry.most_minimal.test.adl
 - spec/lib/openehr/serializer/adl_serializer_spec.rb
 - spec/lib/openehr/serializer/openEHR-EHR-SECTION.test.v1.adl
 - spec/lib/openehr/serializer/openEHR-EHR-SECTION.test.v1.xml
 - spec/lib/openehr/serializer/sample_archetype_spec.rb
 - spec/lib/openehr/serializer/xml_serializer_spec.rb
-- spec/lib/openehr/terminology/open_ehr_terminology_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 homepage: http://openehr.jp
@@ -755,13 +750,13 @@ require_paths:
 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: []
@@ -771,4 +766,3 @@ signing_key:
 specification_version: 3
 summary: Ruby implementation of the openEHR specification
 test_files: []
-has_rdoc: 

data/lib/openehr/rm/support/terminology.rb

@@ -1,135 +0,0 @@
-
-module OpenEHR
-  module RM
-    module Support
-      module Terminology
-        class CodeSetAccess
-          def all_codes
-            raise NotImplementedError, "all_codes must be implemented"
-          end
-
-          def has_code(a_code)
-            raise NotImplementedError, "has_code must be implemented"
-          end
-
-          def has_lang(a_lang)
-            raise NotImplementedError, "has_lang must be implemented"
-          end
-
-          def id
-            raise NotImplementedError, "id must be returned"
-          end
-        end
-
-        module OpenEHRCodeSetIdentifier
-          CODE_SET_ID_CHARACER_SETS = "character sets".freeze
-          CODE_SET_ID_COMPRESSION_ALGORITHMS = "compression algorithms".freeze
-          CODE_SET_ID_COUNTRIES = "countries".freeze
-          CODE_SET_ID_INTEGRITY_CHECK_ALGORITHMS = "integrity check algorithms".freeze
-          CODE_SET_ID_LANGUAGES = "languages".freeze
-          CODE_SET_ID_MEDIA_TYPES = "media types".freeze
-          def valid_code_set_id(an_id)
-            !@an_id.nil?
-          end
-        end
-
-        module OpenEHRTerminologyGroupIdentifiers
-          GROUP_ID_ATTESTATION_REASON = "attestation reason".freeze
-          GROUP_ID_AUDIT_CHANGE_TYPE = "audit change type".freeze
-          GROUP_ID_COMPOSITION_CATEGORY = "composition category".freeze
-          GROUP_ID_MATH_FUNCTION = "event math function".freeze
-          GROUP_ID_INSTRUCTION_STATES = "instruction states".freeze
-          GROUP_ID_INSTRUCTION_TRANSITIONS = "instruction transitions".freeze
-          GROUP_ID_NULL_FLAVOURS = "null flavours".freeze
-          GROUP_ID_PARTICIPATION_FUNCTION = "participation function".freeze
-          GROUP_ID_PARTICIPATION_MODE = "participation mode".freeze
-          GROUP_ID_PROPERTY = "property".freeze
-          GROUP_ID_SETTING = "setting".freeze.freeze
-          GROUP_ID_SUBJECT_RELATIONSHIP = "subject relationship".freeze
-          GROUP_ID_TERM_MAPPING_PURPOSE = "term mapping purpose".freeze
-          GROUP_ID_VERSION_LIFECYCLE_STATE = "version lifecycle state".freeze
-          TERMINOLOGY_ID = "openehr".freeze
-        end
-
-        class TerminologyAccess
-          attr_reader :id
-
-          def initialize(args = {})
-            self.id = args[:id]
-          end
-
-          def all_codes
-            raise NotImplementedError, "all_codes is not implemented"
-          end
-
-          def codes_for_group_id(group_id)
-            raise NotImplementedError, "codes_for_group_id is not implemented"
-          end
-
-          def codes_for_group_name(name, lang)
-            raise NotImplementedError, "codes_for_group_name is not implemented"
-          end
-
-          def has_code_for_group_id(group_id, a_code)
-            
-          end
-
-          def id=(id)
-            @terminology = Terminology.find_all_by_name(id)
-            @id = id
-          end
-
-          def rubric_for_code(code, lang)
-            return Terminology.find(:first, :conditions => {:code => code,
-                                      :lang => lang})
-          end
-
-          private
-          def id_exists
-            if id.nil?
-              raise ArgumentError, "id must not be nil"
-            elsif id.empty?
-              raise ArgumentError, "id must not be empty"
-            end
-          end
-        end
-
-        class TerminologyService
-          include OpenEHRCodeSetIdentifier, OpenEHRTerminologyGroupIdentifiers
-
-          def code_set(name)
-            raise NotImplementedError, "code_set is not implemented"
-          end
-
-          def code_set_for_id(id)
-            raise NotImplementedError, "code_set_for_id is not implemented"
-          end
-
-          def code_set_identifiers
-            raise NotImplementedError, "code_set_for_identifiers is not implemented"
-          end
-
-          def has_code_set(name)
-            raise NotImplementedError, "has_code_set is not implemented"
-          end
-
-          def has_terminology?(name)
-            raise NotImplementedError, "has_terminology is not implemented"
-          end
-
-          def openehr_code_sets
-            raise NotImplementedError, "openehr_code_set is not implemented"
-          end
-
-          def terminology(name)
-            return TerminologyAccess.new(:id => name)
-          end
-          
-          def terminology_identifiers
-            raise NotImplementedError, "terminology_identiferes is not implemented"
-          end
-        end 
-      end # of Terminology
-    end # of Support
-  end # of RM
-end # of OpenEHR

data/lib/openehr/terminology/open_ehr_terminology.rb

@@ -1,41 +0,0 @@
-require 'rubygems'
-require 'xmlsimple'
-#require 'ActiveSupport'
-
-module OpenEHR
-  module Terminology
-    class OpenEHRTerminology
-      def initialize
-        @terms = XmlSimple.xml_in(File.open('doc/openehr_terminology.xml'))
-      end
-
-      def languages
-        @terms['Language']
-      end
-
-      def primary_rubrics
-        @terms['PrimaryRubric']
-      end
-
-      def concepts
-        @terms['Concept']
-      end
-
-      def groupers
-        @terms['Grouper']
-      end
-
-      def grouped_concepts
-        @terms['GroupedConcept']
-      end
-
-      def terminology_identifiers
-        @terms['TerminologyIdentifiers']
-      end
-
-      def territories
-        @terms['Territory']
-      end
-    end 
-  end
-end

data/lib/openehr/terminology.rb

@@ -1,7 +0,0 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-module OpenEHR
-  module Terminology
-    autoload :OpenEHRTerminology, 'terminology/open_ehr_terminology'
-  end
-end

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

@@ -1,22 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
-include OpenEHR::RM::Support::Terminology
-
-describe TerminologyService do
-  before(:each) do
-    @ts ||= TerminologyService.new
-  end
-
-  it 'should get terminology by its name'
-
-  it 'should get code_set by its name'
-
-  it 'should reply if it has terminology or not'
-
-  it 'should reply if it has terminology or not'
-
-  it 'should reply all terminology_identifires'
-
-  it 'should get openehr code stes'
-
-  it 'should get code_set_identifiers'
-end

data/spec/lib/openehr/terminology/open_ehr_terminology_spec.rb

@@ -1,40 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'OpenEHRTerminology' do
-  before(:each) do
-    @term = OpenEHR::Terminology::OpenEHRTerminology.new
-  end
-
-  it 'should parse and return languages' do
-    @term.languages[0].should == {'code' => 'af', 'Description' => 'Afrikaans'}
-  end
-
-  it 'should parse and return primary rubrics' do
-    @term.primary_rubrics[0].should == {'Id' => '0', 'Language' => 'en'}
-  end
-
-  it 'should parse and return concepts' do
-    @term.concepts[0].should == {'Rubric' => 'self', 'Language' => 'en',
-      'ConceptID' => '0'}
-  end
-
-  it 'should parse and return groupers' do
-    @term.groupers[0].should == {'id' => '0', 'ConceptID' => '154'}
-  end
-
-  it 'should parse and return grouped_concepts' do
-    @term.grouped_concepts[0].should == {'ChildID' => '0', 'GrouperID' => '1'}
-  end
-
-  it 'should parse and return terminology identifiers' do
-    @term.terminology_identifiers[0].should ==
-      {'VSAB' => 'AIR93', 'Authority' => 'UMLS2003AA',
-      'SourceName' => 'AI/RHEUM,1993'}
-  end
-
-  it 'should parse and return territory' do
-    @term.territories[0].should == 
-      {'Text' => 'Afghanistan', 'ThreeLetter'=>'AFG',
-      'NumericCode' => '004', 'TwoLetter' => 'AF'}
-  end
-end