class-cattr 0.1.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5b8ee894264312e37f4ab8c50c9b968f78daa42bf099cb83a10bea0110074da
-  data.tar.gz: 71287dd412409772d3ca15f9260da2b9bdf419164644088d13552f9d5db4ad54
+  metadata.gz: daf0e9dce7f539dcee2efa21621efe388773b7d8d5a241bee4a752306857a37f
+  data.tar.gz: 3f8afb451644f3d88e158943de7cd9c33cf84dd26724067bf5b64667d7b18064
 SHA512:
-  metadata.gz: 88948b3e2d2a34b3d153dcdbafcf054159c5b01d55ce2f6c7b4212d39cc5256a1f1b53507eec4dcc41bfe3a903e9d22f16162be492040c56f59179c025c52901
-  data.tar.gz: 786b42b9e22806b4aa3ab92d45f0706f613c1c1439e6b9dd7c06dedd4fdfcd9775bcb26732acb183e21b6ec2d176d2f81fafdad48f9a90c16b0d418209981702
+  metadata.gz: 80dd686971edcea3eeb2316ac6f3ea4e78c9e0132e66a810ff86e471a795cf377947fc8694b21923512f42158942ab968f0b808178be61a0877a96fd542de72c
+  data.tar.gz: 9b1ac1643ff555037c60ba35f0a96347aa277144f7db4c08399c6b080cdb628a9a99c1d665524013f48f2aa16763237c1521fb7135a55244ccd091c9f9e97fd8

data/.version

@@ -1 +1 @@
-0.1.3
+0.3.1

data/lib/lib/base.rb

@@ -1,23 +1,56 @@
 class Class
-  def cattr name = nil, value = nil, &block
-    return CattrProxy.new(self) unless name
-
-    if !value.nil? || block
-      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 }
+
+      unless opts.class == Hash
+        raise ArgumentError, 'Options are not a Hash'
+      end
+
+      # 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 |arg = :_nil|
+          if arg == :_nil
+            CattrProxy.new(self).send(name)
+          else
+            CattrProxy.new(self).send('%s=' % name, arg)
+          end
+        end
       end
 
-      if !value.nil?
-        CattrProxy.new(self).send('%s=' % name, value)
-      elsif block
-        CattrProxy.new(self).send(name, value, &block)
+      # 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
-      CattrProxy.new(self).send('%s=' % name, nil)
+      # Klass.cattr.foo
+
+      CattrProxy.new(self)
     end
   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.3
+  version: 0.3.1
 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