linker 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2ed1e6ea0a1cbeb8e9a03be501ebd955520c170
-  data.tar.gz: 96e64ebd76d12627a1b7cdb9ed6b6a9f9c4e0397
+  metadata.gz: bcc18fea535a80a29996d4cc6ae5b80336032844
+  data.tar.gz: 73535617eb9909c44eb49867be0038cd6f3cfb5e
 SHA512:
-  metadata.gz: 5023b6abca89663ca60e77d67e78c8ec2d90d618ea2fff75b4f024285e8bba6eba5779f25cb28d1571c38d175aa2336ef1d9321ffbb860d27d698ce89f49991e
-  data.tar.gz: 0550fa1b92021d00cc446ffd72dcc15ddf6b022eff5de7d569371999bdfade9552ed88140483ddde0e60174bb1980de8f077a65c0bece3b68da8d083a86e2f91
+  metadata.gz: 976e4b2e0cbcdd89f7f7426c60b75276dc687e3bdf9a634383eefa61f98cea2d9816355013a8806fbe510331046bbad8cbceafbfc9c2f2c5ce345586d9036e7b
+  data.tar.gz: 3e127b05c15cf6d8c0851aa0ea60fc39620d25c19937ed65906fb0b7e8f247af0cca3a57eba1d81c5459017a2f600a09397832e80bfcb2c94b7f72ed5fa1621c

data/README.md

@@ -37,20 +37,20 @@ class User < ActiveRecord::Base
 end
 ```
 
-Create a form class, include Linker and set main model:
+Create a form class through `rails g form whatever` or manually (it should include Linker and have main model set like below).
 ```ruby
-class UsersForm
+class UserForm
   include Linker
   
   main_model User # or :user or 'User'
 end
 ```
 
-Now you can create a new form for existing user `UsersForm.new(User.find params[:id])` or to a new one `UsersForm.new(User.new)`:
+Now you can create a new form for existing user `UserForm.new(User.find params[:id])` or to a new one `UserForm.new(User.new)`:
 ```ruby
 class UsersController < ApplicationController
   def new
-    @user_form = UsersForm.new(User.new)
+    @user_form = UserForm.new(User.new)
   end
 
   def create

data/lib/generators/rails/form_generator.rb

@@ -0,0 +1,24 @@
+module Rails
+  module Generators
+    class FormGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path('../templates', __FILE__)
+
+      desc <<DESC
+Description:
+    Stubs out a form class in app/forms directory.
+
+Examples:
+    `rails g form user`
+
+    This creates:
+        app/forms/user_form.rb
+DESC
+
+      def create_form_file
+        template 'form.rb', File.join('app/forms', "#{singular_name}_form.rb")
+      end
+
+      hook_for :test_framework
+    end
+  end
+end

data/lib/generators/rails/templates/form.rb

@@ -0,0 +1,5 @@
+class <%= class_name %>Form
+  include Linker
+  
+  main_model <%= class_name.singularize.camelize %>
+end

data/lib/generators/rspec/form_generator.rb

@@ -0,0 +1,9 @@
+module Rspec
+  class FormGenerator < ::Rails::Generators::NamedBase
+    source_root File.expand_path('../templates', __FILE__)
+
+    def create_spec_file
+      template 'form_spec.rb', File.join('spec/forms', "#{singular_name}_form_spec.rb")
+    end
+  end
+end

data/lib/generators/rspec/templates/form_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe <%= singular_name.camelize %>Form do
+end

data/lib/generators/test_unit/form_generator.rb

@@ -0,0 +1,9 @@
+module TestUnit
+  class FormGenerator < ::Rails::Generators::NamedBase
+    source_root File.expand_path('../templates', __FILE__)
+
+    def create_test_file
+      template 'form_test.rb', File.join('test/forms', "#{singular_name}_form_test.rb")
+    end
+  end
+end

data/lib/generators/test_unit/templates/form_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class <%= singular_name.camelize %>FormTest < ActiveSupport::TestCase
+end

data/lib/linker/forms/attributes.rb

@@ -65,12 +65,10 @@ module Linker
       # Create required methods to use `fields_for`
       def set_fields_for_methods assoc_set, singular = false
         assoc_set.each do |c|
-          method_prefix = singular ? c[:tablelized_klass].singularize : c[:tablelized_klass]
-
-          #ap "criando método #{method_prefix}"
-          self.class.send(:define_method, method_prefix) do
+          #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(method_prefix)
+            .send(c[:name])
 
             neww = singular ? c[:klass].constantize.new : [c[:klass].constantize.new] * 2
 
@@ -81,8 +79,8 @@ module Linker
             end
           end
 
-          #ap "criando método #{method_prefix}_attributes="
-          self.class.send(:define_method, "#{method_prefix}_attributes=") do |attributes|
+          #ap "criando método #{c[:name]}_attributes="
+          self.class.send(:define_method, "#{c[:name]}_attributes=") do |attributes|
           end
         end
       end
@@ -90,8 +88,8 @@ module Linker
       def map_associations assoc
         assoc.inject([]) do |t, c| 
           t << {
-            klass:         c.klass.name, 
-            tablelized_klass: c.klass.name.pluralize.underscore,
+            name: c.name.to_s, 
+            klass: c.klass.name,
             # delete_if remove useless attrs
             columns:       filter_columns(c.klass)
           }

data/lib/linker/forms/params.rb

@@ -8,7 +8,7 @@ module Linker
       def params= params
         # Delete all associated objects if there is nothing in params
         @mapped_hm_assoc.each do |c|
-          _get_main_model.send(c[:tablelized_klass]).destroy_all if !params.key?("#{c[:tablelized_klass]}_attributes")
+          _get_main_model.send(c[:name]).destroy_all if !params.key?("#{c[:name]}_attributes")
         end
 
         params.each do |param, value|
@@ -16,7 +16,7 @@ module Linker
 
           if value.is_a?(Hash)
             # belongs_to attrs
-            if map_belongs_to_associations.select{|c| c[:klass] == table.singularize.camelize}.present?
+            if map_belongs_to_associations.select{|c| c[:name] == table.singularize}.present?
               if value['id'].present?
                 _get_main_model.send(table).update_attributes(value)
               else
@@ -24,23 +24,23 @@ module Linker
               end
 
             # has_one attrs
-            elsif map_has_one_associations.select{|c| c[:klass] == table.camelize}.present?
+            elsif map_has_one_associations.select{|c| c[:name] == table}.present?
               if value['id'].present?
                 _get_main_model.send(table).update_attributes(value)
               else
-                _get_main_model.send("#{table}=", table.camelize.constantize.new(value))
+                _get_main_model.send("build_#{table}", value)
               end
 
             # has_many attrs
             else
               ids = value.map.with_index{|c,i| c.last['id'].present? ? c.last['id'] : nil }.compact
-              _get_main_model.send(table).where(["#{table}.id NOT IN (?)", ids]).destroy_all if ids.present?
+              _get_main_model.send(table).where(["#{_get_main_model.send(table).table.name}.id NOT IN (?)", ids]).destroy_all if ids.present?
 
               value.each do |c|
                 if c.last['id'].present?
                   _get_main_model.send(table).find(c.last['id']).update_attributes(c.last)
                 else
-                  _get_main_model.send(table) << table.singularize.camelize.constantize.new(c.last)
+                  _get_main_model.send(table).send(:build, c.last)
                 end
               end
             end

data/lib/linker/version.rb

@@ -1,3 +1,3 @@
 module Linker
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/fake_app/active_record/models.rb

@@ -1,11 +1,12 @@
 class User < ActiveRecord::Base
   belongs_to :company
-  belongs_to :family
+  belongs_to :my_family, class_name: 'Family'
 
   has_one :address, dependent: :destroy
+  has_one :little_pet, class_name: 'Pet'
 
   has_many :dependent_users, dependent: :destroy
-  has_many :tasks, dependent: :destroy
+  has_many :my_tasks, dependent: :destroy, class_name: 'Task'
 
   #has_attached_file :avatar, :styles => { :medium => "300x300>", :thumb => "100x100>" }, :default_url => "/images/:style/missing.png"
   #validates_attachment_content_type :avatar, :content_type => /\Aimage\/.*\Z/
@@ -14,6 +15,9 @@ end
 class Address < ActiveRecord::Base
 end
 
+class Pet < ActiveRecord::Base
+end
+
 class Company < ActiveRecord::Base
   has_many :users
 end
@@ -35,7 +39,7 @@ class CreateAllTables < ActiveRecord::Migration
     create_table :users do |t|
       t.string :name
       t.references :company, index: true
-      t.references :family, index: true
+      t.references :my_family, index: true
 
       t.timestamps
     end
@@ -76,6 +80,14 @@ class CreateAllTables < ActiveRecord::Migration
       
       t.timestamps
     end
+
+    create_table :pets do |t|
+      t.string :name
+
+      t.references :user, index: true
+      
+      t.timestamps
+    end
   end
 end
 ActiveRecord::Migration.verbose = false
@@ -83,5 +95,6 @@ CreateAllTables.up
 
 # seed
 bar = User.create(name: 'Bar')
-bar.tasks << Task.create(name: 'Task 1')
+bar.my_tasks << Task.create(name: 'Task 1')
+bar.little_pet = Pet.create(name: 'Stuart')
 bar.dependent_users << DependentUser.create(name: 'John', date_birth: Date.new(1990, 2, 1))

data/spec/users_form_spec.rb

@@ -27,21 +27,25 @@ describe UsersForm do
   subject(:dependent_users_sample) { users_form.dependent_users.sample }
   it { expect(dependent_users_sample).to be_an(DependentUser) }
 
-  it { expect(users_form).to respond_to(:tasks, :tasks_attributes=) }
-  it { expect(users_form.tasks).to be_an(Array) }
-  subject(:tasks_sample) { users_form.tasks.sample }
+  it { expect(users_form).to respond_to(:my_tasks, :my_tasks_attributes=) }
+  it { expect(users_form.my_tasks).to be_an(Array) }
+  subject(:tasks_sample) { users_form.my_tasks.sample }
   it { expect(tasks_sample).to be_an(Task) }
 
   it { expect(users_form).to respond_to(:address, :address_attributes=) }
   subject(:address) { users_form.address }
   it { expect(address).to be_an(Address) }
 
+  it { expect(users_form).to respond_to(:little_pet, :little_pet_attributes=) }
+  subject(:pet) { users_form.little_pet }
+  it { expect(pet).to be_an(Pet) }
+
   it { expect(users_form).to respond_to(:company, :company_attributes=) }
   subject(:company) { users_form.company }
   it { expect(company).to be_an(Company) }
 
-  it { expect(users_form).to respond_to(:family, :family_attributes=) }
-  subject(:family) { users_form.family }
+  it { expect(users_form).to respond_to(:my_family, :my_family_attributes=) }
+  subject(:family) { users_form.my_family }
   it { expect(family).to be_an(Family) }
 
   context 'new' do
@@ -60,6 +64,8 @@ describe UsersForm do
 
     it { expect(address.persisted?).to eq(false) }  
 
+    it { expect(pet.persisted?).to eq(false) }  
+
     it { expect(company.persisted?).to eq(false) }  
 
     it { expect(family.persisted?).to eq(false) }  
@@ -70,9 +76,10 @@ describe UsersForm do
       users_form.params = {
         'name'                       => "Foo",
         'company_attributes'         => {'id' => '', 'name' => 'My Company', 'website' => 'mycompany.com'},
-        'family_attributes'          => {'id' => '', 'last_name' => 'Milan'},
+        'my_family_attributes'       => {'id' => '', 'last_name' => 'Milan'},
         'address_attributes'         => {'id' => '', 'street' => '', 'district' => ''},
-        'tasks_attributes'           => {'0' => {'id' => '', 'name' => 'T1'}, '1' => {'id' => '', 'name' => 'T2'}},
+        'little_pet_attributes'      => {'id' => '', 'name' => 'Stuart'},
+        'my_tasks_attributes'        => {'0' => {'id' => '', 'name' => 'T1'}, '1' => {'id' => '', 'name' => 'T2'}},
         'dependent_users_attributes' => {'0' => {'id' => '', 'name' => '', 'date_birth' => ''}, '1' => {'id' => '', 'name' => '', 'date_birth' => ''}}
       }
       users_form.save
@@ -82,23 +89,29 @@ describe UsersForm do
     it { expect(user.persisted?).to eq(true) }
     it { expect(user.name).to eq('Foo') }
 
+    subject(:user_tasks) { user.my_tasks }
     it { expect(tasks_sample.persisted?).to eq(true) }
-    it { expect(users_form.tasks.first.id).to eq(user.tasks.first.id) }
-    it { expect(user.tasks.first.name).to eq('T1') }
-    it { expect(user.tasks.last.name).to eq('T2') }
+    it { expect(users_form.my_tasks.first.id).to eq(user.my_tasks.first.id) }
+    it { expect(user_tasks.first.name).to eq('T1') }
+    it { expect(user_tasks.last.name).to eq('T2') }
 
     it { expect(dependent_users_sample.persisted?).to eq(true) }
     it { expect(dependent_users_sample.name).to eq('') }
     
+    it { expect(pet).to be_a(Pet)}
+    it { expect(pet.persisted?).to be(true)}
+    it { expect(pet.updated_at).to eq(pet.created_at)}
+    it { expect(pet.name).to eq('Stuart')}
+
     subject(:user_company) { user.company }
     it { expect(user_company.persisted?).to eq(true) }
     it { expect(users_form.company.id).to eq(user_company.id) }
     it { expect(user_company.name).to eq('My Company') }
     it { expect(user_company.website).to eq('mycompany.com') }
 
-    subject(:user_family) { user.family }
+    subject(:user_family) { user.my_family }
     it { expect(user_family.persisted?).to eq(true) }
-    it { expect(users_form.family.id).to eq(user_family.id) }
+    it { expect(user_family.id).to eq(user_family.id) }
     it { expect(user_family.last_name).to eq('Milan') }
   end
 
@@ -107,8 +120,9 @@ describe UsersForm do
       users_form_existing_user.params = {
         'name'                       => "Bar",
         'company_attributes'         => {'id' => '', 'name' => 'My Company', 'website' => 'mycompany.com'},
-        'family_attributes'          => {'id' => '', 'last_name' => 'Milan'},
+        'my_family_attributes'       => {'id' => '', 'last_name' => 'Milan'},
         'address_attributes'         => {'id' => '', 'street' => '', 'district' => ''},
+        'little_pet_attributes'      => {'id' => '1', 'name' => 'Stuart 2'},
         #'tasks_attributes'           => {'0' => {'id' => '', 'name' => 'T1'}, '1' => {'id' => '', 'name' => 'T2'}},
         'dependent_users_attributes' => {'0' => {'id' => '1', 'name' => 'John 2', 'date_birth' => Date.new(1990, 2, 2)}, '1' => {'id' => '', 'name' => '', 'date_birth' => ''}}
       }
@@ -120,9 +134,10 @@ describe UsersForm do
     subject(:users_form_existing_user_user_dependent_users) { users_form_existing_user.user.dependent_users }
     subject(:users_form_existing_user_company) { users_form_existing_user.company }
     subject(:users_form_existing_user_address) { users_form_existing_user.address }
-    subject(:users_form_existing_user_family) { users_form_existing_user.family }
-    subject(:users_form_existing_user_user_tasks) { users_form_existing_user.user.tasks }
-    subject(:users_form_existing_user_tasks_sample) { users_form_existing_user.tasks.sample }
+    subject(:users_form_existing_user_pet) { users_form_existing_user.little_pet }
+    subject(:users_form_existing_user_family) { users_form_existing_user.my_family }
+    subject(:users_form_existing_user_user_tasks) { users_form_existing_user.user.my_tasks }
+    subject(:users_form_existing_user_tasks_sample) { users_form_existing_user.my_tasks.sample }
 
     subject(:users_form_existing_user_to_model) { users_form_existing_user.to_model }
     it { expect(users_form_existing_user_to_model.class).to eq(User) }
@@ -134,6 +149,8 @@ describe UsersForm do
 
     it { expect(users_form_existing_user_dependent_users.sample.persisted?).to eq(true) }
     it { expect(users_form_existing_user_dependent_users.first.id).to eq(1) }
+    it { expect(users_form_existing_user_dependent_users.first.updated_at).not_to eq(users_form_existing_user_dependent_users.first.created_at) }
+    it { expect(users_form_existing_user_dependent_users.last.updated_at).to eq(users_form_existing_user_dependent_users.last.created_at) }
     it { expect(users_form_existing_user_dependent_users.first.name).to eq('John 2') }
 
     it { expect(users_form_existing_user_user_dependent_users.sample.persisted?).to eq(true)}
@@ -149,8 +166,14 @@ describe UsersForm do
 
     it { expect(users_form_existing_user_family.persisted?).to be(true) }
     it { expect(users_form_existing_user_family.last_name).to eq('Milan') }
+    
+    it { expect(users_form_existing_user_pet).to be_a(Pet) }
+    it { expect(users_form_existing_user_pet.persisted?).to be(true) }
+    it { expect(users_form_existing_user_pet.updated_at).not_to eq(users_form_existing_user_pet.created_at)}
+    it { expect(users_form_existing_user_pet.name).to eq('Stuart 2') }
 
     it { expect(users_form_existing_user_address.persisted?).to be(true) }
     it { expect(users_form_existing_user_address.street).to eq('') }
+    it { expect(users_form_existing_user_address.district).to eq('') }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Glauco Custódio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,6 +136,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/generators/rails/form_generator.rb
+- lib/generators/rails/templates/form.rb
+- lib/generators/rspec/form_generator.rb
+- lib/generators/rspec/templates/form_spec.rb
+- lib/generators/test_unit/form_generator.rb
+- lib/generators/test_unit/templates/form_test.rb
 - lib/linker.rb
 - lib/linker/forms/attributes.rb
 - lib/linker/forms/configuration_methods.rb