sniff 0.9.0 → 0.10.0

data/lib/sniff.rb

@@ -54,4 +54,3 @@ require 'earth'
 
 $:.unshift File.dirname(__FILE__)
 require 'sniff/database'
-require 'sniff/emitter'

data/lib/sniff/version.rb

@@ -1,3 +1,3 @@
 module Sniff
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

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

@@ -1,56 +1,64 @@
 require 'time'
 require 'timeframe'
 
-Given /^an? (.+) emission$/ do |emitter|
-  @emitter_class = emitter.gsub(/\s+/,'_').camelize
-  @emitter_class = "#{@emitter_class}Record".constantize
-  @activity_hash = {}
-  @expectations = []
+Given %r{^an? (.+) (emitter|emission)$} do |name, _|
+  name = name.gsub(/\s+/,'_').camelize + 'Record'
+  @activity = name.constantize
+  @characteristics = {}
+  @expectations ||= []
 end
 
-Given /^an? (.+) has nothing$/ do |emitter|
-  Given "a #{emitter} emission"
+Given /^(a )?characteristic "(.*)" of integer value "(.*)"$/ do |_, name, value|
+  Given "characteristic \"#{name}\" of \"#{value}\", converted with \"to_i\""
 end
-
-Given /^an? (.+) has "(.+)" of "(.*)"$/ do |emitter, field, value|
-  Given "a #{emitter} emission"
-  Given "it has \"#{field}\" of \"#{value}\""
+Given /^(a )?characteristic "(.*)" of address value "(.*)"$/ do |_, name, value|
+  Given "characteristic \"#{name}\" of \"#{value}\", converted with \"to_s\""
 end
 
-Given /^it has "(.+)" of "(.*)"$/ do |field, value|
-  if value =~ /[\d-]+\/[\d-]+/
-    @timeframe = Timeframe.interval(value) 
-  elsif value.present?
-    methods = field.split('.')
-    context = @activity_hash
-    methods.each do |method|
-      method = method.to_sym
-      if method == methods.last.to_sym
-        context[method] = coerce_value(value) 
-      else
-        context[method] ||= {}
-      end
-      context = context[method]
+Given /^(a )?characteristic "(.*)" of "([^\"]*)"(, converted with "(.*)")?$/ do |_, name, value, __, converter|
+  if name =~ /\./
+    model_name, attribute = name.split /\./
+    model = begin
+      model_name.singularize.camelize.constantize
+    rescue NameError
+      association = @activity.reflect_on_association model_name.to_sym
+      association.klass
     end
+    value = model.send "find_by_#{attribute}", value
+    @characteristics[model_name.to_sym] = value
+  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
+  else
+    value = coerce_value(value)
+    @characteristics[name.to_sym] = value
   end
 end
 
-Given /^the current date is "(.+)"$/ do |current_date|
-  @current_date = Time.parse(current_date)
+Given /^(a )?characteristic "(.*)" including "(.*)"$/ do |_, name, values|
+  @characteristics[name.to_sym] ||= []
+  @characteristics[name.to_sym] += values.split(/,/)
+end
+
+Given /^an? (.+) has nothing$/ do |emitter|
+end
+
+Given /^it has "(.+)" of "(.*)"$/ do |field, value|
+  Given %Q{characteristic "#{field}" of "#{value}"}
 end
 
 When /^emissions are calculated$/ do
-  @timeframe ||= Timeframe.this_year
-  @activity = @emitter_class.from_params_hash @activity_hash
   @expectations.map(&:call)
-  if @current_date
-    Timecop.travel(@current_date) do
-      @emission = @activity.emission @timeframe
-    end
-  else
-    @emission = @activity.emission @timeframe
+  Timecop.travel(@current_date || Time.now) do
+    @timeframe ||= Timeframe.this_year
+    @activity_instance = @activity.new @characteristics
+    @emission = @activity_instance.emission @timeframe
   end
-  @characteristics = @activity.deliberations[:emission].characteristics
+  @characteristics = @activity_instance.deliberations[:emission].characteristics
 end
 
 Then /^the emission value should be within "([\d\.]+)" kgs of "([\d\.]+)"$/ do |cusion, emissions|
@@ -67,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.deliberations[:emission].compliance
+  compliance = Set.new @activity_instance.deliberations[:emission].compliance
   unless standards.empty?
     compliance.should_not be_empty, 'Expected calculation to comply with some standards, but it complied with none'
   end
@@ -77,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.deliberations[:emission].compliance
+  compliance = Set.new @activity_instance.deliberations[:emission].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/lib/test_support/cucumber/step_definitions/committee_steps.rb

@@ -1,53 +1,12 @@
 require 'active_support'
 
-Given /^an? (.+) emitter$/ do |name|
-  name = name.gsub(/\s+/,'_').camelize + 'Record'
-  @activity = name.constantize
-  @characteristics ||= {}
-  @expectations ||= []
-end
-
-Given /^(a )?characteristic "(.*)" of integer value "(.*)"$/ do |_, name, value|
-  Given "characteristic \"#{name}\" of \"#{value}\", converted with \"to_i\""
-end
-Given /^(a )?characteristic "(.*)" of address value "(.*)"$/ do |_, name, value|
-  Given "characteristic \"#{name}\" of \"#{value}\", converted with \"to_s\""
-end
-
-Given /^(a )?characteristic "(.*)" of "([^\"]*)"(, converted with "(.*)")?$/ do |_, name, value, __, converter|
-  if name =~ /\./
-    model_name, attribute = name.split /\./
-    model = begin
-      model_name.singularize.camelize.constantize
-    rescue NameError
-      association = @activity.reflect_on_association model_name.to_sym
-      association.klass
-    end
-    value = model.send "find_by_#{attribute}", value
-    @characteristics[model_name.to_sym] = value
-  elsif name == 'timeframe' || name == 'active_subtimeframe'
-    @characteristics[name.to_sym] = (value.present?) ? Timeframe.interval(value) : nil
-  elsif converter
-    value = value.send converter
-    @characteristics[name.to_sym] = value
-  else
-    value = coerce_value(value)
-    @characteristics[name.to_sym] = value
-  end
-end
-
-Given /^(a )?characteristic "(.*)" including "(.*)"$/ do |_, name, values|
-  @characteristics[name.to_sym] ||= []
-  @characteristics[name.to_sym] += values.split(/,/)
-end
-
 When /^the "(.*)" committee is calculated$/ do |committee_name|
   @expectations.map(&:call)
   @decision ||= @activity.decisions[:emission]
   @committee = @decision.committees.find { |c| c.name.to_s == committee_name }
   args = [@characteristics]
-  if @characteristics[:timeframe]
-    args << [@characteristics[:timeframe]]
+  if @timeframe
+    args << [@timeframe]
   else
     args << []
   end

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

@@ -1,4 +1,4 @@
 Then /trace the calculation/ do
-  @activity.class.send :include, Leap::Trace
-  @activity.trace_report
+  @activity_instance.class.send :include, Leap::Trace
+  @activity_instance.trace_report
 end

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

@@ -1,5 +1,9 @@
 require 'timecop'
 
 Given /it is the year "(.*)"/ do |year|
-  Timecop.travel Time.local(year.to_i, 6, 1, 0, 0, 0)
+  @current_date = Time.local(year.to_i, 6, 1, 0, 0, 0)
+end
+
+Given /^the current date is "(.+)"$/ do |current_date|
+  @current_date = Time.parse(current_date)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sniff
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-28 00:00:00.000000000Z
+date: 2011-09-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152976640 !ruby/object:Gem::Requirement
+  requirement: &2153676220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2152976640
+  version_requirements: *2153676220
 - !ruby/object:Gem::Dependency
   name: aaronh-chronic
-  requirement: &2152962300 !ruby/object:Gem::Requirement
+  requirement: &2153673720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.9
   type: :runtime
   prerelease: false
-  version_requirements: *2152962300
+  version_requirements: *2153673720
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &2152961020 !ruby/object:Gem::Requirement
+  requirement: &2153666240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2152961020
+  version_requirements: *2153666240
 - !ruby/object:Gem::Dependency
   name: force_schema
-  requirement: &2152959760 !ruby/object:Gem::Requirement
+  requirement: &2153665500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152959760
+  version_requirements: *2153665500
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152957300 !ruby/object:Gem::Requirement
+  requirement: &2153664360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152957300
+  version_requirements: *2153664360
 - !ruby/object:Gem::Dependency
   name: earth
-  requirement: &2152956080 !ruby/object:Gem::Requirement
+  requirement: &2153663820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *2152956080
+  version_requirements: *2153663820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152954060 !ruby/object:Gem::Requirement
+  requirement: &2153663140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152954060
+  version_requirements: *2153663140
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152952920 !ruby/object:Gem::Requirement
+  requirement: &2153662480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152952920
+  version_requirements: *2153662480
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2152951340 !ruby/object:Gem::Requirement
+  requirement: &2153661660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152951340
+  version_requirements: *2153661660
 - !ruby/object:Gem::Dependency
   name: dkastner-rocco
-  requirement: &2152949280 !ruby/object:Gem::Requirement
+  requirement: &2153660780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152949280
+  version_requirements: *2153660780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152947120 !ruby/object:Gem::Requirement
+  requirement: &2153659880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *2152947120
+  version_requirements: *2153659880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152946240 !ruby/object:Gem::Requirement
+  requirement: &2153658380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152946240
+  version_requirements: *2153658380
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2152945320 !ruby/object:Gem::Requirement
+  requirement: &2153656480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152945320
+  version_requirements: *2153656480
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2152944840 !ruby/object:Gem::Requirement
+  requirement: &2153655500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152944840
+  version_requirements: *2153655500
 - !ruby/object:Gem::Dependency
   name: timeframe
-  requirement: &2152944200 !ruby/object:Gem::Requirement
+  requirement: &2153653860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 0.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *2152944200
+  version_requirements: *2153653860
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &2152943640 !ruby/object:Gem::Requirement
+  requirement: &2153653200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152943640
+  version_requirements: *2153653200
 - !ruby/object:Gem::Dependency
   name: sandbox
-  requirement: &2152943020 !ruby/object:Gem::Requirement
+  requirement: &2153652020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152943020
+  version_requirements: *2153652020
 - !ruby/object:Gem::Dependency
   name: emitter
-  requirement: &2152942200 !ruby/object:Gem::Requirement
+  requirement: &2153651140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,7 +208,7 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *2152942200
+  version_requirements: *2153651140
 description: Provides development and test environment for emitter gems
 email: derek.kastner@brighterplanet.com
 executables: []
@@ -217,7 +217,6 @@ extra_rdoc_files:
 - README.markdown
 files:
 - lib/sniff/database.rb
-- lib/sniff/emitter.rb
 - lib/sniff/leap_ext.rb
 - lib/sniff/rake_tasks.rb
 - lib/sniff/version.rb
@@ -278,7 +277,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 30156126096634883
+      hash: -3665390323637434628
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/sniff/emitter.rb

@@ -1,42 +0,0 @@
-module Sniff
-  module Emitter
-    def self.included(target)
-      target.instance_eval do
-        extend ClassMethods
-      end
-    end
-    
-    def parent_class
-      Emitter
-    end
-
-    module ClassMethods
-      def from_params_hash(params = Hash.new)
-        resolved_params = Hash.new
-        associations = reflect_on_all_associations
-        params.each do |k, v|
-          next if v.blank?
-          c = characterization[k.to_sym]
-          next unless c
-          if associations.map(&:name).include?(c.name.to_sym)
-            association = associations.find { |a| a.name == c.name.to_sym }
-            klass = association.options[:class_name] || association.name.to_s.pluralize.classify
-            klass = klass.constantize
-            if v.is_a?(Hash)
-              # h[:origin_airport][:iata_code] => 'MIA'
-              attr_name, attr_value = v.to_a.flatten[0, 2]
-              resolved_params[k] = klass.send "find_by_#{attr_name}", attr_value
-            else
-              # h[:origin_airport] => 'MIA'
-              resolved_params[k] = klass.send "find_by_#{k}", v
-            end
-          else
-            resolved_params[k] = v
-          end
-        end
-        new resolved_params
-      end
-    end
-  end
-end
-