active_delegate 1.0.2 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0ff0702750360bd4c01ebc4075853ce241921ec038c864e6c3536934adfbcba
-  data.tar.gz: 3e18f2b5f05f886b1d5a25e7e2b46cc5fb511ccd90edbff242b543891512359c
+  metadata.gz: d85c2de28a990e8fb0e392262d2f0db2d63e31ddafb8a0326e33b4ab85290d5d
+  data.tar.gz: 86c12da318e53d570a90fdc7a7a0fd8d3af6612b41d161b023d0fd1f455a2f42
 SHA512:
-  metadata.gz: 81f7b9b0b20bca2831c30c1e90ed4789cfcac4501b37816eb4ff6879a78da79875d67f7a9fd90a71c4d5a977a6eec4cfe376424c10e7c04cd4d4b283dca2ddaa
-  data.tar.gz: b6bef5e43efab6fa63b8f3f95952fc2e1f3df0cdd2f4af7cefdad6e73e18edddb2b8ebd13d78130bce3b3dfb443e086f23445b48a72fb9c4eb71c9d56e2734dc
+  metadata.gz: 46c2b21fc4216a86b2fc448f1dfe3b45887765afc01b8c5150e578fd070a9f7db47a050edfb517f4d310d1748ae4967ac03bb3e720acd5d590d5fd81df90cc2b
+  data.tar.gz: 9bac2587b0324a2186d44689769345cb15f7f4e2a210bbed0e08206c1795c6e01a1ef0f9f9824c2a66d1104cef97e21733038301fc57b6ae6b325f9ca12952dc

data/lib/active_delegate/association/methods.rb

@@ -27,11 +27,11 @@ module ActiveDelegate
       end
 
       def prefixed
-        prefixes.map { |s| :"#{s}#{attribute}" }
+        prefixes.map { |s| :"#{s}#{association_name}" }
       end
 
       def suffixed
-        suffixes.map { |s| :"#{attribute}#{s}" }
+        suffixes.map { |s| :"#{association_name}#{s}" }
       end
     end
   end

data/lib/active_delegate/attribute/methods.rb

@@ -6,7 +6,9 @@ module ActiveDelegate
     class Methods
       attr_reader :attribute_name, :association_instance
 
-      def initialize(attribute_name, association_class)
+      def initialize(attribute_name, association_class, writer:, dirty:)
+        @define_writer        = writer
+        @define_dirty         = dirty
         @attribute_name       = attribute_name
         @association_instance = association_class.new
       end
@@ -26,7 +28,10 @@ module ActiveDelegate
       private
 
       def accessor_suffixes
-        ['', '=', '?']
+        suffixes = ['', '?']
+        suffixes << '=' if @define_writer
+
+        suffixes
       end
 
       def dirty_module
@@ -36,6 +41,8 @@ module ActiveDelegate
       end
 
       def dirty_suffixes
+        return [] unless @define_dirty
+
         @dirty_suffixes ||= begin
           suffixes = dirty_module.attribute_method_matchers.map(&:suffix)
           suffixes.select { |m| m.starts_with?('_') }

data/lib/active_delegate/attribute/object.rb

@@ -16,19 +16,27 @@ module ActiveDelegate
       end
 
       def define?
-        options[:define] || in_option?(:define)
+        dirty? && (in_option?(:define) || options[:define])
       end
 
       def localize?
-        options[:localized] || in_option?(:localized)
+        in_option?(:localized) || options[:localized]
+      end
+
+      def writer?
+        in_option?(:writer) || options[:writer]
+      end
+
+      def dirty?
+        writer? && (in_option?(:dirty) || options[:dirty])
       end
 
       def finder?
-        options[:finder] || in_option?(:finder)
+        in_option?(:finder) || options[:finder]
       end
 
       def scope?
-        options[:scope] || in_option?(:scope)
+        in_option?(:scope) || options[:scope]
       end
 
       def prefix
@@ -69,10 +77,13 @@ module ActiveDelegate
 
       def aliases
         return {} unless aliased?
+
         Hash[delegatable_methods.map { |m| generate_alias(m) }]
       end
 
       def localized
+        return [] unless localize?
+
         @localized ||= Localize.new(unprefixed, association_class).attributes
       end
 
@@ -80,13 +91,21 @@ module ActiveDelegate
         localized.any?
       end
 
+      def accessible_attributes
+        @accessible_attributes ||= [unprefixed].map { |a| add_prefix(a) }
+      end
+
       def delegatable_attributes
         @delegatable_attributes ||= [unprefixed, *localized].map { |a| add_prefix(a) }
       end
 
       def delegatable_methods
         @delegatable_methods ||= [unprefixed, *localized].flat_map do |method_name|
-          Methods.new(method_name, association_class).delegatable
+          methods = Methods.new(
+            method_name, association_class, writer: writer?, dirty: dirty?
+          )
+
+          methods.delegatable
         end
       end
 
@@ -97,7 +116,7 @@ module ActiveDelegate
       end
 
       def remove_prefix(attr_name)
-        attr_name.to_s.sub("#{prefix}_", '').to_sym
+        prefix.present? ? attr_name.to_s.sub("#{prefix}_", '').to_sym : attr_name
       end
 
       def generate_alias(method_name)

data/lib/active_delegate/attributes.rb

@@ -11,6 +11,8 @@ module ActiveDelegate
       {
         except:    [],
         only:      [],
+        writer:    true,
+        dirty:     true,
         localized: false,
         define:    true,
         finder:    false,
@@ -22,7 +24,7 @@ module ActiveDelegate
     end
 
     def attribute_options
-      keys = %i[cast_type default define alias localized finder scope]
+      keys = %i[cast_type default define alias writer dirty localized finder scope]
       options.select { |k, _v| k.in? keys }.merge(prefix: delegation_prefix)
     end
 
@@ -31,7 +33,11 @@ module ActiveDelegate
     end
 
     def excluded_attributes
-      excluded  = %i[id created_at updated_at]
+      excluded  = %i[created_at updated_at]
+      excluded << association_reflection.active_record_primary_key.to_sym
+
+      for_key   = association_reflection.foreign_key
+      excluded << for_key.to_sym if for_key.present?
 
       sti_col   = association_class.inheritance_column
       excluded << sti_col.to_sym if sti_col.present?
@@ -88,17 +94,24 @@ module ActiveDelegate
         default:     attribute.default
       }
 
+      redefine_reader(method_name, attr_options)
+      redefine_writer(method_name, attr_options) if attribute.writer?
+    end
+
+    def redefine_reader(method_name, attr_options)
       model.send(:redefine_method, method_name) do |*args|
         ActiveDelegate::Attribute::Accessor.new(self, attr_options).read(*args)
       end
+    end
 
+    def redefine_writer(method_name, attr_options)
       model.send(:redefine_method, :"#{method_name}=") do |value|
         ActiveDelegate::Attribute::Accessor.new(self, attr_options).write(value)
       end
     end
 
     def delegate_methods(methods)
-      model.delegate(*methods, delegation_options)
+      model.delegate(*methods, **delegation_options)
     end
 
     def define_model_method(method, *attributes)
@@ -117,7 +130,7 @@ module ActiveDelegate
     def define_attribute_methods(attribute)
       model.attribute(attribute.aliased, attribute.read_type) if attribute.define?
 
-      attribute.delegatable_attributes.each do |method_name|
+      attribute.accessible_attributes.each do |method_name|
         redefine_attribute_accessors(method_name, attribute)
       end
 

data/lib/active_delegate/delegator.rb

@@ -45,6 +45,7 @@ module ActiveDelegate
     def association_reflection
       reflection = model.reflect_on_association(association_name)
       return reflection unless reflection.nil?
+
       raise "#{model.name} don't have the association #{association_name}"
     end
 

data/lib/active_delegate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveDelegate
-  VERSION = '1.0.2'
+  VERSION = '1.0.7'
 end

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: active_delegate
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.7
 platform: ruby
 authors:
 - Jonian Guveli
-autorequire: 
-bindir: exe
+autorequire:
+bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 description: Stores and retrieves delegatable data through attributes on an ActiveRecord
   class, with support for translatable attributes.
 email:
@@ -75,7 +81,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -93,7 +98,7 @@ homepage: https://github.com/hardpixel/active-delegate
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,9 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Delegate ActiveRecord model attributes and associations
 test_files: []

data/Gemfile.lock

@@ -1,41 +0,0 @@
-PATH
-  remote: .
-  specs:
-    active_delegate (1.0.1)
-      activerecord (~> 5.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
-      arel (>= 9.0)
-    activesupport (5.2.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    concurrent-ruby (1.0.5)
-    i18n (1.1.0)
-      concurrent-ruby (~> 1.0)
-    minitest (5.10.3)
-    rake (10.5.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_delegate!
-  bundler (~> 1.14)
-  minitest (~> 5.0)
-  rake (~> 10.0)
-
-BUNDLED WITH
-   1.16.6