brighter_planet_metadata 0.0.4 → 0.0.5

data/brighter_planet_metadata.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport', '>=2.3.4'
   s.add_dependency 'i18n' # activesupport?
   s.add_dependency 'cache_method'
+  s.add_development_dependency 'brighter_planet_deploy'
   s.add_development_dependency 'fakeweb'
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'fakefs'

data/lib/brighter_planet_metadata/cm1_authority.rb

@@ -1,13 +1,14 @@
+require 'brighter_planet_deploy'
 require 'singleton'
 module BrighterPlanet
   class Metadata
     class Cm1Authority
       include ::Singleton
-      def authority?(universe, method_id)
-        return unless universe == 'cm1_production'
+      def authority?(method_id)
+        return unless ::Rails.env.production? and ::BrighterPlanet.deploy.servers.me.service == 'EmissionEstimateService'
         method_id = method_id.to_s
         if method_id == 'certified_emitters'
-          defined?(::Rails) and ::Rails.application.certified?
+          ::Rails.application.certified?
         else
           respond_to? method_id
         end
@@ -28,9 +29,6 @@ module BrighterPlanet
           memo
         end
       end
-      def color
-        (AuthoritativeDnsResolver.getaddress('carbon.brighterplanet.com') == '184.73.240.13') ? 'red' : 'blue'
-      end
     end
   end
 end

data/lib/brighter_planet_metadata/data1_authority.rb

@@ -1,10 +1,11 @@
+require 'brighter_planet_deploy'
 require 'singleton'
 module BrighterPlanet
   class Metadata
     class Data1Authority
       include ::Singleton
-      def authority?(universe, method_id)
-        return unless universe == 'data1_production'
+      def authority?(method_id)
+        return unless ::Rails.env.production? and ::BrighterPlanet.deploy.servers.me.service == 'ReferenceDataService'
         respond_to? method_id
       end
       def resources

data/lib/brighter_planet_metadata/metadata.rb

@@ -11,8 +11,6 @@ end if ::ActiveSupport::VERSION::MAJOR == 3
 
 module BrighterPlanet
   class Metadata
-    autoload :AuthoritativeDnsResolver, 'brighter_planet_metadata/authoritative_dns_resolver'
-    
     include ::Singleton
     LIVE_URL = {
       'datasets'            => 'http://data.brighterplanet.com/datasets.json',
@@ -20,7 +18,6 @@ module BrighterPlanet
       'certified_emitters'  => 'http://certified.carbon.brighterplanet.com/emitters.json',
       'resources'           => 'http://data.brighterplanet.com/resources.json',
       'protocols'           => 'http://carbon.brighterplanet.com/protocols.json',
-      'color'               => 'http://carbon.brighterplanet.com/color.json'
     }.freeze
     
     # sabshere 2/4/11 obv these have to be updated with some regularity
@@ -28,9 +25,8 @@ module BrighterPlanet
       'datasets'            => %w{ AutomobileIndustry FlightIndustry },
       'emitters'            => %w{ Automobile AutomobileTrip BusTrip Computation Diet ElectricityUse Flight FuelPurchase Lodging Meeting Motorcycle Pet Purchase RailTrip Residence Shipment },
       'certified_emitters'  => %w{ },
-      'resources'           => %w{ AirConditionerUse Aircraft AircraftClass AircraftManufacturer Airline Airport AutomobileFuelType AutomobileMake AutomobileMakeFleetYear AutomobileMakeModel AutomobileMakeModelYear AutomobileMakeModelYearVariant AutomobileMakeYear AutomobileSizeClass AutomobileSizeClassYear AutomobileTypeFuelAge AutomobileTypeFuelControl AutomobileTypeFuelYear AutomobileTypeFuelYearControl AutomobileTypeYear Breed BreedGender BusClass Carrier CarrierMode CensusDivision CensusRegion ClimateDivision ClothesMachineUse ComputationPlatform Country DataCenterCompany DietClass DishwasherUse EgridRegion EgridSubregion FlightDistanceClass FlightFuelType FlightSeatClass FlightSegment FoodGroup FuelPrice FuelType FuelYear Gender GreenhouseGas Industry IndustryProduct IndustryProductLine IndustrySector LodgingClass Merchant MerchantCategory MerchantCategoryIndustry PetroleumAdministrationForDefenseDistrict ProductLine ProductLineIndustryProduct RailClass ResidenceAppliance ResidenceClass ResidenceFuelPrice ResidenceFuelType ResidentialEnergyConsumptionSurveyResponse Sector ServerType ServerTypeAlias ShipmentMode Species State Urbanity ZipCode },
+      'resources'           => %w{ AirConditionerUse Aircraft AircraftClass AircraftManufacturer Airline Airport AutomobileFuel AutomobileMake AutomobileMakeFleetYear AutomobileMakeModel AutomobileMakeModelYear AutomobileMakeModelYearVariant AutomobileMakeYear AutomobileSizeClass AutomobileSizeClassYear AutomobileTypeFuelAge AutomobileTypeFuelControl AutomobileTypeFuelYear AutomobileTypeFuelYearAge AutomobileTypeFuelYearControl AutomobileTypeYear Breed BreedGender BusClass BusFuel BusFuelControl BusFuelYearControl Carrier CarrierMode CensusDivision CensusRegion ClimateDivision ClothesMachineUse ComputationCarrier ComputationCarrierInstanceClass ComputationCarrierRegion Country DietClass DishwasherUse EgridRegion EgridSubregion FlightDistanceClass FlightSeatClass FlightSegment FoodGroup Fuel FuelPrice FuelType FuelYear Gender GreenhouseGas LodgingClass PetroleumAdministrationForDefenseDistrict RailClass ResidenceAppliance ResidenceClass ResidenceFuelPrice ResidenceFuelType ResidentialEnergyConsumptionSurveyResponse ShipmentMode Species State Urbanity ZipCode },
       'protocols'           => { 'ghg_protocol_scope_3' => 'Greenhouse Gas Protocol Scope 3', 'iso' => 'ISO 14064-1', 'tcr' => 'The Climate Registry', 'ghg_protocol_scope_1' => 'Greenhouse Gas Protocol Scope 1' },
-      'color'               => 'unknown'
     }.freeze
     
     # What resources are available.
@@ -58,11 +54,6 @@ module BrighterPlanet
       deep_copy_of_authoritative_value_or_fallback 'protocols'
     end
     
-    # What 'color' the emission estimate service is today.
-    def color
-      deep_copy_of_authoritative_value_or_fallback 'color'
-    end
-
     # Clear out any cached values
     def refresh
       # instance_variables.each { |ivar_name| instance_variable_set ivar_name, nil }
@@ -85,17 +76,6 @@ module BrighterPlanet
       [ cm1_authority, data1_authority ]
     end
     
-    # A universe of operation, for example an EngineYard AppCloud "environment"
-    def universe
-      if ::ENV['BRIGHTER_PLANET_METADATA_FORCE_UNIVERSE'].present?
-        ::ENV['BRIGHTER_PLANET_METADATA_FORCE_UNIVERSE']
-      elsif ::File.readable? '/etc/brighterplanet/universe'
-        ::File.read('/etc/brighterplanet/universe').chomp
-      else
-        'unknown'
-      end
-    end
-    
     def deep_copy_of_authoritative_value_or_fallback(k)
       v = authoritative_value_or_fallback k
       case v
@@ -113,7 +93,7 @@ module BrighterPlanet
     # Used internally to pull a live list of emitters/datasets/etc. or fall back to a static one.
     def authoritative_value_or_fallback(k)
       k = k.to_s
-      if (authority = authorities.detect { |a| a.authority? universe, k })
+      if (authority = authorities.detect { |a| a.authority? k })
         authority.send k
       else
         begin

data/lib/brighter_planet_metadata/version.rb

@@ -1,3 +1,3 @@
 module BrighterPlanetMetadata
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/helper.rb

@@ -5,6 +5,7 @@ require 'test/unit'
 require 'fakeweb'
 require 'fakefs/safe'
 require 'fileutils'
+require 'active_support/string_inquirer'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'brighter_planet_metadata'
@@ -14,7 +15,8 @@ class Test::Unit::TestCase
     FakeWeb.clean_registry
     FakeWeb.allow_net_connect = false
     Rails.application.certified = false
-    Rails.root = nil
+    Rails.root = '/var/www/myapp'
+    Rails.env = ActiveSupport::StringInquirer.new 'development'
   end
   def teardown
     FakeFS::FileSystem.clear
@@ -28,7 +30,7 @@ end
 require 'singleton'
 require 'active_support/core_ext/module'
 module Rails
-  mattr_accessor :root
+  mattr_accessor :root, :env
   def self.application
     FakeApplication.instance
   end

data/test/test_live_cm1.rb

@@ -12,23 +12,27 @@ class TestLiveCm1 < Test::Unit::TestCase
   def setup
     super
     FakeFS.activate!
-    FileUtils.mkdir_p '/etc/brighterplanet'
-    File.open('/etc/brighterplanet/universe', 'w') { |f| f.write 'cm1_production' }
+    Rails.env = ActiveSupport::StringInquirer.new 'production'
+    Rails.root = '/data/edge/current'
+    FileUtils.mkdir_p '/data/edge/current/config/brighter_planet_deploy'
+    FileUtils.mkdir_p '/data/edge/current/public/brighter_planet_deploy'
+    File.open('/data/edge/current/config/brighter_planet_deploy/service', 'w') { |f| f.write 'EmissionEstimateService' }
   end
     
-  def test_universe
-    assert_equal 'cm1_production', ::BrighterPlanet.metadata.send(:universe)
+  def test_self_awareness
+    assert ::Rails.env.production?
+    assert_equal 'EmissionEstimateService', ::BrighterPlanet.deploy.servers.me.service
   end
   
   def test_authority
-    assert ::BrighterPlanet::Metadata::Cm1Authority.instance.authority?('cm1_production', 'emitters')
+    assert ::BrighterPlanet::Metadata::Cm1Authority.instance.authority?('emitters')
 
     # you don't have authority to say what's certified...
-    assert !::BrighterPlanet::Metadata::Cm1Authority.instance.authority?('cm1_production', 'certified_emitters')
+    assert !::BrighterPlanet::Metadata::Cm1Authority.instance.authority?('certified_emitters')
     
     # now you do
     Rails.application.certified = true
-    assert ::BrighterPlanet::Metadata::Cm1Authority.instance.authority?('cm1_production', 'certified_emitters')
+    assert ::BrighterPlanet::Metadata::Cm1Authority.instance.authority?('certified_emitters')
   ensure
     Rails.application.certified = false
   end

data/test/test_live_data1.rb

@@ -18,27 +18,28 @@ class TestLiveData1 < Test::Unit::TestCase
     fake_resource_path = File.join earth_gem_path, 'lib', 'earth', 'live_data1_resource.rb'
     File.open(fake_resource_path, 'w') { |f| f.write "class ::LiveData1Resource < ActiveRecord::Base; end"}
     eval File.read(fake_resource_path) unless defined?(::LiveData1Resource)
+        
+    # faking deploy
+    Rails.env = ActiveSupport::StringInquirer.new 'production'
+    Rails.root = '/var/www/data1/current'
+    FileUtils.mkdir_p '/var/www/data1/current/config/brighter_planet_deploy'
+    FileUtils.mkdir_p '/var/www/data1/current/public/brighter_planet_deploy'
+    File.open('/var/www/data1/current/config/brighter_planet_deploy/service', 'w') { |f| f.write 'ReferenceDataService' }
     
     # FAKING DATASETS
-    ::Rails.root = '/data/data1/current'
     eval "class ::Dataset; end"
-    
-    # fake what looks like a dataset
     fake_dataset_path = File.join ::Rails.root, 'app', 'models', 'live_data1_dataset.rb'
     File.open(fake_dataset_path, 'w') { |f| f.write "class ::LiveData1Dataset < Dataset; end"}
     eval File.read(fake_dataset_path) unless defined?(::LiveData1Dataset)
-        
-    # FAKING A UNIVERSE
-    FileUtils.mkdir_p '/etc/brighterplanet'
-    File.open('/etc/brighterplanet/universe', 'w') { |f| f.write 'data1_production' }
   end
-  
-  def test_universe
-    assert_equal 'data1_production', ::BrighterPlanet.metadata.send(:universe)
+
+  def test_self_awareness
+    assert ::Rails.env.production?
+    assert_equal 'ReferenceDataService', ::BrighterPlanet.deploy.servers.me.service
   end
   
   def test_authority
-    assert ::BrighterPlanet.metadata.send(:data1_authority).authority?('data1_production', 'resources')
+    assert ::BrighterPlanet.metadata.send(:data1_authority).authority?('resources')
   end
   
   def test_resources

data/test/test_live_remote.rb

@@ -14,7 +14,6 @@ class TestLiveRemote < Test::Unit::TestCase
       'http://certified.carbon.brighterplanet.com/emitters.json'  => { 'emitters' => %w{ LiveRemoteCertifiedEmitter } },
       'http://data.brighterplanet.com/resources.json'             => { 'resources' => %w{ LiveRemoteResource } },
       'http://carbon.brighterplanet.com/protocols.json'           => { 'protocols' => { 'fooprotocol' => 'Foo Protocol' } },
-      'http://carbon.brighterplanet.com/color.json'               => { 'color' => 'magenta'}
     }.each do |url, hsh|
       FakeWeb.register_uri  :get,
                             url,
@@ -50,8 +49,4 @@ class TestLiveRemote < Test::Unit::TestCase
   def test_protocols
     assert ::BrighterPlanet.metadata.protocols.values.include?('Foo Protocol')
   end
-  
-  def test_color
-    assert_equal 'magenta', ::BrighterPlanet.metadata.color
-  end
 end

data/test/test_real.rb

@@ -30,8 +30,4 @@ class TestReal < Test::Unit::TestCase
   def test_protocols
     assert ::BrighterPlanet.metadata.protocols.values.include?('The Climate Registry')
   end
-  
-  def test_color
-    assert %w{ red blue }.include?(::BrighterPlanet.metadata.color)
-  end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: brighter_planet_metadata
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -16,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -05:00
+date: 2011-06-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,9 +22,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -41,11 +33,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 3
-        - 4
         version: 2.3.4
   type: :runtime
   version_requirements: *id002
@@ -57,9 +44,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -71,79 +55,61 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
+  name: brighter_planet_deploy
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: test-unit
+  name: fakeweb
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: fakefs
+  name: test-unit
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: earth
+  name: fakefs
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: fastercsv
+  name: earth
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id009
@@ -164,13 +130,11 @@ files:
 - bin/brighter_planet_metadata
 - brighter_planet_metadata.gemspec
 - lib/brighter_planet_metadata.rb
-- lib/brighter_planet_metadata/authoritative_dns_resolver.rb
 - lib/brighter_planet_metadata/cm1_authority.rb
 - lib/brighter_planet_metadata/data1_authority.rb
 - lib/brighter_planet_metadata/metadata.rb
 - lib/brighter_planet_metadata/version.rb
 - test/helper.rb
-- test/test_developer_machine.rb
 - test/test_fallback.rb
 - test/test_live_cm1.rb
 - test/test_live_data1.rb
@@ -191,18 +155,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
@@ -213,7 +171,6 @@ specification_version: 3
 summary: Names of Brighter Planet things
 test_files: 
 - test/helper.rb
-- test/test_developer_machine.rb
 - test/test_fallback.rb
 - test/test_live_cm1.rb
 - test/test_live_data1.rb

data/lib/brighter_planet_metadata/authoritative_dns_resolver.rb

@@ -1,12 +0,0 @@
-require 'dnsruby'
-module BrighterPlanet
-  class Metadata
-    module AuthoritativeDnsResolver
-      def self.getaddress(domain_name)
-        r = ::Dnsruby::Resolver.new(:nameserver => %w{ ns1.easydns.com ns2.easydns.com ns3.easydns.org })
-        q = r.query domain_name, ::Dnsruby::Types.A, ::Dnsruby::Classes.IN
-        q.answer[0].address.to_s
-      end
-    end
-  end
-end

data/test/test_developer_machine.rb

@@ -1,17 +0,0 @@
-require 'helper'
-
-class TestDeveloperMachine < Test::Unit::TestCase
-  def test_developing_cm1_locally
-    ENV['BRIGHTER_PLANET_METADATA_FORCE_UNIVERSE'] = 'cm1_production'
-    assert_equal 'cm1_production', BrighterPlanet.metadata.send(:universe)
-  ensure 
-    ENV['BRIGHTER_PLANET_METADATA_FORCE_UNIVERSE'] = ''
-  end
-  
-  def test_developing_data1_locally
-    ENV['BRIGHTER_PLANET_METADATA_FORCE_UNIVERSE'] = 'data1_production'
-    assert_equal 'data1_production', BrighterPlanet.metadata.send(:universe)
-  ensure 
-    ENV['BRIGHTER_PLANET_METADATA_FORCE_UNIVERSE'] = ''
-  end
-end