arca 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3efd4bf79b0304d713b4c0f1865dccdcbb80c737
-  data.tar.gz: 2beaa25cc62e0db4d126413aa0be9a675030d881
+  metadata.gz: cc4f919a7e79ca23f5ea8f1c37412bc40c181289
+  data.tar.gz: e6299619e24d39985a7f29f9809f043770cb9a30
 SHA512:
-  metadata.gz: b8ff7a7e3fd5aefbbc63bc4a6c3acef480ffb6847d5d7f6d7a44cd7e8e8fd85559db97efa37d89e82f151a8143a834339df03ce527517c8387dcabdcaef06de8
-  data.tar.gz: fa9cc3afb45446d2f36e4fc13965704510d70778c7a82133627a67b250a880335b73416fa473f7323f7d94c895722a970d10438ea48e4c86bfcdd41b06a48882
+  metadata.gz: 071f2a40b8184eea62932bc28b8e8d11988c8c68fcb742f9406c54fa576aca6695f5706db5fdd4215c8deba572a63408de27b21baa599298a644f7afb5bfe9f9
+  data.tar.gz: 265d6b69cd5c21a061191b08f035c40663ffe7e2062dd30222423048d5ba580e8ee6409e33bf2e0228a3f994b1019730bedfa6b6a88bedabe52cdcfe6be65f8a

data/arca.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "arca"
-  spec.version       = "2.0.1"
+  spec.version       = "2.1.0"
   spec.date          = "2015-08-07"
   spec.summary       = "ActiveRecord callback analyzer"
   spec.description   = "Arca is a callback analyzer for ActiveRecord ideally suited for digging yourself out of callback hell"

data/lib/arca/callback_analysis.rb

@@ -113,7 +113,9 @@ module Arca
     # Public: Boolean representing whether the conditional target is located in
     # the same file where the callback is defined.
     def external_conditional_target?
-      return if conditional_target_symbol.nil?
+      return false if conditional_target_symbol.nil?
+      return false if conditional_target_symbol.is_a?(Array)
+      return false if [:create, :update, :destroy].include?(conditional_target_symbol)
 
       callback_file_path != conditional_target_file_path
     end

data/lib/arca/report.rb

@@ -54,7 +54,7 @@ module Arca
       number_of_unique_conditionals(model.analyzed_callbacks_array)
     end
 
-    def_delegators :model, :lines_between_count, :external_callbacks_count,
+    def_delegators :@model, :lines_between_count, :external_callbacks_count,
       :external_targets_count, :external_conditionals_count
 
     # Public: Integer representing the possible number of permutations stemming

data/test/fixtures/ticket.rb

@@ -3,6 +3,7 @@ class Ticket < ActiveRecord::Base
 
   before_save :set_title, :set_body
   before_save :upcase_title, :if => :title_is_a_shout?
+  after_commit :update_timeline, :on => [:create, :destroy]
 
   def set_title
     self.title ||= "Ticket id #{SecureRandom.hex(2)}"
@@ -19,4 +20,8 @@ class Ticket < ActiveRecord::Base
   def title_is_a_shout?
     self.title.split(" ").size == 1
   end
+
+  def update_timeline
+    puts "Updating timeline"
+  end
 end

data/test/lib/arca/callback_analysis_test.rb

@@ -85,8 +85,8 @@ class Arca::CallbackAnalysisTest < Minitest::Test
 
   def test_target_line_number
     assert_equal 9, announce_save.target_line_number
-    assert_equal 7, set_title.target_line_number
-    assert_equal 15, upcase_title.target_line_number
+    assert_equal 8, set_title.target_line_number
+    assert_equal 16, upcase_title.target_line_number
   end
 
   def test_external_target?
@@ -97,8 +97,8 @@ class Arca::CallbackAnalysisTest < Minitest::Test
 
   def test_lines_to_target
     assert_equal 5, announce_save.lines_to_target
-    assert_equal 2, set_title.lines_to_target
-    assert_equal 9, upcase_title.lines_to_target
+    assert_equal 3, set_title.lines_to_target
+    assert_equal 10, upcase_title.lines_to_target
   end
 
   def test_conditional_symbol
@@ -122,12 +122,12 @@ class Arca::CallbackAnalysisTest < Minitest::Test
   def test_conditional_target_line_number
     assert_nil announce_save.conditional_target_line_number
     assert_nil set_title.conditional_target_line_number
-    assert_equal 19, upcase_title.conditional_target_line_number
+    assert_equal 20, upcase_title.conditional_target_line_number
   end
 
   def test_lines_to_conditional_target
     assert_nil announce_save.lines_to_conditional_target
     assert_nil set_title.lines_to_conditional_target
-    assert_equal 13, upcase_title.lines_to_conditional_target
+    assert_equal 14, upcase_title.lines_to_conditional_target
   end
 end

data/test/lib/arca/collector_test.rb

@@ -5,6 +5,7 @@ class Arca::CollectorTest < Minitest::Test
     callbacks = Ticket.arca_callback_data
     assert_equal 1, callbacks[:after_save].size
     assert_equal 4, callbacks[:before_save].size
+    assert_equal 1, callbacks[:after_commit].size
 
     callback = callbacks[:after_save][0]
     assert_equal :after_save, callback[:callback_symbol]
@@ -45,6 +46,14 @@ class Arca::CollectorTest < Minitest::Test
     assert_equal :upcase_title, callback[:target_symbol]
     assert_equal :if, callback[:conditional_symbol]
     assert_equal :title_is_a_shout?, callback[:conditional_target_symbol]
+
+    callback = callbacks[:after_commit][0]
+    assert_equal :after_commit, callback[:callback_symbol]
+    assert_match "test/fixtures/ticket.rb", callback[:callback_file_path]
+    assert_equal 6, callback[:callback_line_number]
+    assert_equal :update_timeline, callback[:target_symbol]
+    assert_equal :on, callback[:conditional_symbol]
+    assert_equal [:create, :destroy], callback[:conditional_target_symbol]
   end
 
   def test_callback_is_reapplied_with_original_args

data/test/lib/arca/model_test.rb

@@ -12,7 +12,7 @@ class Arca::ModelTest < Minitest::Test
   def test_source_location
     source_location = model.source_location(:set_title)
     assert_match "test/fixtures/ticket.rb", source_location[:file_path]
-    assert_equal 7, source_location[:line_number]
+    assert_equal 8, source_location[:line_number]
   end
 
   def test_source_location_with_method_symbol_with_no_associated_method
@@ -33,16 +33,16 @@ class Arca::ModelTest < Minitest::Test
   end
 
   def test_analyzed_callbacks_array
-    assert_equal 5, model.analyzed_callbacks_array.size
+    assert_equal 6, model.analyzed_callbacks_array.size
     assert model.analyzed_callbacks_array[0].is_a?(Arca::CallbackAnalysis)
   end
 
   def test_analyzed_callbacks_count
-    assert_equal 5, model.analyzed_callbacks_count
+    assert_equal 6, model.analyzed_callbacks_count
   end
 
   def test_lines_between_count
-    assert_equal 5, model.lines_between_count
+    assert_equal 6, model.lines_between_count
   end
 
   def test_external_callbacks_count

data/test/lib/arca/report_test.rb

@@ -14,14 +14,14 @@ class Arca::ReportTest < Minitest::Test
   end
 
   def callbacks_count
-    assert_equal 4, report.callbacks_count
+    assert_equal 5, report.callbacks_count
   end
 
   def test_conditionals_count
-    assert_equal 1, report.conditionals_count
+    assert_equal 2, report.conditionals_count
   end
 
   def test_calculated_permutations
-    assert_equal 2, report.calculated_permutations
+    assert_equal 3, report.calculated_permutations
   end
 end

data/test/test_helper.rb

@@ -4,6 +4,7 @@ require "minitest/autorun"
 require "arca"
 
 class ActiveRecord::Base
+  self.raise_in_transactional_callbacks = true
   include Arca::Collector
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arca
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Jonathan Hoyt