arca 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1becb49c860d2d307b0a29e91a2d93e0bfe86845
-  data.tar.gz: b230fe2a8c7d72fc0d84767de6546d67ea707426
+  metadata.gz: b0591095b4b348fcbd76cf72ef3cea8aeecb8016
+  data.tar.gz: bd32d70f3788e5238761d3368b6944b923860c54
 SHA512:
-  metadata.gz: fc86642a2abba3e45f437b4607ab54e775a009ea35611202907a3af1d7da8a59fc0fadc110467a5c66ce080f6133e9e409071c50c34254d1fa4d2611392f3777
-  data.tar.gz: bd855300d7bc35f2d5029ec4749cf72572f626a675402f4af92d759b81bb5821cf8b3fca86b1675fa59cb3cfd6afc8d38e52a192a68031a11096867e160094b2
+  metadata.gz: 9ea28b0b452751d96980314871b79df23b5ea261e9defbc9e3f331690d1c5ca4f4fee7b8c6c65461298faab770034c1c58e752b89cd9f5aa833b032b784a5c5b
+  data.tar.gz: 5477fd14ed651d2681b8167db4ef3ee5ea60ae7246f73cb9e9e36c025df1f2747678d1db410b47113d8f78985bde696cf25b2cfee7e4b69bd90e92f35f001250

data/arca.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "arca"
-  spec.version       = "2.1.3"
+  spec.version       = "2.2.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

@@ -80,7 +80,7 @@ module Arca
     # Public: Boolean representing whether the callback target is located in the
     # same file where the callback is defined.
     def external_target?
-      return false if target_symbol == :block
+      return false if target_symbol == :inline
       target_file_path != callback_file_path
     end
 

data/lib/arca/collector.rb

@@ -33,9 +33,21 @@ module Arca
             # Duplicate args before modifying.
             args_copy = args.dup
 
-            # Add target_symbol :block to args_copy if a block was given.
+            # Add target_symbol :inline to args_copy if a block, Proc, or Class
+            # was given.
             if block
-              args_copy.unshift(:block)
+              args_copy.unshift(:inline)
+            elsif args_copy.first.kind_of?(Proc)
+              args_copy.shift
+              args_copy.unshift(:inline)
+            elsif !args_copy.first.kind_of?(Symbol)
+              class_or_instance = args_copy.shift
+
+              if class_or_instance.class == Class
+                args_copy.unshift(class_or_instance.name.to_sym)
+              else
+                args_copy.unshift(class_or_instance.class.name.to_sym)
+              end
             end
 
             # Get the options hash from the end of the args Array if it exists.
@@ -78,7 +90,6 @@ module Arca
                 :conditional_symbol             => conditional_symbol,
                 :conditional_target_symbol      => conditional_target_symbol
               }
-
             end
 
             # Bind the callback method to self and call it with args.

data/test/fixtures/announcements.rb

@@ -1,8 +1,19 @@
+class SomeCallbackClass
+  def after_destroy(record)
+    puts "after_destroy announcement callback"
+  end
+end
+
 module Announcements
   def self.included(base)
     base.class_eval do
-      before_save { puts "pre-save announcement callback" }
+      before_save { puts "before_save announcement callback" }
       after_save :announce_save
+
+      around_save lambda { puts "around_save announcement callback" }
+      before_destroy -> { puts "before_destroy announcement callback" }
+
+      after_destroy SomeCallbackClass.new
     end
   end
 

data/test/lib/arca/callback_analysis_test.rb

@@ -75,7 +75,7 @@ class Arca::CallbackAnalysisTest < Minitest::Test
   end
 
   def test_target_line_number
-    assert_equal 9, announce_save.target_line_number
+    assert_equal 20, announce_save.target_line_number
     assert_equal 8, set_title.target_line_number
     assert_equal 16, upcase_title.target_line_number
   end
@@ -87,7 +87,7 @@ class Arca::CallbackAnalysisTest < Minitest::Test
   end
 
   def test_lines_to_target
-    assert_equal 5, announce_save.lines_to_target
+    assert_equal 16, announce_save.lines_to_target
     assert_equal 3, set_title.lines_to_target
     assert_equal 10, upcase_title.lines_to_target
   end

data/test/lib/arca/collector_test.rb

@@ -6,11 +6,15 @@ class Arca::CollectorTest < Minitest::Test
     assert_equal 1, callbacks[:after_save].size
     assert_equal 4, callbacks[:before_save].size
     assert_equal 1, callbacks[:after_commit].size
+    assert_equal 1, callbacks[:around_save].size
+    assert_equal 1, callbacks[:before_destroy].size
+    assert_equal 1, callbacks[:after_destroy].size
+
 
     callback = callbacks[:after_save][0]
     assert_equal :after_save, callback[:callback_symbol]
     assert_match "test/fixtures/announcements.rb", callback[:callback_file_path]
-    assert_equal 5, callback[:callback_line_number]
+    assert_equal 11, callback[:callback_line_number]
     assert_equal :announce_save, callback[:target_symbol]
     assert_nil callback[:conditional_symbol]
     assert_nil callback[:conditional_target_symbol]
@@ -18,8 +22,8 @@ class Arca::CollectorTest < Minitest::Test
     callback = callbacks[:before_save][0]
     assert_equal :before_save, callback[:callback_symbol]
     assert_match "test/fixtures/announcements.rb", callback[:callback_file_path]
-    assert_equal 4, callback[:callback_line_number]
-    assert_equal :block, callback[:target_symbol]
+    assert_equal 10, callback[:callback_line_number]
+    assert_equal :inline, callback[:target_symbol]
     assert_nil callback[:conditional_symbol]
     assert_nil callback[:conditional_target_symbol]
 
@@ -54,6 +58,30 @@ class Arca::CollectorTest < Minitest::Test
     assert_equal :update_timeline, callback[:target_symbol]
     assert_equal :on, callback[:conditional_symbol]
     assert_equal [:create, :destroy], callback[:conditional_target_symbol]
+
+    callback = callbacks[:around_save][0]
+    assert_equal :around_save, callback[:callback_symbol]
+    assert_match "test/fixtures/announcements.rb", callback[:callback_file_path]
+    assert_equal 13, callback[:callback_line_number]
+    assert_equal :inline, callback[:target_symbol]
+    assert_nil callback[:conditional_symbol]
+    assert_nil callback[:conditional_target_symbol]
+
+    callback = callbacks[:before_destroy][0]
+    assert_equal :before_destroy, callback[:callback_symbol]
+    assert_match "test/fixtures/announcements.rb", callback[:callback_file_path]
+    assert_equal 14, callback[:callback_line_number]
+    assert_equal :inline, callback[:target_symbol]
+    assert_nil callback[:conditional_symbol]
+    assert_nil callback[:conditional_target_symbol]
+
+    callback = callbacks[:after_destroy][0]
+    assert_equal :after_destroy, callback[:callback_symbol]
+    assert_match "test/fixtures/announcements.rb", callback[:callback_file_path]
+    assert_equal 16, callback[:callback_line_number]
+    assert_equal :SomeCallbackClass, callback[:target_symbol]
+    assert_nil callback[:conditional_symbol]
+    assert_nil callback[:conditional_target_symbol]
   end
 
   def test_callback_is_reapplied_with_original_args

data/test/lib/arca/model_test.rb

@@ -33,24 +33,24 @@ class Arca::ModelTest < Minitest::Test
   end
 
   def test_analyzed_callbacks_array
-    assert_equal 6, model.analyzed_callbacks_array.size
+    assert_equal 9, model.analyzed_callbacks_array.size
     assert model.analyzed_callbacks_array[0].is_a?(Arca::CallbackAnalysis)
   end
 
   def test_analyzed_callbacks_count
-    assert_equal 6, model.analyzed_callbacks_count
+    assert_equal 9, model.analyzed_callbacks_count
   end
 
   def test_lines_between_count
-    assert_equal 6, model.lines_between_count
+    assert_equal 16, model.lines_between_count
   end
 
   def test_external_callbacks_count
-    assert_equal 2, model.external_callbacks_count
+    assert_equal 5, model.external_callbacks_count
   end
 
   def test_external_targets_count
-    assert_equal 0, model.external_targets_count
+    assert_equal 1, model.external_targets_count
   end
 
   def test_external_conditionals_count

data/test/lib/arca/report_test.rb

@@ -22,6 +22,6 @@ class Arca::ReportTest < Minitest::Test
   end
 
   def test_calculated_permutations
-    assert_equal 3, report.calculated_permutations
+    assert_equal 6, report.calculated_permutations
   end
 end

metadata

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