sniff 0.0.3 → 0.0.4

data/README.markdown

@@ -2,8 +2,10 @@
 Testing environment for Brighter Planet Climate Middleware emission calculation gems.
 
 This gem provides:
- * Sample climate data, representative of data found on http://data.brighterplanet.com
+ * Sample data used for calculations, representative of data found on http://data.brighterplanet.com
+ * A database/ActiveRecord environment for said data
  * References to gems needed by each emitter gem  
+ * An autoloader that will load any models and sample data needed by the emitter gem being tested (see Usage)
 
 # Usage
 Within an emitter gem's test setup, you can:
@@ -11,6 +13,8 @@ Within an emitter gem's test setup, you can:
     
     Sniff.init '/path/to/emitter_project'
 
+If an emitter gem has its own test models and data, sniff will look for the models in `EMITTER_GEM_DIR/lib/test_support/data_models/` and the data fixtures in `EMITTER_GEM_DIR/lib/test_support/db/fixtures/`. It will also look for a schema in `EMITTER_GEM_DIR/lib/test_support/db/schema.rb`
+
 # How to contribute
 Typical contributions will include updates to test data.
 

data/lib/sniff.rb

@@ -6,26 +6,16 @@ module Sniff
   end
 
   def init(local_root, options = {})
-    require 'active_record'
-    require 'sqlite3'
-
-    load_plugins
+    options[:earth] ||= :none
 
     Sniff::Database.init local_root, options
   end
-
-  def load_plugins
-    Dir[File.join(Sniff.root, 'vendor', '**', 'init.rb')].each do |pluginit|
-      $:.unshift File.join(File.dirname(pluginit), 'lib')
-      load pluginit
-    end
-  end
 end
 
+require 'earth'
 require 'characterizable'
+require 'timeframe'
+
 $:.unshift File.dirname(__FILE__)
-require 'sniff/active_record_ext'
 require 'sniff/database'
 require 'sniff/emitter'
-require 'sniff/conversions_ext'
-require 'sniff/timeframe'

data/lib/sniff/database.rb

@@ -1,5 +1,7 @@
+require 'active_support'
 require 'fileutils'
 require 'logger'
+require 'sqlite3'
 
 module Sniff
   class Database
@@ -12,7 +14,7 @@ module Sniff
           environments << really_init(Sniff.root)
         end
 
-        db_init local_root
+        db_init options
         environments.each { |e| e.populate_fixtures }
       end
 
@@ -22,21 +24,20 @@ module Sniff
         db
       end
 
-      def db_init(local_root)
-        db_path = File.join(local_root, 'db')
-        db_file_path = File.join(db_path, 'emitter_data.sqlite3')
-        FileUtils.mkdir_p db_path
-        db_drop db_file_path
-        connect db_file_path
+      def db_init(options)
+        ActiveRecord::Base.logger = Logger.new nil
+        connect
         db_create
-        load_all_schemas
+        earth_init(options[:earth])
       end
 
-      def connect(db_file_path)
+      def earth_init(domain)
+        Earth.init domain, :apply_schemas => true
+      end
+
+      def connect
         ActiveRecord::Base.establish_connection :adapter => 'sqlite3',
-          :database => db_file_path,
-          :pool => 5,
-          :timeout => 5000
+          :database => ':memory:'
       end
 
       def db_drop(db_file_path)
@@ -46,39 +47,15 @@ module Sniff
       def db_create
         ActiveRecord::Base.connection
       end
-
-      def define_schema(&blk)
-        @schemas = [] unless defined?(@schemas)
-        @schemas << blk
-      end
-
-      def schemas
-        @schemas
-      end
-
-      def load_all_schemas
-        orig_std_out = STDOUT.clone
-        STDOUT.reopen File.open(File.join('/tmp', 'schema_output'), 'w') 
-
-        ActiveRecord::Schema.define(:version => 1) do
-          ar_schema = self
-          Sniff::Database.schemas.each do |s|
-            ar_schema.instance_eval &s
-          end
-        end
-      ensure
-        STDOUT.reopen(orig_std_out)
-      end
     end
 
-    attr_accessor :root, :lib_path, :schema_path, :fixtures_path,
+    attr_accessor :root, :lib_path, :fixtures_path,
       :load_data, :fixtures, :logger
 
     def initialize(root, options)
       self.root = root
       self.lib_path = File.join(root, 'lib', 'test_support')
       self.load_data = options[:load_data]
-      self.schema_path = options[:schema_path]
       self.fixtures_path = options[:fixtures_path]
       self.logger = Logger.new options[:logdev]
     end
@@ -92,10 +69,6 @@ module Sniff
       @load_data
     end
 
-    def schema_path
-      @schema_path ||= File.join(lib_path, 'db', 'schema.rb')
-    end
-
     def fixtures_path
       @fixtures_path ||= File.join(lib_path, 'db', 'fixtures')
     end
@@ -105,17 +78,10 @@ module Sniff
     end
 
     def init
-      load_models
       load_supporting_libs
-      read_schema
       read_fixtures if load_data?
     end
 
-    def read_schema
-      log "Reading schema #{schema_path}"
-      load(schema_path)
-    end
-
     def read_fixtures
       require 'active_record/fixtures'
       log "Reading fixtures from #{fixtures_path}/**/*.{yml,csv}"
@@ -127,8 +93,12 @@ module Sniff
 
     def populate_fixtures
       fixtures.each do |fixture_file|
-        log "Loading fixture #{fixture_file}"
-        Fixtures.create_fixtures(fixtures_path, fixture_file[(fixtures_path.size + 1)..-5])
+        klass = File.basename(fixture_file, '.csv').
+          camelize.singularize
+        if Object.const_defined?(klass) and klass.constantize.table_exists?
+          log "Loading fixture #{fixture_file}"
+          Fixtures.create_fixtures(fixtures_path, fixture_file[(fixtures_path.size + 1)..-5])
+        end
       end
     end
 
@@ -139,12 +109,5 @@ module Sniff
         require lib
       end
     end
-
-    def load_models
-      Dir["#{lib_path}/data_models/**/*.rb"].each do |lib|
-        log "Loading model #{lib}"
-        require lib
-      end
-    end
   end
 end

data/lib/sniff/emitter.rb

@@ -10,11 +10,14 @@ require 'data_miner'
 module Sniff
   module Emitter
     def self.included(target)
-      target.send :extend, Leap::Subject
-      target.send :extend, ClassMethods
-      target.send :extend, SummaryJudgement
-      target.send :extend, FastTimestamp
-      target.send :include, Characterizable
+      target.instance_eval do
+        extend Leap::Subject
+        extend ClassMethods
+        extend SummaryJudgement
+        extend FastTimestamp
+        include Characterizable
+        include CommonName
+      end
     end
     
     def parent_class
@@ -61,6 +64,10 @@ module Sniff
         new resolved_params
       end
       
+      def _common_name
+        name.underscore
+      end
+
       def pattern?
         common_name.ends_with? 'pattern'
       end

data/spec/lib/sniff/database_spec.rb

@@ -3,18 +3,17 @@ require 'fileutils'
 
 describe Sniff::Database do
   describe '#connect' do
-    before :all do
+    before :each do
       @db_path = File.join(File.dirname(__FILE__), '..', '..', '..')
-      Sniff.init(@db_path)
-      @sqlite_path = File.join(@db_path, 'db', 'emitter_data.sqlite3') 
     end
-    after :all do
-      FileUtils.rm_f(@sqlite_path)
-    end
-    it 'should create an sqlite database in the given directory' do
-      File.exists?(@sqlite_path).should be_true
+    it 'should load the air domain' do
+      Sniff.init(@db_path, :earth => :air, :apply_schemas => true)
+      Airport.count.should == 0 # we don't have fixtures for this here
+      ZipCode.count.should > 0
+      expect { AutomobileFuelType }.should raise_error
     end
-    it 'should load data' do
+    it 'should load data for all domains' do
+      Sniff.init(@db_path, :earth => :all, :apply_schemas => true)
       ZipCode.count.should > 0
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sniff
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Derek Kastner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 -04:00
+date: 2010-07-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,8 +38,25 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  name: sqlite3-ruby
+  name: activesupport
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: -1848230024
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta4
+        version: 3.0.0.beta4
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: sqlite3-ruby
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -50,12 +67,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  requirement: *id002
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: falls_back_on
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -66,12 +83,12 @@ dependencies:
         - 0
         - 2
         version: 0.0.2
-  requirement: *id003
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: cohort_scope
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -82,12 +99,12 @@ dependencies:
         - 0
         - 5
         version: 0.0.5
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: leap
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -98,12 +115,12 @@ dependencies:
         - 3
         - 3
         version: 0.3.3
-  requirement: *id005
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: summary_judgement
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -114,12 +131,12 @@ dependencies:
         - 3
         - 8
         version: 1.3.8
-  requirement: *id006
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: fast_timestamp
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -130,12 +147,12 @@ dependencies:
         - 0
         - 4
         version: 0.0.4
-  requirement: *id007
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: common_name
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -146,54 +163,38 @@ dependencies:
         - 1
         - 5
         version: 0.1.5
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: conversions
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 4
-        - 5
-        version: 1.4.5
   requirement: *id009
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  name: geokit
+  name: timeframe
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 29
         segments: 
-        - 1
-        - 5
         - 0
-        version: 1.5.0
+        - 0
+        - 1
+        version: 0.0.1
   requirement: *id010
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  name: data_miner
+  name: earth
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 87
+        hash: 19
         segments: 
         - 0
-        - 4
-        - 44
-        version: 0.4.44
+        - 0
+        - 6
+        version: 0.0.6
   requirement: *id011
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -244,12 +245,16 @@ dependencies:
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 62196417
         segments: 
+        - 2
         - 0
-        version: "0"
+        - 0
+        - beta
+        - 17
+        version: 2.0.0.beta.17
   requirement: *id015
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -284,8 +289,10 @@ description: |
   Testing environment for Brighter Planet Climate Middleware emission calculation gems.
   
   This gem provides:
-   * Sample climate data, representative of data found on http://data.brighterplanet.com
+   * Sample data used for calculations, representative of data found on http://data.brighterplanet.com
+   * A database/ActiveRecord environment for said data
    * References to gems needed by each emitter gem  
+   * An autoloader that will load any models and sample data needed by the emitter gem being tested (see Usage)
   
   # Usage
   Within an emitter gem's test setup, you can:
@@ -293,6 +300,8 @@ description: |
       
       Sniff.init '/path/to/emitter_project'
   
+  If an emitter gem has its own test models and data, sniff will look for the models in `EMITTER_GEM_DIR/lib/test_support/data_models/` and the data fixtures in `EMITTER_GEM_DIR/lib/test_support/db/fixtures/`. It will also look for a schema in `EMITTER_GEM_DIR/lib/test_support/db/schema.rb`
+  
   # How to contribute
   Typical contributions will include updates to test data.
   
@@ -363,23 +372,10 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - lib/sniff.rb
-- lib/sniff/active_record_ext.rb
-- lib/sniff/conversions_ext.rb
 - lib/sniff/database.rb
 - lib/sniff/emitter.rb
 - lib/sniff/tasks.rb
 - lib/sniff/timeframe.rb
-- lib/test_support/data_models/census_division.rb
-- lib/test_support/data_models/census_region.rb
-- lib/test_support/data_models/climate_division.rb
-- lib/test_support/data_models/country.rb
-- lib/test_support/data_models/egrid_region.rb
-- lib/test_support/data_models/egrid_subregion.rb
-- lib/test_support/data_models/gender.rb
-- lib/test_support/data_models/petroleum_administration_for_defense_district.rb
-- lib/test_support/data_models/state.rb
-- lib/test_support/data_models/urbanity.rb
-- lib/test_support/data_models/zip_code.rb
 - lib/test_support/db/fixtures/census_divisions.csv
 - lib/test_support/db/fixtures/census_regions.csv
 - lib/test_support/db/fixtures/climate_divisions.csv
@@ -390,56 +386,10 @@ files:
 - lib/test_support/db/fixtures/petroleum_administration_for_defense_districts.csv
 - lib/test_support/db/fixtures/states.csv
 - lib/test_support/db/fixtures/urbanities.csv
-- lib/test_support/db/fixtures/yearly_anonymous_emissions.csv
-- lib/test_support/db/fixtures/yearly_typical_emissions.csv
 - lib/test_support/db/fixtures/zip_codes.csv
-- lib/test_support/db/schema.rb
-- vendor/geokit-rails/CHANGELOG.rdoc
-- vendor/geokit-rails/MIT-LICENSE
-- vendor/geokit-rails/README.markdown
-- vendor/geokit-rails/Rakefile
-- vendor/geokit-rails/about.yml
-- vendor/geokit-rails/assets/api_keys_template
-- vendor/geokit-rails/init.rb
-- vendor/geokit-rails/install.rb
-- vendor/geokit-rails/lib/geokit-rails.rb
-- vendor/geokit-rails/lib/geokit-rails/acts_as_mappable.rb
-- vendor/geokit-rails/lib/geokit-rails/adapters/abstract.rb
-- vendor/geokit-rails/lib/geokit-rails/adapters/mysql.rb
-- vendor/geokit-rails/lib/geokit-rails/adapters/postgresql.rb
-- vendor/geokit-rails/lib/geokit-rails/adapters/sqlserver.rb
-- vendor/geokit-rails/lib/geokit-rails/defaults.rb
-- vendor/geokit-rails/lib/geokit-rails/geocoder_control.rb
-- vendor/geokit-rails/lib/geokit-rails/ip_geocode_lookup.rb
-- vendor/geokit-rails/test/acts_as_mappable_test.rb
-- vendor/geokit-rails/test/boot.rb
-- vendor/geokit-rails/test/database.yml
-- vendor/geokit-rails/test/fixtures/companies.yml
-- vendor/geokit-rails/test/fixtures/custom_locations.yml
-- vendor/geokit-rails/test/fixtures/locations.yml
-- vendor/geokit-rails/test/fixtures/mock_addresses.yml
-- vendor/geokit-rails/test/fixtures/mock_families.yml
-- vendor/geokit-rails/test/fixtures/mock_houses.yml
-- vendor/geokit-rails/test/fixtures/mock_organizations.yml
-- vendor/geokit-rails/test/fixtures/mock_people.yml
-- vendor/geokit-rails/test/fixtures/stores.yml
-- vendor/geokit-rails/test/ip_geocode_lookup_test.rb
-- vendor/geokit-rails/test/models/company.rb
-- vendor/geokit-rails/test/models/custom_location.rb
-- vendor/geokit-rails/test/models/location.rb
-- vendor/geokit-rails/test/models/mock_address.rb
-- vendor/geokit-rails/test/models/mock_family.rb
-- vendor/geokit-rails/test/models/mock_house.rb
-- vendor/geokit-rails/test/models/mock_organization.rb
-- vendor/geokit-rails/test/models/mock_person.rb
-- vendor/geokit-rails/test/models/store.rb
-- vendor/geokit-rails/test/schema.rb
-- vendor/geokit-rails/test/tasks.rake
-- vendor/geokit-rails/test/test_helper.rb
 - README.markdown
 - spec/lib/sniff/database_spec.rb
 - spec/spec_helper.rb
-- spec/spec.opts
 has_rdoc: true
 homepage: http://github.com/brighterplanet/sniff
 licenses: []
@@ -477,16 +427,3 @@ summary: Test support for Brighter Planet carbon gems
 test_files: 
 - spec/lib/sniff/database_spec.rb
 - spec/spec_helper.rb
-- lib/test_support/data_models/census_division.rb
-- lib/test_support/data_models/census_region.rb
-- lib/test_support/data_models/climate_division.rb
-- lib/test_support/data_models/country.rb
-- lib/test_support/data_models/egrid_region.rb
-- lib/test_support/data_models/egrid_subregion.rb
-- lib/test_support/data_models/gender.rb
-- lib/test_support/data_models/petroleum_administration_for_defense_district.rb
-- lib/test_support/data_models/state.rb
-- lib/test_support/data_models/urbanity.rb
-- lib/test_support/data_models/zip_code.rb
-- lib/test_support/db/schema.rb
-- spec/spec.opts