composite_primary_keys 8.1.6 → 9.0.10

data/test/plugins/pagination_helper.rb

@@ -1,135 +1,135 @@
-module ActionView
-  module Helpers
-    # Provides methods for linking to ActionController::Pagination objects using a simple generator API.  You can optionally
-    # also build your links manually using ActionView::Helpers::AssetHelper#link_to like so:
-    #
-    # <%= link_to "Previous page", { :page => paginator.current.previous } if paginator.current.previous %>
-    # <%= link_to "Next page", { :page => paginator.current.next } if paginator.current.next %>
-    module PaginationHelper
-      unless const_defined?(:DEFAULT_OPTIONS)
-        DEFAULT_OPTIONS = {
-          :name => :page,
-          :window_size => 2,
-          :always_show_anchors => true,
-          :link_to_current_page => false,
-          :params => {}
-        }
-      end
-
-      # Creates a basic HTML link bar for the given +paginator+.  Links will be created
-      # for the next and/or previous page and for a number of other pages around the current
-      # pages position. The +html_options+ hash is passed to +link_to+ when the links are created.
-      #
-      # ==== Options
-      # <tt>:name</tt>::                 the routing name for this paginator
-      #                                  (defaults to +page+)
-      # <tt>:prefix</tt>::               prefix for pagination links
-      #                                  (i.e. Older Pages: 1 2 3 4)
-      # <tt>:suffix</tt>::               suffix for pagination links
-      #                                  (i.e. 1 2 3 4 <- Older Pages)
-      # <tt>:window_size</tt>::          the number of pages to show around 
-      #                                  the current page (defaults to <tt>2</tt>)
-      # <tt>:always_show_anchors</tt>::  whether or not the first and last
-      #                                  pages should always be shown
-      #                                  (defaults to +true+)
-      # <tt>:link_to_current_page</tt>:: whether or not the current page
-      #                                  should be linked to (defaults to
-      #                                  +false+)
-      # <tt>:params</tt>::               any additional routing parameters
-      #                                  for page URLs
-      #
-      # ==== Examples
-      #  # We'll assume we have a paginator setup in @person_pages...
-      #
-      #  pagination_links(@person_pages)
-      #  # => 1 <a href="/?page=2/">2</a> <a href="/?page=3/">3</a>  ... <a href="/?page=10/">10</a>
-      #
-      #  pagination_links(@person_pages, :link_to_current_page => true)
-      #  # => <a href="/?page=1/">1</a> <a href="/?page=2/">2</a> <a href="/?page=3/">3</a>  ... <a href="/?page=10/">10</a>
-      #
-      #  pagination_links(@person_pages, :always_show_anchors => false)
-      #  # => 1 <a href="/?page=2/">2</a> <a href="/?page=3/">3</a> 
-      #
-      #  pagination_links(@person_pages, :window_size => 1)
-      #  # => 1 <a href="/?page=2/">2</a>  ... <a href="/?page=10/">10</a>
-      #
-      #  pagination_links(@person_pages, :params => { :viewer => "flash" })
-      #  # => 1 <a href="/?page=2&amp;viewer=flash/">2</a> <a href="/?page=3&amp;viewer=flash/">3</a>  ... 
-      #  #    <a href="/?page=10&amp;viewer=flash/">10</a>
-      def pagination_links(paginator, options={}, html_options={})
-        name = options[:name] || DEFAULT_OPTIONS[:name]
-        params = (options[:params] || DEFAULT_OPTIONS[:params]).clone
-        
-        prefix = options[:prefix] || ''
-        suffix = options[:suffix] || ''
-
-        pagination_links_each(paginator, options, prefix, suffix) do |n|
-          params[name] = n
-          link_to(n.to_s, params, html_options)
-        end
-      end
-
-      # Iterate through the pages of a given +paginator+, invoking a
-      # block for each page number that needs to be rendered as a link.
-      # 
-      # ==== Options
-      # <tt>:window_size</tt>::          the number of pages to show around 
-      #                                  the current page (defaults to +2+)
-      # <tt>:always_show_anchors</tt>::  whether or not the first and last
-      #                                  pages should always be shown
-      #                                  (defaults to +true+)
-      # <tt>:link_to_current_page</tt>:: whether or not the current page
-      #                                  should be linked to (defaults to
-      #                                  +false+)
-      #
-      # ==== Example
-      #  # Turn paginated links into an Ajax call
-      #  pagination_links_each(paginator, page_options) do |link|
-      #    options = { :url => {:action => 'list'}, :update => 'results' }
-      #    html_options = { :href => url_for(:action => 'list') }
-      #
-      #    link_to_remote(link.to_s, options, html_options)
-      #  end
-      def pagination_links_each(paginator, options, prefix = nil, suffix = nil)
-        options = DEFAULT_OPTIONS.merge(options)
-        link_to_current_page = options[:link_to_current_page]
-        always_show_anchors = options[:always_show_anchors]
-
-        current_page = paginator.current_page
-        window_pages = current_page.window(options[:window_size]).pages
-        return if window_pages.length <= 1 unless link_to_current_page
-        
-        first, last = paginator.first, paginator.last
-        
-        html = ''
-
-        html << prefix if prefix
-
-        if always_show_anchors and not (wp_first = window_pages[0]).first?
-          html << yield(first.number)
-          html << ' ... ' if wp_first.number - first.number > 1
-          html << ' '
-        end
-          
-        window_pages.each do |page|
-          if current_page == page && !link_to_current_page
-            html << page.number.to_s
-          else
-            html << yield(page.number)
-          end
-          html << ' '
-        end
-        
-        if always_show_anchors and not (wp_last = window_pages[-1]).last? 
-          html << ' ... ' if last.number - wp_last.number > 1
-          html << yield(last.number)
-        end
-
-        html << suffix if suffix
-
-        html
-      end
-      
-    end # PaginationHelper
-  end # Helpers
-end # ActionView
+module ActionView
+  module Helpers
+    # Provides methods for linking to ActionController::Pagination objects using a simple generator API.  You can optionally
+    # also build your links manually using ActionView::Helpers::AssetHelper#link_to like so:
+    #
+    # <%= link_to "Previous page", { :page => paginator.current.previous } if paginator.current.previous %>
+    # <%= link_to "Next page", { :page => paginator.current.next } if paginator.current.next %>
+    module PaginationHelper
+      unless const_defined?(:DEFAULT_OPTIONS)
+        DEFAULT_OPTIONS = {
+          :name => :page,
+          :window_size => 2,
+          :always_show_anchors => true,
+          :link_to_current_page => false,
+          :params => {}
+        }
+      end
+
+      # Creates a basic HTML link bar for the given +paginator+.  Links will be created
+      # for the next and/or previous page and for a number of other pages around the current
+      # pages position. The +html_options+ hash is passed to +link_to+ when the links are created.
+      #
+      # ==== Options
+      # <tt>:name</tt>::                 the routing name for this paginator
+      #                                  (defaults to +page+)
+      # <tt>:prefix</tt>::               prefix for pagination links
+      #                                  (i.e. Older Pages: 1 2 3 4)
+      # <tt>:suffix</tt>::               suffix for pagination links
+      #                                  (i.e. 1 2 3 4 <- Older Pages)
+      # <tt>:window_size</tt>::          the number of pages to show around 
+      #                                  the current page (defaults to <tt>2</tt>)
+      # <tt>:always_show_anchors</tt>::  whether or not the first and last
+      #                                  pages should always be shown
+      #                                  (defaults to +true+)
+      # <tt>:link_to_current_page</tt>:: whether or not the current page
+      #                                  should be linked to (defaults to
+      #                                  +false+)
+      # <tt>:params</tt>::               any additional routing parameters
+      #                                  for page URLs
+      #
+      # ==== Examples
+      #  # We'll assume we have a paginator setup in @person_pages...
+      #
+      #  pagination_links(@person_pages)
+      #  # => 1 <a href="/?page=2/">2</a> <a href="/?page=3/">3</a>  ... <a href="/?page=10/">10</a>
+      #
+      #  pagination_links(@person_pages, :link_to_current_page => true)
+      #  # => <a href="/?page=1/">1</a> <a href="/?page=2/">2</a> <a href="/?page=3/">3</a>  ... <a href="/?page=10/">10</a>
+      #
+      #  pagination_links(@person_pages, :always_show_anchors => false)
+      #  # => 1 <a href="/?page=2/">2</a> <a href="/?page=3/">3</a> 
+      #
+      #  pagination_links(@person_pages, :window_size => 1)
+      #  # => 1 <a href="/?page=2/">2</a>  ... <a href="/?page=10/">10</a>
+      #
+      #  pagination_links(@person_pages, :params => { :viewer => "flash" })
+      #  # => 1 <a href="/?page=2&amp;viewer=flash/">2</a> <a href="/?page=3&amp;viewer=flash/">3</a>  ... 
+      #  #    <a href="/?page=10&amp;viewer=flash/">10</a>
+      def pagination_links(paginator, options={}, html_options={})
+        name = options[:name] || DEFAULT_OPTIONS[:name]
+        params = (options[:params] || DEFAULT_OPTIONS[:params]).clone
+        
+        prefix = options[:prefix] || ''
+        suffix = options[:suffix] || ''
+
+        pagination_links_each(paginator, options, prefix, suffix) do |n|
+          params[name] = n
+          link_to(n.to_s, params, html_options)
+        end
+      end
+
+      # Iterate through the pages of a given +paginator+, invoking a
+      # block for each page number that needs to be rendered as a link.
+      # 
+      # ==== Options
+      # <tt>:window_size</tt>::          the number of pages to show around 
+      #                                  the current page (defaults to +2+)
+      # <tt>:always_show_anchors</tt>::  whether or not the first and last
+      #                                  pages should always be shown
+      #                                  (defaults to +true+)
+      # <tt>:link_to_current_page</tt>:: whether or not the current page
+      #                                  should be linked to (defaults to
+      #                                  +false+)
+      #
+      # ==== Example
+      #  # Turn paginated links into an Ajax call
+      #  pagination_links_each(paginator, page_options) do |link|
+      #    options = { :url => {:action => 'list'}, :update => 'results' }
+      #    html_options = { :href => url_for(:action => 'list') }
+      #
+      #    link_to_remote(link.to_s, options, html_options)
+      #  end
+      def pagination_links_each(paginator, options, prefix = nil, suffix = nil)
+        options = DEFAULT_OPTIONS.merge(options)
+        link_to_current_page = options[:link_to_current_page]
+        always_show_anchors = options[:always_show_anchors]
+
+        current_page = paginator.current_page
+        window_pages = current_page.window(options[:window_size]).pages
+        return if window_pages.length <= 1 unless link_to_current_page
+        
+        first, last = paginator.first, paginator.last
+        
+        html = ''
+
+        html << prefix if prefix
+
+        if always_show_anchors and not (wp_first = window_pages[0]).first?
+          html << yield(first.number)
+          html << ' ... ' if wp_first.number - first.number > 1
+          html << ' '
+        end
+          
+        window_pages.each do |page|
+          if current_page == page && !link_to_current_page
+            html << page.number.to_s
+          else
+            html << yield(page.number)
+          end
+          html << ' '
+        end
+        
+        if always_show_anchors and not (wp_last = window_pages[-1]).last? 
+          html << ' ... ' if last.number - wp_last.number > 1
+          html << yield(last.number)
+        end
+
+        html << suffix if suffix
+
+        html
+      end
+      
+    end # PaginationHelper
+  end # Helpers
+end # ActionView

data/test/setup.rb

@@ -1,51 +1,51 @@
-# setup_db.rb
-require 'dbi'
-
-# Run "createdb cpk_test" first
-
-teacher_to_school = %Q{
-  create table teacher_to_school(
-    schoolid varchar(8),
-    teacherid varchar(8),
-    datebegin date,
-    teacherrole varchar(20),
-    primary key (schoolid, teacherid)
-  );
-
-}
-
-globe_teacher = %Q{
-  create table globe_teacher(
-    teacherid varchar(8) primary key,
-    currentschoolid varchar(8),
-    userid varchar(16)
-  );
-
-}
-
-globe_school = %Q{
-  create table globe_school(
-    schoolid varchar(8) primary key,
-    schoolname varchar(100) not null,
-    city varchar(35) not null
-  )
-
-}
-
-add_records = [
-  "insert into globe_teacher values ('ZZGLOBEY', 'ZZGLOBE1',
-'dberger');",
-  "insert into globe_school values ('ZZCOUCAR', 'NCAR Foothills Lab',
-'Boulder');",
-  "insert into globe_school values ('ZZGLOBE1', 'The GLOBE Program',
-'Boulder');",
-  "insert into teacher_to_school values('ZZGLOBE1', 'ZZGLOBEY', '1-JUN-2010', 'GLOBE OFFICE');",
-  "insert into teacher_to_school values('ZZCOUCAR', 'ZZGLOBEY', '1-AUG-2010', 'GLOBE Teacher');"
-]
-
-DBI.connect('dbi:Pg:cpk_test', 'postgres') do |dbh|
-  dbh.execute(teacher_to_school)
-  dbh.execute(globe_teacher)
-  dbh.execute(globe_school)
-  add_records.each{ |sql| dbh.execute(sql) }
+# setup_db.rb
+require 'dbi'
+
+# Run "createdb cpk_test" first
+
+teacher_to_school = %Q{
+  create table teacher_to_school(
+    schoolid varchar(8),
+    teacherid varchar(8),
+    datebegin date,
+    teacherrole varchar(20),
+    primary key (schoolid, teacherid)
+  );
+
+}
+
+globe_teacher = %Q{
+  create table globe_teacher(
+    teacherid varchar(8) primary key,
+    currentschoolid varchar(8),
+    userid varchar(16)
+  );
+
+}
+
+globe_school = %Q{
+  create table globe_school(
+    schoolid varchar(8) primary key,
+    schoolname varchar(100) not null,
+    city varchar(35) not null
+  )
+
+}
+
+add_records = [
+  "insert into globe_teacher values ('ZZGLOBEY', 'ZZGLOBE1',
+'dberger');",
+  "insert into globe_school values ('ZZCOUCAR', 'NCAR Foothills Lab',
+'Boulder');",
+  "insert into globe_school values ('ZZGLOBE1', 'The GLOBE Program',
+'Boulder');",
+  "insert into teacher_to_school values('ZZGLOBE1', 'ZZGLOBEY', '1-JUN-2010', 'GLOBE OFFICE');",
+  "insert into teacher_to_school values('ZZCOUCAR', 'ZZGLOBEY', '1-AUG-2010', 'GLOBE Teacher');"
+]
+
+DBI.connect('dbi:Pg:cpk_test', 'postgres') do |dbh|
+  dbh.execute(teacher_to_school)
+  dbh.execute(globe_teacher)
+  dbh.execute(globe_school)
+  add_records.each{ |sql| dbh.execute(sql) }
 end 

data/test/test_aliases.rb

@@ -1,18 +1,18 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestAliases < ActiveSupport::TestCase
-  fixtures :reference_codes
-
-  def test_primary_key_setter_alias_composite_key
-    reference_code = ReferenceCodeUsingCompositeKeyAlias.find([1, 2])
-    assert_equal 'MRS', reference_code.code_label
-    assert_equal 'Mrs', reference_code.abbreviation
-  end
-
-  def test_primary_key_setter_alias_simple_key
-    reference_code = ReferenceCodeUsingSimpleKeyAlias.find('MRS')
-    assert_equal 1, reference_code.reference_type_id
-    assert_equal 2, reference_code.reference_code
-    assert_equal 'Mrs', reference_code.abbreviation
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestAliases < ActiveSupport::TestCase
+  fixtures :reference_codes
+
+  def test_primary_key_setter_alias_composite_key
+    reference_code = ReferenceCodeUsingCompositeKeyAlias.find([1, 2])
+    assert_equal 'MRS', reference_code.code_label
+    assert_equal 'Mrs', reference_code.abbreviation
+  end
+
+  def test_primary_key_setter_alias_simple_key
+    reference_code = ReferenceCodeUsingSimpleKeyAlias.find('MRS')
+    assert_equal 1, reference_code.reference_type_id
+    assert_equal 2, reference_code.reference_code
+    assert_equal 'Mrs', reference_code.abbreviation
+  end
+end

data/test/test_associations.rb

@@ -71,16 +71,6 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal(3, tariffs.inject(0) {|sum, tariff| sum + tariff.product_tariffs.length})
   end
 
-  def test_has_one_association_is_not_cached_to_where_it_returns_the_wrong_one
-    engineering = departments(:engineering)
-    engineering_head = engineering.head
-
-    accounting = departments(:accounting)
-    accounting_head = accounting.head
-
-    refute_equal accounting_head, engineering_head
-  end
-
   def test_association_with_composite_primary_key_can_be_autosaved
     room = Room.new(dorm_id: 1000, room_id: 1001)
     room_assignment = RoomAssignment.new(student_id: 1000)
@@ -91,11 +81,16 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal(room_assignment.room_id, 1001)
   end
 
-  def test_association_with_composite_primary_key_can_be_autosaved_on_update
-    robert = employees(:robert)
-    robert_salary = robert.create_one_salary(year: "2015", month: "1")
-    robert.update(name: robert.name.reverse)
-    assert_equal(robert.id, robert_salary.employee_id)
+  def test_has_one_association_is_not_cached_to_where_it_returns_the_wrong_one
+    engineering = departments(:engineering)
+    engineering_head = engineering.head
+    assert_equal(employees(:sarah), engineering_head)
+
+    accounting = departments(:accounting)
+    accounting_head = accounting.head
+    assert_equal(employees(:steve), accounting_head)
+
+    refute_equal accounting_head, engineering_head
   end
 
   def test_has_one_association_primary_key_and_foreign_key_are_present
@@ -274,7 +269,7 @@ class TestAssociations < ActiveSupport::TestCase
     assert_not_nil(department.head)
   end
 
-  def test_has_many_build__simple_key
+  def test_has_many_build_simple_key
     user = users(:santiago)
     reading = user.readings.build
     assert_equal user.id, reading.user_id
@@ -352,7 +347,13 @@ class TestAssociations < ActiveSupport::TestCase
   def test_foreign_key_present_with_null_association_ids
     group = Group.new
     group.memberships.build
-    associations = group.association_cache[:memberships]
+    associations = group.association(:memberships)
     assert_equal(false, associations.send('foreign_key_present?'))
   end
+
+  def test_ids_equals_for_non_CPK_case
+    article = Article.new
+    article.reading_ids = Reading.pluck(:id)
+    assert_equal article.reading_ids, Reading.pluck(:id)
+  end
 end

data/test/test_composite_arrays.rb

@@ -1,24 +1,24 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class CompositeArraysTest < ActiveSupport::TestCase
-
-  def test_new_primary_keys
-    keys = CompositePrimaryKeys::CompositeKeys.new
-    assert_not_nil keys
-    assert_equal '', keys.to_s
-    assert_equal '', "#{keys}"
-  end
-
-  def test_initialize_primary_keys
-    keys = CompositePrimaryKeys::CompositeKeys.new([1,2,3])
-    assert_not_nil keys
-    assert_equal '1,2,3', keys.to_s
-    assert_equal '1,2,3', "#{keys}"
-  end
-
-  def test_to_composite_keys
-    keys = [1,2,3].to_composite_keys
-    assert_equal CompositePrimaryKeys::CompositeKeys, keys.class
-    assert_equal '1,2,3', keys.to_s
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class CompositeArraysTest < ActiveSupport::TestCase
+
+  def test_new_primary_keys
+    keys = CompositePrimaryKeys::CompositeKeys.new
+    assert_not_nil keys
+    assert_equal '', keys.to_s
+    assert_equal '', "#{keys}"
+  end
+
+  def test_initialize_primary_keys
+    keys = CompositePrimaryKeys::CompositeKeys.new([1,2,3])
+    assert_not_nil keys
+    assert_equal '1,2,3', keys.to_s
+    assert_equal '1,2,3', "#{keys}"
+  end
+
+  def test_to_composite_keys
+    keys = [1,2,3].to_composite_keys
+    assert_equal CompositePrimaryKeys::CompositeKeys, keys.class
+    assert_equal '1,2,3', keys.to_s
+  end
+end

data/test/test_counter_cache.rb

@@ -1,31 +1,31 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestCalculations < ActiveSupport::TestCase
-  fixtures :tariffs
-
-  def test_update_counter
-    tariff = tariffs(:flat)
-    assert_equal(50, tariff.amount)
-    Tariff.update_counters(tariff.id, :amount => 1)
-    tariff.reload
-    assert_equal(51, tariff.amount)
-  end
-
-  def test_increment_counter
-    tariff = tariffs(:flat)
-    assert_equal(50, tariff.amount)
-    Tariff.increment_counter(:amount, tariff.id)
-
-    tariff.reload
-    assert_equal(51, tariff.amount)
-  end
-
-  def test_decrement_counter
-    tariff = tariffs(:flat)
-    assert_equal(50, tariff.amount)
-    Tariff.decrement_counter(:amount, tariff.id)
-
-    tariff.reload
-    assert_equal(49, tariff.amount)
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestCalculations < ActiveSupport::TestCase
+  fixtures :tariffs
+
+  def test_update_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.update_counters(tariff.id, :amount => 1)
+    tariff.reload
+    assert_equal(51, tariff.amount)
+  end
+
+  def test_increment_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.increment_counter(:amount, tariff.id)
+
+    tariff.reload
+    assert_equal(51, tariff.amount)
+  end
+
+  def test_decrement_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.decrement_counter(:amount, tariff.id)
+
+    tariff.reload
+    assert_equal(49, tariff.amount)
+  end
 end

data/test/test_create.rb

@@ -1,8 +1,8 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestCreate < ActiveSupport::TestCase
-  fixtures :students, :dorms, :rooms, :room_assignments, :reference_types, :reference_codes, :streets, :suburbs
-  
+  fixtures :articles, :students, :dorms, :rooms, :room_assignments, :reference_types, :reference_codes, :streets, :suburbs
+
   CLASSES = {
     :single => {
       :class => ReferenceType,
@@ -101,7 +101,7 @@ class TestCreate < ActiveSupport::TestCase
     assert_equal(200, restaurant.store_id)
     assert_equal("My Store", restaurant.name)
 
-    assert_equal(1, restaurant.suburbs(true).length)
+    assert_equal(1, restaurant.suburbs.reload.length)
 
     # Test suburbs
     suburb = restaurant.suburbs[0]
@@ -116,14 +116,13 @@ class TestCreate < ActiveSupport::TestCase
     room.save!
 
     student1 = students(:kelly)
-    student2 = students(:jordan)
 
     RoomAssignment.delete_all
 
     assignment1 = RoomAssignment.new(:student_id => student1.id, :dorm_id => room.dorm_id, :room_id => room.room_id)
     assignment1.save!
 
-    room.room_assignments = [assignment1]
+    room.room_assignment_ids = [[assignment1.student_id, assignment1.dorm_id, assignment1.room_id]]
     room.save!
 
     assert_equal(1, room.room_assignments.length)
@@ -146,11 +145,20 @@ class TestCreate < ActiveSupport::TestCase
     assignment2 = RoomAssignment.new(:student_id => student2.id, :dorm_id => room.dorm_id, :room_id => room.room_id)
     assignment2.save!
 
-    room.room_assignments = [assignment1,assignment2]
+    room.room_assignment_ids = [[assignment1.student_id, assignment1.dorm_id, assignment1.room_id],
+                                [assignment2.student_id, assignment2.dorm_id, assignment2.room_id]]
     room.save!
 
     assert_equal(2, room.room_assignments.length)
     assert_equal(assignment1, room.room_assignments[0])
     assert_equal(assignment2, room.room_assignments[1])
   end
+
+  def test_create_article_invalid_id
+    error = assert_raises(ActiveRecord::RecordInvalid) do
+      article = Article.create!(:id => 1)
+    end
+
+    assert_equal('Validation failed: Id has already been taken', error.to_s)
+  end
 end