various model fixes

Author: kynan

app/models/content_removal_request.rb

@@ -1,8 +1,7 @@
 class ContentRemovalRequest < ActiveRecord::Base
   belongs_to :content_removal_request_period
+  belongs_to :product
+  belongs_to :reason
 
-  has_many :products
-  has_many :reasons
-
-  attr_accessible :courtOrders, :executive, :items
+  attr_accessible :court_orders, :executive, :items
 end

app/models/content_removal_request_period.rb

@@ -1,6 +1,7 @@
 class ContentRemovalRequestPeriod < ActiveRecord::Base
+  belongs_to :country
+
   has_many :content_removal_requests
-  has_one :country
 
   attr_accessible :period_start, :period_end, :percentage_complied
 end

app/models/country.rb

@@ -1,6 +1,8 @@
 class Country < ActiveRecord::Base
   belongs_to :continent
-  belongs_to :content_removal_request_period
+
+  has_many :content_removal_request_periods
+  has_many :content_removal_requests, :through => :content_removal_request_periods
 
   validates_presence_of :code, :name
   validates_uniqueness_of :code

app/models/product.rb

@@ -1,5 +1,5 @@
 class Product < ActiveRecord::Base
-  belongs_to :content_removal_request
+  has_many :content_removal_requests
 
   attr_accessible :name
 end

app/models/reason.rb

@@ -1,5 +1,5 @@
 class Reason < ActiveRecord::Base
-  belongs_to :content_removal_request
+  has_many :content_removal_requests
 
   attr_accessible :name
 end

db/migrate/20111109012514_create_content_removal_requests.rb

@@ -4,7 +4,7 @@ def self.up
       t.integer :content_removal_request_period_id
       t.integer :product_id
       t.integer :reason_id
-      t.integer :courtOrders
+      t.integer :court_orders
       t.integer :executive
       t.integer :items
       t.timestamps

db/schema.rb

@@ -49,7 +49,7 @@
     t.integer  "content_removal_request_period_id"
     t.integer  "product_id"
     t.integer  "reason_id"
-    t.integer  "courtOrders"
+    t.integer  "court_orders"
     t.integer  "executive"
     t.integer  "items"
     t.datetime "created_at"

test/fixtures/content_removal_requests.yml

@@ -2,14 +2,14 @@ one:
   content_removal_request_period_id: 1
   product_id: 1
   reason_id: 1
-  courtOrders: 1
+  court_orders: 1
   executive: 1
   items: 1
 
 two:
   content_removal_request_period_id: 1
   product_id: 1
   reason_id: 1
-  courtOrders: 1
+  court_orders: 1
   executive: 1
   items: 1