sniff 0.11.10 → 0.11.11

data/lib/sniff/database.rb

@@ -33,20 +33,20 @@ module Sniff
 
       # Connect to the database and set up an ActiveRecord logger
       def db_init(options)
-        options[:db_adapter] ||= 'sqlite3'
-        options[:db_name] ||= ':memory:'
+        options = options.symbolize_keys
+        options[:adapter] ||= options.delete(:db_adapter) || 'sqlite3'
+        options[:database] ||= options.delete(:db_name) || ':memory:'
         ActiveRecord::Base.logger = Sniff.logger
-        ActiveRecord::Base.establish_connection :adapter => options[:db_adapter],
-          :database => options[:db_name]
+        ActiveRecord::Base.establish_connection options
       end
 
-      # Initialize Earth, tell it to load schemas defined by each domain model's
-      # data_miner definition
+      # Initialize Earth, but don't load schemas - otherwise get blank tables
+      # for any resources in a loaded domain that don't have a fixture
       def earth_init(domains)
         domains ||= :none
         domains = [domains] unless domains.is_a? Array
         args = domains
-        args << {:apply_schemas => true}
+        args << {:apply_schemas => false}
 
         Earth.init *args
       end

data/lib/sniff/fixture.rb

@@ -11,7 +11,8 @@ module Sniff
         next unless Object.const_defined?(model_name)
         
         model = model_name.constantize
-        model.auto_upgrade! unless model.table_exists?
+        model.auto_upgrade!
+        model.delete_all # always import from scratch
         ActiveRecord::Base.logger.info "Loading fixture #{fixture_file}"
         CSV.foreach(fixture_file, :headers => true) do |row|
           ActiveRecord::Base.connection.insert_fixture(row, model.table_name) rescue ActiveRecord::RecordNotUnique

data/lib/sniff/version.rb

@@ -1,3 +1,3 @@
 module Sniff
-  VERSION = "0.11.10"
+  VERSION = "0.11.11"
 end

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

@@ -25,17 +25,17 @@ Given /^(a )?characteristic "(.*)" of "([^\"]*)"(, converted with "(.*)")?$/ do
       association.klass
     end
     value = model.send "find_by_#{attribute}", value
-    @characteristics[model_name.to_sym] = value
+    @characteristics[model_name.to_sym] = value unless value.nil?
   elsif name == 'timeframe' 
     @timeframe = (value.present?) ? Timeframe.interval(value) : nil
   elsif name == 'active_subtimeframe'
     @characteristics[:active_subtimeframe] = (value.present?) ? Timeframe.interval(value) : nil
   elsif converter
     value = value.send converter
-    @characteristics[name.to_sym] = value
+    @characteristics[name.to_sym] = value unless value.nil?
   else
     value = coerce_value(value)
-    @characteristics[name.to_sym] = value
+    @characteristics[name.to_sym] = value unless value.nil?
   end
 end
 

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

@@ -13,15 +13,15 @@ module CucumberValueParser
       false
     elsif value =~ /\d+.*,.*\d/ # ???
       value
-    elsif value =~ /^\d+\.\d+$/ # float
+    elsif value =~ /^-?\d+\.\d+$/ # float
       value.to_f
-    elsif value =~ /^\d+(\.\d+)?\.\.\d+(\.\d+)?$/ # range
+    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/ # zero preceding stuff => the input as a string
+    elsif value =~ /^0/ # zero preceding anything but a float or range => the input as a string
       value
-    elsif value =~ /^\d+$/ # integer
+    elsif value =~ /^-?\d+$/ # integer
       value.to_i
     elsif value =~ /Address:/
       value.sub(/Address:\s*/,'')

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

@@ -17,15 +17,27 @@ describe CucumberValueParser do
     it 'should parse a float' do
       coerce_value('2.3').should == 2.3
     end
+    it 'should parse a negative float' do
+      coerce_value('-2.3').should == -2.3
+    end
     it 'should parse a zero-prefixed float' do
-      coerce_value('2.0').should == 2.0
+      coerce_value('02.0').should == 2.0
+    end
+    it 'should parse a zero-prefixed integer' do
+      coerce_value('05753').should == '05753'
     end
     it 'should parse a range' do
       coerce_value('12..42').should == (12..42)
     end
+    it 'should parse negative ranges' do
+      coerce_value('-42..-12').should == (-42..-12)
+    end
     it 'should parse an integer' do
       coerce_value('2').should == 2
     end
+    it 'should parse a negative integer' do
+      coerce_value('-2').should == -2
+    end
     it 'should parse a date' do
       coerce_value('today').should be_an_instance_of(Time)
       coerce_value('2010-01-20').should be_an_instance_of(Time)

metadata

@@ -1,222 +1,224 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sniff
-version: !ruby/object:Gem::Version
-  version: 0.11.10
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.11.11
 platform: ruby
-authors:
+authors: 
 - Derek Kastner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &2154013700 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "3"
   type: :runtime
   prerelease: false
-  version_requirements: *2154013700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: aaronh-chronic
-  requirement: &2154013040 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.3.9
   type: :runtime
   prerelease: false
-  version_requirements: *2154013040
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: bueller
-  requirement: &2154012340 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2154012340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: mini_record-compat
-  requirement: &2154011720 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2154011720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &2154011140 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2154011140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: earth
-  requirement: &2154010500 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *2154010500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &2154009720 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154009720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &2154008920 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2154008920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &2154007900 !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2154007900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: dkastner-rocco
-  requirement: &2154007180 !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2154007180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2153990300 !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
+      - !ruby/object:Gem::Version 
+        version: "2"
   type: :runtime
   prerelease: false
-  version_requirements: *2153990300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &2153988820 !ruby/object:Gem::Requirement
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2153988820
-- !ruby/object:Gem::Dependency
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
   name: timecop
-  requirement: &2153986880 !ruby/object:Gem::Requirement
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2153986880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
   name: timeframe
-  requirement: &2153984780 !ruby/object:Gem::Requirement
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *2153984780
-- !ruby/object:Gem::Dependency
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
   name: watchr
-  requirement: &2153983540 !ruby/object:Gem::Requirement
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2153983540
-- !ruby/object:Gem::Dependency
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
   name: sandbox
-  requirement: &2153982720 !ruby/object:Gem::Requirement
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2153982720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
   name: emitter
-  requirement: &2153978180 !ruby/object:Gem::Requirement
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *2153978180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  requirement: &2153976960 !ruby/object:Gem::Requirement
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2153976960
-description: Provides development and test environment for Brighter Planet's impact
-  model libraries.
+  version_requirements: *id018
+description: Provides development and test environment for Brighter Planet's impact model libraries.
 email: derek.kastner@brighterplanet.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.markdown
-files:
+files: 
 - lib/sniff/database.rb
 - lib/sniff/fixture.rb
 - lib/sniff/leap_ext.rb
@@ -254,34 +256,35 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/brighterplanet/sniff
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-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: 3037549694573789126
+      segments: 
       - 0
-      hash: -595814420828995385
-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'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Provides development and test environment for Brighter Planet's impact model
-  libraries.
-test_files:
+summary: Provides development and test environment for Brighter Planet's impact model libraries.
+test_files: 
 - spec/fixtures/dirigible/features/support/db/fixtures/automobile_fuel_types.csv
 - spec/fixtures/dirigible/features/support/db/fixtures/automobile_make_fleet_years.csv
 - spec/fixtures/dirigible/features/support/db/fixtures/automobile_make_years.csv