sniff 0.10.1 → 0.11.0

data/README.markdown

@@ -2,7 +2,7 @@
 Development environment for Brighter Planet "emitter" libraries.
 
 ## Background
-Brighter Planet's carbon models, such as [`flight`](http://github.com/brighterplanet/flight), inhabit a complex production runtime environment backing the [CM1 carbon calculation web service](http://carbon.brighterplanet.com). Sniff simulates this environment, including representative data, fixtures, and other supporting code, so that developers can test improvements to the emitters before submitting them back to Brighter Planet.
+Brighter Planet's impact models, such as [`flight`](http://github.com/brighterplanet/flight), inhabit a complex production runtime environment backing the [CM1 web service](http://carbon.brighterplanet.com). Sniff simulates this environment, including representative data, fixtures, and other supporting code, so that developers can test improvements to the emitters before submitting them back to Brighter Planet.
 
 ### Caution
 The data and other supporting information in the sniff environment is only representative of production data and in many cases is purely fictional, contrived to return predictable results in tests. Emission estimates and other information gleaned from execution within this environment will undoubtedly be--to put it simply--wrong. For real numbers, always use live queries to [CM1](http://carbon.brighterplanet.com).
@@ -32,7 +32,7 @@ At the command prompt, do:
     #=> <ZipCode id="...>
 
 ## The emitter
-An *emitter* is a software model of a real-world GHG emission source, like a flight. Brighter Planet's emitter libraries each comprise a carbon model, an attribute curation policy, a persistence schema, and a summarization strategy.
+An *emitter* is a software model of a real-world impact source, like a flight. Brighter Planet's emitter libraries each comprise an impact model, an attribute curation policy, a persistence schema, and a summarization strategy.
 
 ### Persistence schema
 Although the production environment does not persist emitter instances, we nevertheless define emitter schemas to ease ActiveRecord assocations. An emitter's schema is defined in `lib/*emitter_name*/data.rb` within an emitter library. For example, here is [flight's schema](http://github.com/brighterplanet/flight/blob/master/lib/flight/data.rb).
@@ -40,12 +40,12 @@ Although the production environment does not persist emitter instances, we never
 Schema are defined using a DSL provided by the [data_miner](http://github.com/seamusabshere/data_miner) library.
 
 ### Attribute curation policy
-This defines how an emitter's attributes (initialized and stored with respect to the schema) are curated and decorated into a snapshot for later use by the carbon model. The policy is defined in `lib/*emitter_name*/characterization.rb` within an emitter library. For example, here is [flight's characterization](http://github.com/brighterplanet/flight/blob/master/lib/flight/characterization.rb).
+This defines how an emitter's attributes (initialized and stored with respect to the schema) are curated and decorated into a snapshot for later use by the impact model. The policy is defined in `lib/*emitter_name*/characterization.rb` within an emitter library. For example, here is [flight's characterization](http://github.com/brighterplanet/flight/blob/master/lib/flight/characterization.rb).
 
 Characterizations are defined using a DSL provided by the [characterizable](http://github.com/seamusabshere/characterizable) library.
 
-### Carbon model
-An emission estimate is obtained by giving an emitter's curated characteristics as input to an execution of its carbon model. The model is defined in `lib/*emitter_name*/characterization.rb` within an emitter library. For example, here is [flight's carbon model](http://github.com/brighterplanet/flight/blob/master/lib/flight/carbon_model.rb).
+### Impact model
+An impact estimate is obtained by giving an emitter's curated characteristics as input to an execution of its impact model. The model is defined in `lib/*emitter_name*/characterization.rb` within an emitter library. For example, here is [flight's impact model](http://github.com/brighterplanet/flight/blob/master/lib/flight/impact_model.rb).
 
 Carbon models are defined using a DSL provided by the [leap](http://github.com/rossmeissl/leap) library.
 

data/lib/sniff.rb

@@ -1,5 +1,5 @@
 require 'data_miner'
-require 'force_schema'
+require 'mini_record'
 require 'sniff/leap_ext'
 require 'logger'
 

data/lib/sniff/database.rb

@@ -100,7 +100,7 @@ module Sniff
     end
 
     def create_emitter_table
-      emitter_class.force_schema! if emitter_class
+      emitter_class.auto_upgrade! if emitter_class
     end
 
     def read_fixtures
@@ -122,7 +122,7 @@ module Sniff
           fixture_file = File.join(fixtures_path, table_name + '.csv')
           if File.exist? fixture_file
             log "Loading fixture #{fixture_file}"
-            Fixtures.create_fixtures(fixtures_path, table_name, resource => table_name)
+            ActiveRecord::Fixtures.create_fixtures(fixtures_path, table_name, resource => table_name)
           end
         end
       end

data/lib/sniff/rake_tasks.rb

@@ -74,10 +74,10 @@ module Sniff
 
         directory 'docs/'
 
-        Rocco::make 'docs/', "lib/#{gemname}/carbon_model.rb"
+        Rocco::make 'docs/', "lib/#{gemname}/impact_model.rb"
 
         task :google_analyzed_rocco => ['docs/', :rocco] do
-          source = File.read "docs/lib/#{gemname}/carbon_model.html"
+          source = File.read "docs/lib/#{gemname}/impact_model.html"
           unless source =~ /_gaq/
             source.sub! '</head>', <<-HTML
   <script type="text/javascript">
@@ -111,7 +111,7 @@ module Sniff
   </style>
 </head>
           HTML
-            File.open "docs/lib/#{gemname}/carbon_model.html", 'w' do |f|
+            File.open "docs/lib/#{gemname}/impact_model.html", 'w' do |f|
               f.puts source
             end
           end
@@ -120,10 +120,10 @@ module Sniff
         desc 'Update rocco docs on gh-pages branch'
         task :pages => ['pages:sync', :google_analyzed_rocco] do
           rev = `git rev-parse --short HEAD`.strip
-          html = File.read "docs/lib/#{gemname}/carbon_model.html"
+          html = File.read "docs/lib/#{gemname}/impact_model.html"
 
           puts `git checkout gh-pages`
-          File.open 'carbon_model.html', 'w' do |f|
+          File.open 'impact_model.html', 'w' do |f|
             f.puts html
           end
 

data/lib/sniff/version.rb

@@ -1,3 +1,3 @@
 module Sniff
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

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

@@ -8,9 +8,9 @@ def bless_characteristics(characteristics)
   end
 end
 
-When /^the "(.*)" committee is calculated$/ do |committee_name|
+When /^the "(.*)" committee reports$/ do |committee_name|
   @expectations.map(&:call)
-  @decision ||= @activity.decisions[:emission]
+  @decision ||= @activity.decisions[:impact]
   @committee = @decision.committees.find { |c| c.name.to_s == committee_name }
   args = [bless_characteristics(@characteristics)]
   if @timeframe

data/lib/test_support/cucumber/step_definitions/{carbon_steps.rb → impact_steps.rb}

@@ -1,7 +1,7 @@
 require 'time'
 require 'timeframe'
 
-Given %r{^an? (.+) (emitter|emission)$} do |name, _|
+Given %r{^an? (\w+)( impact)?$} do |name, _|
   name = name.gsub(/\s+/,'_').camelize + 'Record'
   @activity = name.constantize
   @characteristics = {}
@@ -51,19 +51,19 @@ Given /^it has "(.+)" of "(.*)"$/ do |field, value|
   Given %Q{characteristic "#{field}" of "#{value}"}
 end
 
-When /^emissions are calculated$/ do
+When /^impacts are calculated$/ do
   @expectations.map(&:call)
   Timecop.travel(@current_date || Time.now) do
     @timeframe ||= Timeframe.this_year
     @activity_instance = @activity.new @characteristics
-    @emission = @activity_instance.emission @timeframe
+    @impact = @activity_instance.impact @timeframe
   end
-  @characteristics = @activity_instance.deliberations[:emission].characteristics
+  @characteristics = @activity_instance.deliberations[:impact].characteristics
 end
 
-Then /^the emission value should be within "([\d\.]+)" kgs of "([\d\.]+)"$/ do |cusion, emissions|
-  @emission.should_not be_nil
-  @emission.should be_within(cusion.to_f).of(emissions.to_f)
+Then /^the amount of "(.*)" should be within "([\d\.]+)" kgs of "([\d\.]+)"$/ do |substance, cusion, target|
+  @impact.should_not be_nil
+  @impact[substance.to_sym].should be_within(cusion.to_f).of(target.to_f)
 end
 
 Then /^the calculation should have used committees "(.*)"$/ do |committee_list|
@@ -75,7 +75,7 @@ end
 
 Then /^the calculation should comply with standards? "(.*)"$/ do |standard_list|
   standards = Set.new standard_list.split(/,\s*/).map(&:to_sym)
-  compliance = Set.new @activity_instance.deliberations[:emission].compliance
+  compliance = Set.new @activity_instance.deliberations[:impact].compliance
   unless standards.empty?
     compliance.should_not be_empty, 'Expected calculation to comply with some standards, but it complied with none'
   end
@@ -85,7 +85,7 @@ end
 
 Then /^the calculation should not comply with standards? "(.*)"$/ do |standard_list|
   standards = Set.new standard_list.split(/,\s*/).map(&:to_sym)
-  compliance = Set.new @activity_instance.deliberations[:emission].compliance
+  compliance = Set.new @activity_instance.deliberations[:impact].compliance
   unless compliance.empty?
     diff_list = (standards - compliance)  # s - c = set of anything in s that is not in c
     diff_list.should be(standards), "Calculation should not have complied with #{(standards - diff_list).to_a.inspect}"

data/spec/fixtures/dirigible/lib/dirigible/data.rb

@@ -2,9 +2,8 @@ module BrighterPlanet
   module Dirigible
     module Data
       def self.included(base)
-        base.force_schema do
-          float    'fuel_efficiency'
-          float    'annual_distance_estimate'
+        base.col :fuel_efficiency, :type => :float
+        base.col :annual_distance_estimate, :type => :float
         end
       end
     end

data/spec/fixtures/dirigible/lib/dirigible/{carbon_model.rb → impact_model.rb}

@@ -1,9 +1,9 @@
 module BrighterPlanet
   module Dirigible
-    module CarbonModel
+    module ImpactModel
       def self.included(base)
-        base.decide :emission, :with => :characteristics do
-          committee :emission do # returns kg CO2
+        base.decide :impact, :with => :characteristics do
+          committee :carbon do # returns kg CO2
             quorum 'default' do
               100.0
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sniff
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00.000000000Z
+date: 2011-10-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2154171320 !ruby/object:Gem::Requirement
+  requirement: &2159026840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2154171320
+  version_requirements: *2159026840
 - !ruby/object:Gem::Dependency
   name: aaronh-chronic
-  requirement: &2154170740 !ruby/object:Gem::Requirement
+  requirement: &2159025840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.9
   type: :runtime
   prerelease: false
-  version_requirements: *2154170740
+  version_requirements: *2159025840
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &2154170100 !ruby/object:Gem::Requirement
+  requirement: &2159024900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2154170100
+  version_requirements: *2159024900
 - !ruby/object:Gem::Dependency
-  name: force_schema
-  requirement: &2154169160 !ruby/object:Gem::Requirement
+  name: mini_record-compat
+  requirement: &2159024520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154169160
+  version_requirements: *2159024520
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2154168640 !ruby/object:Gem::Requirement
+  requirement: &2159024060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154168640
+  version_requirements: *2159024060
 - !ruby/object:Gem::Dependency
   name: earth
-  requirement: &2154156700 !ruby/object:Gem::Requirement
+  requirement: &2159023520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *2154156700
+  version_requirements: *2159023520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154143680 !ruby/object:Gem::Requirement
+  requirement: &2159022960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154143680
+  version_requirements: *2159022960
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2154143260 !ruby/object:Gem::Requirement
+  requirement: &2159022560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154143260
+  version_requirements: *2159022560
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2154142640 !ruby/object:Gem::Requirement
+  requirement: &2159022100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154142640
+  version_requirements: *2159022100
 - !ruby/object:Gem::Dependency
   name: dkastner-rocco
-  requirement: &2154142080 !ruby/object:Gem::Requirement
+  requirement: &2159021640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154142080
+  version_requirements: *2159021640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154140800 !ruby/object:Gem::Requirement
+  requirement: &2159021140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *2154140800
+  version_requirements: *2159021140
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2154140300 !ruby/object:Gem::Requirement
+  requirement: &2159020720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154140300
+  version_requirements: *2159020720
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2154139620 !ruby/object:Gem::Requirement
+  requirement: &2159020180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154139620
+  version_requirements: *2159020180
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2154138960 !ruby/object:Gem::Requirement
+  requirement: &2159019260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154138960
+  version_requirements: *2159019260
 - !ruby/object:Gem::Dependency
   name: timeframe
-  requirement: &2154138080 !ruby/object:Gem::Requirement
+  requirement: &2159016400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 0.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *2154138080
+  version_requirements: *2159016400
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &2154137460 !ruby/object:Gem::Requirement
+  requirement: &2159014620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154137460
+  version_requirements: *2159014620
 - !ruby/object:Gem::Dependency
   name: sandbox
-  requirement: &2154136980 !ruby/object:Gem::Requirement
+  requirement: &2159013680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154136980
+  version_requirements: *2159013680
 - !ruby/object:Gem::Dependency
   name: emitter
-  requirement: &2154136440 !ruby/object:Gem::Requirement
+  requirement: &2159010700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,8 +208,9 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *2154136440
-description: Provides development and test environment for emitter gems
+  version_requirements: *2159010700
+description: Provides development and test environment for Brighter Planet's impact
+  model libraries.
 email: derek.kastner@brighterplanet.com
 executables: []
 extensions: []
@@ -222,8 +223,8 @@ files:
 - lib/sniff/version.rb
 - lib/sniff/watcher.rb
 - lib/sniff.rb
-- lib/test_support/cucumber/step_definitions/carbon_steps.rb
 - lib/test_support/cucumber/step_definitions/committee_steps.rb
+- lib/test_support/cucumber/step_definitions/impact_steps.rb
 - lib/test_support/cucumber/step_definitions/leap_steps.rb
 - lib/test_support/cucumber/step_definitions/temporal_steps.rb
 - lib/test_support/cucumber/support/values.rb
@@ -250,10 +251,10 @@ files:
 - spec/fixtures/dirigible/features/support/db/fixtures/automobile_size_classes.csv
 - spec/fixtures/dirigible/features/support/db/fixtures/automobile_variants.csv
 - spec/fixtures/dirigible/features/support/dirigible_record.rb
-- spec/fixtures/dirigible/lib/dirigible/carbon_model.rb
 - spec/fixtures/dirigible/lib/dirigible/characterization.rb
 - spec/fixtures/dirigible/lib/dirigible/data.rb
 - spec/fixtures/dirigible/lib/dirigible/fallback.rb
+- spec/fixtures/dirigible/lib/dirigible/impact_model.rb
 - spec/fixtures/dirigible/lib/dirigible/relationships.rb
 - spec/fixtures/dirigible/lib/dirigible/summarization.rb
 - spec/fixtures/dirigible/lib/dirigible.rb
@@ -277,7 +278,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 955745844092119533
+      hash: 2886137388542734836
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -289,7 +290,8 @@ rubyforge_project:
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: Test support for Brighter Planet carbon gems
+summary: Provides development and test environment for Brighter Planet's impact model
+  libraries.
 test_files:
 - spec/db/emitter_data.sqlite3
 - spec/db/schema_output
@@ -302,10 +304,10 @@ test_files:
 - spec/fixtures/dirigible/features/support/db/fixtures/automobile_size_classes.csv
 - spec/fixtures/dirigible/features/support/db/fixtures/automobile_variants.csv
 - spec/fixtures/dirigible/features/support/dirigible_record.rb
-- spec/fixtures/dirigible/lib/dirigible/carbon_model.rb
 - spec/fixtures/dirigible/lib/dirigible/characterization.rb
 - spec/fixtures/dirigible/lib/dirigible/data.rb
 - spec/fixtures/dirigible/lib/dirigible/fallback.rb
+- spec/fixtures/dirigible/lib/dirigible/impact_model.rb
 - spec/fixtures/dirigible/lib/dirigible/relationships.rb
 - spec/fixtures/dirigible/lib/dirigible/summarization.rb
 - spec/fixtures/dirigible/lib/dirigible.rb