emitter 0.10.0 → 0.11.0

data/Gemfile

@@ -1,7 +1,6 @@
 gem 'sniff', :path => ENV['LOCAL_SNIFF'] if ENV['LOCAL_SNIFF']
 gem 'data_miner', :path => ENV['LOCAL_DATA_MINER'] if ENV['LOCAL_DATA_MINER']
 gem 'earth', :path => ENV['LOCAL_EARTH'] if ENV['LOCAL_EARTH']
-gem 'force_schema', :path => ENV['LOCAL_FORCE_SCHEMA'] if ENV['LOCAL_FORCE_SCHEMA']
 
 source :rubygems
 

data/LICENSE-PREAMBLE

@@ -1,5 +1,5 @@
 BRIGHTER PLANET ADDITIONAL PREAMBLE TO THE GNU AFFERO GENERAL PUBLIC LICENSE
-January 7, 2011
+August 3, 2011
 
 This preamble is meant to help the licensee understand exactly what
 software is being received under the license and set expectations as to
@@ -37,13 +37,14 @@ This license does not extend to the following:
     license including but not limited to other forms of open source
     license, commercial license, and the like;
 
-  * Any element of any Brighter Planet Carbon Middleware web service,
+  * Any element of any Brighter Planet CM1 web service,
     including but not limited to the copyrights, trademarks, graphic
     design, text, documentation, method of interaction with clients,
     runtime environment, technical infrastructure, and software code, is
     not covered by the license; and
 
-  * Any aspect or use of http://carbon.brighterplanet.com.
+  * Any aspect or use of http://carbon.brighterplanet.com or any other
+    subdomain of brighterplanet.com.
 
 If you have any questions, please contact licensing@brighterplanet.com
 

data/README.rdoc

@@ -1,6 +1,6 @@
 = emitter
 
-Base gem for Brighter Planet's carbon model gems. See http://carbon.brighterplanet.com
+Software framework for Brighter Planet's impact modeling libraries. See http://carbon.brighterplanet.com
 
 == Note on Patches/Pull Requests
  
@@ -14,4 +14,4 @@ Base gem for Brighter Planet's carbon model gems. See http://carbon.brighterplan
 
 == Copyright
 
-Copyright (c) 2010 Brighter Planet, Inc. See LICENSE for details.
+Copyright 2010, 2011 Brighter Planet, Inc. See LICENSE and LICENSE-PREAMBLE for details.

data/emitter.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Andy Rossmeissl", "Seamus Abshere", "Ian Hough", "Matt Kling", 'Derek Kastner']
   s.email       = %q{derek@brighterplanet.com}
   s.homepage    = "https://github.com/brighterplanet/emitter"
-  s.summary     = %q{The mother of all carbon models}
-  s.description = %q{A software model in Ruby for the greenhouse gas emissions}
+  s.summary     = %q{A framework for modelling the impact of real-world entities.}
+  s.description = %q{A framework for modelling the impact of real-world entities.}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -23,12 +23,12 @@ Gem::Specification.new do |s|
   s.add_dependency 'data_miner', '>=1.2.1' unless ENV['LOCAL_DATA_MINER']
   s.add_dependency 'earth', '>=0.5.1' unless ENV['LOCAL_EARTH']
   s.add_dependency 'falls_back_on'
-  s.add_dependency 'leap'
+  s.add_dependency 'leap', '>=0.5.4'
   s.add_dependency 'summary_judgement'
   s.add_dependency 'timeframe'
   s.add_dependency 'weighted_average'
-  s.add_dependency 'force_schema' unless ENV['LOCAL_FORCE_SCHEMA']
-  s.add_development_dependency 'activerecord', '~>3.0.0'
+  s.add_dependency 'mini_record-compat'
+  s.add_development_dependency 'activerecord', '~>3'
   s.add_development_dependency 'bueller'
-  s.add_development_dependency 'sniff', '>=0.8.2' unless ENV['LOCAL_SNIFF']
+  s.add_development_dependency 'sniff', '~>0.11.0' unless ENV['LOCAL_SNIFF']
 end

data/lib/emitter.rb

@@ -6,14 +6,14 @@ require 'charisma'
 require 'data_miner'
 require 'summary_judgement'
 require 'falls_back_on'
-require 'force_schema'
+require 'mini_record'
 
 require 'emitter/measurement'
 
 module BrighterPlanet
   module Emitter
     REQUIRED_COMPONENTS = %w{
-      carbon_model
+      impact_model
       characterization
       data
       relationships
@@ -37,17 +37,17 @@ module BrighterPlanet
         require "#{common_name}/#{component}"
       end
       
-      base.instance_variable_set :@emission_scope, @emission_scope if @emission_scope
+      base.instance_variable_set :@impact_scope, @impact_scope if @impact_scope
       
       base.extend ::Leap::Subject
-      base.send :include, "::BrighterPlanet::#{common_camel}::CarbonModel".constantize
+      base.send :include, "::BrighterPlanet::#{common_camel}::ImpactModel".constantize
 
       base.send :include, ::Charisma
       base.send :include, "::BrighterPlanet::#{common_camel}::Characterization".constantize
       base.class_eval do
         preexisting = characterization.keys
-        decisions[:emission].committees.reject do |committee|
-          committee.name == :emission or preexisting.include?(committee.name)
+        decisions[:impact].committees.reject do |committee|
+          preexisting.include?(committee.name)
         end.each do |committee|
           characterize do
             has committee.name, :options => committee.options.slice(:measures, :display_with)
@@ -56,8 +56,8 @@ module BrighterPlanet
       end
 
       base.send :include, "::BrighterPlanet::#{common_camel}::Data".constantize
-      unless base.data_miner_config.steps.any? { |step| step.description == :force_schema! }
-        base.data_miner_config.steps.unshift ::DataMiner::Process.new(base.data_miner_config, :force_schema!)
+      unless base.data_miner_config.steps.any? { |step| step.description == :auto_upgrade! }
+        base.data_miner_config.steps.unshift ::DataMiner::Process.new(base.data_miner_config, :auto_upgrade! )
       end
       unless base.data_miner_config.steps.any? { |step| step.description == :run_data_miner_on_parent_associations! }
         base.data_miner_config.steps.push ::DataMiner::Process.new(base.data_miner_config, :run_data_miner_on_parent_associations!)
@@ -78,13 +78,13 @@ module BrighterPlanet
 
     # this gets added as a class method to the emitter module
     def scope(statement)
-      @emission_scope = statement
+      @impact_scope = statement
     end
         
     module ClassMethods
       # this will have been set by self.included on the emitter module
-      def emission_scope
-        @emission_scope
+      def impact_scope
+        @impact_scope
       end
     end
   end

data/lib/emitter/version.rb

@@ -1,3 +1,3 @@
 module Emitter
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/spec/emitter_spec.rb

@@ -10,7 +10,7 @@ describe BrighterPlanet::Emitter do
       $:.unshift File.expand_path('fixtures/dirigible/lib', File.dirname(__FILE__))
       require 'dirigible'
       Airship.send :include, BrighterPlanet::Dirigible
-      Airship.force_schema!
+      Airship.auto_upgrade!
 
       $:.unshift File.expand_path('fixtures/biplane/lib', File.dirname(__FILE__))
     end
@@ -33,11 +33,11 @@ describe BrighterPlanet::Emitter do
     end
     
     it 'should state its own scope' do
-      Airship.emission_scope.should == 'Anthropogenic emissions resulting from the inflation, launching, and acceleration of dirigibles'
+      Airship.impact_scope.should == 'Anthropogenic impacts resulting from the inflation, launching, and acceleration of dirigibles'
     end
     
     it 'should have extra data_miner steps' do
-      Airship.data_miner_config.steps[0].description.should == :force_schema!
+      Airship.data_miner_config.steps[0].description.should == :auto_upgrade!
       Airship.data_miner_config.steps[1].description.should == "the first step defined in the emitter module"
       Airship.data_miner_config.steps[2].description.should == :run_data_miner_on_parent_associations!
     end

data/spec/fixtures/biplane/lib/biplane/data.rb

@@ -2,11 +2,9 @@ module BrighterPlanet
   module Biplane
     module Data
       def self.included(base)
-        base.force_schema do
-          float :distance
-          float :payload
-          integer :dirigible_class_id
-        end
+        base.col :distance, :type => :float
+        base.col :payload, :type => :float
+        base.col :dirigible_class_id, :type => :integer
       end
     end
   end

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

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

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

@@ -3,6 +3,6 @@ require 'emitter'
 module BrighterPlanet
   module Dirigible
     extend BrighterPlanet::Emitter
-    scope 'Anthropogenic emissions resulting from the inflation, launching, and acceleration of dirigibles'
+    scope 'Anthropogenic impacts resulting from the inflation, launching, and acceleration of dirigibles'
   end
 end

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

@@ -2,12 +2,10 @@ module BrighterPlanet
   module Dirigible
     module Data
       def self.included(base)
-        base.force_schema do
-          float :distance
-          float :payload
-          float :surface_area
-          integer :dirigible_class_id
-        end
+        base.col :distance, :type => :float
+        base.col :payload, :type => :float
+        base.col :surface_area, :type => :float
+        base.col :dirigible_class_id, :type => :integer
         
         base.data_miner do
           process "the first step defined in the emitter module" do

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 CO2e
+        base.decide :impact, :with => :characteristics do
+          committee :carbon do # returns kg CO2e
             quorum 'default' do
               100.0
             end

metadata

@@ -2,7 +2,7 @@
 name: emitter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -91,7 +91,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.4
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -128,7 +128,7 @@ dependencies:
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: force_schema
+  name: mini_record-compat
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -146,7 +146,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.0
+        version: "3"
   type: :development
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -166,12 +166,12 @@ dependencies:
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.2
+        version: 0.11.0
   type: :development
   version_requirements: *id014
-description: A software model in Ruby for the greenhouse gas emissions
+description: A framework for modelling the impact of real-world entities.
 email: derek@brighterplanet.com
 executables: []
 
@@ -192,16 +192,16 @@ files:
 - lib/emitter/version.rb
 - spec/emitter_spec.rb
 - spec/fixtures/biplane/lib/biplane.rb
-- spec/fixtures/biplane/lib/biplane/carbon_model.rb
 - spec/fixtures/biplane/lib/biplane/characterization.rb
 - spec/fixtures/biplane/lib/biplane/data.rb
+- spec/fixtures/biplane/lib/biplane/impact_model.rb
 - spec/fixtures/biplane/lib/biplane/relationships.rb
 - spec/fixtures/biplane/lib/biplane/summarization.rb
 - spec/fixtures/dirigible/lib/dirigible.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/spec_helper.rb
@@ -232,20 +232,20 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: The mother of all carbon models
+summary: A framework for modelling the impact of real-world entities.
 test_files: 
 - spec/emitter_spec.rb
 - spec/fixtures/biplane/lib/biplane.rb
-- spec/fixtures/biplane/lib/biplane/carbon_model.rb
 - spec/fixtures/biplane/lib/biplane/characterization.rb
 - spec/fixtures/biplane/lib/biplane/data.rb
+- spec/fixtures/biplane/lib/biplane/impact_model.rb
 - spec/fixtures/biplane/lib/biplane/relationships.rb
 - spec/fixtures/biplane/lib/biplane/summarization.rb
 - spec/fixtures/dirigible/lib/dirigible.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/spec_helper.rb