clean-annotations 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a9aaf5121402a2a3a19d2e4aa0e5eb26d3a1cf8bb3aa9e32377bf7a7f38780e
-  data.tar.gz: 6dd0855bc5ce65fa2a1360ef703cff2fa427bd63a0b3f674b48b0f87ad883699
+  metadata.gz: 74db9a7090b7480819a19a8cbd8b05b3f8284322b447381c3976f40499a81a78
+  data.tar.gz: ab20371189f91a861308b864344cd9b7c1fa169fa105ff4c0f12a2d6017d8ac3
 SHA512:
-  metadata.gz: 2727df348b72d4df04c43bdc3671b945d0db5250249170257fe1ef15ffb87d33862ce18f8adc8cdb99b4b3e09d01a75a7631678b36b2e804f4f1309f02ff5cb5
-  data.tar.gz: 7db76fb31d58cd3feef260bdd46f36879a5e27fec7ab92c7b564cb6ddaa9dfb8a3f256d923aaeabce054019dfb0e3ea441c9a19ce238a9c688b098a7708f01f7
+  metadata.gz: 287e422e1bb5f4468b579718b3c2973ad52102255875a6f8321f020b787cebb2ddb5d659c219cbfc3d5560627f084d881a5d2a62eef65db14c23b953d9c6224f
+  data.tar.gz: d936ec9f237cd161f284ecaf521e865c522767199410925f77ce4924c0022edb8ec1deb325aa4c1139455f5dcea625f06fcaa8a261934eab7965428b1edc5064

data/.version

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/clean-annotations.rb

@@ -1,6 +1,6 @@
-require_relative './clean-annotations/class_callbacks'
-
-# do not load if allready defined
+unless Object.respond_to?(:define_callback)
+  require_relative './clean-annotations/class_callbacks'
+end
 
 unless Object.respond_to?(:class_attribute)
   require_relative './clean-annotations/class_attribute'

data/lib/clean-annotations/class_callbacks.rb

@@ -1,9 +1,13 @@
 # Rails style callbacks
 
-class Class
-  def class_callback name
+class Object
+  def define_callback name
     ivar = "@class_callbacks_#{name}"
 
+    unless is_a?(Class) || is_a?(Module)
+      raise ArgumentError, 'define_callback Can only be defined in a class or a module'
+    end
+
     define_singleton_method(name) do |method_name=nil, &block|
       ref = caller[0].split(':in ').first
 
@@ -11,13 +15,11 @@ class Class
       self.instance_variable_get(ivar)[ref] = method_name || block
     end
   end
-end
 
-class Object
-  def class_callback name, *args
+  def run_callback name, *args
     ivar = "@class_callbacks_#{name}"
 
-    list = self.class.ancestors
+    list = is_a?(Class) || is_a?(Module) ? ancestors : self.class.ancestors
     list = list.slice 0, list.index(Object) if list.index(Object)
 
     list.reverse.each do |klass|
@@ -36,11 +38,11 @@ class Object
 end
 
 # for controllers, execute from AppController to MainController
-# class_callback :before
+# define_callback :before
 # before do
 #    ...
 # end
 # before :method_name
 # instance = new
-# instance.class_callback :before
-# instance.class_callback :before, @arg
+# instance.run_callback :before
+# instance.run_callback :before, @object

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clean-annotations
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dino Reic