emitter 0.4.2 → 0.5.0

data/emitter.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'activesupport', '>=2.3.4'
-  s.add_dependency 'characterizable'
+  s.add_dependency 'charisma', '>=0.3.0'
   s.add_dependency 'cohort_scope'
   s.add_dependency 'data_miner', '>=1.1' unless ENV['LOCAL_DATA_MINER']
   s.add_dependency 'earth' unless ENV['LOCAL_EARTH']

data/lib/emitter/version.rb

@@ -1,3 +1,3 @@
 module Emitter
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

data/lib/emitter.rb

@@ -1,11 +1,20 @@
+require 'leap'
+require 'cohort_scope'
+require 'charisma'
+require 'data_miner'
+require 'summary_judgement'
+require 'falls_back_on'
+
 module BrighterPlanet
   module Emitter
     REQUIRED_COMPONENTS = %w{
       carbon_model
       characterization
-      data summarization
+      data
       relationships
+      summarization
     }
+    
     def included(base)
       base.extend ClassMethods
       
@@ -18,24 +27,18 @@ module BrighterPlanet
       
       base.instance_variable_set :@emission_scope, @emission_scope if @emission_scope
       
-      require 'leap'
-      require 'cohort_scope'
       base.extend ::Leap::Subject
       base.send :include, "::BrighterPlanet::#{common_camel}::CarbonModel".constantize
 
-      require 'characterizable'
-      base.send :include, ::Characterizable
+      base.send :include, ::Charisma
       base.send :include, "::BrighterPlanet::#{common_camel}::Characterization".constantize
-      base.add_implicit_characteristics
+      base._add_implicit_characteristics
 
-      require 'data_miner'
       base.send :include, "::BrighterPlanet::#{common_camel}::Data".constantize
 
-      require 'summary_judgement'
       base.extend ::SummaryJudgement
       base.send :include, "::BrighterPlanet::#{common_camel}::Summarization".constantize
 
-      require 'falls_back_on'
       begin
         require "#{common_name}/fallback"
         base.send :include, "::BrighterPlanet::#{common_camel}::Fallback".constantize
@@ -49,14 +52,19 @@ module BrighterPlanet
     def scope(statement)
       @emission_scope = statement
     end
-    
+        
     module ClassMethods
-      def add_implicit_characteristics
-        decisions[:emission].committees.map(&:name).reject { |c| characteristics.keys.unshift(:emission).include? c }.each do |c|
-          characterize { has c }
+      def _add_implicit_characteristics
+        preexisting = characterization.keys
+        decisions[:emission].committees.reject do |committee|
+          committee.name == :emission or preexisting.include?(committee.name)
+        end.each do |committee|
+          characterize do
+            has committee.name, :options => committee.options.slice(:measures, :display_with)
+          end
         end
       end
-      
+            
       def emission_scope; @emission_scope end
     end
   end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: emitter
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
+  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -18,180 +14,151 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 -05:00
+date: 2011-06-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 4
         version: 2.3.4
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: characterizable
+  name: charisma
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 0.3.0
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: cohort_scope
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: data_miner
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
         version: "1.1"
   type: :runtime
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: earth
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: falls_back_on
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: leap
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: summary_judgement
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: timeframe
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: weighted_average
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
         version: "3"
   type: :development
-  prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: bueller
+  prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: sniff
+  prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id013
 description: A software model in Ruby for the greenhouse gas emissions
 email: derek@brighterplanet.com
@@ -240,23 +207,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1258509401476034243
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1258509401476034243
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: The mother of all carbon models