active_delegate 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e17b460409a616aa13bb2a37fedc9bc4fb136d0
-  data.tar.gz: b7b928163141d0c4f4acb49eab1b4c5deaf07738
+  metadata.gz: 59b7e693e22c66982f05158ef1df7ac3a1f5f1f2
+  data.tar.gz: 198ecbb8547fe818fea48ddf07eb1ca5fdb879ea
 SHA512:
-  metadata.gz: 6dd676d93994f9d99f12b20e6b5454a6423af734a89c4f2b5350e733eb75cf759d49c5c540f8c169bbc44596f5cf7786664cf5dd47cc8ea2aa46c546a6211e06
-  data.tar.gz: 7648081d154bd45b0ba836d9a2777a9e44ee0e73952f838555ba62c5557f87a58feb7918e55901e66857c1e46e1e2883487bd86b8b5eb5b6ff3c2d32855a9664
+  metadata.gz: 168cede4634ec480bab04354409d72f6306cceccfb27ad5c18e6a51ea686d3e308da13a81572540cb461ab4735e73c46124f4f10d217d094f1d1707edbd3b7ff
+  data.tar.gz: e71530500911af1ac072a82c4e0d29feb0e03a76ef0f23dfcd0b5ac9ec6a7ad79e1bd5286da0c29e41b4e4b9eeb6168b32d7bd07fb4e142fbe5aa85e81b20e66

data/Gemfile.lock

@@ -1,29 +1,28 @@
 PATH
   remote: .
   specs:
-    active_delegate (0.1.2)
+    active_delegate (0.1.1)
       activerecord (~> 5.0)
       i18n (~> 0.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activerecord (5.1.4)
-      activemodel (= 5.1.4)
-      activesupport (= 5.1.4)
+    activemodel (5.1.1)
+      activesupport (= 5.1.1)
+    activerecord (5.1.1)
+      activemodel (= 5.1.1)
+      activesupport (= 5.1.1)
       arel (~> 8.0)
-    activesupport (5.1.4)
+    activesupport (5.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (8.0.0)
     concurrent-ruby (1.0.5)
-    i18n (0.9.0)
-      concurrent-ruby (~> 1.0)
-    minitest (5.10.3)
+    i18n (0.8.4)
+    minitest (5.10.2)
     rake (10.5.0)
     thread_safe (0.3.6)
     tzinfo (1.2.3)
@@ -39,4 +38,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.15.4
+   1.14.6

data/lib/active_delegate/attributes.rb

@@ -18,7 +18,7 @@ module ActiveDelegate
 
       # Get default options
       def default_options
-        { except: [], only: [], allow_nil: false, to: [], prefix: nil, localized: false }
+        { except: [], only: [], allow_nil: false, to: [], prefix: nil, localized: false, finder: false, scope: false }
       end
 
       # Get association reflection
@@ -135,14 +135,83 @@ module ActiveDelegate
         undefined = attributes.reject { |a| a.in? existing }
 
         undefined.each do |attrib|
-          attr_name = attrib.to_s.sub("#{attribute_prefix}_", '')
-          cast_type = @options[:cast_type] || association_class.attribute_types["#{attr_name}"]
+          attr_name    = attrib.to_s.sub("#{attribute_prefix}_", '')
+          cast_type    = @options[:cast_type] || association_class.attribute_types["#{attr_name}"]
+          attr_alias   = @options[:alias]
+          attr_default = @options[:default] || association_class.column_defaults["#{attr_name}"]
+          attr_finder  = @options[:finder] || Array(@options[:finder]).include?(attr_name)
+          attr_scope   = @options[:scope] || Array(@options[:scope]).include?(attr_name)
 
           @model.attribute(attrib, cast_type)
 
-          if @options[:alias].present?
-            @model.attribute(@options[:alias], cast_type)
-            @model.alias_attribute(@options[:alias], attrib)
+          define_attribute_default_value(attrib, attr_name, attr_default) unless attr_default.nil?
+          define_attribute_alias_method(attrib, attr_alias, cast_type) unless attr_alias.nil?
+          define_attribute_finder_methods(attr_alias || attrib, attr_name) if attr_finder == true
+          define_attribute_scope_methods(attr_alias || attrib, attr_name) if attr_scope == true
+        end
+      end
+
+      # Define delegated attribute default
+      def define_attribute_default_value(attrib, attr_name, attr_default)
+        attr_assoc = @options[:to]
+        attr_cattr = :"_attribute_#{attrib}_default"
+
+        @model.send(:define_singleton_method, attr_cattr) { attr_default }
+
+        @model.class_eval do
+          class_eval <<-EOM, __FILE__, __LINE__ + 1
+            def #{attrib}
+              send(:#{attr_assoc}).try(:#{attr_name}) || self.class.send(:#{attr_cattr})
+            end
+          EOM
+        end
+      end
+
+      # Define delegated attribute alias
+      def define_attribute_alias_method(attrib, attr_alias, cast_type)
+        @model.attribute(attr_alias, cast_type)
+        @model.alias_attribute(attr_alias, attrib)
+      end
+
+      # Define attribute finder methods
+      def define_attribute_finder_methods(attrib, attr_name)
+        attr_assoc  = @options[:to]
+        attr_table  = association_reflection.klass.table_name
+        attr_method = :"find_by_#{attrib}"
+
+        @model.send(:define_singleton_method, attr_method) do |value|
+          includes(attr_assoc).find_by(attr_table => { attr_name => value })
+        end
+
+        @model.send(:define_singleton_method, :"#{attr_method}!") do |value|
+          includes(attr_assoc).find_by!(attr_table => { attr_name => value })
+        end
+      end
+
+      # Define attribute scope methods
+      def define_attribute_scope_methods(attrib, attr_name)
+        attr_assoc = @options[:to]
+        attr_table = association_reflection.klass.table_name
+        attr_blank = { attr_table => { attr_name => nil } }
+
+        @model.scope :"with_#{attrib}", -> (*names) do
+          named = { attr_table => { attr_name => names } }
+
+          if names.empty?
+            includes(attr_assoc).where.not(attr_blank)
+          else
+            includes(attr_assoc).where(named)
+          end
+        end
+
+        @model.scope :"without_#{attrib}", -> (*names) do
+          named = { attr_table => { attr_name => names } }
+
+          if names.empty?
+            includes(attr_assoc).where(attr_blank)
+          else
+            includes(attr_assoc).where(attr_blank)
+            .or(includes(attr_assoc).where.not(named))
           end
         end
       end

data/lib/active_delegate/version.rb

@@ -1,3 +1,3 @@
 module ActiveDelegate
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_delegate
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-12 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord