composite_primary_keys 7.0.15 → 7.0.16

data/test/fixtures/dorm.rb

@@ -1,3 +1,3 @@
-class Dorm < ActiveRecord::Base
-  has_many :rooms, -> {includes(:room_attributes)}, :primary_key => [:id]
+class Dorm < ActiveRecord::Base
+  has_many :rooms, -> {includes(:room_attributes)}, :primary_key => [:id]
 end

data/test/fixtures/membership.rb

@@ -1,7 +1,7 @@
-class Membership < ActiveRecord::Base
-  self.primary_keys = :user_id, :group_id
-  belongs_to :user
-	belongs_to :group
-	has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
-  has_many :readings, :primary_key => :user_id, :foreign_key => :user_id
+class Membership < ActiveRecord::Base
+  self.primary_keys = :user_id, :group_id
+  belongs_to :user
+	belongs_to :group
+	has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
+  has_many :readings, :primary_key => :user_id, :foreign_key => :user_id
 end

data/test/fixtures/membership_statuses.yml

@@ -1,17 +1,17 @@
-santiago-cpk:
-  id: 1
-  user_id: 1
-  group_id: 1
-  status: Active
-
-drnic-cpk:
-  id: 2
-  user_id: 2
-  group_id: 1
-  status: Owner
-
-cfis-cpk:
-  id: 3
-  user_id: 3
-  group_id: 2
+santiago-cpk:
+  id: 1
+  user_id: 1
+  group_id: 1
+  status: Active
+
+drnic-cpk:
+  id: 2
+  user_id: 2
+  group_id: 1
+  status: Owner
+
+cfis-cpk:
+  id: 3
+  user_id: 3
+  group_id: 2
   status: Active

data/test/fixtures/memberships.yml

@@ -1,11 +1,11 @@
-santiago-cpk:
-  user_id: 1
-  group_id: 1
-
-drnic-cpk:
-  user_id: 2
-  group_id: 1
-
-cfis-cpk:
-  user_id: 3
+santiago-cpk:
+  user_id: 1
+  group_id: 1
+
+drnic-cpk:
+  user_id: 2
+  group_id: 1
+
+cfis-cpk:
+  user_id: 3
   group_id: 2

data/test/fixtures/product_tariffs.yml

@@ -1,14 +1,14 @@
-first_flat:
-  product_id: 1
-  tariff_id: 1
-  tariff_start_date: <%= Date.today.to_s(:db) %>
-
-first_free:
-  product_id: 1
-  tariff_id: 2
-  tariff_start_date: <%= Date.today.to_s(:db) %>
-
-second_free:
-  product_id: 2
-  tariff_id: 2
-  tariff_start_date: <%= Date.today.to_s(:db) %>
+first_flat:
+  product_id: 1
+  tariff_id: 1
+  tariff_start_date: <%= Date.today.to_s(:db) %>
+
+first_free:
+  product_id: 1
+  tariff_id: 2
+  tariff_start_date: <%= Date.today.to_s(:db) %>
+
+second_free:
+  product_id: 2
+  tariff_id: 2
+  tariff_start_date: <%= Date.today.to_s(:db) %>

data/test/fixtures/reference_code.rb

@@ -1,7 +1,7 @@
-class ReferenceCode < ActiveRecord::Base
-  self.primary_keys = :reference_type_id, :reference_code
-
-  belongs_to :reference_type, :foreign_key => "reference_type_id"
-
-  validates_presence_of :reference_code, :code_label, :abbreviation
-end
+class ReferenceCode < ActiveRecord::Base
+  self.primary_keys = :reference_type_id, :reference_code
+
+  belongs_to :reference_type, :foreign_key => "reference_type_id"
+
+  validates_presence_of :reference_code, :code_label, :abbreviation
+end

data/test/fixtures/restaurants_suburb.rb

@@ -1,3 +1,3 @@
-class RestaurantsSuburb < ActiveRecord::Base
-
+class RestaurantsSuburb < ActiveRecord::Base
+
 end

data/test/fixtures/suburb.rb

@@ -1,6 +1,6 @@
-class Suburb < ActiveRecord::Base
-  self.primary_keys = :city_id, :suburb_id
-  has_many :streets,  :foreign_key => [:city_id, :suburb_id]
-  has_many :first_streets, -> {where("streets.name = 'First Street'")},
-           :foreign_key => [:city_id, :suburb_id], :class_name => 'Street'
+class Suburb < ActiveRecord::Base
+  self.primary_keys = :city_id, :suburb_id
+  has_many :streets,  :foreign_key => [:city_id, :suburb_id]
+  has_many :first_streets, -> {where("streets.name = 'First Street'")},
+           :foreign_key => [:city_id, :suburb_id], :class_name => 'Street'
 end

data/test/fixtures/topic.rb

@@ -1,6 +1,6 @@
-class Topic < ActiveRecord::Base
-	has_many :topic_sources, dependent: :destroy
-	accepts_nested_attributes_for :topic_sources
-
-	validates :name, :feed_size, presence: true
+class Topic < ActiveRecord::Base
+	has_many :topic_sources, dependent: :destroy
+	accepts_nested_attributes_for :topic_sources
+
+	validates :name, :feed_size, presence: true
 end

data/test/fixtures/topic_source.rb

@@ -1,7 +1,7 @@
-class TopicSource < ActiveRecord::Base
-	self.primary_keys = :topic_id, :platform
-
-	belongs_to :topic, inverse_of: :topic_sources
-
-	validates :platform, presence: true
+class TopicSource < ActiveRecord::Base
+	self.primary_keys = :topic_id, :platform
+
+	belongs_to :topic, inverse_of: :topic_sources
+
+	validates :platform, presence: true
 end

data/test/fixtures/topic_sources.yml

@@ -1,4 +1,4 @@
-music_source:
-  topic_id: 1
-  platform: 'twitter'
+music_source:
+  topic_id: 1
+  platform: 'twitter'
   keywords: 'classical'

data/test/fixtures/topics.yml

@@ -1,9 +1,9 @@
-music:
-  id: 1
-  name: Guitar
-  feed_size: 500
-
-iphone:
-  id: 2
-  name: iPhone
+music:
+  id: 1
+  name: Guitar
+  feed_size: 500
+
+iphone:
+  id: 2
+  name: iPhone
   feed_size: 500

data/test/fixtures/users.yml

@@ -1,11 +1,11 @@
-santiago:
-  id: 1
-  name: Santiago
-  
-drnic:
-  id: 2
-  name: Dr Nic
-
-cfis:
-  id: 3
+santiago:
+  id: 1
+  name: Santiago
+  
+drnic:
+  id: 2
+  name: Dr Nic
+
+cfis:
+  id: 3
   name: cfis

data/test/test_attribute_methods.rb

@@ -1,63 +1,63 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestAttributeMethods < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes
-
-  def test_read_attribute_with_single_key
-    rt = ReferenceType.find(1)
-    assert_equal(1, rt.reference_type_id)
-    assert_equal('NAME_PREFIX', rt.type_label)
-    assert_equal('Name Prefix', rt.abbreviation)
-  end
-
-  def test_read_attribute_with_composite_keys
-    ref_code = ReferenceCode.find([1, 1])
-    assert_equal(1, ref_code.id.first)
-    assert_equal(1, ref_code.id.last)
-    assert_equal('Mr', ref_code.abbreviation)
-  end
-
-  # to_key returns array even for single key
-  def test_to_key_with_single_key
-    rt = ReferenceType.find(1)
-    assert_equal([1], rt.to_key)
-  end
-
-  def test_to_key_with_composite_keys
-    ref_code = ReferenceCode.find([1, 1])
-    assert_equal(1, ref_code.to_key.first)
-    assert_equal(1, ref_code.to_key.last)
-  end
-
-  def test_to_key_with_single_key_unsaved
-    rt = ReferenceType.new
-    assert_nil(rt.to_key)
-  end
-
-  def test_to_key_with_composite_keys_unsaved
-    ref_code = ReferenceCode.new
-    assert_nil(ref_code.to_key)
-  end
-
-  def test_to_key_with_single_key_destroyed
-    rt = ReferenceType.find(1)
-    rt.destroy
-    assert_equal([1], rt.to_key)
-  end
-
-  def test_to_key_with_composite_key_destroyed
-    ref_code = ReferenceCode.find([1, 1])
-    ref_code.destroy
-    assert_equal([1,1], ref_code.to_key)
-  end
-
-  def test_id_was
-    rt = ReferenceType.find(1)
-    rt.id = 2
-    assert_equal 1, rt.id_was
-    
-    ref_code = ReferenceCode.find([1, 1])
-    ref_code.id = [1,2]
-    assert_equal [1,1], ref_code.id_was
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestAttributeMethods < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes
+
+  def test_read_attribute_with_single_key
+    rt = ReferenceType.find(1)
+    assert_equal(1, rt.reference_type_id)
+    assert_equal('NAME_PREFIX', rt.type_label)
+    assert_equal('Name Prefix', rt.abbreviation)
+  end
+
+  def test_read_attribute_with_composite_keys
+    ref_code = ReferenceCode.find([1, 1])
+    assert_equal(1, ref_code.id.first)
+    assert_equal(1, ref_code.id.last)
+    assert_equal('Mr', ref_code.abbreviation)
+  end
+
+  # to_key returns array even for single key
+  def test_to_key_with_single_key
+    rt = ReferenceType.find(1)
+    assert_equal([1], rt.to_key)
+  end
+
+  def test_to_key_with_composite_keys
+    ref_code = ReferenceCode.find([1, 1])
+    assert_equal(1, ref_code.to_key.first)
+    assert_equal(1, ref_code.to_key.last)
+  end
+
+  def test_to_key_with_single_key_unsaved
+    rt = ReferenceType.new
+    assert_nil(rt.to_key)
+  end
+
+  def test_to_key_with_composite_keys_unsaved
+    ref_code = ReferenceCode.new
+    assert_nil(ref_code.to_key)
+  end
+
+  def test_to_key_with_single_key_destroyed
+    rt = ReferenceType.find(1)
+    rt.destroy
+    assert_equal([1], rt.to_key)
+  end
+
+  def test_to_key_with_composite_key_destroyed
+    ref_code = ReferenceCode.find([1, 1])
+    ref_code.destroy
+    assert_equal([1,1], ref_code.to_key)
+  end
+
+  def test_id_was
+    rt = ReferenceType.find(1)
+    rt.id = 2
+    assert_equal 1, rt.id_was
+    
+    ref_code = ReferenceCode.find([1, 1])
+    ref_code.id = [1,2]
+    assert_equal [1,1], ref_code.id_was
+  end
+end

data/test/test_calculations.rb

@@ -1,42 +1,42 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestCalculations < ActiveSupport::TestCase
-  fixtures :articles, :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants,
-           :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users, :readings,
-           :departments, :employees, :memberships, :membership_statuses
-
-  def test_count
-    assert_equal(3, Product.includes(:product_tariffs).count)
-    assert_equal(3, Tariff.includes(:product_tariffs).count)
-
-    expected = {Date.today => 2,
-                Date.today.next => 1}
-
-    assert_equal(expected, Tariff.group(:start_date).count)
-  end
-
-  def test_count_distinct
-    product = products(:first_product)
-    assert_equal(1, product.product_tariffs.select('tariff_start_date').distinct.count)
-  end
-  
-  def test_count_not_distinct
-    product = products(:first_product)
-    assert_equal(2, product.product_tariffs.select('tariff_start_date').count)
-  end
-
-  def test_count_includes
-    count = Dorm.where("rooms.room_id = ?", 2).includes(:rooms).references(:rooms).count
-    assert_equal(1, count)
-  end
-
-  def test_count_includes_dup_columns
-    count = Tariff.includes(:product_tariffs).references(:product_tariffs).where("product_tariffs.tariff_id = ?", 2).count
-    assert_equal(1, count)
-  end
-
-  def test_average
-    average = Tariff.average(:amount)
-    assert_equal(50, average)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestCalculations < ActiveSupport::TestCase
+  fixtures :articles, :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants,
+           :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users, :readings,
+           :departments, :employees, :memberships, :membership_statuses
+
+  def test_count
+    assert_equal(3, Product.includes(:product_tariffs).count)
+    assert_equal(3, Tariff.includes(:product_tariffs).count)
+
+    expected = {Date.today => 2,
+                Date.today.next => 1}
+
+    assert_equal(expected, Tariff.group(:start_date).count)
+  end
+
+  def test_count_distinct
+    product = products(:first_product)
+    assert_equal(1, product.product_tariffs.select('tariff_start_date').distinct.count)
+  end
+  
+  def test_count_not_distinct
+    product = products(:first_product)
+    assert_equal(2, product.product_tariffs.select('tariff_start_date').count)
+  end
+
+  def test_count_includes
+    count = Dorm.where("rooms.room_id = ?", 2).includes(:rooms).references(:rooms).count
+    assert_equal(1, count)
+  end
+
+  def test_count_includes_dup_columns
+    count = Tariff.includes(:product_tariffs).references(:product_tariffs).where("product_tariffs.tariff_id = ?", 2).count
+    assert_equal(1, count)
+  end
+
+  def test_average
+    average = Tariff.average(:amount)
+    assert_equal(50, average)
+  end
+end

data/test/test_callbacks.rb

@@ -1,99 +1,99 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestCallbacks < ActiveSupport::TestCase
-  fixtures :suburbs
-
-  def setup
-    @@callbacks = OpenStruct.new
-
-    Suburb.class_eval do
-      before_create do
-        @@callbacks.before_create = true
-      end
-
-      after_create do
-        @@callbacks.after_create = true
-      end
-
-      around_create do |suburb, block|
-        @@callbacks.around_create = true
-        block.call
-      end
-
-      before_save do
-        @@callbacks.before_save = true
-      end
-
-      after_save do
-        @@callbacks.after_save = true
-      end
-
-      around_save do |suburb, block|
-        @@callbacks.around_save = true
-        block.call
-      end
-
-      before_update do
-        @@callbacks.before_update = true
-      end
-
-      after_update do
-        @@callbacks.after_update = true
-      end
-
-      around_update do |suburb, block|
-        @@callbacks.around_update = true
-        block.call
-      end
-    end
-  end
-
-  def teardown
-    Suburb.reset_callbacks(:create)
-    Suburb.reset_callbacks(:save)
-    Suburb.reset_callbacks(:update)
-  end
-
-  def test_create
-    refute(@@callbacks.before_save)
-    refute(@@callbacks.after_save)
-    refute(@@callbacks.around_save)
-
-    refute(@@callbacks.before_create)
-    refute(@@callbacks.after_create)
-    refute(@@callbacks.around_create)
-
-    suburb = Suburb.new(:city_id => 3, :suburb_id => 3, :name => 'created')
-    suburb.save!
-
-    assert(@@callbacks.before_save)
-    assert(@@callbacks.after_save)
-    assert(@@callbacks.around_save)
-
-    assert(@@callbacks.before_create)
-    assert(@@callbacks.after_create)
-    assert(@@callbacks.around_create)
-  end
-
-  def test_update
-    refute(@@callbacks.before_save)
-    refute(@@callbacks.after_save)
-    refute(@@callbacks.around_save)
-
-    refute(@@callbacks.before_create)
-    refute(@@callbacks.after_create)
-    refute(@@callbacks.around_create)
-
-    suburb = suburbs(:first)
-    suburb.name = 'Updated'
-    suburb.save
-
-    assert(@@callbacks.before_update)
-    assert(@@callbacks.after_update)
-    assert(@@callbacks.around_update)
-
-    assert(@@callbacks.before_save)
-    assert(@@callbacks.after_save)
-    assert(@@callbacks.around_save)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestCallbacks < ActiveSupport::TestCase
+  fixtures :suburbs
+
+  def setup
+    @@callbacks = OpenStruct.new
+
+    Suburb.class_eval do
+      before_create do
+        @@callbacks.before_create = true
+      end
+
+      after_create do
+        @@callbacks.after_create = true
+      end
+
+      around_create do |suburb, block|
+        @@callbacks.around_create = true
+        block.call
+      end
+
+      before_save do
+        @@callbacks.before_save = true
+      end
+
+      after_save do
+        @@callbacks.after_save = true
+      end
+
+      around_save do |suburb, block|
+        @@callbacks.around_save = true
+        block.call
+      end
+
+      before_update do
+        @@callbacks.before_update = true
+      end
+
+      after_update do
+        @@callbacks.after_update = true
+      end
+
+      around_update do |suburb, block|
+        @@callbacks.around_update = true
+        block.call
+      end
+    end
+  end
+
+  def teardown
+    Suburb.reset_callbacks(:create)
+    Suburb.reset_callbacks(:save)
+    Suburb.reset_callbacks(:update)
+  end
+
+  def test_create
+    refute(@@callbacks.before_save)
+    refute(@@callbacks.after_save)
+    refute(@@callbacks.around_save)
+
+    refute(@@callbacks.before_create)
+    refute(@@callbacks.after_create)
+    refute(@@callbacks.around_create)
+
+    suburb = Suburb.new(:city_id => 3, :suburb_id => 3, :name => 'created')
+    suburb.save!
+
+    assert(@@callbacks.before_save)
+    assert(@@callbacks.after_save)
+    assert(@@callbacks.around_save)
+
+    assert(@@callbacks.before_create)
+    assert(@@callbacks.after_create)
+    assert(@@callbacks.around_create)
+  end
+
+  def test_update
+    refute(@@callbacks.before_save)
+    refute(@@callbacks.after_save)
+    refute(@@callbacks.around_save)
+
+    refute(@@callbacks.before_create)
+    refute(@@callbacks.after_create)
+    refute(@@callbacks.around_create)
+
+    suburb = suburbs(:first)
+    suburb.name = 'Updated'
+    suburb.save
+
+    assert(@@callbacks.before_update)
+    assert(@@callbacks.after_update)
+    assert(@@callbacks.around_update)
+
+    assert(@@callbacks.before_save)
+    assert(@@callbacks.after_save)
+    assert(@@callbacks.around_save)
+  end
+end