linker 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 211f9391f1bbcb2d22be5a502350da538c78d832
-  data.tar.gz: eaf03f9335c5fda1328ab368cf63261f5997bf50
+  metadata.gz: 6f9eb0fbcfcc447101d0f027e48f4629797cd3ac
+  data.tar.gz: efbb3242eaf1badba9f5fc47ec5f9292917fa8c8
 SHA512:
-  metadata.gz: 0bdb09982452a1638328e2f1f07e1a28fbda1208767d4efe1b8dad04981c5e95e55a06acecccb145c4a20e74556f4f048feabad251bbdd69a74be2be55f2610c
-  data.tar.gz: 6efa622c9b1ea0f6d10530946de2d09f049b6acd02c8121c928ba69fec7e9199e87f518d44c2ad55f242c17a9946bc2d224ef8fc72c75db2169ec8bb1b359bce
+  metadata.gz: 2c46308f866502dcde44718902c531cc87507e318dfa7d3ee04ce87e657f1b9b56730d504b822de2cb14d401361df387f9dae22b25ce48d3ac4dd7662fa4f1a5
+  data.tar.gz: 2684c6ed01fa6b29c0046305c2e958442d2f0524c4ea0d97e8280016b9ba5c8fc7d767160ecca4c3c7705abd450183f6a951037d8f361e56f3f6b35d63e3c135

data/.travis.yml

@@ -1,14 +1,31 @@
 language: ruby
+
 rvm:
   - 2.0.0
   - 2.1.0
   - 2.2.0
+  - 2.3.0
+
 env:
   - "RAILS_VERSION=3.1.0"
   - "RAILS_VERSION=3.2.0"
   - "RAILS_VERSION=4.0.0"
   - "RAILS_VERSION=4.1.0"
   - "RAILS_VERSION=4.2.0"
-  - "RAILS_VERSION=master"
+
+matrix:
+  include:
+    # Rails 5.x only supports 2.2+
+    - rvm: 2.3.0
+      env: RAILS_VERSION=master
+    - rvm: 2.3.0
+      env: RAILS_VERSION=5.0.0
+    - rvm: 2.2.2
+      env: RAILS_VERSION=5.0.0
+
+allow_failures:
+  - rvm: 2.3.0
+    env: RAILS_VERSION=master
+
 notifications:
-  email: false
+  email: false

data/Gemfile

@@ -9,9 +9,9 @@ rails = case rails_version
 when "master"
   {github: "rails/rails"}
 when "default"
-  "~> 4.1.5"
+  "~> 5.0.0"
 else
   "~> #{rails_version}"
 end
 
-gem "rails", rails
+gem "rails", rails

data/lib/linker/forms/attributes.rb

@@ -23,19 +23,20 @@ module Linker
     end
 
     def set_reader_for_main_model
-      #ap "criando reader for main model #{@main_model.to_s.underscore}"
       # Create attr reader for main model
       self.class.__send__(:attr_reader, @main_model.to_s.underscore)
-    end   
+    end
 
     def set_delegations
       # Delegate fields for main model
-      filter_columns(@main_model).each{|c| delegate_attr(c, @main_model.to_s.underscore) }
+      filter_columns(@main_model).each do |c|
+        delegate_attr(c, @main_model.to_s.underscore)
+      end
 
       [map_has_one_associations, map_belongs_to_associations].each do |rgroup|
         rgroup.each do |c|
           c[:columns].each do |cc|
-            #ap "delegando #{cc} e #{cc}= para #{c[:name]}__#{cc}"
+            # ap "delegating #{cc} and #{cc}= for #{c[:name]}__#{cc}"
             self.class.__send__(:delegate, cc, "#{cc}=", to: c[:name].underscore.to_sym, prefix: "#{c[:name]}_")
           end
         end
@@ -43,104 +44,105 @@ module Linker
     end
 
     private
-      def get_has_many_associations
-        @hm_assoc ||= @main_model.reflect_on_all_associations(:has_many)
-      end
 
-      def get_has_one_associations
-        @ho_assoc ||= @main_model.reflect_on_all_associations(:has_one)
-      end
+    def get_has_many_associations
+      @hm_assoc ||= @main_model.reflect_on_all_associations(:has_many)
+    end
 
-      def get_belongs_to_associations
-        @bt_assoc ||= @main_model.reflect_on_all_associations(:belongs_to)
-      end
+    def get_has_one_associations
+      @ho_assoc ||= @main_model.reflect_on_all_associations(:has_one)
+    end
 
-      def filter_columns model
-        f = model.columns.map(&:name)
-                         .delete_if{|cn| USELESS_COLUMNS_REGEX.match(cn) }
-        # Get Paperclip attachments
-        begin
-          f = Paperclip::AttachmentRegistry.names_for(model).inject(f) do |t, c|
-            t << c.to_s
-          end
-        rescue
+    def get_belongs_to_associations
+      @bt_assoc ||= @main_model.reflect_on_all_associations(:belongs_to)
+    end
+
+    def filter_columns(model)
+      f = model.columns.map(&:name)
+                       .delete_if{ |cn| USELESS_COLUMNS_REGEX.match(cn) }
+      # Get Paperclip attachments
+      begin
+        f = Paperclip::AttachmentRegistry.names_for(model).inject(f) do |t, c|
+          t << c.to_s
         end
-        f
+      rescue
       end
+      f
+    end
 
-      def delegate_attr att, class_to
-        #ap "delegando #{att} e #{att}= para #{class_to.underscore.pluralize.to_sym}"
-        self.class.__send__(:delegate, att, "#{att}=", to: class_to.underscore.to_sym)
-      end
+    def delegate_attr(att, class_to)
+      # ap "delegating #{att} and #{att}= for #{class_to.underscore.pluralize.to_sym}"
+      self.class.__send__(:delegate, att, "#{att}=", to: class_to.underscore.to_sym)
+    end
 
-      # Create required methods to use `fields_for`
-      def set_fields_for_methods assoc_set, singular = false
-        assoc_set.each do |c|
-          #ap "criando método #{c[:name]}"
-          self.class.send(:define_method, c[:name]) do
-            assocs = instance_variable_get("@#{get_main_model.to_s.underscore}")
-            .send(c[:name])
-
-            neww = singular ? c[:klass].constantize.new : [c[:klass].constantize.new] * 2
-
-            if singular
-              (assocs.present? && assocs) || neww
-            else
-              (assocs.map{|c| c}.present? && assocs.map{|c| c}) || neww
-            end
-          end
+    # Create required methods to use `fields_for`
+    def set_fields_for_methods(assoc_set, singular = false)
+      assoc_set.each do |c|
+        # ap "creating method #{c[:name]}"
+        self.class.send(:define_method, c[:name]) do
+          assocs = instance_variable_get("@#{get_main_model.to_s.underscore}")
+          .send(c[:name])
 
-          #ap "criando método #{c[:name]}_attributes="
-          self.class.send(:define_method, "#{c[:name]}_attributes=") do |attributes|
-          end
-        end
-      end
+          neww = singular ? c[:klass].constantize.new : [c[:klass].constantize.new] * 2
 
-      def set_non_fields_for_methods assoc_set
-        assoc_set.each do |c|
-          #ap "criando método #{c[:name]}_list"
-          self.class.send(:define_method, "#{c[:name]}_list") do
-            assoc = instance_variable_get("@#{get_main_model.to_s.underscore}")
-                    .send(c[:name])
-            assoc.present? && assoc.id || nil
+          if singular
+            (assocs.present? && assocs) || neww
+          else
+            (assocs.map { |c| c }.present? && assocs.map { |c| c }) || neww
           end
         end
-      end
 
-      def set_remove_accessor assoc_set
-        assoc_set.each do |c|
-          #ap "Criando attr_accessor :_remove para #{c[:klass]}"
-          c[:klass].constantize.class_eval{ attr_accessor :_remove }
+        # ap "creating method #{c[:name]}_attributes="
+        self.class.send(:define_method, "#{c[:name]}_attributes=") do |attributes|
         end
       end
+    end
 
-      def map_associations assoc
-        assoc.inject([]) do |t, c| 
-          t << {
-            name: c.name.to_s, 
-            klass: c.klass.name,
-            # delete_if remove useless attrs
-            columns:       filter_columns(c.klass)
-          }
+    def set_non_fields_for_methods(assoc_set)
+      assoc_set.each do |c|
+        # ap "creating method #{c[:name]}_list"
+        self.class.send(:define_method, "#{c[:name]}_list") do
+          assoc = instance_variable_get("@#{get_main_model.to_s.underscore}")
+                  .send(c[:name])
+          assoc.present? && assoc.id || nil
         end
       end
+    end
 
-      def map_has_many_associations
-        # Create an array with associated classes names and attrs
-        @mapped_hm_assoc ||= map_associations(get_has_many_associations)
-        @mapped_hm_assoc
+    def set_remove_accessor(assoc_set)
+      assoc_set.each do |c|
+        # ap "creating attr_accessor :_remove para #{c[:klass]}"
+        c[:klass].constantize.class_eval { attr_accessor :_remove }
       end
+    end
 
-      def map_belongs_to_associations
-        # Create an array with associated classes names and attrs
-        @mapped_bt_assoc ||= map_associations(get_belongs_to_associations)
-        @mapped_bt_assoc
+    def map_associations(assoc)
+      assoc.inject([]) do |t, c|
+        t << {
+          name: c.name.to_s,
+          klass: c.klass.name,
+          # delete_if remove useless attrs
+          columns: filter_columns(c.klass)
+        }
       end
+    end
 
-      def map_has_one_associations
-        # Create an array with associated classes names and attrs
-        @mapped_ho_assoc ||= map_associations(get_has_one_associations)
-        @mapped_ho_assoc
-      end
+    def map_has_many_associations
+      # Create an array with associated classes names and attrs
+      @mapped_hm_assoc ||= map_associations(get_has_many_associations)
+      @mapped_hm_assoc
+    end
+
+    def map_belongs_to_associations
+      # Create an array with associated classes names and attrs
+      @mapped_bt_assoc ||= map_associations(get_belongs_to_associations)
+      @mapped_bt_assoc
+    end
+
+    def map_has_one_associations
+      # Create an array with associated classes names and attrs
+      @mapped_ho_assoc ||= map_associations(get_has_one_associations)
+      @mapped_ho_assoc
+    end
   end
-end
+end

data/lib/linker/forms/configuration_methods.rb

@@ -1,9 +1,9 @@
 module Linker
   module ConfigurationMethods
     extend ActiveSupport::Concern
-    
+
     module ClassMethods
-      def main_model main_model
+      def main_model(main_model)
         @main_model = main_model.to_s.camelize
       end
 
@@ -19,6 +19,5 @@ module Linker
         include ActiveModel::Validations
       end
     end
-
   end
-end
+end

data/lib/linker/forms/params.rb

@@ -5,13 +5,13 @@ module Linker
     extend ActiveSupport::Concern
 
     included do
-      def params= params
+      def params=(params)
         before_set_params(params)
         params.each do |param, value|
           if value.is_a?(Hash)
             table = param.gsub(%r{_attributes$}, '')
             # belongs_to attrs
-            if map_belongs_to_associations.select{|c| c[:name] == table}.present?
+            if map_belongs_to_associations.select { |c| c[:name] == table }.present?
               if value['id'].present?
                 _get_main_model.send(table).update_attributes(value)
               else
@@ -28,12 +28,12 @@ module Linker
 
             # has_many attrs
             else
-              ids_to_remove = value.map{|c| c.last['id'] if c.last['id'].present? && c.last.key?('_remove') && c.last['_remove'] == '1' }.compact
+              ids_to_remove = value.map { |c| c.last['id'] if c.last['id'].present? && c.last.key?('_remove') && c.last['_remove'] == '1' }.compact
 
               if ids_to_remove.present?
                 r = search_has_many(table)
                 r[:klass].constantize.send(:where, ["#{r[:klass].constantize.table_name}.id IN (?)", ids_to_remove]).destroy_all
-                value.delete_if{|i, c| ids_to_remove.include?(c['id']) }
+                value.delete_if { |i, c| ids_to_remove.include?(c['id']) }
               end
 
               value.each do |c|
@@ -63,26 +63,28 @@ module Linker
       # @param validate [boolean] a boolean declaring if the form class must be validated.
       # @return [boolean] a boolean representing if the form class was validated (or no, if `validate` is `false`) and
       # saved successfully
-      def save validate: true
-        main_model = _get_main_model
-       
-        valid = true
-        if validate
-          valid = self.valid?
-          if valid
+      def save(validate: true)
+        ActiveRecord::Base.transaction do
+          main_model = _get_main_model
+
+          valid = true
+          if validate
+            valid = self.valid?
+            if valid
+              before_save
+              save = main_model.save
+              after_save
+            end
+          else
             before_save
             save = main_model.save
             after_save
           end
-        else
-          before_save
-          save = main_model.save
-          after_save
+          valid && save
         end
-        valid && save
       end
 
-      def before_set_params params
+      def before_set_params(params)
       end
 
       def before_save
@@ -90,22 +92,22 @@ module Linker
 
       def after_save
       end
-
     end
 
     private
-      def _get_main_model
-        main_model ||= self.send(self.class._main_model.underscore)
-      end
 
-      def search_has_one name
-        s = @mapped_ho_assoc.detect{|c| c[:name] == name}
-        s.present? && s
-      end
+    def _get_main_model
+      main_model ||= self.send(self.class._main_model.underscore)
+    end
 
-      def search_has_many name
-        s = @mapped_hm_assoc.detect{|c| c[:name] == name}
-        s.present? && s
-      end
+    def search_has_one(name)
+      s = @mapped_ho_assoc.detect { |c| c[:name] == name }
+      s.present? && s
+    end
+
+    def search_has_many(name)
+      s = @mapped_hm_assoc.detect { |c| c[:name] == name }
+      s.present? && s
+    end
   end
-end
+end

data/lib/linker/version.rb

@@ -1,3 +1,3 @@
 module Linker
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/linker.rb

@@ -3,12 +3,12 @@ require 'active_support/all'
 require 'linker/forms/attributes'
 require 'linker/forms/params'
 
-module Linker 
+module Linker
   extend ActiveSupport::Concern
   include Linker::Attributes
   include Linker::Params
 
-  def initialize main_model_instance = self.class._main_model.constantize.send(:new)
+  def initialize(main_model_instance = self.class._main_model.constantize.send(:new))
     # Creating instance variable for main model
     instance_variable_set("@#{main_model_instance.class.name.underscore}", main_model_instance)
 
@@ -25,4 +25,4 @@ module Linker
       instance_variable_get("@#{self.class._main_model.underscore}")
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linker
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Glauco Custódio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A wrapper to form objects in ActiveRecord. Forget accepts_nested_attributes_for.
@@ -193,4 +193,3 @@ test_files:
 - spec/fake_app/rails_app.rb
 - spec/spec_helper.rb
 - spec/users_form_spec.rb
-has_rdoc: