ncs_navigator_configuration 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -1,11 +1,19 @@
 NCS Navigator Configuration gem history
 =======================================
 
+0.3.1
+-----
+
+- Make Areas and SSUs optional for the PSU in the sampling unit CSV
+  file. (#7)
+
 0.3.0
 -----
 
 - New optional study center attribute: short_name. (#10)
+
 - New optional attribute for Staff Portal and Core: mail_from. (#8)
+
 - New optional study center attribute: `exception_email_recipients`. (#9)
 
 0.2.0

data/lib/ncs_navigator/configuration.rb

@@ -357,11 +357,11 @@ module NcsNavigator
     ##
     # @return [Array<SamplingUnitArea>] the areas defined in {#sampling_units_file}.
     def sampling_unit_areas
-      @sampling_unit_areas ||= read_sampling_unit_areas
+      @sampling_unit_areas ||= primary_sampling_units.collect(&:sampling_unit_areas).flatten
     end
     alias :areas :sampling_unit_areas
 
-    def read_sampling_unit_areas
+    def read_primary_sampling_units
       psus = {}
       areas = {}
       ssus = {}
@@ -377,28 +377,32 @@ module NcsNavigator
         :converters => [strip_ws], :header_converters => [strip_ws]
       ) do |row|
         psu = (psus[row['PSU_ID']] ||= PrimarySamplingUnit.new(row['PSU_ID']))
-        area = (areas[row['AREA']] ||= SamplingUnitArea.new(row['AREA'], psu))
-        ssu = (ssus[row['SSU_ID']] ||= SecondarySamplingUnit.new(row['SSU_ID'], row['SSU_NAME'], area))
-        if row['TSU_ID']
-          TertiarySamplingUnit.new(row['TSU_ID'], row['TSU_NAME'], ssu)
+        if row['AREA']
+          area = (areas[row['AREA']] ||= SamplingUnitArea.new(row['AREA'], psu))
+          if row['SSU_ID']
+            area = (areas[row['AREA']] ||= SamplingUnitArea.new(row['AREA'], psu))
+            ssu = (ssus[row['SSU_ID']] ||= SecondarySamplingUnit.new(row['SSU_ID'], row['SSU_NAME'], area))
+            if row['TSU_ID']
+              TertiarySamplingUnit.new(row['TSU_ID'], row['TSU_NAME'], ssu)
+            end
+          end
         end
       end
-
-      areas.values
+      psus.values
     end
-    private :read_sampling_unit_areas
+    private :read_primary_sampling_units
 
     ##
     # @return [Array<PrimarySamplingUnit>] the PSUs defined in {#sampling_units_file}.
     def primary_sampling_units
-      @primary_sampling_units ||= sampling_unit_areas.collect(&:primary_sampling_unit).uniq
+      @primary_sampling_units ||= read_primary_sampling_units
     end
     alias :psus :primary_sampling_units
 
     ##
     # @return [Array<SecondarySamplingUnit>] the SSUs defined in {#sampling_units_file}.
     def secondary_sampling_units
-      @secondary_sampling_units ||= sampling_unit_areas.collect(&:secondary_sampling_units).flatten
+      @secondary_sampling_units ||= primary_sampling_units.collect(&:secondary_sampling_units).flatten
     end
     alias :ssus :secondary_sampling_units
 

data/lib/ncs_navigator/configuration/version.rb

@@ -1,5 +1,5 @@
 module NcsNavigator
   class Configuration
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/spec/ncs_navigator/configuration_spec.rb

@@ -228,6 +228,35 @@ module NcsNavigator
           psu.secondary_sampling_units.collect(&:id).should == %w(One Two Three)
         end
       end
+
+      context 'without Areas and SSUs' do
+        before do
+          input_hash['Study Center']['sampling_units_file'] =
+            File.expand_path('../no_ssus.csv', __FILE__)
+        end
+
+        subject { from_hash.primary_sampling_units }
+
+        it 'has the right number' do
+          subject.size.should == 1
+        end
+
+        describe 'an individual PSU' do
+          let(:psu) { subject.first }
+
+          it 'has the correct ID' do
+            psu.id.should == '204'
+          end
+
+          it 'has no Areas' do
+            psu.should have(0).sampling_unit_areas
+          end
+
+          it 'has no SSUs' do
+            psu.should have(0).secondary_sampling_units
+          end
+        end
+      end
     end
 
     describe '#secondary_sampling_units' do

data/spec/ncs_navigator/no_ssus.csv

@@ -0,0 +1,2 @@
+PSU_ID,AREA,SSU_ID,SSU_NAME,TSU_ID,TSU_NAME
+204,,,,,

metadata

@@ -1,152 +1,156 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ncs_navigator_configuration
-version: !ruby/object:Gem::Version
-  version: 0.3.0
+version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
-authors:
+authors: 
 - Rhett Sutphin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: ncs_mdes
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2012-07-10 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 4
+        version: "0.4"
+  requirement: *id001
+  name: ncs_mdes
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: inifile
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 4
+        - 1
         version: 0.4.1
+  requirement: *id002
+  name: inifile
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        version: "1.5"
+  requirement: *id003
   name: fastercsv
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
+  requirement: *id004
+  name: rake
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 6
+        version: "2.6"
+  requirement: *id005
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 7
+        - 2
         version: 0.7.2
+  requirement: *id006
+  name: yard
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.2
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 3
+        - 2
         version: 0.3.2
+  requirement: *id007
+  name: fakefs
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 6
+        version: "1.6"
+  requirement: *id008
   name: ci_reporter
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-description: ! "\n    An internal component of the NCS Navigator suite, this gem provides
-  a common view\n    onto shared configuration elements.\n  "
-email:
+description: "\n    An internal component of the NCS Navigator suite, this gem provides a common view\n    onto shared configuration elements.\n  "
+email: 
 - r-sutphin@northwestern.edu
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rvmrc
 - .yardopts
@@ -164,44 +168,49 @@ files:
 - spec/ncs_navigator/configuration_spec.rb
 - spec/ncs_navigator/every_su.csv
 - spec/ncs_navigator/everything.ini
+- spec/ncs_navigator/no_ssus.csv
 - spec/ncs_navigator/no_tsus.csv
 - spec/ncs_navigator/spaces.csv
 - spec/spec_helper.rb
-homepage: ''
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 2522240099632272850
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 2522240099632272850
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Common configuration elements for the NCS Navigator suite
-test_files:
+test_files: 
 - spec/ncs_navigator/configuration/version_spec.rb
 - spec/ncs_navigator/configuration_spec.rb
 - spec/ncs_navigator/every_su.csv
 - spec/ncs_navigator/everything.ini
+- spec/ncs_navigator/no_ssus.csv
 - spec/ncs_navigator/no_tsus.csv
 - spec/ncs_navigator/spaces.csv
 - spec/spec_helper.rb