active_delegate 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f95ea0f40afa5aabed0b3e54e3b064e764626dc
-  data.tar.gz: d3976e39af3730289c55028b76d5f229b50fc4ec
+  metadata.gz: 9257eb3266aac4668738613ec5fee51d5bd64fbd
+  data.tar.gz: d31d564366686047837729288ef8e61d1d68b609
 SHA512:
-  metadata.gz: fc09a5f81b8a25ccd6123fd8b886272cab05b63edb456765afb5ecef04c1b73a83c2bf9300c06a4f83fdedae40048380fe016df659c86aa146d2f0905fc8d462
-  data.tar.gz: 22c2241231587b30d7eb2614f4bb672fe1935a7ca437ecaaa4e9ee42d5ac8621cc0a8dfeff5e873af6950b4ace563993b80d17a66061cce5eb3161b98fc9de7c
+  metadata.gz: 5d080e28edc7ddea35d0985bd401dbe5b7c3eb096638bd63761b6384b71994db51346ca9724de857cd257e4515e359af7d8bd30f8a88f8389263b52b371ac244
+  data.tar.gz: 939e98b59a2b65954c7c467c925e5820fd29e99c870f2f2c903b219d468b3c46d1f924bc0ca4e4fd4e062ed83c609003034dd7bdc9c0612b3859d9cb1a746b19

data/Gemfile.lock

@@ -2,38 +2,12 @@ PATH
   remote: .
   specs:
     active_delegate (0.1.1)
+      activerecord (~> 5.0)
       i18n (~> 0.8)
-      rails (~> 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.1)
-      actionpack (= 5.1.1)
-      nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.1.1)
-      actionview (= 5.1.1)
-      activesupport (= 5.1.1)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.1)
-      activesupport (= 5.1.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.1)
-      activesupport (= 5.1.1)
-      globalid (>= 0.3.6)
     activemodel (5.1.1)
       activesupport (= 5.1.1)
     activerecord (5.1.1)
@@ -46,66 +20,13 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (8.0.0)
-    builder (3.2.3)
     concurrent-ruby (1.0.5)
-    erubi (1.6.0)
-    globalid (0.4.0)
-      activesupport (>= 4.2.0)
-    i18n (0.8.1)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.5)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
+    i18n (0.8.4)
     minitest (5.10.2)
-    nio4r (2.1.0)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
-    rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.1.1)
-      actioncable (= 5.1.1)
-      actionmailer (= 5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
-      activemodel (= 5.1.1)
-      activerecord (= 5.1.1)
-      activesupport (= 5.1.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.1.1)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.1)
-      actionpack (= 5.1.1)
-      activesupport (= 5.1.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (0.19.4)
     thread_safe (0.3.6)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -3,6 +3,7 @@
 Stores and retrieves delegatable data through attributes on a ActiveRecord class, with support for translatable attributes.
 
 [![Gem Version](https://badge.fury.io/rb/active_delegate.svg)](https://badge.fury.io/rb/active_delegate)
+[![Build Status](https://travis-ci.org/hardpixel/active-delegate.svg?branch=master)](https://travis-ci.org/hardpixel/active-delegate)
 [![Code Climate](https://codeclimate.com/github/hardpixel/active-delegate/badges/gpa.png)](https://codeclimate.com/github/hardpixel/active-delegate)
 
 ## Installation
@@ -37,16 +38,29 @@ class Person < ActiveRecord::Base
   has_one    :user
   has_many   :books
 
-  delegate_attributes to: :address, prefix: true
+  delegate_attributes to: :address, prefix: true, localized: true
 end
 
-person = Person.new(name: "John", email: 'john@mail.com', address_city: 'Athens', address_district: 'Attiki')
-
-person.name             # 'John'
-person.address_city     # 'Athens'
-person.address.city     # 'Athens'
-person.address_district # 'Attiki'
-person.address.district # 'Attiki'
+params = {
+  name:                'John',
+  email:               'john@mail.com',
+  address_city:        'Athens',
+  address_city_el:     'Αθήνα',
+  address_district:    'Attiki',
+  address_district_el: 'Αττική'
+}
+
+person = Person.new(params)
+
+person.name                # 'John'
+person.address_city        # 'Athens'
+person.address.city        # 'Athens'
+person.address_city_el     # 'Αθήνα'
+person.address.city_el     # 'Αθήνα'
+person.address_district    # 'Attiki'
+person.address.district    # 'Attiki'
+person.address_district_el # 'Αττική'
+person.address.district_el # 'Αττική'
 
 class User < ActiveRecord::Base
   # columns: :login, :password, :person_id
@@ -59,7 +73,14 @@ class User < ActiveRecord::Base
   delegate_attributes   to: :person
 end
 
-user = User.new(login: 'jonian', password: 'passwd', name: "John", email: 'john@mail.com')
+params = {
+  login:    'jonian',
+  password: 'passwd',
+  name:     'John',
+  email:    'john@mail.com'
+}
+
+user = User.new(params)
 
 user.name           # 'John'
 user.login          # 'jonian'

data/lib/active_delegate/attributes.rb

@@ -48,11 +48,18 @@ module ActiveDelegate
         [:id, :created_at, :updated_at] + poly_attr.to_a
       end
 
+      # Get method attributes
+      def association_valid_methods(attributes)
+        assoc_methods = association_class.public_instance_methods
+        attributes.to_a.select { |a| a.in? assoc_methods }
+      end
+
       # Get delegatable attributes
       def delegatable_attributes
         attributes = association_attribute_names.map(&:to_sym)
         attributes = attributes & @options[:only].to_a   if @options[:only].present?
         attributes = attributes - @options[:except].to_a if @options[:except].present?
+        attributes = attributes + association_valid_methods(@options[:only])
         attributes = attributes - default_excluded_attributes
 
         attributes.map(&:to_sym)
@@ -84,12 +91,12 @@ module ActiveDelegate
 
       # Redefine build association method
       def redefine_build_association
-        association_name = @options[:to]
+        assoc_name = @options[:to]
 
         @model.class_eval do
           class_eval <<-EOM, __FILE__, __LINE__ + 1
-            def #{association_name}
-              super || send(:build_#{association_name})
+            def #{assoc_name}
+              super || send(:build_#{assoc_name})
             end
           EOM
         end
@@ -109,8 +116,9 @@ module ActiveDelegate
 
       # Save delagated attributes in model class
       def save_delegated_attributes
-        delegated = prefix_attributes(delegatable_attributes)
         dl_method = :"#{@options[:to]}_attribute_names"
+        delegated = prefix_attributes(delegatable_attributes)
+        delegated = @model.try(dl_method).to_a.concat(delegated)
 
         @model.send(:define_singleton_method, dl_method) { delegated }
 

data/lib/active_delegate/version.rb

@@ -1,3 +1,3 @@
 module ActiveDelegate
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/active_delegate.rb

@@ -4,6 +4,8 @@ module ActiveDelegate
   autoload :Associations, 'active_delegate/associations'
   autoload :Attributes,   'active_delegate/attributes'
 
+  require "active_record"
+
   class << self
     def included(model_class)
       model_class.extend self

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: active_delegate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Delegate ActiveRecord model attributes and associations