rexport 1.0.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bc0f21f26d12d42e97f2a1fd8a0c9228becce29b46ed07327ca8fd5369b9deb
-  data.tar.gz: 98d65ab17ade5855ec9ef73ad220239c2f99aeb64329cc133b29c04f40f540b2
+  metadata.gz: 8cf8cb2fe8850f491ab8eb8a92d0034d1447babd6a4a79457acea80fcbec94fc
+  data.tar.gz: 2e646631a4c3673359f31bd222c43c32ed6fcb20813f7f6ac34d633005899628
 SHA512:
-  metadata.gz: 5da93e49137f2f965206a014bcf21dadb52d47b76adf83135cffb4f0406a1e3ffbc9c99dbcbaffdb8f3f0b5785dc74495c37cb7dc300c9631c8fd8cd18072436
-  data.tar.gz: 6f5a80568333c860813ed938b027f1d79e6a70cec53024e888eaa58044db638c359db5967f868377fa211c782673a1adeabd83d7ff59501362c3f296ad4cb6dc
+  metadata.gz: '08d2fd739cf9775d22295a57ba4ffd934da63079339f0b697ff923ecba958b2bf5c007987a5ade00756b56a758672d37b23482dc9151dbb610157be181761521'
+  data.tar.gz: '0359913d6d17b4303518284a54a5da8428a1c0b3ce871766fa117a37c063f5d739aa812a08e495689867502ca63be23e719405211eb2ea35b2c046dae006c6e7'

data/app/views/export_items/_export_item.html.erb

@@ -1,8 +1,8 @@
-<tr id="<%= dom_id(export_item) %>" class="<%= cycle('odd','even') %> <%= @export.modifiable? ? 'handle' : '' %>">
+<%= tag.tr(id: dom_id(export_item), class: "handle") do %>
   <td class="row_title"><%= export_item.name %></td>
   <td><%= export_item.rexport_field %></td>
   <td class="table_icons">
-    <%= link_to(image_tag('icon_edit.gif'), edit_export_item_path(export_item)) if @export.modifiable? %>
-    <%= link_to_delete(export_item, text: false) if @export.modifiable? %>
+    <%= link_to(image_tag('icon_edit.gif'), edit_export_item_path(export_item)) %>
+    <%= link_to_delete(export_item, text: false) %>
   </td>
-</tr>
+<% end %>

data/app/views/exports/_show.html.erb

@@ -2,7 +2,7 @@
 <div id="custom_export_options">
   <h4>Options</h4>
   <ul>
-    <li><%= link_to("#{image_tag('icon_edit.gif')} Edit".html_safe, edit_export_path(@export)) if @export.modifiable? %></li>
+    <li><%= link_to("#{image_tag('icon_edit.gif')} Edit".html_safe, edit_export_path(@export)) %></li>
     <li><%= link_to "#{image_tag('icon_export.png')} Export".html_safe, export_path(@export, format: :csv)  %></li>
     <li><%= link_to "#{image_tag('icon_copy.png')} Copy".html_safe, exports_path(:original_export_id => @export.id), method: :post %></li>
   </ul>
@@ -29,12 +29,12 @@
       <th class='action_icons'>&nbsp;</th>
     </tr>
   </thead>
-  <%= content_tag :tbody, {id: 'export_items'}.merge(@export.modifiable? ? {class: 'sortable', 'data-url' => export_item_sorting_path} : {}) do %>
+  <%= tag.tbody(id: 'export_items', class: 'sortable', 'data-url' => export_item_sorting_path) do %>
     <%= render partial: @export.export_items.ordered %>
   <% end %>
 </table>
 
-<%= content_tag(:p, 'Drag and drop the rows in the table above to re-order the export data left to right in the output (see sample below).', class: 'instructions') if @export.modifiable? %>
+<%= tag.p('Drag and drop the rows in the table above to re-order the export data left to right in the output (see sample below).', class: 'instructions') %>
 
 <%= render(partial: 'filters') unless @export.export_filters.blank? %>
 

data/app/views/exports/index.html.erb

@@ -25,8 +25,8 @@
       <td class="table_icons">
         <%= link_to_export export_path(export, format: :csv), text: false  %>
         <%= link_to_show export, text: false %>
-        <%= link_to(image_tag('icon_edit.gif'), edit_export_path(export), title: 'Edit') if export.modifiable? %>
-        <%= link_to_delete(export, text: false) if export.modifiable? %>
+        <%= link_to(image_tag('icon_edit.gif'), edit_export_path(export), title: 'Edit') %>
+        <%= link_to_delete(export, text: false) %>
       </td>
     </tr>
   <% end %>

data/lib/rexport/data_fields.rb

@@ -3,97 +3,12 @@ module Rexport #:nodoc:
     extend ActiveSupport::Concern
 
     module ClassMethods
-      # Returns hash of exportable data items
-      def rexport_fields
-        @rexport_fields ||= nil
-        unless @rexport_fields
-          @rexport_fields = HashWithIndifferentAccess.new
-          initialize_rexport_fields
-        end
-        @rexport_fields
-      end
-
-      # Returns sorted array of rexport DataFields
-      def rexport_fields_array
-        rexport_fields.values.sort
-      end
-
-      # Adds a data item to rexport_fields
-      def add_rexport_field(name, options = {})
-        rexport_fields[name.to_s] = DataField.new(name, options)
-      end
-
-      # Adds associated methods to rexport_fields
-      #   :associations - an association or arrary of associations
-      #   :methods - a method or array of methods
-      #   :filter - if true will send type: :association to add_report_field
-      def add_association_methods(options = {})
-        options.stringify_keys!
-        options.assert_valid_keys(%w(associations methods filter))
-
-        methods = options.reverse_merge('methods' => 'name')['methods']
-        methods = [methods] if methods.kind_of?(String)
-
-        associations = options['associations']
-        associations = [associations] if associations.kind_of?(String)
-
-        type = options['filter'] ? :association : nil
-
-        associations.each do |association|
-          methods.each do |method|
-            add_rexport_field("#{association}_#{method}", method: "#{association}.#{method}", type: type)
-          end
-        end
-      end
-
-      # Removes files from rexport_fields
-      # useful to remove content columns you don't want included in exports
-      def remove_rexport_fields(*fields)
-        fields.flatten.each { |field| rexport_fields.delete(field.to_s) }
-      end
-
-      # Returns an array of export methods corresponding with field_names
-      def get_rexport_methods(*field_names)
-        field_names.flatten.map do |f|
-          begin
-            components = f.to_s.split('.')
-            field_name = components.pop
-            components.push(get_klass_from_associations(components).get_rexport_method(field_name)) * '.'
-          rescue NoMethodError
-            'undefined_rexport_field'
-          end
-        end
-      end
-
-      # Returns the associated class by following the associations
+      # Returns the associated class by following the chain of associations
       def get_klass_from_associations(*associations)
         associations.flatten!
         return self if associations.empty?
         reflect_on_association(associations.shift.to_sym).klass.get_klass_from_associations(associations)
       end
-
-      # Returns the export method for a given field_name
-      def get_rexport_method(field_name)
-        if rexport_fields[field_name]
-          rexport_fields[field_name].method
-        else
-          raise NoMethodError
-        end
-      end
-
-      def reset_column_information
-        @rexport_fields = nil
-        super
-      end
-
-      private
-
-      # Adds content columns rexport_fields, includes callback
-      # initialize_local_rexport_fields for client defined initialization
-      def initialize_rexport_fields
-        content_columns.each { |field| add_rexport_field(field.name, type: field.type) }
-        initialize_local_rexport_fields if respond_to?(:initialize_local_rexport_fields)
-      end
     end
 
     # Return an array of formatted export values for the passed methods

data/lib/rexport/export_items_controller_methods.rb

@@ -5,7 +5,7 @@ module Rexport
     end
 
     def update
-      if export_item.update_attributes(export_item_params)
+      if export_item.update(export_item_params)
         redirect_to export_path(export_item.export), notice: 'ExportItem was successfully updated.'
       else
         render :edit

data/lib/rexport/export_methods.rb

@@ -57,6 +57,11 @@ module Rexport #:nodoc:
       model_class_name.constantize
     end
 
+    # Returns a RexportModel for the current export_model
+    def rexport_model
+      @rexport_model ||= RexportModel.new(export_model)
+    end
+
     # Returns an array of RexportModels including export_model and associated rexport capable models
     def rexport_models
       @rexport_models ||= get_rexport_models(export_model)
@@ -117,15 +122,12 @@ module Rexport #:nodoc:
       end
     end
 
-    def modifiable?
-      # override to disable edit and destroy links for specific exports
-      true
-    end
-
     private
 
     def get_records(limit = nil)
       get_export_values(export_model.where(build_conditions).includes(build_include).limit(limit))
+    rescue ActiveRecord::StatementInvalid => e
+      [[e.message]]
     end
 
     def seed_records(objects)
@@ -136,21 +138,20 @@ module Rexport #:nodoc:
       objects.map { |object| object.export(rexport_methods) }
     end
 
-    def get_rexport_models(rexport_model, result = [], path = nil)
-      return unless rexport_model.respond_to?(:rexport_fields)
-      result << RexportModel.new(rexport_model, path)
-      get_associations(rexport_model).each do |associated_model|
-        # prevent infinite loop by checking if this class is already in the result set
-        unless result.detect { |model| model.klass == associated_model.klass }
-          get_rexport_models(associated_model.klass, result, [path, associated_model.name].compact * '.')
-        end
+    def get_rexport_models(model, results = [], path = nil)
+      return unless model.include?(Rexport::DataFields)
+      results << RexportModel.new(model, path: path)
+      get_associations(model).each do |associated_model|
+        # prevent infinite loop by checking if this class is already in the results set
+        next if results.detect { |result| result.klass == associated_model.klass }
+        get_rexport_models(associated_model.klass, results, [path, associated_model.name].compact * '.')
       end
-      return result
+      return results
     end
 
-    def get_associations(rexport_model)
+    def get_associations(model)
       %i(belongs_to has_one).map do |type|
-        rexport_model.reflect_on_all_associations(type)
+        model.reflect_on_all_associations(type)
       end.flatten.reject(&:polymorphic?)
     end
 
@@ -177,7 +178,7 @@ module Rexport #:nodoc:
     end
 
     def rexport_methods
-      @rexport_methods ||= export_model.get_rexport_methods(ordered_rexport_fields)
+      @rexport_methods ||= rexport_model.get_rexport_methods(ordered_rexport_fields)
     end
 
     def rexport_fields
@@ -199,9 +200,7 @@ module Rexport #:nodoc:
         end
       end
 
-      position = 0
-      rexport_fields.each do |rexport_field|
-        position += 1
+      rexport_fields.each.with_index(1) do |rexport_field, position|
         export_item = export_items.detect { |i| i.rexport_field == rexport_field } || export_items.create(rexport_field: rexport_field)
         export_item.update_attribute(:position, position) if set_position
       end

data/lib/rexport/exports_controller_methods.rb

@@ -32,7 +32,7 @@ module Rexport
     end
 
     def update
-      if export.update_attributes(export_params)
+      if export.update(export_params)
         redirect_to export, notice: 'Export was successfully updated.'
       else
         render :edit

data/lib/rexport/rexport_model.rb

@@ -2,13 +2,18 @@ module Rexport #:nodoc:
   class RexportModel
     attr_accessor :klass, :path
 
-    def initialize(klass, path = nil)
+    def initialize(klass, path: nil)
       self.klass = klass
       self.path = path.to_s unless path.blank?
+      initialize_rexport_fields
+    end
+
+    def rexport_fields
+      @rexport_fields ||= HashWithIndifferentAccess.new
     end
 
     def rexport_fields_array
-      klass.rexport_fields_array
+      rexport_fields.values.sort
     end
 
     def field_path(field_name)
@@ -16,8 +21,11 @@ module Rexport #:nodoc:
     end
 
     def collection_from_association(association)
-      return klass.send("find_#{association}_for_rexport") if klass.respond_to?("find_#{association}_for_rexport")
-      klass.reflect_on_association(association.to_sym).klass.all
+      if klass.respond_to?("find_#{association}_for_rexport")
+        klass.public_send("find_#{association}_for_rexport")
+      else
+        klass.reflect_on_association(association.to_sym).klass.all
+      end
     end
 
     def filter_column(field)
@@ -29,5 +37,82 @@ module Rexport #:nodoc:
     def name
       klass.name
     end
+
+    # Adds a data item to rexport_fields
+    def add_rexport_field(name, options = {})
+      rexport_fields[name.to_s] = DataField.new(name, options)
+    end
+
+    # Removes files from rexport_fields
+    # useful to remove content columns you don't want included in exports
+    def remove_rexport_fields(*fields)
+      fields.flatten.each { |field| rexport_fields.delete(field.to_s) }
+    end
+
+    # Adds associated methods to rexport_fields
+    #   :associations - an association or arrary of associations
+    #   :methods - a method or array of methods
+    #   :filter - if true will send type: :association to add_report_field
+    def add_association_methods(options = {})
+      options.stringify_keys!
+      options.assert_valid_keys(%w(associations methods filter))
+
+      methods = options.reverse_merge('methods' => 'name')['methods']
+      methods = [methods] if methods.kind_of?(String)
+
+      associations = options['associations']
+      associations = [associations] if associations.kind_of?(String)
+
+      type = options['filter'] ? :association : nil
+
+      associations.each do |association|
+        methods.each do |method|
+          add_rexport_field("#{association}_#{method}", method: "#{association}.#{method}", type: type)
+        end
+      end
+    end
+
+    # Returns an array of export methods corresponding with field_names
+    def get_rexport_methods(*field_names)
+      field_names.flatten.map do |f|
+        begin
+          components = f.to_s.split('.')
+          field_name = components.pop
+          components.push(get_rexport_model(components).get_rexport_method(field_name)) * '.'
+        rescue NoMethodError
+          'undefined_rexport_field'
+        end
+      end
+    end
+
+    protected
+
+    # Returns a rexport_model for the associated class by following the chain of associations
+    def get_rexport_model(associations)
+      associations.empty? ? self : rexport_models[associations.dup]
+    end
+
+    # Memoize rexport_models to avoid initializing rexport_fields multiple times
+    def rexport_models
+      @rexport_models ||= Hash.new do |hash, key|
+        hash[key] = self.class.new(klass.get_klass_from_associations(key))
+      end
+    end
+
+    # Returns the export method for a given field_name
+    def get_rexport_method(field_name)
+      if rexport_fields[field_name]
+        rexport_fields[field_name].method
+      else
+        raise NoMethodError
+      end
+    end
+
+    private
+
+    def initialize_rexport_fields
+      klass.content_columns.each { |field| add_rexport_field(field.name, type: field.type) }
+      klass.initialize_local_rexport_fields(self) if klass.respond_to?(:initialize_local_rexport_fields)
+    end
   end
 end

data/lib/rexport/version.rb

@@ -1,3 +1,3 @@
 module Rexport
-  VERSION = '1.0.2'
+  VERSION = '1.2.1'
 end

data/test/factories.rb

@@ -54,6 +54,21 @@ module Rexport
         end
       end
 
+      factory :invalid_filtered_export, class: 'Export' do
+        name              { 'Invalid Filtered Enrollment Export' }
+        model_class_name  { 'Enrollment' }
+        export_items do |items|
+          %w(grade_export_item status_name_export_item).map do |item|
+            items.association(item)
+          end
+        end
+        export_filters do |filters|
+          %w(invalid_filter).map do |filter|
+            filters.association(filter)
+          end
+        end
+      end
+
       factory :family_name_export_item, class: 'ExportItem' do
         position       { 1 }
         name           { 'Family Name' }
@@ -86,6 +101,11 @@ module Rexport
         filter_field   { 'status.name' }
         value          { 'active' }
       end
+
+      factory :invalid_filter, class: 'ExportFilter' do
+        filter_field   { 'invalid' }
+        value          { '1' }
+      end
     end
   end
 end

data/test/test_helper.rb

@@ -112,10 +112,10 @@ class Enrollment < ActiveRecord::Base
 
   private
 
-  def Enrollment.initialize_local_rexport_fields
-    add_rexport_field(:foo_method, method: :foo)
-    add_rexport_field(:bad_method, method: 'bad_method')
-    add_association_methods(associations: %w(status ilp_status))
+  def self.initialize_local_rexport_fields(rexport_model)
+    rexport_model.add_rexport_field(:foo_method, method: :foo)
+    rexport_model.add_rexport_field(:bad_method, method: 'bad_method')
+    rexport_model.add_association_methods(associations: %w(status ilp_status))
   end
 end
 
@@ -123,6 +123,10 @@ class Student < ActiveRecord::Base
   include Rexport::DataFields
   belongs_to :family
   has_many :enrollments
+
+  def self.find_family_for_rexport
+    Family.order(:name)
+  end
 end
 
 class Family < ActiveRecord::Base
@@ -135,8 +139,8 @@ class Family < ActiveRecord::Base
 
   private
 
-  def Family.initialize_local_rexport_fields
-    add_rexport_field(:foo_method, method: :foo)
+  def self.initialize_local_rexport_fields(rexport_model)
+    rexport_model.add_rexport_field(:foo_method, method: :foo)
   end
 end
 
@@ -158,9 +162,6 @@ class ExportFilter < ActiveRecord::Base
 end
 
 class SelfReferentialCheck < ActiveRecord::Base
+  include Rexport::DataFields
   belongs_to :enrollment
-
-  def SelfReferentialCheck.rexport_fields
-    'trick get_rexport_models into believing we are exportable'
-  end
 end

data/test/unit/data_fields_test.rb

@@ -3,83 +3,6 @@ require 'test_helper'
 class DataFieldsTest < ActiveSupport::TestCase
 
   class RexportClassMethodsTest < DataFieldsTest
-    test 'should initialize local rexport fields' do
-      assert_equal(
-        %w(active bad_method created_at foo_method grade ilp_status_name status_name updated_at),
-        Enrollment.rexport_fields.keys.sort
-      )
-    end
-
-    test 'should initialize data atributes' do
-      assert_equal 'grade',   Enrollment.rexport_fields[:grade].method
-      assert_equal :integer,  Enrollment.rexport_fields[:grade].type
-    end
-
-    test 'should initialize method' do
-      assert_equal 'foo', Enrollment.rexport_fields[:foo_method].method
-      assert_nil Enrollment.rexport_fields[:foo_method].type
-    end
-
-    test 'should return sorted data fields array' do
-      assert_equal(
-        %w(active bad_method created_at foo_method grade ilp_status_name status_name updated_at),
-        Enrollment.rexport_fields_array.map(&:name)
-      )
-    end
-
-    test 'should add single association method to rexport_fields' do
-      assert_difference('Enrollment.rexport_fields.length') do
-        Enrollment.add_association_methods(associations: 'test_association')
-      end
-      assert_equal 'test_association_name', Enrollment.rexport_fields[:test_association_name].name
-      assert_equal 'test_association.name', Enrollment.rexport_fields[:test_association_name].method
-    end
-
-    test 'should add name methods for multiple associations' do
-      assert_difference('Enrollment.rexport_fields.length', 3) do
-        Enrollment.add_association_methods(associations: %w(a b c))
-      end
-    end
-
-    test 'should add multiple methods for multiple associations' do
-      assert_difference('Enrollment.rexport_fields.length', 9) do
-        Enrollment.add_association_methods(associations: %w(a1 a2 a3), methods: %w(m1 m2 m3))
-      end
-    end
-
-    test 'should get rexport methods' do
-      assert_equal(
-        ['student.family.foo',
-          'student.name',
-          'undefined_rexport_field',
-          'undefined_rexport_field',
-          'status.name',
-          'grade'
-        ],
-        Enrollment.get_rexport_methods(
-          'student.family.foo_method',
-          'student.name',
-          'student.bad_method',
-          'bad_association.test',
-          'status_name',
-          'grade'
-        )
-      )
-    end
-
-    test 'should remove single rexport field' do
-      assert      Enrollment.rexport_fields[:grade]
-      assert      Enrollment.remove_rexport_fields(:grade)
-      assert_nil  Enrollment.rexport_fields[:grade]
-    end
-
-    test 'should remove multiple rexport fields' do
-      fields = %w(grade status_name foo_method)
-      fields.each { |field| assert(Enrollment.rexport_fields[field]) }
-      assert Enrollment.remove_rexport_fields(fields)
-      fields.each { |field| assert_nil(Enrollment.rexport_fields[field]) }
-    end
-
     test 'should get klass from assocations' do
       assert_equal Family, Enrollment.get_klass_from_associations('student', 'family')
     end
@@ -89,13 +12,6 @@ class DataFieldsTest < ActiveSupport::TestCase
         Enrollment.get_klass_from_associations('not_an_association')
       end
     end
-
-    test 'should reset column information with rexport_reset' do
-      Enrollment.expects(:initialize_rexport_fields).times(2).returns(true)
-      assert Enrollment.rexport_fields
-      Enrollment.reset_column_information
-      assert Enrollment.rexport_fields
-    end
   end
 
   class RexportInstanceMethodsTest < DataFieldsTest

data/test/unit/export_methods_test.rb

@@ -42,6 +42,13 @@ class ExportMethodsTest < ActiveSupport::TestCase
     assert_equal [['1', 'active']], create(:filtered_export).records
   end
 
+  test 'should return error message for records when export has an invalid filter' do
+    assert_equal(
+      [["SQLite3::SQLException: no such column: enrollments.invalid"]],
+      create(:invalid_filtered_export).records
+    )
+  end
+
   test 'should call get_records' do
     export = build(:export)
     export.expects(:get_records).with(Rexport::SAMPLE_SIZE).returns(true)
@@ -202,10 +209,6 @@ class ExportMethodsTest < ActiveSupport::TestCase
     end
   end
 
-  test 'should return true for modifiable?' do
-    assert Export.new.modifiable?
-  end
-
   private
 
   def create_export(fields: {}, filters: {})

data/test/unit/rexport_model_test.rb

@@ -1,35 +1,137 @@
 require 'test_helper'
 
 class RexportModel < ActiveSupport::TestCase
-  test 'should return correct foreign_key' do
-    rexport_model = Rexport::RexportModel.new(Enrollment)
+  test 'should initialize rexport_fields' do
+    assert_equal(
+      %w(active bad_method created_at foo_method grade ilp_status_name status_name updated_at),
+      rexport_model.rexport_fields.keys.sort
+    )
+  end
+
+  test 'should initialize data atributes' do
+    assert_equal 'grade',   rexport_model.rexport_fields[:grade].method
+    assert_equal :integer,  rexport_model.rexport_fields[:grade].type
+  end
+
+  test 'should initialize method' do
+    assert_equal 'foo', rexport_model.rexport_fields[:foo_method].method
+    assert_nil rexport_model.rexport_fields[:foo_method].type
+  end
+
+  test 'should add single association method to rexport_fields' do
+    assert_fields_length do |rexport|
+      rexport.add_association_methods(associations: 'test_association')
+      assert_equal 'test_association_name', rexport.rexport_fields[:test_association_name].name
+      assert_equal 'test_association.name', rexport.rexport_fields[:test_association_name].method
+    end
+  end
+
+  test 'should add name methods for multiple associations' do
+    assert_fields_length(change: 3) do |rexport|
+      rexport.add_association_methods(associations: %w(a b c))
+    end
+  end
+
+  test 'should add multiple methods for multiple associations' do
+    assert_fields_length(change: 9) do |rexport|
+      rexport.add_association_methods(associations: %w(a1 a2 a3), methods: %w(m1 m2 m3))
+    end
+  end
+
+  test 'should remove single rexport field' do
+    rexport_model.tap do |rexport|
+      assert      rexport.rexport_fields[:grade]
+      assert      rexport.remove_rexport_fields(:grade)
+      assert_nil  rexport.rexport_fields[:grade]
+    end
+  end
+
+  test 'should remove multiple rexport fields' do
+    fields = %w(grade status_name foo_method)
 
-    data_field = Enrollment.rexport_fields['status_name']
-    assert_equal 'status_id', rexport_model.filter_column(data_field)
+    rexport_model.tap do |rexport|
+      fields.each { |field| assert(rexport.rexport_fields[field]) }
+      assert rexport.remove_rexport_fields(fields)
+      fields.each { |field| assert_nil(rexport.rexport_fields[field]) }
+    end
+  end
 
-    data_field = Enrollment.rexport_fields['ilp_status_name']
-    assert_equal 'ilp_status_id', rexport_model.filter_column(data_field)
+  test 'should get rexport methods' do
+    assert_equal(
+      [
+        'student.family.foo',
+        'student.name',
+        'undefined_rexport_field',
+        'undefined_rexport_field',
+        'status.name',
+        'grade'
+      ],
+      rexport_model.get_rexport_methods(
+        'student.family.foo_method',
+        'student.name',
+        'student.bad_method',
+        'bad_association.test',
+        'status_name',
+        'grade'
+      )
+    )
+  end
+
+  test 'should use cached rexport_model when getting multiple fields from one model' do
+    rexport_model.tap do |rexport|
+      assert_equal ['student.name'], rexport.get_rexport_methods('student.name')
+      Student.expects(:get_klass_from_associations).times(0)
+      assert_equal ['student.date_of_birth'], rexport.get_rexport_methods('student.date_of_birth')
+    end
+  end
+
+  test 'should return default foreign_key' do
+    assert_equal 'status_id', rexport_model.filter_column(data_field('status_name'))
+  end
+
+  test 'should return custom foreign_key' do
+    assert_equal 'ilp_status_id', rexport_model.filter_column(data_field('ilp_status_name'))
   end
 
   test 'should call rexport_fields_array' do
-    rexport_model = Rexport::RexportModel.new(Enrollment)
-    Enrollment.expects(:rexport_fields_array).returns(true)
-    assert rexport_model.rexport_fields_array
+    assert_equal(
+      %w(active bad_method created_at foo_method grade ilp_status_name status_name updated_at),
+      rexport_model.rexport_fields_array.map(&:name)
+    )
   end
 
   test 'should return field_path' do
-    rexport_model = Rexport::RexportModel.new(Enrollment, 'foo')
-    assert_equal 'foo.bar', rexport_model.field_path('bar')
+    assert_equal 'foo.bar', rexport_model(path: 'foo').field_path('bar')
   end
 
   test 'should return collection_from_association' do
-    rexport_model = Rexport::RexportModel.new(Enrollment)
     Status.expects(:all).returns(true)
     assert rexport_model.collection_from_association('status')
   end
 
+  test 'should return custom find method for collection_from_association' do
+    Student.expects(:find_family_for_rexport).returns(true)
+    assert rexport_model(model: Student).collection_from_association('family')
+  end
+
+
   test 'should return class name' do
-    rexport_model = Rexport::RexportModel.new(Enrollment)
     assert_equal 'Enrollment', rexport_model.name
   end
+
+  private
+
+  def rexport_model(model: Enrollment, path: nil)
+    Rexport::RexportModel.new(model, path: path)
+  end
+
+  def data_field(name)
+    rexport_model.rexport_fields[name]
+  end
+
+  def assert_fields_length(rexport: rexport_model, change: 1, &block)
+    assert_difference('rexport.rexport_fields.length', change) do
+      block.call(rexport)
+    end
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rexport
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Aaron Baldwin
 - Brightways Learning
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,56 +17,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '6.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.13'
 description: Rexport integrates into a Rails application making model data available
   for export into CSV files.
 email:
@@ -120,7 +120,7 @@ homepage: https://github.com/wwidea/rexport
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,17 +135,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.3.9
+signing_key:
 specification_version: 4
 summary: Ruby on Rails gem to manage exports.
 test_files:
-- test/unit/export_methods_test.rb
+- test/factories.rb
+- test/test_helper.rb
 - test/unit/data_field_test.rb
-- test/unit/rexport_model_test.rb
-- test/unit/export_filter_methods_test.rb
 - test/unit/data_fields_test.rb
-- test/unit/tree_node_test.rb
+- test/unit/export_filter_methods_test.rb
 - test/unit/export_item_methods_test.rb
-- test/factories.rb
-- test/test_helper.rb
+- test/unit/export_methods_test.rb
+- test/unit/rexport_model_test.rb
+- test/unit/tree_node_test.rb