class-cattr 0.1.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eda23fbd2a8040014f38211ae51181dd37c990f936860a8934e2b1a37912d22
-  data.tar.gz: 47027b1c8fc3a495160c792a85cc99d6a25ac1daa2adbf49f24c3944665f7785
+  metadata.gz: 6afe725cd74e87fa927f966c51613a7be9f519220e182a200010cb78176692a7
+  data.tar.gz: eec357ac38c904324ced0cab8fe2e71480a87388d67ab8ce2ff65cf3b2c4954d
 SHA512:
-  metadata.gz: 1756b3182dbaf2557ce40abf8266acdb32bdfec4b6261f260c9abfc5695556a7bc03f9beddce6893f02c9c50619551418fa75953c745b8663aa00a9cad75545a
-  data.tar.gz: a382bb28e40f6e9b3cfed71456cd1d24debd0c458ed6282a51b8247cba29671a8746f5f63d0b722881028cf12bdd366ee30d24e7f3442cc8444afb2f9d1f29d3
+  metadata.gz: 910462bc7cf06b0077cd993ecb19e8e0db778f6af3ccd8eacc5057d7296bde6546af70a305adc3773364661077b1b0f9a6d5950007b0bbd6157ba5ab40c3ed5a
+  data.tar.gz: c4507794f655b5aaaf2563680522794007d51fdb3538d170e931f0ac3c07337808fe88e440829ac58f7d99843b44b4c3f55a6c7c68b5119c1ff6221143271ce1

data/.version

@@ -1 +1 @@
-0.1.2
+0.3.0

data/lib/lib/base.rb

@@ -1,18 +1,47 @@
 class Class
-  def cattr name = nil, create_class_method = true
-    if name && create_class_method == true
-      define_singleton_method(name) do |arg = :_nil|
-        if arg == :_nil
-          CattrProxy.new(self).send(name)
-        else
+  def cattr name = nil, opts = {}, &block
+    if name
+      # cattr :foo, class: true, instance: true, default: proc { bar }
+
+      # if block provided, set it as a default value
+      if block
+        opts[:default] = block
+      end
+
+      # set class methods
+      if opts[:class]
+        define_singleton_method('%s=' % name) do |arg|
           CattrProxy.new(self).send('%s=' % name, arg)
         end
+
+        define_singleton_method(name) do
+          CattrProxy.new(self).send(name)
+        end
       end
-    end
 
-    if name
-      CattrProxy.new(self).send('%s=' % name, nil)
+      # set instance methods
+      if opts[:instance]
+        define_method('%s=' % name) do |arg|
+          CattrProxy.new(self.class).send('%s=' % name, arg)
+        end
+
+        define_method(name) do
+          CattrProxy.new(self.class).send(name)
+        end
+      end
+
+      # capture bad arguments
+      supported = [:default, :class, :instance]
+      invalid = opts.keys - supported
+      if invalid.first
+        raise ArgumentError, 'Invalid argument :%s, supported: %s' % [invalid.first, supported.join(', ')]
+      end
+
+      # set values
+      CattrProxy.new(self).send('%s=' % name, opts[:default])
     else
+      # Klass.cattr.foo
+
       CattrProxy.new(self)
     end
   end

data/lib/lib/proxy.rb

@@ -3,29 +3,29 @@ class CattrProxy
     @host = host
   end
 
-  def method_missing key, value=nil, &block
+  def method_missing key, value = nil
     name = '@cattr_%s' % key
 
     if name.sub!(/=$/, '')
       @host.instance_variable_set name, value
     else
-      if block_given?
-        @host.instance_variable_set name, block
-      else
-        unless value.nil?
-          raise ArgumentError, 'Plese use setter cattr.%s= to set argument' % key.to_s.sub('=', '')
-        end
+      unless value.nil?
+        raise ArgumentError, 'Plese use setter cattr.%s= to set argument' % key
+      end
+
+      for el in @host.ancestors
+        if el.respond_to?(:superclass) && el != Object && el.instance_variable_defined?(name)
+          local = el.instance_variable_get name
 
-        for el in @host.ancestors
-          if el.respond_to?(:superclass) && el != Object && el.instance_variable_defined?(name)
-            value = el.instance_variable_get name
-            value = value.call if value === Proc
-            return value
+          if local === Proc
+            local = @host.instance_exec &local
           end
-        end
 
-        raise ArgumentError, 'Cattr class variable "cattr.%s" not defined on "%s".' % [name.sub('@cattr_', ''), @host]
+          return local
+        end
       end
+
+      raise ArgumentError, 'Cattr class variable "cattr.%s" not defined on "%s".' % [name.sub('@cattr_', ''), @host]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: class-cattr
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Dino Reic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-22 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies: []
 description: Class attributes are not natively supported by ruby, this fixes the problem!
 email: reic.dino@gmail.com
@@ -39,7 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Ruby class attributes