ncs_mdes_warehouse 0.7.2 → 0.7.3

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 NCS Navigator MDES Warehouse History
 ====================================
 
+0.7.3
+-----
+
+- Correct primary key resolution in FK index. (#2388)
+
+- Remove autoload for MDES 2.0 models. MDES models should only be loaded via a
+  warehouse configuration instance. Doing otherwise will likely confuse
+  DataMapper.
+
 0.7.2
 -----
 

data/lib/ncs_navigator/warehouse/models.rb

@@ -7,8 +7,5 @@ module NcsNavigator::Warehouse
   module Models
     autoload :MdesModel,           'ncs_navigator/warehouse/models/mdes_model'
     autoload :MdesModelCollection, 'ncs_navigator/warehouse/models/mdes_model_collection'
-
-    # Generated modules
-    autoload :TwoPointZero, 'ncs_navigator/warehouse/models/two_point_zero'
   end
 end

data/lib/ncs_navigator/warehouse/transformers/foreign_key_index.rb

@@ -96,7 +96,7 @@ module NcsNavigator::Warehouse::Transformers
 
       if reference_value && !seen?(foreign_model, reference_value)
         interim_unsatisfied << RelationshipInstance.new(
-          record.id, record.class.to_s, foreign_model, reference_name, reference_value
+          record.key.first, record.class.to_s, foreign_model, reference_name, reference_value
         )
       end
     end

data/lib/ncs_navigator/warehouse/version.rb

@@ -1,5 +1,5 @@
 module NcsNavigator
   module Warehouse
-    VERSION = '0.7.2'
+    VERSION = '0.7.3'
   end
 end

data/spec/ncs_navigator/warehouse/transformers/foreign_key_index_spec.rb

@@ -6,7 +6,7 @@ module NcsNavigator::Warehouse::Transformers
       include ::DataMapper::Resource
 
       property :psu_id, String
-      property :id, Integer, :key => true
+      property :a_id, Integer, :key => true
 
       belongs_to :old_one, self, :child_key => [ :old_one_id ]
       belongs_to :frob, 'NcsNavigator::Warehouse::Transformers::Frob', :child_key => [ :frob_id ]
@@ -16,7 +16,7 @@ module NcsNavigator::Warehouse::Transformers
       include ::DataMapper::Resource
 
       property :psu_id, String
-      property :id, Integer, :key => true
+      property :f_id, Integer, :key => true
     end
 
     before(:each) do
@@ -47,27 +47,27 @@ module NcsNavigator::Warehouse::Transformers
 
     describe 'reporting errors' do
       before do
-        fk_index.record_and_verify(Frob.new(:id => 8))
-        fk_index.record_and_verify(Frob.new(:id => 16))
+        fk_index.record_and_verify(Frob.new(:f_id => 8))
+        fk_index.record_and_verify(Frob.new(:f_id => 16))
       end
 
       it 'does not report for a key which is satisfied when it is first recorded' do
-        fk_index.record_and_verify(Addr.new(:frob_id => 8, :id => 1))
+        fk_index.record_and_verify(Addr.new(:frob_id => 8, :a_id => 1))
         fk_index.report_errors(transform_status)
 
         errors.should == []
       end
 
       it 'does not report for a key which is not initially satisfied but is later' do
-        fk_index.record_and_verify(Addr.new(:frob_id => 4, :id => 1))
-        fk_index.record_and_verify(Frob.new(:id => 4))
+        fk_index.record_and_verify(Addr.new(:frob_id => 4, :a_id => 1))
+        fk_index.record_and_verify(Frob.new(:f_id => 4))
         fk_index.report_errors(transform_status)
 
         errors.should == []
       end
 
       it 'does not report for a key which is provided by the external key provider' do
-        fk_index.record_and_verify(Addr.new(:id => 8, :old_one_id => 120))
+        fk_index.record_and_verify(Addr.new(:a_id => 8, :old_one_id => 120))
         fk_index.report_errors(transform_status)
 
         errors.should == []
@@ -76,7 +76,7 @@ module NcsNavigator::Warehouse::Transformers
       it 'does not report for a key which is provided by the external key provider when the associated model class has not previously been referenced' do
         another_index = ForeignKeyIndex.new(:existing_key_provider => key_provider)
 
-        another_index.record_and_verify(Addr.new(:id => 8, :frob_id => 80))
+        another_index.record_and_verify(Addr.new(:a_id => 8, :frob_id => 80))
         another_index.report_errors(transform_status)
 
         errors.should == []
@@ -84,7 +84,7 @@ module NcsNavigator::Warehouse::Transformers
 
       describe 'when a key is never satisfied' do
         before do
-          fk_index.record_and_verify(Addr.new(:frob_id => 4, :id => 1))
+          fk_index.record_and_verify(Addr.new(:frob_id => 4, :a_id => 1))
           fk_index.report_errors(transform_status)
         end
 
@@ -113,7 +113,7 @@ module NcsNavigator::Warehouse::Transformers
       end
 
       it 'reports multiple failed references for a single record' do
-        fk_index.record_and_verify(Addr.new(:id => 1, :frob_id => 2, :old_one_id => 3))
+        fk_index.record_and_verify(Addr.new(:a_id => 1, :frob_id => 2, :old_one_id => 3))
         fk_index.report_errors(transform_status)
 
         errors.collect { |e| e.message.match(/foreign key (\S+)/)[1] }.sort.should ==

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ncs_mdes_warehouse
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ncs_mdes
@@ -1817,7 +1817,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -207131653451212377
+      hash: 4409560537695379906
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1826,7 +1826,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -207131653451212377
+      hash: 4409560537695379906
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24