openehr-rails 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92a4348de69e23c4a2ad1a7e94474c64cf0edbe1
-  data.tar.gz: d046a39a04e8a17b6ffe8f1442316aaf42decda4
+  metadata.gz: edebd8ffbc62aa73c4a68c3228cd620785d9d5da
+  data.tar.gz: 8adab5b662a5e326cfa8f789b94edad7f01a47a2
 SHA512:
-  metadata.gz: f113378a660a76c57260ed2f32ca06f62ae86a2160366142324c4284b51f1db9c385469551f67639fed23e9c43abe335f409587ef3c566ee9e3bf3ac53b0d6b3
-  data.tar.gz: 733160daa158dcb5c9f5acdf9c751b23854a17d78562312b6d8475bc85bbf21fd9ceb34359d062d9348f9b43146cbafd059c3b0b5cf1e03d30b6e8e9fb701873
+  metadata.gz: 14bc325f51ef06ace5fbcea0d809d1eb584f98107382552709b2b16bb16078e7768d7ec5dc76a8d55a625a0157dd1df026dbeb6b49ede8993c22ebc0adacf23c
+  data.tar.gz: bba6b194d42a8ab8223141a210a55f1eb3a366fa85289f84f415dfeafb3585ff33868ed5fda7defa60142dd590a65faddbcbd7e7aa05409ab2117de3f90891ba

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
-
+gem 'openehr', path: '~/src/openehr-ruby'
 gemspec

data/lib/generators/openehr.rb

@@ -17,7 +17,7 @@ module Openehr
 
       protected
       def archetype
-        @archetype ||= OpenEHR::Parser::ADLParser.new(@adl_file).parse
+        @archetype ||= ::OpenEHR::Parser::ADLParser.new(archetype_file).parse
       end
       
       def archetype_path

data/lib/openehr-rails/version.rb

@@ -1,5 +1,5 @@
 module OpenEHR
   module Rails
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/openehr-rails.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
   gem.require_paths = ["lib"]
-  gem.add_dependency('openehr')
+#  gem.add_dependency('openehr')
   gem.add_dependency('rails', '~> 4.1.0')
   gem.add_dependency('ckm_client')
 

data/spec/generator_helper.rb

@@ -1,3 +1,4 @@
 def archetype
-  @archetype ||= OpenEHR::Parser::ADLParser.new('spec/generators/templates/openEHR-EHR-OBSERVATION.blood_pressure.v1.adl').parse
+  @archetype ||= OpenEHR::Parser::ADLParser.new(File.join(File.dirname(__FILE__), 'generators/templates/openEHR-EHR-OBSERVATION.blood_pressure.v1.adl')).parse
 end
+# let(:archetype) {OpenEHR::Parser::ADLParser.new('spec/generators/templates/openEHR-EHR-OBSERVATION.blood_pressure.v1.adl').parse}

data/spec/generators/openehr/archetyped_base_spec.rb

@@ -5,33 +5,34 @@ require 'generator_helper'
 module Openehr
   module Generators
     describe ArchetypedBase do
-      before (:each) do
-        @archetyped_base = Openehr::Generators::ArchetypedBase.new([archetype])
-      end
+      let(:adl_file) { File.expand_path('../../templates/openEHR-EHR-OBSERVATION.blood_pressure.v1.adl', __FILE__) }
 
       context 'archetype file' do
         it 'archetype file is adl_file' do
-          adl_file = File.expand_path '../../templates/openEHR-EHR-OBSERVATION.blood_pressure.v1.adl', __FILE__
           archetyped_base = Openehr::Generators::ArchetypedBase.new([adl_file])
-          archetyped_base.send(:archetype_file).should == File.expand_path('../../templates/openEHR-EHR-OBSERVATION.blood_pressure.v1.adl', __FILE__)
+          expect(archetyped_base.send(:archetype_file)).to eq(File.expand_path('../../templates/openEHR-EHR-OBSERVATION.blood_pressure.v1.adl', __FILE__))
         end
       end
 
-      context 'archetype path' do
-        it 'archetype_path is app/archetypes' do
-          @archetyped_base.send(:archetype_path).should == 'app/archetypes'
+      describe 'protected values' do
+        let(:archetyped_base) {Openehr::Generators::ArchetypedBase.new([archetype])}
+
+        context 'archetype path' do
+          it 'archetype_path is app/archetypes' do
+            expect(archetyped_base.send(:archetype_path)).to eq('app/archetypes')
+          end
         end
-      end
 
-      context 'model name' do
-        it 'is origined form archetype id' do
-          expect(@archetyped_base.send(:model_name)).to eq 'open_ehr_ehr_observation_blood_pressure_v1'
+        context 'model name' do
+          it 'is origined form archetype id' do
+            expect(archetyped_base.send(:model_name)).to eq 'open_ehr_ehr_observation_blood_pressure_v1'
+          end
         end
-      end
 
-      context 'controller_name' do
-        it 'is originated from archtype id' do
-          expect(@archetyped_base.send(:controller_name)).to eq 'open_ehr_ehr_observation_blood_pressure_v1'      
+        context 'controller_name' do
+          it 'is originated from archtype id' do
+            expect(archetyped_base.send(:controller_name)).to eq 'open_ehr_ehr_observation_blood_pressure_v1'      
+          end
         end
       end
     end    

data/spec/generators/openehr/assets/assets_generator_spec.rb

@@ -17,20 +17,20 @@ module Openehr
       context 'scaffold.css' do
         subject { file('app/assets/stylesheets/scaffold.css') }
 
-        it { should exist }
-        it { should contain /body {/}
+        it { is_expected.to exist }
+        it { is_expected.to contain /body {/}
       end
 
       context 'generate scss file' do
         subject { file('app/assets/stylesheets/open_ehr_ehr_observation_blood_pressure_v1.css.scss') }
 
-        it { should exist }
+        it { is_expected.to exist }
       end
 
       context 'generate coffeescript' do
         subject { file('app/assets/javascripts/open_ehr_ehr_observation_blood_pressure_v1.js.coffee') }
 
-        it { should exist }
+        it { is_expected.to exist }
       end
     end
   end

data/spec/generators/openehr/controller/controller_generator_spec.rb

@@ -16,9 +16,9 @@ module Openehr
       
       subject { file('app/controllers/open_ehr_ehr_observation_blood_pressure_v1_controller.rb') }
       
-      it { should exist }
+      it { is_expected.to exist }
 
-      it { should contain /^class OpenEhrEhrObservationBloodPressureV1Controller < ApplicationController$/ }
+      it { is_expected.to contain /^class OpenEhrEhrObservationBloodPressureV1Controller < ApplicationController$/ }
     end
   end
 end

data/spec/generators/openehr/helper/helper_generator_spec.rb

@@ -15,8 +15,8 @@ module Openehr
       context 'helper generation' do
         subject { file('app/helpers/open_ehr_ehr_observation_blood_pressure_v1_helper.rb') }
 
-        it { should exist }
-        it { should contain /module OpenEhrEhrObservationBloodPressureV1Helper/ }
+        it { is_expected.to exist }
+        it { is_expected.to contain /module OpenEhrEhrObservationBloodPressureV1Helper/ }
       end
     end
   end

data/spec/generators/openehr/i18n/i18n_generator_spec.rb

@@ -17,43 +17,43 @@ module Openehr
         describe 'i18n.rb generation' do
           subject { file('config/initializers/i18n.rb') }
 
-          it { should exist }
-          it { should contain /I18n\.default_locale = :en/ }
-          it { should contain /LANGUAGES/ }
-          it { should contain /\['English', 'en'\],/ }
-          it { should contain /\['Japanese', 'ja'\]/ }
-          it { should contain /\['Dutch', 'nl'\],/ }
+          it { is_expected.to exist }
+          it { is_expected.to contain /I18n\.default_locale = :en/ }
+          it { is_expected.to contain /LANGUAGES/ }
+          it { is_expected.to contain /\['English', 'en'\],/ }
+          it { is_expected.to contain /\['Japanese', 'ja'\]/ }
+          it { is_expected.to contain /\['Dutch', 'nl'\],/ }
         end
 
         describe 'en.yml generation' do
           subject { file('config/locales/en.yml') }
 
-          it { should exist }
-          it { should contain /en:/ }
-          it { should contain /layouts:/ }
-          it { should contain /application:/ }
-          it { should contain /open_ehr_ehr_observation_blood_pressure_v1/ }
-          it { should contain /index: &ontology/ }
-          it { should contain /at0000: "Blood Pressure"/ }
-          it { should contain /at0001: "history"/ }
-          it { should contain /new: \*ontology/ }
-          it { should contain /form: \*ontology/ }
-          it { should contain /show: \*ontology/ }
-          it { should contain /edit: \*ontology/ }
+          it { is_expected.to exist }
+          it { is_expected.to contain /en:/ }
+          it { is_expected.to contain /layouts:/ }
+          it { is_expected.to contain /application:/ }
+          it { is_expected.to contain /open_ehr_ehr_observation_blood_pressure_v1/ }
+          it { is_expected.to contain /index: &ontology/ }
+          it { is_expected.to contain /at0000: "Blood Pressure"/ }
+          it { is_expected.to contain /at0001: "history"/ }
+          it { is_expected.to contain /new: \*ontology/ }
+          it { is_expected.to contain /form: \*ontology/ }
+          it { is_expected.to contain /show: \*ontology/ }
+          it { is_expected.to contain /edit: \*ontology/ }
         end
 
         describe 'ja.yml generation' do
           subject { file('config/locales/ja.yml')}
 
-          it { should exist }
-          it { should contain /ja:/ }
+          it { is_expected.to exist }
+          it { is_expected.to contain /ja:/ }
         end
 
         describe 'nl.yml generation' do
           subject { file('config/locales/nl.yml') }
 
-          it { should exist }
-          it { should contain /nl:/ }
+          it { is_expected.to exist }
+          it { is_expected.to contain /nl:/ }
         end
       end
     end

data/spec/generators/openehr/install/install_generator_spec.rb

@@ -10,6 +10,6 @@ describe Openehr::Generators::InstallGenerator do
   end
 
   it 'makes app/archetypes directory' do
-    file('app/archetypes').should exist
+    expect(file('app/archetypes')).to exist
   end
 end

data/spec/generators/openehr/migration/migration_generator_spec.rb

@@ -14,13 +14,13 @@ module Openehr
       context 'default archetype db migration' do
         subject { file('db/migrate/create_archetypes.rb') }
 
-        it { should be_a_migration }
+        it { is_expected.to be_a_migration }
       end
 
       context 'default rm db migration' do
         subject { file('db/migrate/create_rms.rb') }
 
-        it { should be_a_migration }
+        it { is_expected.to be_a_migration }
       end
     end
   end

data/spec/generators/openehr/model/model_generator_spec.rb

@@ -15,40 +15,40 @@ module Openehr
       context 'rm.rb generation' do
         subject { file('app/models/rm.rb') }
 
-        it { should exist }
-        it { should contain 'class Rm < ActiveRecord::Base' }
-        it { should contain 'belongs_to :archetype' }
+        it { is_expected.to exist }
+        it { is_expected.to contain 'class Rm < ActiveRecord::Base' }
+        it { is_expected.to contain 'belongs_to :archetype' }
       end
 
       context 'archetype.rb generation' do
         subject { file('app/models/archetype.rb') }
 
-        it { should exist }
-        it { should contain 'class Archetype < ActiveRecord::Base' }
-        it { should contain 'has_many :rms, dependent: :destroy' }
+        it { is_expected.to exist }
+        it { is_expected.to contain 'class Archetype < ActiveRecord::Base' }
+        it { is_expected.to contain 'has_many :rms, dependent: :destroy' }
       end
 
       context 'interim model generation' do
         subject { file('app/models/open_ehr_ehr_observation_blood_pressure_v1.rb') }
 
-        it { should exist }
-        it { should contain 'class OpenEhrEhrObservationBloodPressureV1' }
-        it { should contain 'OpenEhrEhrObservationBloodPressureV1.new(archetype: archetype)' }
-        it { should contain  'OpenEhrEhrObservationBloodPressureV1.new(archetype: Archetype.find(id))' }
-        it { should contain "def self.build(params)\n    OpenEhrEhrObservationBloodPressureV1.new(params)"}
-        it { should contain 'archetype.rms.inject(archetype.save, :&) {|rm| rm.save' }
-        it { should contain "def update(attributes)\n    self.attributes=attributes" }
-        it { should contain "@archetype ||= Archetype.new(archetypeid: 'openEHR-EHR-OBSERVATION.blood_pressure.v1', uid: SecureRandom.uuid)" }
-        it { should contain /def at0004$/ }
-        it { should contain /at0004model.num_value$/}
-        it { should contain 'def at0004=(at0004)' }
-        it { should contain 'at0004model.num_value = at0004'}
-        it { should contain 'at0004model.save'}
-        it { should contain 'translate(at0008model.text_value)'}
-        it { should contain 'def confat(node_id, path)'}
-        it { should contain 'archetype.rms.build(:node_id => node_id, :path => path)' }
-        it { should contain 'I18n.translate("open_ehr_ehr_observation_blood_pressure_v1.index.#{term}")'}
-        it { should contain "def persisted?\n    archetype.persisted?"}
+        it { is_expected.to exist }
+        it { is_expected.to contain 'class OpenEhrEhrObservationBloodPressureV1' }
+        it { is_expected.to contain 'OpenEhrEhrObservationBloodPressureV1.new(archetype: archetype)' }
+        it { is_expected.to contain  'OpenEhrEhrObservationBloodPressureV1.new(archetype: Archetype.find(id))' }
+        it { is_expected.to contain "def self.build(params)\n    OpenEhrEhrObservationBloodPressureV1.new(params)"}
+        it { is_expected.to contain 'archetype.rms.inject(archetype.save, :&) {|rm| rm.save' }
+        it { is_expected.to contain "def update(attributes)\n    self.attributes=attributes" }
+        it { is_expected.to contain "@archetype ||= Archetype.new(archetypeid: 'openEHR-EHR-OBSERVATION.blood_pressure.v1', uid: SecureRandom.uuid)" }
+        it { is_expected.to contain /def at0004$/ }
+        it { is_expected.to contain /at0004model.num_value$/}
+        it { is_expected.to contain 'def at0004=(at0004)' }
+        it { is_expected.to contain 'at0004model.num_value = at0004'}
+        it { is_expected.to contain 'at0004model.save'}
+        it { is_expected.to contain 'translate(at0008model.text_value)'}
+        it { is_expected.to contain 'def confat(node_id, path)'}
+        it { is_expected.to contain 'archetype.rms.build(:node_id => node_id, :path => path)' }
+        it { is_expected.to contain 'I18n.translate("open_ehr_ehr_observation_blood_pressure_v1.index.#{term}")'}
+        it { is_expected.to contain "def persisted?\n    archetype.persisted?"}
       end
     end
   end

data/spec/generators/openehr/scaffold/scaffold_generator_spec.rb

@@ -16,13 +16,13 @@ module Openehr
         context 'generate rm migration' do
           subject { file('db/migrate/create_rms.rb') }
           
-          it { should be_a_migration}
+          it { is_expected.to be_a_migration}
         end
 
         context 'generate archetype migration' do
           subject { file('db/migrate/create_archetypes.rb') }
 
-          it { should be_a_migration }
+          it { is_expected.to be_a_migration }
         end
       end
 
@@ -30,113 +30,113 @@ module Openehr
       context 'generate rm model' do
         subject { file('app/models/open_ehr_ehr_observation_blood_pressure_v1.rb') }
 
-        it { should exist}
+        it { is_expected.to exist}
       end
 
       context 'invoke index.html.erb template engine' do
         subject { file('app/views/open_ehr_ehr_observation_blood_pressure_v1/index.html.erb') }
 
-        it { should exist }
-        it { should contain '<h1>Listing <%= t(".at0000") %></h1>' }
-        it { should contain '<th><%= t(".at0004") %></th>' }
-        it { should contain '<th><%= t(".at0005") %></th>' }
-        it { should_not contain '<th><%= t(".at0006") %></th>' }
-        it { should contain '<td><%= open_ehr_ehr_observation_blood_pressure_v1.at0004 %></td>' }
-        it { should contain "<%= link_to 'Show', open_ehr_ehr_observation_blood_pressure_v1_path(id: open_ehr_ehr_observation_blood_pressure_v1.id) %>"}
-        it { should contain "<%= link_to 'Edit', edit_open_ehr_ehr_observation_blood_pressure_v1_path(id: open_ehr_ehr_observation_blood_pressure_v1.id) %>" }
-        it { should contain "<%= link_to 'Destroy', open_ehr_ehr_observation_blood_pressure_v1_path(id: open_ehr_ehr_observation_blood_pressure_v1.id), method: :delete, data: { confirm: 'Are you sure?' } %>"}
+        it { is_expected.to exist }
+        it { is_expected.to contain '<h1>Listing <%= t(".at0000") %></h1>' }
+        it { is_expected.to contain '<th><%= t(".at0004") %></th>' }
+        it { is_expected.to contain '<th><%= t(".at0005") %></th>' }
+        it { is_expected.not_to contain '<th><%= t(".at0006") %></th>' }
+        it { is_expected.to contain '<td><%= open_ehr_ehr_observation_blood_pressure_v1.at0004 %></td>' }
+        it { is_expected.to contain "<%= link_to 'Show', open_ehr_ehr_observation_blood_pressure_v1_path(id: open_ehr_ehr_observation_blood_pressure_v1.id) %>"}
+        it { is_expected.to contain "<%= link_to 'Edit', edit_open_ehr_ehr_observation_blood_pressure_v1_path(id: open_ehr_ehr_observation_blood_pressure_v1.id) %>" }
+        it { is_expected.to contain "<%= link_to 'Destroy', open_ehr_ehr_observation_blood_pressure_v1_path(id: open_ehr_ehr_observation_blood_pressure_v1.id), method: :delete, data: { confirm: 'Are you sure?' } %>"}
       end
 
       context 'invoke show.html.erb template engine' do
         subject { file('app/views/open_ehr_ehr_observation_blood_pressure_v1/show.html.erb') }
 
-        it { should contain 'Data' }
-        it { should contain "<strong><%= t('.at0005') %></strong>: " }
-        it { should contain '<%= @open_ehr_ehr_observation_blood_pressure_v1.at0005 %>mm[Hg]<br/>' }
-        it { should contain 'Protocol' }
-        it { should contain "<strong><%= t('.at0013') %></strong>: <%= @open_ehr_ehr_observation_blood_pressure_v1.at0013 %>"}
+        it { is_expected.to contain 'Data' }
+        it { is_expected.to contain "<strong><%= t('.at0005') %></strong>: " }
+        it { is_expected.to contain '<%= @open_ehr_ehr_observation_blood_pressure_v1.at0005 %>mm[Hg]<br/>' }
+        it { is_expected.to contain 'Protocol' }
+        it { is_expected.to contain "<strong><%= t('.at0013') %></strong>: <%= @open_ehr_ehr_observation_blood_pressure_v1.at0013 %>"}
       end
 
       context 'invoke edit.html.erb template engine' do
         subject { file('app/views/open_ehr_ehr_observation_blood_pressure_v1/edit.html.erb') }
 
-        it { should exist }
-        it { should contain "Editing <%= t('.at0000')"}
+        it { is_expected.to exist }
+        it { is_expected.to contain "Editing <%= t('.at0000')"}
       end
 
       context 'invoke new.html.erb template engine' do
         subject { file('app/views/open_ehr_ehr_observation_blood_pressure_v1/new.html.erb')}
 
-        it { should exist}
-        it { should contain /New \<%= t\(\".at0000\"\) %\>/ }
+        it { is_expected.to exist}
+        it { is_expected.to contain /New \<%= t\(\".at0000\"\) %\>/ }
       end
 
       context 'invoke _form.html.erb template engine' do
         subject { file('app/views/open_ehr_ehr_observation_blood_pressure_v1/_form.html.erb')}
 
-        it { should exist }
-        it { should contain "f.select :at0013, t('.at0015') => 'at0015', t('.at0016') => 'at0016'"}
-        it { should contain "<%= t('.at0006') %></strong>: <%= f.text_field :at0006 %>" }
+        it { is_expected.to exist }
+        it { is_expected.to contain "f.select :at0013, t('.at0015') => 'at0015', t('.at0016') => 'at0016'"}
+        it { is_expected.to contain "<%= t('.at0006') %></strong>: <%= f.text_field :at0006 %>" }
       end
 
       context 'invoke routing generator' do
         subject { file('config/routes.rb')}
 
-        it { should contain 'resources :open_ehr_ehr_observation_blood_pressure_v1'}
+        it { is_expected.to contain 'resources :open_ehr_ehr_observation_blood_pressure_v1'}
       end
 
       context 'Insert inflection setting' do
         subject { file('config/initializers/inflections.rb') }
         
-        it { should contain 'inflect.uncountable %w( open_ehr_ehr_observation_blood_pressure_v1 )' }
+        it { is_expected.to contain 'inflect.uncountable %w( open_ehr_ehr_observation_blood_pressure_v1 )' }
       end
 
       context 'invoke assets generator' do
         subject { file('app/assets/stylesheets/scaffold.css') }
 
-        it { should exist }
+        it { is_expected.to exist }
       end
 
       context 'i18n generator' do
         subject { file('config/initializers/i18n.rb') }
 
-        it { should exist }
+        it { is_expected.to exist }
       end
       
       context 'add locale switcher to application.html.erb' do
         subject { file('app/views/layouts/application.html.erb') }
 
-        it { should exist }
-        it { should contain /\<%= select_tag 'locale',/ }
-        it { should contain /options_for_select\(LANGUAGES, I18n\.locale.to_s\),/ }
+        it { is_expected.to exist }
+        it { is_expected.to contain /\<%= select_tag 'locale',/ }
+        it { is_expected.to contain /options_for_select\(LANGUAGES, I18n\.locale.to_s\),/ }
       end
 
       context 'layout.css.scss' do
         subject { file('app/assets/stylesheets/layout.css.scss') }
 
-        it { should exist }
-        it { should contain /\.locale {/ }
+        it { is_expected.to exist }
+        it { is_expected.to contain /\.locale {/ }
       end
 
       context 'invoke helper generator' do
         subject { file('app/helpers/open_ehr_ehr_observation_blood_pressure_v1_helper.rb')}
 
-        it { should exist }
+        it { is_expected.to exist }
       end
 
       describe 'controller generator' do
         subject { file('app/controllers/open_ehr_ehr_observation_blood_pressure_v1_controller.rb') }
 
-        it { should exist }
+        it { is_expected.to exist }
       end
 
       describe 'application controller modifier' do
         subject { file('app/controllers/application_controller.rb') }
 
-        it { should contain /before_action :set_locale/ }
-        it { should contain /def set_locale/ }
-        it { should contain /I18n\.locale = params\[:locale\] \|\| session\[:locale\] \|\| I18n\.default_locale/ }
-        it { should contain /end$/ }
+        it { is_expected.to contain /before_action :set_locale/ }
+        it { is_expected.to contain /def set_locale/ }
+        it { is_expected.to contain /I18n\.locale = params\[:locale\] \|\| session\[:locale\] \|\| I18n\.default_locale/ }
+        it { is_expected.to contain /end$/ }
       end
     end
   end