ncs_mdes_warehouse 0.15.0.pre1 → 0.15.0.pre2

data/ci-exec.sh

@@ -2,7 +2,7 @@
 
 export NCS_NAVIGATOR_ENV=ci
 
-BUNDLER_VERSION=1.2.0
+BUNDLER_VERSION=1.3.5
 GEMSET=ncs_mdes_warehouse
 
 if [ -z $CI_RUBY ]; then

data/lib/ncs_navigator/warehouse/data_mapper_patches.rb

@@ -45,3 +45,16 @@ module DataMapper::Inflector
     lower_case_and_underscored_word
   end
 end
+
+# TODO: add/verify there are specs to ensure this does not break the
+#       behavior of mdes-wh without --soft_validations
+#
+# This hack is added to get around DataMapper validating :required =>
+# true in dm-core. With dm-validations :required => true is also
+# validated but the validation in dm-core cannot be disabled using
+# save! (or any other known method)
+class DataMapper::Property
+  def valid?(*args)
+    true
+  end
+end

data/lib/ncs_navigator/warehouse/models/mdes_model.rb

@@ -29,6 +29,13 @@ module NcsNavigator::Warehouse::Models
             content = %w(-3 -6).detect { |c| prop.options[:set].include?(c) }
           end
 
+          # If the content is a BigDecimal, we don't want
+          # the result in engineering notation, which is the default.
+          # We want floating-point notation instead.
+          if content.is_a?(BigDecimal)
+            content = content.to_s('F')
+          end
+
           # Omit if blank and omittable, otherwise have a blast
           if !content.blank? || !prop.omittable
             xml.tag!(variable_name, content)

data/lib/ncs_navigator/warehouse/version.rb

@@ -1,5 +1,5 @@
 module NcsNavigator
   module Warehouse
-    VERSION = '0.15.0.pre1'
+    VERSION = '0.15.0.pre2'
   end
 end

data/spec/ncs_navigator/warehouse/models/mdes_model_spec.rb

@@ -33,9 +33,10 @@ module NcsNavigator::Warehouse::Models
         property   :color_scale, NcsNavigator::Warehouse::DataMapper::NcsString,
                    :pii => true,
                    :set => %w(3 4 5 6 7 8 -6)
+        property   :sample_size, NcsNavigator::Warehouse::DataMapper::NcsDecimal
         property   :size, NcsNavigator::Warehouse::DataMapper::NcsInteger, :omittable => true
 
-        mdes_order :tableau_id, :age_span, :context_id, :ssn, :color_scale, :size
+        mdes_order :tableau_id, :age_span, :context_id, :ssn, :color_scale, :size, :sample_size
       end
 
       class Spec::Sample::Context
@@ -55,7 +56,7 @@ module NcsNavigator::Warehouse::Models
     describe '.mdes_order' do
       it 'is retrievable' do
         Spec::Sample::GenerationalTableau.mdes_order.
-          should == [ :tableau_id, :age_span, :context_id, :ssn, :color_scale, :size ]
+          should == [ :tableau_id, :age_span, :context_id, :ssn, :color_scale, :size, :sample_size ]
       end
     end
 
@@ -67,7 +68,7 @@ module NcsNavigator::Warehouse::Models
       subject {
         Spec::Sample::GenerationalTableau.new(
           :tableau_id => 4, :age_span => '19-54', :ssn => '555-45-4444', :color_scale => '5',
-          :size => 14
+          :size => 14, :sample_size => 15.01234
         ).tap do |gt|
           gt.context_id = 'AB-7833'
         end
@@ -82,7 +83,11 @@ module NcsNavigator::Warehouse::Models
       end
 
       it 'emits the expected number of columns' do
-        xml.root.elements.size.should == 7
+        xml.root.elements.size.should == 8
+      end
+
+      it 'produces decimals in a floating-point notation' do
+        xml.xpath('//sample_size').first.text.strip.should == "15.01234"
       end
 
       it 'produces XML omitting PII by default' do
@@ -104,7 +109,7 @@ module NcsNavigator::Warehouse::Models
 
       it 'emits the columns according to the mdes_order' do
         xml.root.elements.collect(&:name).
-          should == %w(tableau_id age_span context_id ssn color_scale size transaction_type)
+          should == %w(tableau_id age_span context_id ssn color_scale size sample_size transaction_type)
       end
 
       it 'emits the property values as expected' do

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

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+require 'ncs_navigator/warehouse/data_mapper'
+
+module NcsNavigator::Warehouse::Transformers
+  describe EnumTransformer do
+    describe '#transform' do
+      context 'soft_validations', :use_database, :modifies_warehouse_state do
+
+        class Sample
+          include ::DataMapper::Resource
+
+          property :psu_id, String
+          property :recruit_type, String, :format => /^\d$/
+          property :id, Integer, :key => true
+          property :name, String, :required => true
+        end
+
+        before(:all) do
+          DataMapper.finalize
+        end
+
+        let(:records) {[Sample.new(:id => 1, :psu_id => '20000030', :name => 'One'),
+                        Sample.new(:id => 2, :psu_id => '20000030', :name => 'Two'),
+                        Sample.new(:id => 3, :psu_id => '20000030', :name => 'Three')
+                       ]}
+        let(:transformer) { EnumTransformer.new(spec_config.tap{|c|c.soft_validations = true}, records) }
+        let(:transform_status) { NcsNavigator::Warehouse::TransformStatus.memory_only('test') }
+
+        it 'saves invalid records but still records validation errors' do
+          records[2].recruit_type = 'H'
+          records[2].should be_dirty
+          records[2].should_not be_valid
+          transformer.transform(transform_status)
+          transform_status.transform_errors.size.should == 1
+          records[2].should_not be_dirty
+        end
+
+        context "in combination with drop_all_null_constraints" do
+          before(:all) {NcsNavigator::Warehouse::Spec.database_initializer.drop_all_null_constraints(:working)}
+          after (:all) {NcsNavigator::Warehouse::Spec.database_initializer.replace_schema}
+          it 'saves null records with drop_all_null_constraints' do
+            records[2].name = nil
+            records[2].should be_dirty
+            records[2].should_not be_valid
+            transformer.transform(transform_status)
+            transform_status.transform_errors.size.should == 1
+            records[2].should_not be_dirty
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -309,7 +309,7 @@ module NcsNavigator::Warehouse::Transformers
           err = transform_status.transform_errors.first
           err.model_class.should == Sample.to_s
           err.record_id.should == '2'
-          err.message.should =~ /^Could not save valid record/
+          err.message.should =~ /^Could not save record/
         end
 
         it 'saves the saveable instances' do

data/spec/spec_helper.rb

@@ -71,8 +71,9 @@ RSpec.configure do |config|
   # 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)
+    NcsNavigator::Warehouse::Spec.database_initializer(spec_config).tap do |db|
+      db.set_up_repository(:both)
+    end
   end
 
   config.after(:each, :use_database) do

data/spec/spec_warehouse_config.rb

@@ -23,8 +23,8 @@ module NcsNavigator::Warehouse
       end
     end
 
-    def self.database_initializer
-      @database_initializer ||= DatabaseInitializer.new(configuration)
+    def self.database_initializer(config = self.configuration)
+      @database_initializer ||= DatabaseInitializer.new(config)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ncs_mdes_warehouse
 version: !ruby/object:Gem::Version
-  version: 0.15.0.pre1
+  version: 0.15.0.pre2
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ncs_mdes
@@ -3635,6 +3635,7 @@ files:
 - spec/ncs_navigator/warehouse/transform_load_spec.rb
 - spec/ncs_navigator/warehouse/transform_status_spec.rb
 - spec/ncs_navigator/warehouse/transformers/database_spec.rb
+- spec/ncs_navigator/warehouse/transformers/enum_transformer_soft_validations_spec.rb
 - spec/ncs_navigator/warehouse/transformers/enum_transformer_spec.rb
 - spec/ncs_navigator/warehouse/transformers/event_start_from_contact_transformer_spec.rb
 - spec/ncs_navigator/warehouse/transformers/foreign_key_index/database_key_provider_spec.rb
@@ -3669,7 +3670,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4565215284799470018
+      hash: 775523728278121596
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -3678,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.24
 signing_key: 
 specification_version: 3
 summary: Scripts and models for building and maintaining the MDES-based reporting
@@ -3710,6 +3711,7 @@ test_files:
 - spec/ncs_navigator/warehouse/transform_load_spec.rb
 - spec/ncs_navigator/warehouse/transform_status_spec.rb
 - spec/ncs_navigator/warehouse/transformers/database_spec.rb
+- spec/ncs_navigator/warehouse/transformers/enum_transformer_soft_validations_spec.rb
 - spec/ncs_navigator/warehouse/transformers/enum_transformer_spec.rb
 - spec/ncs_navigator/warehouse/transformers/event_start_from_contact_transformer_spec.rb
 - spec/ncs_navigator/warehouse/transformers/foreign_key_index/database_key_provider_spec.rb