earth 0.1.4 → 0.2.0

data/lib/earth/industry.rb

@@ -1,10 +1,10 @@
-require 'earth/industry/industries_product_lines'
-require 'earth/industry/industries_sectors'
+require 'earth/industry/industry_product_line'
+require 'earth/industry/industry_sector'
 require 'earth/industry/industry'
 require 'earth/industry/merchant'
-require 'earth/industry/merchant_categories_industries'
+require 'earth/industry/merchant_category_industry'
 require 'earth/industry/merchant_category'
 require 'earth/industry/product_line'
-require 'earth/industry/product_lines_sectors'
+require 'earth/industry/product_line_sector'
 require 'earth/industry/sector'
 

data/lib/earth/industry/industry.rb

@@ -2,12 +2,11 @@ class Industry < ActiveRecord::Base
   extend Earth::Base
   set_primary_key :naics_code
   
-  has_many :industries_product_lines, :foreign_key => 'naics_code'
+  has_many :industry_product_lines, :foreign_key => 'naics_code'
   has_many :product_lines, :through => :industries_product_lines
-  has_many :industries_sectors, :foreign_key => 'naics_code'
-  has_many :sectors, :through => :industries_sectors
-  has_many :merchant_categories_industries, :foreign_key => 'naics_code', 
-    :class_name => 'MerchantCategoriesIndustries'
+  has_many :industry_sectors, :foreign_key => 'naics_code'
+  has_many :sectors, :through => :industry_sectors
+  has_many :merchant_category_industries, :foreign_key => 'naics_code'
   
   def self.schema_definition
     lambda do

data/lib/earth/industry/{industries_product_lines.rb → industry_product_line.rb}

@@ -1,4 +1,4 @@
-class IndustriesProductLines < ActiveRecord::Base
+class IndustryProductLine < ActiveRecord::Base
   extend Earth::Base
   set_primary_key :row_hash
   
@@ -16,6 +16,6 @@ class IndustriesProductLines < ActiveRecord::Base
   end
 
   data_miner do
-    IndustriesProductLines.define_schema(self)
+    IndustryProductLine.define_schema(self)
   end
 end

data/lib/earth/industry/{industries_sectors.rb → industry_sector.rb}

@@ -1,4 +1,4 @@
-class IndustriesSectors < ActiveRecord::Base
+class IndustrySector < ActiveRecord::Base
   extend Earth::Base
   belongs_to :industry,  :foreign_key => 'naics_code'
   belongs_to :sector,    :foreign_key => 'io_code'
@@ -12,6 +12,6 @@ class IndustriesSectors < ActiveRecord::Base
   end
 
   data_miner do
-    IndustriesSectors.define_schema(self)
+    IndustrySector.define_schema(self)
   end
 end

data/lib/earth/industry/merchant_category.rb

@@ -2,8 +2,8 @@ class MerchantCategory < ActiveRecord::Base
   extend Earth::Base
   set_primary_key :mcc
 
-  has_many :merchant_categories_industries, :foreign_key => 'mcc', :class_name => 'MerchantCategoriesIndustries'
-  has_many :industries, :through => :merchant_categories_industries
+  has_many :merchant_category_industries, :foreign_key => 'mcc'
+  has_many :industries, :through => :merchant_category_industries
 
   def name
     description

data/lib/earth/industry/merchant_category_industry.rb

@@ -0,0 +1,20 @@
+class MerchantCategoryIndustry < ActiveRecord::Base
+  extend Earth::Base
+  
+  belongs_to :merchant_category, :foreign_key => 'mcc'
+  belongs_to :industry,          :foreign_key => 'naics_code'
+  has_many :industry_product_lines, :through => :industry
+  has_many :industry_sectors, :through => :industry
+
+  def self.schema_definition
+    lambda do
+      string 'mcc'
+      float  'ratio'
+      string 'naics_code'
+    end
+  end
+
+  data_miner do
+    MerchantCategoryIndustry.define_schema(self)
+  end
+end

data/lib/earth/industry/product_line.rb

@@ -2,8 +2,8 @@ class ProductLine < ActiveRecord::Base
   extend Earth::Base
   set_primary_key :ps_code
   
-  has_many :product_lines_sectors, :foreign_key => 'ps_code'
-  has_many :sectors, :through => :product_lines_sectors
+  has_many :product_line_sectors, :foreign_key => 'ps_code'
+  has_many :sectors, :through => :product_line_sectors
   
   def self.schema_definition
     lambda do

data/lib/earth/industry/{product_lines_sectors.rb → product_line_sector.rb}

@@ -1,4 +1,4 @@
-class ProductLinesSectors < ActiveRecord::Base
+class ProductLineSector < ActiveRecord::Base
   extend Earth::Base
   belongs_to :product_line, :foreign_key => 'ps_code'
   belongs_to :sector,       :foreign_key => 'io_code'
@@ -13,6 +13,6 @@ class ProductLinesSectors < ActiveRecord::Base
   end
 
   data_miner do
-    ProductLinesSectors.define_schema(self)
+    ProductLineSector.define_schema(self)
   end
 end

data/lib/earth/industry/sector.rb

@@ -2,7 +2,7 @@ class Sector < ActiveRecord::Base
   extend Earth::Base
   set_primary_key :io_code
 
-  has_many :product_lines_sectors, :class_name => 'ProductLinesSectors', :foreign_key => 'io_code'
+  has_many :product_line_sectors, :foreign_key => 'io_code'
 
   def self.schema_definition
     lambda do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: earth
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 -05:00
+date: 2010-09-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 299253624
+        hash: -1848230024
         segments: 
         - 3
         - 0
@@ -324,14 +324,14 @@ files:
 - lib/earth/hospitality/lodging_class.rb
 - lib/earth/hospitality/lodging_class/data_miner.rb
 - lib/earth/industry.rb
-- lib/earth/industry/industries_product_lines.rb
-- lib/earth/industry/industries_sectors.rb
 - lib/earth/industry/industry.rb
+- lib/earth/industry/industry_product_line.rb
+- lib/earth/industry/industry_sector.rb
 - lib/earth/industry/merchant.rb
-- lib/earth/industry/merchant_categories_industries.rb
 - lib/earth/industry/merchant_category.rb
+- lib/earth/industry/merchant_category_industry.rb
 - lib/earth/industry/product_line.rb
-- lib/earth/industry/product_lines_sectors.rb
+- lib/earth/industry/product_line_sector.rb
 - lib/earth/industry/sector.rb
 - lib/earth/inflectors.rb
 - lib/earth/locality.rb

data/lib/earth/industry/merchant_categories_industries.rb

@@ -1,20 +0,0 @@
-class MerchantCategoriesIndustries < ActiveRecord::Base
-  extend Earth::Base
-  
-  belongs_to :merchant_category, :foreign_key => 'mcc'
-  belongs_to :industry,          :foreign_key => 'naics_code'
-  has_many :industries_product_lines, :through => :industry, :class_name => 'IndustriesProductLines'
-  has_many :industries_sectors, :through => :industry, :class_name => 'IndustriesSectors'
-
-  def self.schema_definition
-    lambda do
-      string 'mcc'
-      float  'ratio'
-      string 'naics_code'
-    end
-  end
-
-  data_miner do
-    MerchantCategoriesIndustries.define_schema(self)
-  end
-end