sniff 0.11.5 → 0.11.6

data/lib/sniff/fixture.rb

@@ -3,24 +3,20 @@ require 'csv'
 module Sniff
   module Fixture
     extend self
-
-    # FIXME TODO this doesn't work for models where the model name is different from the table name
-    # (e.g. PetroleumAdministrationForDefenseDistrict, ResidentialEnergyConsumptionSurveyResponse)
+    
     def load_fixtures(fixtures_path)
       Encoding.default_external = 'UTF-8' if Object.const_defined?('Encoding')
       Dir.glob(File.join(fixtures_path, '**/*.csv')) do |fixture_file|
-        table_name = File.basename(fixture_file, '.csv')
-        model_name = table_name.singularize.camelize
+        model_name = File.basename(fixture_file, '.csv').singularize.camelize
         next unless Object.const_defined?(model_name)
-
+        
         model = model_name.constantize
         model.auto_upgrade! unless model.table_exists?
         ActiveRecord::Base.logger.info "Loading fixture #{fixture_file}"
         CSV.foreach(fixture_file, :headers => true) do |row|
-          ActiveRecord::Base.connection.insert_fixture(row, table_name) rescue ActiveRecord::RecordNotUnique
+          ActiveRecord::Base.connection.insert_fixture(row, model.table_name) rescue ActiveRecord::RecordNotUnique
         end
       end
     end
   end
 end
-

data/lib/sniff/version.rb

@@ -1,3 +1,3 @@
 module Sniff
-  VERSION = "0.11.5"
+  VERSION = "0.11.6"
 end

data/lib/test_support/cucumber/step_definitions/committee_steps.rb

@@ -48,10 +48,10 @@ Then /^the conclusion should not comply with standards? "(.*)"$/ do |standard_li
   end
 end
 
-Then /^the conclusion of the committee should be "(.*)"$/ do |conclusion|
+Then /^the conclusion of the committee should be "(.*)"$/ do |expectation|
   conclusion = @report.try(:conclusion)
   conclusion = conclusion.respond_to?(:value) ? conclusion.value : conclusion
-  compare_values(conclusion, coerce_value(conclusion))
+  compare_values(conclusion, coerce_value(expectation))
 end
 
 Then /^the conclusion of the committee should be timeframe "(.*)"$/ do |conclusion|

data/lib/test_support/cucumber/support/values.rb

@@ -11,15 +11,17 @@ module CucumberValueParser
       true
     elsif value == 'false'
       false
-    elsif value =~ /\d+.*,.*\d/
+    elsif value =~ /\d+.*,.*\d/ # ???
       value
-    elsif value =~ /\d+\.\d+/
+    elsif value =~ /^\d+\.\d+$/ # float
       value.to_f
-    elsif value =~ /^0+$/
+    elsif value =~ /^\d+(\.\d+)?\.\.\d+(\.\d+)?$/ # range
+      (value.split('..')[0].to_i)..(value.split('..')[1].to_i)
+    elsif value =~ /^0+$/ # all zeros => 0
       0
-    elsif value =~ /^0/
+    elsif value =~ /^0/ # zero preceding stuff => the input as a string
       value
-    elsif value =~ /^\d+$/
+    elsif value =~ /^\d+$/ # integer
       value.to_i
     elsif value =~ /Address:/
       value.sub(/Address:\s*/,'')

data/spec/lib/test_support/cucumber/support/values_spec.rb

@@ -20,6 +20,9 @@ describe CucumberValueParser do
     it 'should parse a zero-prefixed float' do
       coerce_value('2.0').should == 2.0
     end
+    it 'should parse a range' do
+      coerce_value('12..42').should == (12..42)
+    end
     it 'should parse an integer' do
       coerce_value('2').should == 2
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sniff
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000Z
+date: 2011-12-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2159421200 !ruby/object:Gem::Requirement
+  requirement: &2159870820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2159421200
+  version_requirements: *2159870820
 - !ruby/object:Gem::Dependency
   name: aaronh-chronic
-  requirement: &2159419880 !ruby/object:Gem::Requirement
+  requirement: &2159870360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.9
   type: :runtime
   prerelease: false
-  version_requirements: *2159419880
+  version_requirements: *2159870360
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &2159418740 !ruby/object:Gem::Requirement
+  requirement: &2159869900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2159418740
+  version_requirements: *2159869900
 - !ruby/object:Gem::Dependency
   name: mini_record-compat
-  requirement: &2159417600 !ruby/object:Gem::Requirement
+  requirement: &2159869520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159417600
+  version_requirements: *2159869520
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2159415880 !ruby/object:Gem::Requirement
+  requirement: &2159869040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159415880
+  version_requirements: *2159869040
 - !ruby/object:Gem::Dependency
   name: earth
-  requirement: &2159414780 !ruby/object:Gem::Requirement
+  requirement: &2159868540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *2159414780
+  version_requirements: *2159868540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2159412780 !ruby/object:Gem::Requirement
+  requirement: &2159868040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2159412780
+  version_requirements: *2159868040
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2159408180 !ruby/object:Gem::Requirement
+  requirement: &2159867620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159408180
+  version_requirements: *2159867620
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2159407200 !ruby/object:Gem::Requirement
+  requirement: &2159867160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159407200
+  version_requirements: *2159867160
 - !ruby/object:Gem::Dependency
   name: dkastner-rocco
-  requirement: &2159406540 !ruby/object:Gem::Requirement
+  requirement: &2159866740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159406540
+  version_requirements: *2159866740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2159405280 !ruby/object:Gem::Requirement
+  requirement: &2159866220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *2159405280
+  version_requirements: *2159866220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2159404620 !ruby/object:Gem::Requirement
+  requirement: &2159865800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159404620
+  version_requirements: *2159865800
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2159403440 !ruby/object:Gem::Requirement
+  requirement: &2159865260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2159403440
+  version_requirements: *2159865260
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2159402800 !ruby/object:Gem::Requirement
+  requirement: &2159864820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159402800
+  version_requirements: *2159864820
 - !ruby/object:Gem::Dependency
   name: timeframe
-  requirement: &2159401200 !ruby/object:Gem::Requirement
+  requirement: &2159864280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 0.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *2159401200
+  version_requirements: *2159864280
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &2159399800 !ruby/object:Gem::Requirement
+  requirement: &2159863840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159399800
+  version_requirements: *2159863840
 - !ruby/object:Gem::Dependency
   name: sandbox
-  requirement: &2159398020 !ruby/object:Gem::Requirement
+  requirement: &2159863360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159398020
+  version_requirements: *2159863360
 - !ruby/object:Gem::Dependency
   name: emitter
-  requirement: &2159397140 !ruby/object:Gem::Requirement
+  requirement: &2159862840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,7 +208,7 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *2159397140
+  version_requirements: *2159862840
 description: Provides development and test environment for Brighter Planet's impact
   model libraries.
 email: derek.kastner@brighterplanet.com
@@ -269,7 +269,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2903624080403960624
+      hash: 1063373729950774231
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: