faalis_contacts 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d224ce4b37d4b8df41a23b1e2e7aafdad200663
-  data.tar.gz: 8f47cbe0aff692e50e3b117aba180eb94fcdd34e
+  metadata.gz: 7c4ccd014599f0ab0443dacb77940a9833744754
+  data.tar.gz: 953e6c9a341de6568b8342d8958362c0c1b37086
 SHA512:
-  metadata.gz: d64066f74f6e01eccb5c65a6010324b9151b959cdfa876d3a94783611541123feec8858758efd8f738f9ace5700bad05704ba94c53aaa2f9dce5a7e46b5e2d46
-  data.tar.gz: 256288cc11e45fdc845785ad466511696fd49a1cbbf0ee66aa70f65ad9031f89a158996c66ecb1c7c1e27c37e7c1bfc92d6e3a48f2c660a7402062774923310b
+  metadata.gz: 1154b504bce0cf4418ae81bdd1de0c69c797722d967dcb1b9afe7d86b296db7d996069f2184a97709fdc3075602261db74d218ec313e844db3e7fb66dcd31bf5
+  data.tar.gz: 730e88542a9882414b6693191ae2423709c1ebd2ff3bba57a8b0f395bb9ccc26143c84093c0d11f474a0ddfbf27d9b038665a7f150fe03cbc598344efc00bc01

data/app/models/contact.rb

@@ -1,7 +1,12 @@
 class Contact < ActiveRecord::Base
+  include  Faalis::Concerns::Authorizable
   has_many :details, :class_name => "ContactDetails"
-
   validates :first_name, :presence => true
   validates :last_name, :presence => true
   #validates_with ValueValidator
+
+  def name
+      "#{organization} - #{first_name} #{last_name}"
+
+  end
 end

data/app/models/contact_details.rb

@@ -1,8 +1,9 @@
 class ContactDetails < ActiveRecord::Base
+  include  Faalis::Concerns::Authorizable
   @already_validate = false
 
   belongs_to :contact
-  belongs_to :field, :class_name => "ContactField"
+  belongs_to :field, :class_name => 'ContactField'
 
   validates :detail_field_id, :presence => true
   validates :detail_type, :presence => true
@@ -17,18 +18,21 @@ class ContactDetails < ActiveRecord::Base
       return
     end
 
-    print "----" * 1000
     if detail_field_id.nil?
       errors[:detail_field] = _("Field can not be empty.")
       return
     end
     rules = ContactField.find(detail_field_id).validation_rules
-    params = JSON.parse(rules).deep_symbolize_keys
-    @already_validate = true
-    begin
-      self.class.validates :detail_value, **params
-    rescue ArgumentError => e
-      errors[:error] = _("Field validation rules is not valid!")
+    unless rules.nil?
+      params = JSON.parse(rules).deep_symbolize_keys
+      @already_validate = true
+      begin
+        self.class.validates :detail_value, **params
+      rescue ArgumentError => e
+        errors[:error] = _("Field validation rules is not valid!")
+      end
+    else
+      @already_validate = true
     end
   end
 end

data/app/models/contact_field.rb

@@ -1,4 +1,5 @@
 class ContactField < ActiveRecord::Base
+  include  Faalis::Concerns::Authorizable
   validates :name, :presence => true
   validates :value_type, :presence => true
 end

data/app/models/contact_type.rb

@@ -1,2 +1,3 @@
 class ContactType < ActiveRecord::Base
+  include  Faalis::Concerns::Authorizable
 end

data/app/views/api/v1/contacts/index.json.jbuilder

@@ -1,5 +1,5 @@
 json.array! @contacts do |contact|
-  json.extract! contact, :id, :prefix, :first_name, :middle_name, :last_name, :suffix, :organization, :is_organization
+  json.extract! contact, :name, :id, :prefix, :first_name, :middle_name, :last_name, :suffix, :organization, :is_organization
   json.details contact.details do |detail|
     json.id detail.id
     json.type detail.detail_type

data/db/seeds.rb

@@ -1,9 +1,8 @@
-ContactField.create(name: "Phone")
-ContactField.create(name: "Email")
-ContactField.create(name: "IM")
-ContactField.create(name: "Address")
-ContactField.create(name: "Zip Code")
-
+ContactField.create(name: "Phone", value_type: "string")
+ContactField.create(name: "Email", value_type: "email")
+ContactField.create(name: "IM", value_type: "string")
+ContactField.create(name: "Address", value_type: "string")
+ContactField.create(name: "Zip Code", value_type: "string")
 
 ContactType.create(name: "Home")
 ContactType.create(name: "Office")

data/lib/faalis_contacts/version.rb

@@ -1,3 +1,3 @@
 module FaalisContacts
-  VERSION = "0.4.0"
+  VERSION = '0.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faalis_contacts
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sameer Rahmani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: globalize
   requirement: !ruby/object:Gem::Requirement