faalis_contacts 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72d5b3c9afd35acd10df5e77c27fbbb41bcc6c59
-  data.tar.gz: 0d20369344fed60c149abf2479a42d4dff001c74
+  metadata.gz: 7a36c809d5f0f7f6843cedfc245ba4a88efe4f36
+  data.tar.gz: 0f1b83bc292c7e01bf220f552c2bbfc46566e72a
 SHA512:
-  metadata.gz: d87494409daf5a7b2470f0512ace91b1337e8ff97be953854d8f3c31dd057f1b48346e18e23b59b836c1e0bcbd38edfff0a10d93ff7307d5864cc5c4da0e6daf
-  data.tar.gz: 780bcdf556b46b977e5a0e50dd708ca0af5d414bf21655e909d226e66e70bc12b585fac2fbee3847a17998373610c48c27807be78623f241b896b0f52a71995a
+  metadata.gz: 342f28942b576db72489e94abf45e895d1de1896232bd142f36cbf088606fe03595d6659c164110f5bf5acecd0e46563f8bfebdb5a576e7fdc38f10fcfec6775
+  data.tar.gz: df1b97486077e0bd7d0a5b2f5939bf28a3a36d55084ca35d4511907ed7405a9240d2a20b0b1ce795d82f93376eb0ddfd8f0a1e4225e7d4262296c76a0c07aa76

data/app/assets/javascripts/faalis_contacts/modules/contact.js

@@ -288,7 +288,15 @@ Contacts.controller("AddContactController", ["Restangular", "$scope", "$location
 
     $scope.remove_row = function(){
         $scope.details_count.pop();
-        $scope.details.pop();
+        var lastobj = $scope.details.pop();
+        if ("id" in lastobj) {
+            API.all("contact_details").customDELETE(lastobj.id)
+            .then(function(data) {
+                success_message(data.msg);
+            }, function(data){
+                catch_error(data);
+            });
+        }
     };
 
     $scope.have = function(field, obj_id) {
@@ -307,6 +315,9 @@ Contacts.controller("AddContactController", ["Restangular", "$scope", "$location
     };
 
     $scope.save = function(save_another){
+        $("small.error").html("");
+        $("small.error").removeClass("error");
+
         var contact = {contact: {
             prefix: $scope.prefix,
             first_name: $scope.first_name,

data/app/assets/javascripts/faalis_contacts/modules/contact_field.js

@@ -105,7 +105,11 @@ ContactFields.controller("AddContactFieldController", ["Restangular", "$scope",
     var is_copy = false;
 
     
-    
+    $scope.value_type_choices = _.sortBy([
+        {name: "string", title: "String"},
+        {name: "numeric", title: "Numeric"},
+        {name: "email", title: "Email"},
+    ], "title");
     if( "id" in $routeParams ){
         $scope.obj_id = $routeParams.id;
         $scope.editing = true;
@@ -118,6 +122,8 @@ ContactFields.controller("AddContactFieldController", ["Restangular", "$scope",
                 .then(function(data) {
                 
                     $scope.name = data.name;
+                    $scope.value_type = data.value_type;
+                    $scope.validation_rules = data.validation_rules;
                 }, function(data){
                     catch_error(data);
                 });
@@ -143,6 +149,8 @@ ContactFields.controller("AddContactFieldController", ["Restangular", "$scope",
     $scope.save = function(save_another){
         var contact_field = {contact_field: {
             name: $scope.name,
+            value_type: $scope.value_type,
+            validation_rules: $scope.validation_rules,
             __res__: 0
         }};
         if (($scope.obj_id) && (is_copy === false)) {

data/app/controllers/api/v1/contact_details_controller.rb

@@ -0,0 +1,18 @@
+class API::V1::ContactDetailsController < Faalis::APIController
+
+  def destroy
+    ids = params[:id].split(",")
+    @contact_details = ::ContactDetails.where(:id => ids)
+    authorize! :destroy, ContactDetails
+    @contact_details.destroy_all
+  end
+
+  def build_resource
+    @contact_details = ::ContactDetails.new(resource_params)
+  end
+
+  def resource_params
+    params.require(:contact_details).permit(:id, :details_value)
+  end
+
+end

data/app/controllers/api/v1/contact_fields_controller.rb

@@ -8,7 +8,7 @@ class API::V1::ContactFieldsController < Faalis::APIController
   end
 
   def create
-
+    
     if @contact_field.save
       respond_with(@contact_field)
     else
@@ -23,7 +23,7 @@ class API::V1::ContactFieldsController < Faalis::APIController
   end
 
   def update
-
+    
 
     if @contact_field.update(resource_params)
       respond_with(@contact_field)
@@ -46,7 +46,7 @@ class API::V1::ContactFieldsController < Faalis::APIController
   end
 
   def resource_params
-    params.require(:contact_field).permit(:id, :name)
+    params.require(:contact_field).permit(:id, :name, :value_type, :validation_rules)
   end
 
 end

data/app/controllers/api/v1/contacts_controller.rb

@@ -8,24 +8,7 @@ class API::V1::ContactsController < Faalis::APIController
   end
 
   def create
-    details = params[:contact][:details] || []
-    details_list = []
-    details.each do |detail|
-      contact_detail = ContactDetails.create!(:detail_field => detail[:field],
-                                              :detail_type => detail[:type],
-                                              :detail_value => detail[:value])
-      details_list << contact_detail
-    end
-
-    @contact.details = details_list
-
-    if @contact.save
-      respond_with(@contact)
-    else
-      respond_to do |format|
-        format.json { render :json => {:fields => @contact.errors}, :status => :unprocessable_entity }
-      end
-    end
+    create_or_update(:create)
   end
 
   def show
@@ -33,24 +16,7 @@ class API::V1::ContactsController < Faalis::APIController
   end
 
   def update
-    details = params[:contact][:details] || []
-    details_list = []
-    details.each do |detail|
-      contact_detail = ContactDetails.create!(:detail_field => detail[:field],
-                                              :detail_type => detail[:type],
-                                              :detail_value => detail[:value])
-      details_list << contact_detail
-    end
-
-    @contact.details = details_list
-
-    if @contact.update(resource_params)
-      respond_with(@contact)
-    else
-      respond_to do |format|
-        format.json { render :json => {:fields => @contact.errors}, :status => :unprocessable_entity }
-      end
-    end
+    create_or_update(:update)
   end
 
   def destroy
@@ -68,4 +34,76 @@ class API::V1::ContactsController < Faalis::APIController
     params.require(:contact).permit(:id, :prefix, :first_name, :middle_name, :last_name, :suffix, :organization, :is_organization)
   end
 
+  private
+
+  def create_or_update(action)
+    details = params[:contact][:details] || []
+    details_list = []
+    details_errors = []
+    valid = true
+
+    details.each do |detail|
+
+      contact_detail = ContactDetails.find_or_initialize_by(:detail_field_id => detail[:field],
+                                                            :detail_type => detail[:type],
+                                                            :detail_value => detail[:value])
+
+      if not contact_detail.valid?
+        details_errors << contact_detail.errors
+        valid = false
+      else
+        details_errors << {}
+        details_list << contact_detail
+      end
+    end
+
+    if valid
+      details_list.each { |x| x.save }
+      @contact.details = details_list
+    end
+
+    result = @contact.update(resource_params) if action == :update
+    result = @contact.save if action == :create
+
+    if result and valid
+      respond_with(@contact)
+    else
+      errors = get_details_error(@contact, details_errors)
+      respond_to do |format|
+        format.json { render :json => errors, :status => :unprocessable_entity }
+      end
+    end
+
+
+  end
+
+  def get_details_error(contact, gerrors)
+    errors = {:fields => contact.errors}
+    counter = 0
+
+    contact.details.each do |detail|
+      if not detail.errors.empty?
+        detail.errors.each do |key, value|
+          errors[:fields]["#{key}_#{counter}".to_sym] = value
+          if errors[:fields]["#{key}_#{counter}".to_sym].length > 1
+            errors[:fields]["#{key}_#{counter}".to_sym].uniq!
+          end
+        end
+      end
+      counter += 1
+    end
+
+    counter = 0
+    gerrors.each do |err|
+      err.each do |key, value|
+        errors[:fields]["#{key}_#{counter}".to_sym] = value
+        if errors[:fields]["#{key}_#{counter}".to_sym].length > 1
+            errors[:fields]["#{key}_#{counter}".to_sym].uniq!
+        end
+      end
+      counter += 1
+    end
+    errors
+  end
+
 end

data/app/models/contact.rb

@@ -3,4 +3,5 @@ class Contact < ActiveRecord::Base
 
   validates :first_name, :presence => true
   validates :last_name, :presence => true
+  #validates_with ValueValidator
 end

data/app/models/contact_details.rb

@@ -1,5 +1,34 @@
 class ContactDetails < ActiveRecord::Base
+  @already_validate = false
+
   belongs_to :contact
+  belongs_to :field, :class_name => "ContactField"
+
+  validates :detail_field_id, :presence => true
+  validates :detail_type, :presence => true
+  validates :detail_value, :presence => true
+
+  validate :validate_value
+
 
+  def validate_value
+    require 'json'
+    if @already_validate
+      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!")
+    end
+  end
 end

data/app/models/contact_field.rb

@@ -1,2 +1,4 @@
 class ContactField < ActiveRecord::Base
+  validates :name, :presence => true
+  validates :value_type, :presence => true
 end

data/app/views/angularjs_templates/contact_field/details.html

@@ -4,6 +4,14 @@
       <b translate>Name :</b> {{object.name}}
       </p>
     
+      <p>
+      <b translate>Value_type :</b> {{object.value_type}}
+      </p>
+    
+      <p>
+      <b translate>Validation_rules :</b> {{object.validation_rules}}
+      </p>
+    
   <ul class="button-group float-right">
     <a ng-href="#/contact_fields/{{ object.id }}/edit" class="small">
       <span class="fa fa-edit"></span> <span translated>Edit</span>

data/app/views/angularjs_templates/contact_field/new.html

@@ -20,6 +20,30 @@
   
   
   
+    
+      <div class="small-4 columns float-left small-offset-2">
+        <label><span translate>Value type</span> :</label>
+        
+          <select id="id_value_type" ui-select2="select2options" ng-model="value_type" name="value_type" >
+            <option ng-repeat="item in value_type_choices" value="{{ item.name }}" title="{{ item.title }}" ng-selected="value_type === item.name">{{ item.title }}</option>
+          </select>
+          
+          <small id="id_value_type_msg"></small>
+    </div>
+  </div>
+  
+  
+    <div class="row">
+      <div class="small-4 columns ">
+        <label><span translate>Validation rules</span> :</label>
+        
+          <textarea id="id_validation_rules" class="rounded" ng-model="validation_rules" name="validation_rules" ></textarea>
+          
+          <small id="id_validation_rules_msg"></small>
+    </div>
+  
+  
+  
   </fieldset>
 </form>
 

data/app/views/api/v1/contact_details/destroy.json.jbuilder

@@ -0,0 +1 @@
+json.msg _("Items removed successfully.")

data/app/views/api/v1/contact_fields/create.json.jbuilder

@@ -1,2 +1,2 @@
-json.extract! @contact_field, :id, :name
+json.extract! @contact_field, :id, :name, :value_type, :validation_rules
 

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

@@ -1,3 +1,3 @@
 json.array! @contact_fields do |contact_field|
-  json.extract! contact_field, :id, :name
+  json.extract! contact_field, :id, :name, :value_type, :validation_rules
 end

data/app/views/api/v1/contact_fields/show.json.jbuilder

@@ -1,2 +1,4 @@
-json.extract! @contact_field, :id, :name
+json.extract! @contact_field, :id, :name, :value_type, :validation_rules
+
+
 

data/app/views/api/v1/contact_fields/update.json.jbuilder

@@ -1,2 +1,2 @@
-json.extract! @contact_field, :id, :name
+json.extract! @contact_field, :id, :name, :value_type, :validation_rules
 

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

@@ -3,7 +3,7 @@ json.array! @contacts do |contact|
   json.details contact.details do |detail|
     json.id detail.id
     json.type detail.detail_type
-    json.field detail.detail_field
+    json.field detail.detail_field_id
     json.value detail.detail_value
   end
 end

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

@@ -2,6 +2,6 @@ json.extract! @contact, :id, :prefix, :first_name, :middle_name, :last_name, :su
 json.details @contact.details do |detail|
   json.id detail.id
   json.type detail.detail_type
-  json.field detail.detail_field
+  json.field detail.detail_field_id
   json.value detail.detail_value
 end

data/config/routes.rb

@@ -4,6 +4,7 @@ Rails.application.routes.draw do
       resources :contacts, :except => [:new]
       resources :contact_types, :except => [:new]
       resources :contact_fields, :except => [:new]
+      resources :contact_details, :only => [:destroy], :class_name => "ContactDetails"
     end
   end
 end

data/db/migrate/20140111082843_create_contact_details.rb

@@ -1,7 +1,7 @@
 class CreateContactDetails < ActiveRecord::Migration
   def change
     create_table :contact_details do |t|
-      t.string :detail_field
+      t.integer :detail_field_id
       t.string :detail_type
       t.string :detail_value
 

data/db/migrate/20140113071029_create_contact_fields.rb

@@ -2,7 +2,8 @@ class CreateContactFields < ActiveRecord::Migration
   def change
     create_table :contact_fields do |t|
       t.string :name
-
+      t.string :value_type
+      t.text :validation_rules
       t.timestamps
     end
   end

data/lib/faalis_contacts/version.rb

@@ -1,3 +1,3 @@
 module FaalisContacts
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

data/lib/tasks/build.rake

@@ -7,7 +7,7 @@ namespace :build do
 
   desc "Create contact fields scaffold"
   task :fields do
-    system "rails g faalis:js_scaffold contact_field name:string --no-bulk --required name"
+    system "rails g faalis:js_scaffold contact_field name:string value_type:in:string,numeric,email validation_rules:text --no-bulk --required name --path faalis_contacts"
   end
 
   desc "Create contact type scaffold"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faalis_contacts
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sameer Rahmani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -145,12 +145,14 @@ files:
 - app/views/api/v1/contacts/create.json.jbuilder
 - app/views/api/v1/contacts/update.json.jbuilder
 - app/views/api/v1/contacts/index.json.jbuilder
+- app/views/api/v1/contact_details/destroy.json.jbuilder
 - app/assets/javascripts/faalis_contacts/application.js
 - app/assets/javascripts/faalis_contacts/modules/contact.js
 - app/assets/javascripts/faalis_contacts/modules/contact_type.js
 - app/assets/javascripts/faalis_contacts/modules/contact_field.js
 - app/controllers/api/v1/contact_fields_controller.rb
 - app/controllers/api/v1/contact_types_controller.rb
+- app/controllers/api/v1/contact_details_controller.rb
 - app/controllers/api/v1/contacts_controller.rb
 - config/routes.rb
 - db/migrate/20140113071029_create_contact_fields.rb