class-cattr 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e36c2669386c70f837891e37cd035574309c08127c0d8982cdc94b4f0b7a400
-  data.tar.gz: 6edda84721643fa97c763f4a41364134ba85be03d37885a977c3104a1cecbca2
+  metadata.gz: 6afe725cd74e87fa927f966c51613a7be9f519220e182a200010cb78176692a7
+  data.tar.gz: eec357ac38c904324ced0cab8fe2e71480a87388d67ab8ce2ff65cf3b2c4954d
 SHA512:
-  metadata.gz: f0b0d0a2b8f31d1a82476adb734f7c704a926cd314f0b7dfd54da7528f386c7a193518f7a5beb9b4b1319be6dd054b4e7e90668f852a409caf44b368d384c210
-  data.tar.gz: b8eb643415ad4a8d9872537910f917955b28ffc120c7719680895c122206e4dc17a89f36724dab674b3b679e704c1f37cdb89288be5b0865256338f129f8f085
+  metadata.gz: 910462bc7cf06b0077cd993ecb19e8e0db778f6af3ccd8eacc5057d7296bde6546af70a305adc3773364661077b1b0f9a6d5950007b0bbd6157ba5ab40c3ed5a
+  data.tar.gz: c4507794f655b5aaaf2563680522794007d51fdb3538d170e931f0ac3c07337808fe88e440829ac58f7d99843b44b4c3f55a6c7c68b5119c1ff6221143271ce1

data/.version

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/lib/base.rb

@@ -1,27 +1,48 @@
 class Class
-  def cattr name = nil, value = :_nil, &block
-    return CattrProxy.new(self) unless name
+  def cattr name = nil, opts = {}, &block
+    if name
+      # cattr :foo, class: true, instance: true, default: proc { bar }
 
-    if value != :_nil || block
-      define_singleton_method('%s=' % name) do |arg|
-        CattrProxy.new(self).send('%s=' % name, arg)
+      # if block provided, set it as a default value
+      if block
+        opts[:default] = block
       end
 
-      define_singleton_method(name) do |arg = :_nil|
-        if arg == :_nil
-          CattrProxy.new(self).send(name)
-        else
+      # 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
+
+      # 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
 
-      if value != :_nil
-        CattrProxy.new(self).send('%s=' % name, value)
-      elsif block
-        CattrProxy.new(self).send(name, value, &block)
+      # 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
-      CattrProxy.new(self).send('%s=' % name, nil)
+      # Klass.cattr.foo
+
+      CattrProxy.new(self)
     end
   end
 end

data/lib/lib/proxy.rb

@@ -3,33 +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
-
-        for el in @host.ancestors
-          if el.respond_to?(:superclass) && el != Object && el.instance_variable_defined?(name)
-            local = el.instance_variable_get name
+      unless value.nil?
+        raise ArgumentError, 'Plese use setter cattr.%s= to set argument' % key
+      end
 
-            if local === Proc
-              local = @host.instance_exec &local
-            end
+      for el in @host.ancestors
+        if el.respond_to?(:superclass) && el != Object && el.instance_variable_defined?(name)
+          local = el.instance_variable_get name
 
-            return local
+          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.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Dino Reic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-12 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