rexport 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b74f494058f073c3dbb32d53a74274bce5223f64d09c75ed971e9b0c2ba27a0
-  data.tar.gz: 7b4eec86b8a911ce049bc8205f656fa0904d4b5f405eeb1475a07e6cdfe658e6
+  metadata.gz: 8cf8cb2fe8850f491ab8eb8a92d0034d1447babd6a4a79457acea80fcbec94fc
+  data.tar.gz: 2e646631a4c3673359f31bd222c43c32ed6fcb20813f7f6ac34d633005899628
 SHA512:
-  metadata.gz: 9437e26f118ac7e267faa26e5b662d4391e09462501955b1d6c93e6eda8ceddf6c61a8c5e498b531d4da8e3eb6761984901e5b944f59f8dabc7bad288bd4f13c
-  data.tar.gz: 7287f82ee398f49c45a424d0a7538127d96bdfb3cb5e6160cc9d19b72eca2688976af71db0731f898f6d5c73147c4de9954fc086ea6faccfe6f61800b8351210
+  metadata.gz: '08d2fd739cf9775d22295a57ba4ffd934da63079339f0b697ff923ecba958b2bf5c007987a5ade00756b56a758672d37b23482dc9151dbb610157be181761521'
+  data.tar.gz: '0359913d6d17b4303518284a54a5da8428a1c0b3ce871766fa117a37c063f5d739aa812a08e495689867502ca63be23e719405211eb2ea35b2c046dae006c6e7'

data/lib/rexport/export_methods.rb

@@ -126,6 +126,8 @@ module Rexport #:nodoc:
 
     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)
@@ -198,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/version.rb

@@ -1,3 +1,3 @@
 module Rexport
-  VERSION = '1.2.0'
+  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/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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexport
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Aaron Baldwin
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-29 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -135,17 +135,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+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