contacts_client 0.0.17 → 0.0.18

data/app/models/contact_attribute/custom_keys.rb

@@ -0,0 +1,48 @@
+class ContactAttribute
+  module CustomKeys
+
+    # Get CustomAttribute names
+    #
+    # @param options [ Hash ]
+    #
+    # @example
+    #   ContactAttribute.async_custom_keys(:page => params[:page]){|i| result = i}
+    def async_custom_keys(options={})
+      options = self.merge_key(options)
+
+      request = Typhoeus::Request.new("#{resource_uri}/custom_keys", params: options)
+      request.on_complete do |response|
+        if response.code >= 200 && response.code < 400
+          log_ok(response)
+
+          parsed_response = ActiveSupport::JSON.decode(response.body)
+          yield parsed_response['collection']
+        else
+          log_failed(response)
+        end
+      end
+      self.hydra.queue(request)
+    end
+
+    ##
+    # Get CustomAttribute names
+    # @see async_custom_keys
+    def custom_keys(options={})
+      result = nil
+      self.retries.times do
+        begin
+          async_custom_keys(options){|i| result = i}
+          Timeout::timeout(self.timeout/1000) do
+            self.hydra.run
+          end
+          break unless result.nil?
+        rescue Timeout::Error
+          self.logger.warn("timeout")
+          result = nil
+        end
+      end
+      result
+    end
+
+  end
+end

data/app/models/contact_attribute.rb

@@ -1,17 +1,26 @@
 class ContactAttribute < LogicalModel
 
+  # defines ContactAttribute.custom_keys and .async_custom_keys
+  extend ContactAttribute::CustomKeys
+
   AVAILABLE_TYPES = %w(telephone email identification address date_attribute custom_attribute social_network_id)
 
   attr_accessor :public, :primary
 
-  self.attribute_keys = [:_id, :_type, :value, :public, :primary, :contact_id, :account_name]
+  attribute :_id
+  attribute :_type
+  attribute :value
+  attribute :public
+  attribute :primary
+  attribute :account_name
+
+  belongs_to :contact, class: 'PadmaContact'
+
+  use_hydra Contacts::HYDRA
+  set_resource_url Contacts::HOST, "/v0/contact_attributes"
+  set_api_key 'app_key', Contacts::API_KEY
 
-  self.hydra = Contacts::HYDRA
-  self.resource_path = "/v0/contact_attributes"
-  self.use_api_key = true
-  self.api_key_name = "app_key"
-  self.api_key = Contacts::API_KEY
-  self.host  = Contacts::HOST
+  validates :value, :presence => true, :unless => proc { self.is_a? DateAttribute }
 
   def new_record?
     self._id.blank?
@@ -21,8 +30,6 @@ class ContactAttribute < LogicalModel
     false
   end
 
-  validates :value, :presence => true, :unless => proc { self.is_a? DateAttribute }
-
   def json_root
     :contact_attribute
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contacts_client
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.8
 description: This is client library for padma-Contacts-ws
 email:
 - dwaynemac@gmail.com
@@ -62,6 +62,7 @@ files:
 - app/models/padma_contact.rb
 - app/models/contacts_merge.rb
 - app/models/attachment.rb
+- app/models/contact_attribute/custom_keys.rb
 - app/models/contact_attribute.rb
 - app/models/avatar.rb
 - lib/contacts_client.rb