ncs_mdes_warehouse 0.15.0.pre3 → 0.15.0.pre4

data/CHANGELOG.md

@@ -10,6 +10,10 @@ NCS Navigator MDES Warehouse History
 - Add drop_not_null option: Drop NOT NULL constraints for all, but
   the primary key colums in the database (#4316)
 
+- Fix trh_meter_calibration's equip_id foreign key reference (#4586)
+
+- Update XmlEmitter to work with latest Thor (#4589)
+
 0.14.0
 ------
 

data/generated_models/ncs_navigator/warehouse/models/three_point_one/trh_meter_calibration.rb

@@ -17,7 +17,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
                'NcsNavigator::Warehouse::Models::ThreePointOne::SrscInfo',
                :child_key => [ :srsc_id ], :required => true
     belongs_to :equip,
-               'NcsNavigator::Warehouse::Models::ThreePointOne::SpecEquipment',
+               'NcsNavigator::Warehouse::Models::ThreePointOne::EnvEquipment',
                :child_key => [ :equip_id ], :required => true
     belongs_to :staff,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Staff',

data/generated_models/ncs_navigator/warehouse/models/three_point_three/trh_meter_calibration.rb

@@ -17,7 +17,7 @@ module NcsNavigator::Warehouse::Models::ThreePointThree
                'NcsNavigator::Warehouse::Models::ThreePointThree::SrscInfo',
                :child_key => [ :srsc_id ], :required => true
     belongs_to :equip,
-               'NcsNavigator::Warehouse::Models::ThreePointThree::SpecEquipment',
+               'NcsNavigator::Warehouse::Models::ThreePointThree::EnvEquipment',
                :child_key => [ :equip_id ], :required => true
     belongs_to :staff,
                'NcsNavigator::Warehouse::Models::ThreePointThree::Staff',

data/generated_models/ncs_navigator/warehouse/models/three_point_two/trh_meter_calibration.rb

@@ -17,7 +17,7 @@ module NcsNavigator::Warehouse::Models::ThreePointTwo
                'NcsNavigator::Warehouse::Models::ThreePointTwo::SrscInfo',
                :child_key => [ :srsc_id ], :required => true
     belongs_to :equip,
-               'NcsNavigator::Warehouse::Models::ThreePointTwo::SpecEquipment',
+               'NcsNavigator::Warehouse::Models::ThreePointTwo::EnvEquipment',
                :child_key => [ :equip_id ], :required => true
     belongs_to :staff,
                'NcsNavigator::Warehouse::Models::ThreePointTwo::Staff',

data/generated_models/ncs_navigator/warehouse/models/three_point_zero/trh_meter_calibration.rb

@@ -17,7 +17,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
                'NcsNavigator::Warehouse::Models::ThreePointZero::SrscInfo',
                :child_key => [ :srsc_id ], :required => true
     belongs_to :equip,
-               'NcsNavigator::Warehouse::Models::ThreePointZero::SpecEquipment',
+               'NcsNavigator::Warehouse::Models::ThreePointZero::EnvEquipment',
                :child_key => [ :equip_id ], :required => true
     belongs_to :staff,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Staff',

data/generated_models/ncs_navigator/warehouse/models/two_point_one/trh_meter_calibration.rb

@@ -17,7 +17,7 @@ module NcsNavigator::Warehouse::Models::TwoPointOne
                'NcsNavigator::Warehouse::Models::TwoPointOne::SrscInfo',
                :child_key => [ :srsc_id ], :required => true
     belongs_to :equip,
-               'NcsNavigator::Warehouse::Models::TwoPointOne::SpecEquipment',
+               'NcsNavigator::Warehouse::Models::TwoPointOne::EnvEquipment',
                :child_key => [ :equip_id ], :required => true
     belongs_to :staff,
                'NcsNavigator::Warehouse::Models::TwoPointOne::Staff',

data/generated_models/ncs_navigator/warehouse/models/two_point_two/trh_meter_calibration.rb

@@ -17,7 +17,7 @@ module NcsNavigator::Warehouse::Models::TwoPointTwo
                'NcsNavigator::Warehouse::Models::TwoPointTwo::SrscInfo',
                :child_key => [ :srsc_id ], :required => true
     belongs_to :equip,
-               'NcsNavigator::Warehouse::Models::TwoPointTwo::SpecEquipment',
+               'NcsNavigator::Warehouse::Models::TwoPointTwo::EnvEquipment',
                :child_key => [ :equip_id ], :required => true
     belongs_to :staff,
                'NcsNavigator::Warehouse::Models::TwoPointTwo::Staff',

data/generated_models/ncs_navigator/warehouse/models/two_point_zero/trh_meter_calibration.rb

@@ -17,7 +17,7 @@ module NcsNavigator::Warehouse::Models::TwoPointZero
                'NcsNavigator::Warehouse::Models::TwoPointZero::SrscInfo',
                :child_key => [ :srsc_id ], :required => true
     belongs_to :equip,
-               'NcsNavigator::Warehouse::Models::TwoPointZero::SpecEquipment',
+               'NcsNavigator::Warehouse::Models::TwoPointZero::EnvEquipment',
                :child_key => [ :equip_id ], :required => true
     belongs_to :staff,
                'NcsNavigator::Warehouse::Models::TwoPointZero::Staff',

data/lib/ncs_navigator/warehouse/version.rb

@@ -1,5 +1,5 @@
 module NcsNavigator
   module Warehouse
-    VERSION = '0.15.0.pre3'
+    VERSION = '0.15.0.pre4'
   end
 end

data/lib/ncs_navigator/warehouse/xml_emitter.rb

@@ -106,7 +106,7 @@ XML
     #   `:filters=>nil` in the options.
     def initialize(config, filename, options={})
       @configuration = config
-      @zip = options.has_key?(:zip) ? options[:zip] : true
+      @zip = options.has_key?('zip') ? options['zip'] : true
 
       @xml_files = determine_files_to_create(filename, options)
 
@@ -116,8 +116,8 @@ XML
         @content_enumerator = options[:content]
       else
         filter_names =
-          if options.has_key?(:filters)
-            options[:filters] ? options[:filters] : []
+          if options.has_key?('filters')
+            options['filters'] ? options['filters'] : []
           else
             [config.default_xml_filter_set].compact
           end

data/spec/ncs_navigator/warehouse/xml_emitter_spec.rb

@@ -5,7 +5,7 @@ require 'zip/zip'
 module NcsNavigator::Warehouse
   describe XmlEmitter, :use_mdes do
     let(:filename) { tmpdir + 'export.xml' }
-    let(:options) { { :zip => false } }
+    let(:options) { { 'zip' => false } }
     let(:emitter) { XmlEmitter.new(spec_config, filename, options) }
     let(:xml) {
       emitter.emit_xml
@@ -246,19 +246,19 @@ module NcsNavigator::Warehouse
             end
 
             it 'is used when there are no filters in the options' do
-              options.delete(:filters)
+              options.delete('filters')
 
               person_names.should == %w(nitneuQ reivaX)
             end
 
             it 'is not used when a different filter is in the options' do
-              options[:filters] = ['upcaser']
+              options['filters'] = ['upcaser']
 
               person_names.should == %w(QUENTIN XAVIER)
             end
 
             it 'is not used when explicitly disabled' do
-              options[:filters] = nil
+              options['filters'] = nil
 
               person_names.should == %w(Quentin Xavier)
             end
@@ -266,19 +266,19 @@ module NcsNavigator::Warehouse
 
           describe 'when there is no default XML filter in the configuration' do
             it 'applies no filters when none are specified' do
-              options.delete(:filters)
+              options.delete('filters')
 
               person_names.should == %w(Quentin Xavier)
             end
 
             it 'applies no filters when an absence of filters is specified' do
-              options[:filters] = nil
+              options['filters'] = nil
 
               person_names.should == %w(Quentin Xavier)
             end
 
             it 'applies specified filters, if any' do
-              options[:filters] = ['upcaser', 'reverser']
+              options['filters'] = ['upcaser', 'reverser']
 
               person_names.should == %w(NITNEUQ REIVAX)
             end
@@ -345,12 +345,12 @@ module NcsNavigator::Warehouse
         end
 
         it 'exists if explicitly requested' do
-          options[:zip] = true
+          options['zip'] = true
           actual.should be_readable
         end
 
         it 'does not exist when excluded' do
-          options[:zip] = false
+          options['zip'] = false
           actual.exist?.should be_false
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ncs_mdes_warehouse
 version: !ruby/object:Gem::Version
-  version: 0.15.0.pre3
+  version: 0.15.0.pre4
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ncs_mdes
@@ -3670,7 +3670,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1848761035843935953
+      hash: -1051607949
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -3679,7 +3679,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Scripts and models for building and maintaining the MDES-based reporting