clean-annotations 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d9303baf6e5dad38ca20584945c4e0c8da1df1b87ea34e0c312eca6dc5723ab
-  data.tar.gz: 0d9f07d7f5b397b8ca6510f19037c1bf89d76ac53aad20fcf085d676e0943c9f
+  metadata.gz: 4a9aaf5121402a2a3a19d2e4aa0e5eb26d3a1cf8bb3aa9e32377bf7a7f38780e
+  data.tar.gz: 6dd0855bc5ce65fa2a1360ef703cff2fa427bd63a0b3f674b48b0f87ad883699
 SHA512:
-  metadata.gz: 4ad56b523d3c8cc57328853e2d888e323c59e2844e32324681fde6b1051181a9722d66109c2195cde2d06fd7c1ecd3b3d36b2620b9f4a8215bd74898327059e7
-  data.tar.gz: f63139c6deed120ed6679b8214c35c72687925d643d63c44796f536f76e8428566967321d8281b388b793ab3d8772e71def90bf3e9575688e57ba223604086a3
+  metadata.gz: 2727df348b72d4df04c43bdc3671b945d0db5250249170257fe1ef15ffb87d33862ce18f8adc8cdb99b4b3e09d01a75a7631678b36b2e804f4f1309f02ff5cb5
+  data.tar.gz: 7db76fb31d58cd3feef260bdd46f36879a5e27fec7ab92c7b564cb6ddaa9dfb8a3f256d923aaeabce054019dfb0e3ea441c9a19ce238a9c688b098a7708f01f7

data/.version

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/clean-annotations/class_attribute.rb

@@ -1,28 +1,32 @@
 # Defines class variable
 
-def Object.class_attribute name, default=nil, &block
-  raise ArgumentError.new('name must be symbol') unless name.is_a?(Symbol)
+class Class
+  def class_attribute name, default=nil, &block
+    raise ArgumentError.new('name must be symbol') unless name.is_a?(Symbol)
 
-  ivar = "@class_attribute_#{name}"
+    ivar = "@class_attribute_#{name}"
 
-  instance_variable_set ivar, block || default
+    instance_variable_set ivar, block || default
 
-  define_singleton_method('%s=' % name) { |arg| send(name, arg) }
-  define_singleton_method(name) do |arg=:_undefined, &block|
-    # define and set if argument given
-    if block || arg != :_undefined
-      return instance_variable_set ivar, block || arg
-    end
+    define_singleton_method('%s=' % name) { |arg| send(name, arg) }
+    define_singleton_method(name) do |arg=:_undefined, &block|
+      # define and set if argument given
+      if block || arg != :_undefined
+        return instance_variable_set ivar, block || arg
+      end
 
-    # find value and return
-    ancestors.each do |klass|
-      if klass.instance_variable_defined?(ivar)
-        value = klass.instance_variable_get ivar
-        return value.is_a?(Proc) ? instance_exec(&value) : value
+      # find value and return
+      ancestors.each do |klass|
+        if klass.instance_variable_defined?(ivar)
+          value = klass.instance_variable_get ivar
+          return value.is_a?(Proc) ? instance_exec(&value) : value
+        end
       end
     end
   end
+end
 
+class Object
   def class_attribute name
     self.class.send(name)
   end

data/lib/clean-annotations/class_callbacks.rb

@@ -1,34 +1,33 @@
 # Rails style callbacks
 
-class Object
-  def class_callback name, arg=nil
-    Object.class_callback name, self, arg
-  end
-
-  def self.class_callback name, context=nil, arg=nil
+class Class
+  def class_callback name
     ivar = "@class_callbacks_#{name}"
 
-    unless context
-      define_singleton_method(name) do |method_name=nil, &block|
-        ref = caller[0].split(':in ').first
+    define_singleton_method(name) do |method_name=nil, &block|
+      ref = caller[0].split(':in ').first
 
-        self.instance_variable_set(ivar, {}) unless instance_variable_defined?(ivar)
-        self.instance_variable_get(ivar)[ref] = method_name || block
-      end
+      self.instance_variable_set(ivar, {}) unless instance_variable_defined?(ivar)
+      self.instance_variable_get(ivar)[ref] = method_name || block
+    end
+  end
+end
+
+class Object
+  def class_callback name, *args
+    ivar = "@class_callbacks_#{name}"
 
-    else
-      list = context.respond_to?(:const_missing) && context.respond_to?(:ancestors) ? context.ancestors : context.class.ancestors
-      list = list.slice 0, list.index(Object) if list.index(Object)
+    list = self.class.ancestors
+    list = list.slice 0, list.index(Object) if list.index(Object)
 
-      list.reverse.each do |klass|
-        if klass.instance_variable_defined?(ivar)
-          mlist = klass.instance_variable_get(ivar).values
-          mlist.each do |m|
-            if m.is_a?(Symbol)
-              context.send m
-            else
-              context.instance_exec arg, &m
-            end
+    list.reverse.each do |klass|
+      if klass.instance_variable_defined?(ivar)
+        mlist = klass.instance_variable_get(ivar).values
+        mlist.each do |m|
+          if m.is_a?(Symbol)
+            send m, *args
+          else
+            instance_exec *args, &m
           end
         end
       end
@@ -43,5 +42,5 @@ end
 # end
 # before :method_name
 # instance = new
-# instance.class_callback :before,
-# instance.class_callback :before, arg
+# instance.class_callback :before
+# instance.class_callback :before, @arg

data/lib/clean-annotations/method_attr.rb

@@ -55,22 +55,24 @@ end
 #     opts
 #   end
 
-#   name "Test method desc"
+#   name "Test method desc 1"
+#   name "Test method desc 2"
 #   param :email, :email
 #   def test
 #   end
 # end
 
-# ap Foo.method_attr
+# Foo.method_attr
 # {
-#   "test": {
-#     "name": [
-#       "Test method desc"
+#   test: {
+#     name: [
+#       "Test method desc 1",
+#       "Test method desc 2"
 #     ],
-#     "param": [
+#     param: [
 #       {
-#         "name": "email",
-#         "type": "String"
+#         name: :email,
+#         type: String
 #       }
 #     ]
 #   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clean-annotations
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies: []
 description: Define annotatable attribute names and assign them to methods or classes,
   add callbacks to non-Rails classes. Void of dependencies.