composite_primary_keys 12.0.9 → 13.0.2

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/test_associations.rb

@@ -343,6 +343,14 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal([3,2], memberships[1].id)
   end
 
+  def test_join_constraints
+    memberships = Membership.joins(:active_statuses)
+    assert_equal(2, memberships.length)
+
+    assert_equal([1,1], memberships[0].id)
+    assert_equal([3,2], memberships[1].id)
+  end
+
   def test_foreign_key_present_with_null_association_ids
     group = Group.new
     group.memberships.build
@@ -355,4 +363,10 @@ class TestAssociations < ActiveSupport::TestCase
     article.reading_ids = Reading.pluck(:id)
     assert_equal article.reading_ids, Reading.pluck(:id)
   end
+
+  def test_find_by_association
+    assert_equal Membership.where(user: '1').count, 1
+    assert_equal Membership.where(user_id: '1').count, 1
+    assert_equal Membership.where(user: User.find(1)).count, 1
+  end
 end

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_attributes.rb

@@ -1,61 +1,76 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestAttributes < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes, :products, :tariffs, :product_tariffs
-  
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-    },
-    :dual   => { 
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-    },
-  }
-  
-  def setup
-    self.class.classes = CLASSES
-  end
-  
-  def test_brackets
-    testing_with do
-      @first.attributes.each_pair do |attr_name, value|
-        assert_equal value, @first[attr_name]
-      end
-    end
-  end
-
-  def test_brackets_primary_key
-    testing_with do
-      assert_equal(@first.id, @first[@primary_keys])
-      assert_equal(@first.id, @first[@first.class.primary_key])
-    end
-  end
-
-  def test_brackets_assignment
-    testing_with do
-      @first.attributes.each_pair do |attr_name, value|
-        next if attr_name == @first.class.primary_key
-        @first[attr_name]= !value.nil? ? value * 2 : '1'
-        assert_equal !value.nil? ? value * 2 : '1', @first[attr_name]
-      end
-    end
-  end
-
-  def test_brackets_foreign_key_assignment
-    tarrif = tariffs(:flat)
-    product_tariff = product_tariffs(:first_flat)
-    compare_indexes(tarrif, tarrif.class.primary_key, product_tariff, [:tariff_id, :tariff_start_date])
-  end
-
-  private
-
-  def compare_indexes(obj1, indexes1, obj2, indexes2)
-    indexes1.length.times do |key_index|
-      key1 = indexes1[key_index]
-      key2 = indexes2[key_index]
-      assert_equal(obj1[key1], obj2[key2])
-    end
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestAttributes < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes, :products, :tariffs, :product_tariffs
+
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => :reference_type_id,
+    },
+    :dual   => {
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+    },
+  }
+
+  def setup
+    self.class.classes = CLASSES
+  end
+
+  def test_brackets
+    tested_at_least_on_attribute = false
+    testing_with do
+      @first.attributes.each_pair do |attr_name, value|
+        next if value.nil?
+        assert_equal value, @first[attr_name]
+        tested_at_least_on_attribute = true
+      end
+    end
+    assert tested_at_least_on_attribute
+  end
+
+  def test_brackets_primary_key
+    testing_with do
+      assert_equal(@first.id, @first[@primary_keys])
+      assert_equal(@first.id, @first[@first.class.primary_key])
+    end
+  end
+
+  def test_brackets_assignment
+    testing_with do
+      @first.attributes.each_pair do |attr_name, value|
+        next if attr_name == @first.class.primary_key
+        @first[attr_name]= !value.nil? ? value * 2 : '1'
+        assert_equal !value.nil? ? value * 2 : '1', @first[attr_name]
+      end
+    end
+  end
+
+  def test_brackets_foreign_key_assignment
+    tarrif = tariffs(:flat)
+    product_tariff = product_tariffs(:first_flat)
+    compare_indexes(tarrif, tarrif.class.primary_key, product_tariff, [:tariff_id, :tariff_start_date])
+  end
+
+  def test_has_attribute
+    tariff = tariffs(:flat)
+    assert(tariff.has_attribute?([:tariff_id, :start_date]))
+    assert(tariff.has_attribute?(['tariff_id', 'start_date']))
+  end
+
+  def test_has__attribute
+    tariff = tariffs(:flat)
+    assert(tariff._has_attribute?(['tariff_id', 'start_date']))
+  end
+
+  private
+
+  def compare_indexes(obj1, indexes1, obj2, indexes2)
+    indexes1.length.times do |key_index|
+      key1 = indexes1[key_index]
+      key2 = indexes2[key_index]
+      assert_equal(obj1[key1], obj2[key2])
+    end
+  end
 end

data/test/test_calculations.rb

@@ -1,42 +1,49 @@
-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, :reference_codes, :reference_types
+
+  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_on_joined_relations_that_have_column_names_in_common
+    count_without_includes = ReferenceCode.count
+    count_with_includes  = ReferenceCode.includes(:reference_type).references(:reference_type).count
+    assert_equal(count_without_includes, count_with_includes)
+    assert_equal(5, count_with_includes)
+  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