ncs_mdes_warehouse 0.13.0 → 0.13.1

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 NCS Navigator MDES Warehouse History
 ====================================
 
+0.13.1
+------
+
+- Fix XmlEmitter#models so that it returns the configured models if available.
+  This was broken in 0.13.0. (#3984)
+
 0.13.0
 ------
 

data/lib/ncs_navigator/warehouse/version.rb

@@ -1,5 +1,5 @@
 module NcsNavigator
   module Warehouse
-    VERSION = '0.13.0'
+    VERSION = '0.13.1'
   end
 end

data/lib/ncs_navigator/warehouse/xml_emitter.rb

@@ -19,12 +19,6 @@ module NcsNavigator::Warehouse
     #   emitter.
     attr_reader :configuration
 
-    ##
-    # @return [Array<Models::MdesModel>] the models whose data will be
-    #   emitted. This is determined from the `:tables` option to
-    #   {#initialize}.
-    attr_reader :models
-
     ##
     # @private exposed for testing
     # @return [Array] the configuration objects related to each separate XML
@@ -140,6 +134,15 @@ XML
       end
     end
 
+    ##
+    # @return [Array<Models::MdesModel>] the models whose data will be
+    #   emitted. This is determined from the `:tables` option to
+    #   {#initialize} or by any `models` method implemented by the value passed
+    #   to the `:content` option.
+    def models
+      @content_enumerator.models if @content_enumerator.respond_to?(:models)
+    end
+
     ##
     # Emit XML from the configured warehouse to {#filename}.
     #

data/spec/ncs_navigator/warehouse/xml_emitter_spec.rb

@@ -32,6 +32,28 @@ module NcsNavigator::Warehouse
       end
     end
 
+    describe '#models' do
+      it 'exposes the configured list of models when no :content' do
+        options[:tables] = %w(person household_unit)
+        emitter.models.should == [mdes_model(:person), mdes_model(:household_unit)]
+      end
+
+      it 'uses the models from the provided :content, if any' do
+        content = mock(Enumerable)
+        content.should_receive(:models).and_return([mdes_model(:listing_unit)])
+        options[:content] = content
+
+        options[:tables] = %w(person household_unit)
+
+        emitter.models.should == [mdes_model(:listing_unit)]
+      end
+
+      it 'is nil if the :content does not provide models' do
+        options[:content] = []
+        emitter.models.should be_nil
+      end
+    end
+
     # Most of the details of the XML are tested on the MdesModel mixin
     describe 'the generated XML', :slow do
       describe 'global attributes' do

data/spec/spec_helper.rb

@@ -67,12 +67,12 @@ RSpec.configure do |config|
 
   ###### use_database
 
-  config.before(:each, :use_database) do
-    $db_init ||=
-      begin
-        init = NcsNavigator::Warehouse::DatabaseInitializer.new(spec_config)
-        init.set_up_repository(:both)
-      end
+  # Other specs call set_up_repository with different warehouse configs.
+  # This interferes with global state (DM's connection setup), so we need
+  # to reconnect for each :use_database group to correct.
+  config.before(:all, :use_database) do
+    init = NcsNavigator::Warehouse::DatabaseInitializer.new(spec_config)
+    init.set_up_repository(:both)
   end
 
   config.after(:each, :use_database) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ncs_mdes_warehouse
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ncs_mdes
@@ -3000,7 +3000,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2914256523883206240
+      hash: 4557343554488518781
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -3009,7 +3009,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2914256523883206240
+      hash: 4557343554488518781
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25