contact_sync 1.4.6 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc9551dbfc1bc07e1292297af8f959ec5b0f9787
-  data.tar.gz: ba61bff7f392f4b4083a450e7ffaba57cc6b36fe
+  metadata.gz: 2929c9d455765385b5821e644c0ffab4dffeca62
+  data.tar.gz: 8148f5288906d279c7111e5f708a16494cc6fc25
 SHA512:
-  metadata.gz: 7d302fe48e68023d8ab08e906f06c3f50410c63c68a26d3f22a3cc2a32a58bd1f5bad619bcc91528b6343e1bcc8eff4614e3c7821f4c23eb0053e3dbcbe7f775
-  data.tar.gz: 9156b43b574e7ec4a8b2f1bef21913041d4f3bb01a13220f8aa1d72d292d625b0d53ca3dae7169a5795f457aef6513be321dd9411f6d775dc0c8dda7cac0e044
+  metadata.gz: 24c507f52f602d35f982cff0ffa2354e22e497b445c148fdaf24141009f510f56044e27ef2466589775418ef9f8599ad854c0d5c3511b531a8421b253e718629
+  data.tar.gz: c077c847af5039e6d04d949ecdd6331169f356bf5af5cc22933b8e3e40eb4c6cbc9348dbb22b719665afc683ba30d08f587b227c7145ae0bd5cefbe831670368

data/Rakefile

@@ -1,37 +1,39 @@
+#!/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ContactSync'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 
-load 'rails/tasks/statistics.rake'
-
+Bundler::GemHelper.install_tasks
+Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
+require 'bundler/gem_tasks'
 
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
-Bundler::GemHelper.install_tasks
+load 'rails/tasks/statistics.rake'  #what is this?
 
-require 'rake/testtask'
+desc "Run all specs in spec directory (excluding plugin specs)"
+RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
+task :default => :spec
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+# Default directory to look in is `/specs`
+# Run with `rake spec`
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.rspec_opts = ['--color', '--format', 'documentation']
 end
 
+task :default => :spec
 
-task default: :test
+require 'rdoc/task'
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'ContactSync'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/lib/contact_sync.rb

@@ -5,7 +5,6 @@ require 'contact_sync/util/global_phone'
 require 'contact_sync/acts_as_syncable'
 require 'contact_sync/syncable'
 require 'encrypted_strings'
-require 'pry-rails'
 
 module ContactSync
 end

data/lib/contact_sync/engine.rb

@@ -1,5 +1,12 @@
 module ContactSync
   class Engine < ::Rails::Engine
     isolate_namespace ContactSync
+
+    config.generators do |g|
+      g.test_framework :rspec
+      g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      g.assets false
+      g.helper false
+    end
   end
 end

data/lib/contact_sync/syncable.rb

@@ -68,6 +68,16 @@ module ContactSync
         modified_contacts.each do |con|
           theContact = self.contacts.find_by_record_id(con[:record_id])
           if ! theContact.blank?
+            #lets create phone_numbers that have been added in this contact.
+            phones = con[:phones]
+            phones.each do |ph|
+              found_phone = theContact.phones.where(encrypted_number: ph[:number].extract_country_code[-1].encrypt(:symmetric)).limit(1).first
+              if !found_phone
+                theContact.phones.create(phone_params(ph))
+              else
+                puts 'modified phone_number is already present. Ignoring situation.'
+              end
+            end
             if !theContact.update_attributes(contact_params(con))
               result[:modified][:failed] << theContact.record_id
             else

data/lib/contact_sync/version.rb

@@ -1,3 +1,3 @@
 module ContactSync
-  VERSION = "1.4.6"
+  VERSION = "1.5.0"
 end

data/lib/generators/install_contact_sync/templates/contact.rb

@@ -2,73 +2,9 @@ class Contact < ActiveRecord::Base
 
   has_many :phones, dependent: :delete_all
   has_many :emails, :dependent => :delete_all
-  # has_many :addresses, :dependent => :delete_all
-  # has_many :instant_messengers, :dependent => :delete_all
-  # has_many :social_profiles, :dependent => :delete_all
 
   belongs_to :user
   validates_presence_of :user
   validates :record_id, presence: true, numericality: {:greater_than => 0}
 
-  # def jsonNotation
-  #
-  #   phonesJSON = Array.new
-  #   self.phones.each do |aPhone|
-  #     hh =
-  #     {
-  #       lable: aPhone.label,
-  #       phone_number: aPhone.number
-  #     }
-  #     phonesJSON << hh
-  #   end
-  #
-  #   emailsJSON = Array.new
-  #
-  #   self.emails.each do |anEmail|
-  #     hh = {
-  #       label: anEmail.label,
-  #       email: anEmail.email
-  #     }
-  #     emailsJSON << hh
-  #   end
-  #
-  #   profilesJSON = Array.new
-  #   self.social_profiles.each do |aProfile|
-  #     hh = {
-  #       label: aProfile.label,
-  #       username: aProfile.username
-  #     }
-  #     profilesJSON << hh
-  #   end
-  #
-  #   messengersJSON = Array.new
-  #   self.instant_messengers.each do |aMessenger|
-  #     hh = {
-  #       label: aMessenger.label,
-  #       username: aMessenger.username
-  #     }
-  #     messengersJSON << hh
-  #   end
-  #
-  #   contact = {
-  #     first_name: first_name,
-  #     middle_name: middle_name,
-  #     last_name: last_name,
-  #     composite_name: composite_name,
-  #     prefix: prefix,
-  #     suffix: suffix,
-  #     nickname: nickname,
-  #     job_title: job_title,
-  #     department: department,
-  #     birthdate: birthdate,
-  #     note: note,
-  #     creation_date: creation_date,
-  #     modification_date: modification_date,
-  #     phones: phonesJSON,
-  #     emails: emailsJSON,
-  #     social_profiles: profilesJSON,
-  #     instant_messengers: messengersJSON
-  #   }
-  #   return contact
-  # end
 end

data/lib/generators/install_contact_sync/templates/phone.rb

@@ -1,20 +1,14 @@
 class Phone < ActiveRecord::Base
   attr_accessor :number
   belongs_to :contact
+  validate :check_validity
 
   def number
     return self.encrypted_number.try(:decrypt,:symmetric) || ""
   end
 
-  def complete_phone_number
-    if self.cc_prefix.blank?
-      "0#{self.number}"
-    else
-      "+#{self.cc_prefix}#{self.number}"
-    end
-  end
-
   def number=(string)
+    puts "Phone Number Received: #{string}"
     self.cc_prefix, num = string.extract_country_code
     if num.blank? or num.length < 4
       self.errors[:phone_number] << "Phone number is not valid"
@@ -24,8 +18,24 @@ class Phone < ActiveRecord::Base
     self.encrypted_number
   end
 
+  def complete_phone_number
+    if self.cc_prefix.blank?
+      "00#{self.phone_number}"
+    elsif self.cc_prefix == "0"
+      "#{self.cc_prefix}#{self.phone_number}"
+    else
+      "+#{self.cc_prefix}#{self.phone_number}"
+    end
+  end
+
   def save_with_format!
     save_with_format
     save
   end
+  private
+  def check_validity
+    if encrypted_number.blank? or number.size < 5
+      errors[:number] << "Phone number is invalid"
+    end
+  end
 end

data/spec/dummy/app/models/address.rb

@@ -0,0 +1,5 @@
+class Address < ActiveRecord::Base
+
+  belongs_to :contact
+
+end

data/spec/dummy/app/models/contact.rb

@@ -0,0 +1,10 @@
+class Contact < ActiveRecord::Base
+
+  has_many :phones, dependent: :delete_all
+  has_many :emails, :dependent => :delete_all
+
+  belongs_to :user
+  validates_presence_of :user
+  validates :record_id, presence: true, numericality: {:greater_than => 0}
+
+end

data/spec/dummy/app/models/email.rb

@@ -0,0 +1,14 @@
+class Email < ActiveRecord::Base
+
+  belongs_to :contact
+
+  def email
+    return self.encrypted_email.decrypt(:symmetric)
+  end
+
+  def email=(string)
+    self.encrypted_email = string.encrypt(:symmetric)
+    self.encrypted_email
+  end
+
+end

data/spec/dummy/app/models/phone.rb

@@ -0,0 +1,41 @@
+class Phone < ActiveRecord::Base
+  attr_accessor :number
+  belongs_to :contact
+  validate :check_validity
+
+  def number
+    return self.encrypted_number.try(:decrypt,:symmetric) || ""
+  end
+
+  def number=(string)
+    puts "Phone Number Received: #{string}"
+    self.cc_prefix, num = string.extract_country_code
+    if num.blank? or num.length < 4
+      self.errors[:phone_number] << "Phone number is not valid"
+      return
+    end
+    self.encrypted_number = num.encrypt(:symmetric)
+    self.encrypted_number
+  end
+
+  def complete_phone_number
+    if self.cc_prefix.blank?
+      "00#{self.phone_number}"
+    elsif self.cc_prefix == "0"
+      "#{self.cc_prefix}#{self.phone_number}"
+    else
+      "+#{self.cc_prefix}#{self.phone_number}"
+    end
+  end
+
+  def save_with_format!
+    save_with_format
+    save
+  end
+  private
+  def check_validity
+    if encrypted_number.blank? or number.size < 5
+      errors[:number] << "Phone number is invalid"
+    end
+  end
+end

data/spec/dummy/app/models/routes.rb

@@ -0,0 +1,9 @@
+
+  namespace :api do
+    scope module: :v1, constraints: ApiConstraints.new(version: 1, default: :true) do
+      resources :users, only: [] do
+        post :sync_contacts
+        get :match_contacts
+      end
+    end
+  end

data/spec/dummy/app/models/user.rb

@@ -0,0 +1,4 @@
+class User < ActiveRecord::Base
+  acts_as_syncable
+  has_many :contacts
+end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>TestApp</title>
+  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/{test → spec}/dummy/config/application.rb

@@ -1,11 +1,17 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
+# Pick the frameworks you want:
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_view/railtie"
+require "sprockets/railtie"
+# require "rails/test_unit/railtie"
 
 Bundler.require(*Rails.groups)
 require "contact_sync"
 
-module Dummy
+module TestApp
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
@@ -21,6 +27,10 @@ module Dummy
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
     config.active_record.raise_in_transactional_callbacks = true
+
+
+    EncryptedStrings::SymmetricCipher.default_algorithm = 'aes-256-cbc'
+    EncryptedStrings::SymmetricCipher.default_password = 'dkljf84fklj09wfkj09rj0cnwjer09c2u3hf9w8nfiojesdpsfpcndsfjs'
+
   end
 end
-

data/spec/dummy/config/initializers/session_store.rb

@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.session_store :cookie_store, key: '_test_app_session'

data/{test → spec}/dummy/config/secrets.yml

@@ -11,12 +11,12 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: f458b4bc886ef02ad5f76a1c5495fc6d5b14479e000d1054ab0f289e29c46a8de1ce93192ca08d3fca6437df51276eb5635e8a4a08d27b19950c2ed7e60c1e55
+  secret_key_base: d55e5b24d007be0f96e6bd46ef59dc022b1244e86a424ba85430009d77be0aa97bc77c0284b69012bba89a781cebba1be8dcf72c514376206d6b9760e5e4a7f2
 
 test:
-  secret_key_base: 1329b6d0e19167547b93702b51e468196fd0af4e56415e38a8ef5aa17f19b4613f53878b08b6b0ffb2875356537e095d14d3673b793e8fc717f046caf65c5e30
+  secret_key_base: 725a51723ba99807a2b6474d8c7f8cc5b753a7f3ca3f2e678a37592d2ac6d3bfe8e3e779104c45bb03075fcfa4a484aaafc94121bae81258c772a16a0858e2aa
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
 production:
-  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+  secret_key_base: 725a51723ba99807a2b6474d8c7f8cc5b753a7f3ca3f2e678a37592d2ac6d3bfe8e3e779104c45bb03075fcfa4a484aaafc94121bae81258c772a16a0858e2dd