innetra-easy_contacts 0.2.1 → 0.2.3

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('easy_contacts', '0.2.1') do |e|
+Echoe.new('easy_contacts', '0.2.3') do |e|
   e.description    = "Easy Contacts for Ruby on Rails 2.2 (i18n)"
   e.url            = "http://github.com/innetra/easy_contacts"
   e.author         = "Ivan Torres"

data/easy_contacts.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easy_contacts}
-  s.version = "0.2.1"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Torres"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{Easy Contacts for Ruby on Rails 2.2 (i18n)}
   s.email = %q{mexpolk@gmail.com}
   s.extra_rdoc_files = ["lib/easy_contacts.rb"]
-  s.files = ["Manifest", "generators/easy_contacts/easy_contacts_generator.rb", "generators/easy_contacts/templates/stylesheets/contacts.css", "generators/easy_contacts/templates/stylesheets/default.css", "generators/easy_contacts/templates/helpers/emails_helper.rb", "generators/easy_contacts/templates/helpers/shadowbox_helper.rb", "generators/easy_contacts/templates/helpers/phones_helper.rb", "generators/easy_contacts/templates/helpers/web_sites_helper.rb", "generators/easy_contacts/templates/helpers/instant_messengers_helper.rb", "generators/easy_contacts/templates/helpers/addresses_helper.rb", "generators/easy_contacts/templates/helpers/form_helper.rb", "generators/easy_contacts/templates/migrations/easy_contacts.rb", "generators/easy_contacts/templates/tasks/init.rake", "generators/easy_contacts/templates/views/phones/destroy.js.rjs", "generators/easy_contacts/templates/views/phones/_phones.html.erb", "generators/easy_contacts/templates/views/phones/_phone.html.erb", "generators/easy_contacts/templates/views/companies/show.html.erb", "generators/easy_contacts/templates/views/companies/edit.html.erb", "generators/easy_contacts/templates/views/companies/new.html.erb", "generators/easy_contacts/templates/views/companies/index.js.erb", "generators/easy_contacts/templates/views/companies/_form.html.erb", "generators/easy_contacts/templates/views/countries/index.js.erb", "generators/easy_contacts/templates/views/emails/destroy.js.rjs", "generators/easy_contacts/templates/views/emails/_email.html.erb", "generators/easy_contacts/templates/views/emails/_emails.html.erb", "generators/easy_contacts/templates/views/instant_messengers/destroy.js.rjs", "generators/easy_contacts/templates/views/instant_messengers/_instant_messengers.html.erb", "generators/easy_contacts/templates/views/instant_messengers/_instant_messenger.html.erb", "generators/easy_contacts/templates/views/people/show.html.erb", "generators/easy_contacts/templates/views/people/edit.html.erb", "generators/easy_contacts/templates/views/people/new.html.erb", "generators/easy_contacts/templates/views/people/index.js.erb", "generators/easy_contacts/templates/views/people/_form.html.erb", "generators/easy_contacts/templates/views/web_sites/_web_site.html.erb", "generators/easy_contacts/templates/views/web_sites/destroy.js.rjs", "generators/easy_contacts/templates/views/web_sites/_web_sites.html.erb", "generators/easy_contacts/templates/views/provinces/index.js.erb", "generators/easy_contacts/templates/views/contacts/_contact_info.html.erb", "generators/easy_contacts/templates/views/contacts/index.html.erb", "generators/easy_contacts/templates/views/contacts/_contact.html.erb", "generators/easy_contacts/templates/views/contacts/index.js.erb", "generators/easy_contacts/templates/views/cities/index.js.erb", "generators/easy_contacts/templates/views/addresses/destroy.js.rjs", "generators/easy_contacts/templates/views/addresses/_address.html.erb", "generators/easy_contacts/templates/views/addresses/_addresses.html.erb", "generators/easy_contacts/templates/models/city.rb", "generators/easy_contacts/templates/models/web_site.rb", "generators/easy_contacts/templates/models/web_site_type.rb", "generators/easy_contacts/templates/models/phone.rb", "generators/easy_contacts/templates/models/country.rb", "generators/easy_contacts/templates/models/email.rb", "generators/easy_contacts/templates/models/address.rb", "generators/easy_contacts/templates/models/company.rb", "generators/easy_contacts/templates/models/email_type.rb", "generators/easy_contacts/templates/models/instant_messenger.rb", "generators/easy_contacts/templates/models/instant_messenger_protocol.rb", "generators/easy_contacts/templates/models/province.rb", "generators/easy_contacts/templates/models/instant_messenger_type.rb", "generators/easy_contacts/templates/models/phone_type.rb", "generators/easy_contacts/templates/models/address_type.rb", "generators/easy_contacts/templates/models/person.rb", "generators/easy_contacts/templates/models/contact.rb", "generators/easy_contacts/templates/controllers/web_sites_controller.rb", "generators/easy_contacts/templates/controllers/phones_controller.rb", "generators/easy_contacts/templates/controllers/people_controller.rb", "generators/easy_contacts/templates/controllers/emails_controller.rb", "generators/easy_contacts/templates/controllers/countries_controller.rb", "generators/easy_contacts/templates/controllers/cities_controller.rb", "generators/easy_contacts/templates/controllers/contacts_controller.rb", "generators/easy_contacts/templates/controllers/addresses_controller.rb", "generators/easy_contacts/templates/controllers/provinces_controller.rb", "generators/easy_contacts/templates/controllers/instant_messengers_controller.rb", "generators/easy_contacts/templates/controllers/companies_controller.rb", "generators/easy_contacts/templates/locales/en.easy_contacts.yml", "generators/easy_contacts/templates/locales/es-MX.easy_contacts.yml", "easy_contacts.gemspec", "Rakefile", "lib/easy_contacts.rb"]
+  s.files = ["Manifest", "generators/easy_contacts/easy_contacts_generator.rb", "generators/easy_contacts/templates/stylesheets/contacts.css", "generators/easy_contacts/templates/stylesheets/default.css", "generators/easy_contacts/templates/helpers/emails_helper.rb", "generators/easy_contacts/templates/helpers/shadowbox_helper.rb", "generators/easy_contacts/templates/helpers/phones_helper.rb", "generators/easy_contacts/templates/helpers/web_sites_helper.rb", "generators/easy_contacts/templates/helpers/instant_messengers_helper.rb", "generators/easy_contacts/templates/helpers/addresses_helper.rb", "generators/easy_contacts/templates/helpers/form_helper.rb", "generators/easy_contacts/templates/migrations/easy_contacts.rb", "generators/easy_contacts/templates/tasks/easy_contacts.rake", "generators/easy_contacts/templates/views/phones/destroy.js.rjs", "generators/easy_contacts/templates/views/phones/_phones.html.erb", "generators/easy_contacts/templates/views/phones/_phone.html.erb", "generators/easy_contacts/templates/views/companies/show.html.erb", "generators/easy_contacts/templates/views/companies/edit.html.erb", "generators/easy_contacts/templates/views/companies/new.html.erb", "generators/easy_contacts/templates/views/companies/index.js.erb", "generators/easy_contacts/templates/views/companies/_form.html.erb", "generators/easy_contacts/templates/views/countries/index.js.erb", "generators/easy_contacts/templates/views/emails/destroy.js.rjs", "generators/easy_contacts/templates/views/emails/_email.html.erb", "generators/easy_contacts/templates/views/emails/_emails.html.erb", "generators/easy_contacts/templates/views/instant_messengers/destroy.js.rjs", "generators/easy_contacts/templates/views/instant_messengers/_instant_messengers.html.erb", "generators/easy_contacts/templates/views/instant_messengers/_instant_messenger.html.erb", "generators/easy_contacts/templates/views/people/show.html.erb", "generators/easy_contacts/templates/views/people/edit.html.erb", "generators/easy_contacts/templates/views/people/new.html.erb", "generators/easy_contacts/templates/views/people/index.js.erb", "generators/easy_contacts/templates/views/people/_form.html.erb", "generators/easy_contacts/templates/views/web_sites/_web_site.html.erb", "generators/easy_contacts/templates/views/web_sites/destroy.js.rjs", "generators/easy_contacts/templates/views/web_sites/_web_sites.html.erb", "generators/easy_contacts/templates/views/provinces/index.js.erb", "generators/easy_contacts/templates/views/contacts/_contact_info.html.erb", "generators/easy_contacts/templates/views/contacts/index.html.erb", "generators/easy_contacts/templates/views/contacts/_contact.html.erb", "generators/easy_contacts/templates/views/contacts/index.js.erb", "generators/easy_contacts/templates/views/cities/index.js.erb", "generators/easy_contacts/templates/views/addresses/destroy.js.rjs", "generators/easy_contacts/templates/views/addresses/_address.html.erb", "generators/easy_contacts/templates/views/addresses/_addresses.html.erb", "generators/easy_contacts/templates/models/city.rb", "generators/easy_contacts/templates/models/web_site.rb", "generators/easy_contacts/templates/models/web_site_type.rb", "generators/easy_contacts/templates/models/phone.rb", "generators/easy_contacts/templates/models/country.rb", "generators/easy_contacts/templates/models/email.rb", "generators/easy_contacts/templates/models/address.rb", "generators/easy_contacts/templates/models/company.rb", "generators/easy_contacts/templates/models/email_type.rb", "generators/easy_contacts/templates/models/instant_messenger.rb", "generators/easy_contacts/templates/models/instant_messenger_protocol.rb", "generators/easy_contacts/templates/models/province.rb", "generators/easy_contacts/templates/models/instant_messenger_type.rb", "generators/easy_contacts/templates/models/phone_type.rb", "generators/easy_contacts/templates/models/address_type.rb", "generators/easy_contacts/templates/models/person.rb", "generators/easy_contacts/templates/models/contact.rb", "generators/easy_contacts/templates/controllers/web_sites_controller.rb", "generators/easy_contacts/templates/controllers/phones_controller.rb", "generators/easy_contacts/templates/controllers/people_controller.rb", "generators/easy_contacts/templates/controllers/emails_controller.rb", "generators/easy_contacts/templates/controllers/countries_controller.rb", "generators/easy_contacts/templates/controllers/cities_controller.rb", "generators/easy_contacts/templates/controllers/contacts_controller.rb", "generators/easy_contacts/templates/controllers/addresses_controller.rb", "generators/easy_contacts/templates/controllers/provinces_controller.rb", "generators/easy_contacts/templates/controllers/instant_messengers_controller.rb", "generators/easy_contacts/templates/controllers/companies_controller.rb", "generators/easy_contacts/templates/locales/en.easy_contacts.yml", "generators/easy_contacts/templates/locales/es-MX.easy_contacts.yml", "Rakefile", "lib/easy_contacts.rb", "easy_contacts.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/innetra/easy_contacts}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Easy_contacts"]

data/generators/easy_contacts/easy_contacts_generator.rb

@@ -48,8 +48,8 @@ class EasyContactsGenerator < Rails::Generator::Base
 
       # Rake tasks
       m.directory('lib/tasks')
-      m.template "tasks/init.rake",
-        "lib/tasks/init.rake"
+      m.template "tasks/easy_contacts.rake",
+        "lib/tasks/easy_contacts.rake"
 
       # Necessary Routes
       unless options[:skip_routes]

data/generators/easy_contacts/templates/helpers/addresses_helper.rb

@@ -1,5 +1,14 @@
 module AddressesHelper
-  def place_address_form(owner)
-    render :partial => "addresses/addresses", :locals => { :owner => owner }
+  def place_address_form(record_or_name, *args)
+    options = {}
+    case record_or_name
+      when String, Symbol
+        options[:fields_prefix] = "#{record_or_name}[address_attributes][]"
+        owner = args.first
+      else
+        owner = record_or_name
+        options[:fields_prefix] = "#{dom_class(owner)}[address_attributes][]"
+    end
+    render :partial => "addresses/addresses", :locals => { :owner => owner, :options => options }
   end
 end

data/generators/easy_contacts/templates/helpers/instant_messengers_helper.rb

@@ -1,6 +1,14 @@
 module InstantMessengersHelper
-  def place_instant_messenger_form(owner)
-    render :partial => "instant_messengers/instant_messengers",
-      :locals => { :owner => owner }
+  def place_instant_messenger_form(record_or_name, *args)
+    options = {}
+    case record_or_name
+      when String, Symbol
+        options[:fields_prefix] = "#{record_or_name}[instant_messenger_attributes][]"
+        owner = args.first
+      else
+        owner = record_or_name
+        options[:fields_prefix] = "#{dom_class(owner)}[instant_messenger_attributes][]"
+    end
+    render :partial => "instant_messengers/instant_messengers", :locals => { :owner => owner, :options => options }
   end
 end

data/generators/easy_contacts/templates/helpers/phones_helper.rb

@@ -1,5 +1,14 @@
 module PhonesHelper
-  def place_phone_form(owner)
-    render :partial => "phones/phones", :locals => { :owner => owner }
+  def place_phone_form(record_or_name, *args)
+    options = {}
+    case record_or_name
+      when String, Symbol
+        options[:fields_prefix] = "#{record_or_name}[phone_attributes][]"
+        owner = args.first
+      else
+        owner = record_or_name
+        options[:fields_prefix] = "#{dom_class(owner)}[phone_attributes][]"
+    end
+    render :partial => "phones/phones", :locals => { :owner => owner, :options => options }
   end
 end

data/generators/easy_contacts/templates/helpers/web_sites_helper.rb

@@ -1,5 +1,14 @@
 module WebSitesHelper
-  def place_web_site_form(owner)
-    render :partial => "web_sites/web_sites", :locals => { :owner => owner }
+  def place_web_site_form(record_or_name, *args)
+    options = {}
+    case record_or_name
+      when String, Symbol
+        options[:fields_prefix] = "#{record_or_name}[web_site_attributes][]"
+        owner = args.first
+      else
+        owner = record_or_name
+        options[:fields_prefix] = "#{dom_class(owner)}[web_site_attributes][]"
+    end
+    render :partial => "web_sites/web_sites", :locals => { :owner => owner, :options => options }
   end
 end

data/generators/easy_contacts/templates/views/addresses/_address.html.erb

@@ -1,5 +1,5 @@
 <%% content_tag_for(:li, address) do -%>
-  <%% fields_for "#{dom_class(owner)}[address_attributes][]", address do |form| -%>
+  <%% fields_for options[:fields_prefix], address do |form| -%>
     <%% unless address.new_record? -%>
       <%%= form.hidden_field :id, :index => nil %>
     <%% end -%>

data/generators/easy_contacts/templates/views/addresses/_addresses.html.erb

@@ -1,5 +1,5 @@
 <%% content_tag(:ul, :id => "addresses") do -%>
   <%% for address in owner.addresses -%>
-    <%%= render :partial => address, :locals => { :owner => owner } %>
+    <%%= render :partial => address, :locals => { :owner => owner, :options => options } %>
   <%% end -%>
 <%% end -%>

data/generators/easy_contacts/templates/views/instant_messengers/_instant_messenger.html.erb

@@ -1,6 +1,5 @@
 <%% content_tag_for(:li, instant_messenger) do -%>
-  <%% fields_for "#{dom_class(owner)}[instant_messenger_attributes][]",
-    instant_messenger do |form| -%>
+  <%% fields_for options[:fields_prefix], instant_messenger do |form| -%>
     <%% unless instant_messenger.new_record? -%>
       <%%= form.hidden_field :id, :index => nil %>
     <%% end -%>

data/generators/easy_contacts/templates/views/instant_messengers/_instant_messengers.html.erb

@@ -1,7 +1,7 @@
 <%% content_tag(:ul, :id => "instant_messengers") do -%>
   <%% for instant_messenger in owner.instant_messengers -%>
     <%%= render :partial => "/instant_messengers/instant_messenger",
-      :object => instant_messenger, :locals => { :owner => owner } %>
+      :object => instant_messenger, :locals => { :owner => owner, :options => options } %>
   <%% end -%>
 <%% end -%>
 <p>
@@ -9,6 +9,6 @@
     page.insert_html :bottom, :instant_messengers,
       :partial => "/instant_messengers/instant_messenger",
       :object => InstantMessenger.new,
-      :locals => { :owner => owner }
+      :locals => { :owner => owner, :options => options }
   end %>
 </p>

data/generators/easy_contacts/templates/views/phones/_phone.html.erb

@@ -1,5 +1,5 @@
 <%% content_tag_for(:li, phone) do -%>
-  <%% fields_for "#{dom_class(owner)}[phone_attributes][]", phone do |form| -%>
+  <%% fields_for options[:fields_prefix], phone do |form| -%>
     <%% unless phone.new_record? -%>
       <%%= form.hidden_field :id, :index => nil %>
     <%% end -%>

data/generators/easy_contacts/templates/views/phones/_phones.html.erb

@@ -1,14 +1,14 @@
 <%% content_tag(:ul, :id => "phones") do -%>
   <%% for phone in owner.phones -%>
     <%%= render :partial => "/phones/phone",
-      :object => phone, :locals => { :owner => owner } %>
+      :object => phone, :locals => { :owner => owner, :options => options } %>
   <%% end -%>
 <%% end -%>
 <p>
   <%%= link_to_function t("phones.add_link") do |page|
-    page.insert_html :bottom, :phones, 
+    page.insert_html :bottom, :phones,
       :partial => "/phones/phone",
       :object => Phone.new,
-      :locals => { :owner => owner }
+      :locals => { :owner => owner, :options => options }
   end %>
 </p>

data/generators/easy_contacts/templates/views/web_sites/_web_site.html.erb

@@ -1,5 +1,5 @@
 <%% content_tag_for(:li, web_site) do -%>
-  <%% fields_for "#{dom_class(owner)}[web_site_attributes][]", web_site do |form| -%>
+  <%% fields_for options[:fields_prefix], web_site do |form| -%>
     <%% unless web_site.new_record? -%>
       <%%= form.hidden_field :id, :index => nil %>
     <%% end -%>

data/generators/easy_contacts/templates/views/web_sites/_web_sites.html.erb

@@ -1,14 +1,14 @@
 <%% content_tag(:ul, :id => "web_sites") do -%>
   <%% for web_site in owner.web_sites -%>
     <%%= render :partial => "/web_sites/web_site",
-      :object => web_site, :locals => { :owner => owner } %>
+      :object => web_site, :locals => { :owner => owner, :options => options } %>
   <%% end -%>
 <%% end -%>
 <p>
   <%%= link_to_function t("web_sites.add_link") do |page|
-    page.insert_html :bottom, :web_sites, 
+    page.insert_html :bottom, :web_sites,
       :partial => "/web_sites/web_site",
       :object => WebSite.new,
-      :locals => { :owner => owner }
+      :locals => { :owner => owner, :options => options }
   end %>
 </p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: innetra-easy_contacts
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors: 
 - Ivan Torres
@@ -34,7 +34,7 @@ files:
 - generators/easy_contacts/templates/helpers/addresses_helper.rb
 - generators/easy_contacts/templates/helpers/form_helper.rb
 - generators/easy_contacts/templates/migrations/easy_contacts.rb
-- generators/easy_contacts/templates/tasks/init.rake
+- generators/easy_contacts/templates/tasks/easy_contacts.rake
 - generators/easy_contacts/templates/views/phones/destroy.js.rjs
 - generators/easy_contacts/templates/views/phones/_phones.html.erb
 - generators/easy_contacts/templates/views/phones/_phone.html.erb
@@ -97,9 +97,9 @@ files:
 - generators/easy_contacts/templates/controllers/companies_controller.rb
 - generators/easy_contacts/templates/locales/en.easy_contacts.yml
 - generators/easy_contacts/templates/locales/es-MX.easy_contacts.yml
-- easy_contacts.gemspec
 - Rakefile
 - lib/easy_contacts.rb
+- easy_contacts.gemspec
 has_rdoc: true
 homepage: http://github.com/innetra/easy_contacts
 post_install_message: