conversocial 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da63dfa82a8c5eea9d576e2b53aa4a49e4b1e6d9
-  data.tar.gz: 73121a7f101b21496f2a9619b90b82386ca610d0
+  metadata.gz: 3186bb8dceef834f750a92652082fa931e8051ae
+  data.tar.gz: 75328ce6fa7ee90cb4537957cab4028a2a442c34
 SHA512:
-  metadata.gz: 3ef6fc9d185148037ad701a8921c87e10a31509cc91875d3c14cc055fb83033d38382a5920560278f543960fda751d6742b3f3a0eb2b2e7f2e96c12cfbb1fa69
-  data.tar.gz: 2ae5a97a6778e0d27dbbed132608efd9572b729d74a9526557acd72b89353044a81d06a12ac3c6490a296667eafc1555fb32009fb01213747ae3dca4bd7edd83
+  metadata.gz: 53442840ec73fbdd6bba59c41922871ecef49053946a4cbd9ba85be73061cd78af50098eb6cf6860f9fa2318799bac8ab859a8ae19c3b41c4fba6c8ae4886815
+  data.tar.gz: 0f4f8fe97978cdb488680092ce9d2598d6ecb9bcce03e99f6fb50df37867d035cdafdfd15ff818587f695e98537c335d741ce5a40b89c9f36d4a72beaf3668d2

data/README.md

@@ -22,6 +22,11 @@ Initialize the client with your key and secret
 
     client = Conversocial::Client.new :key => '...', :secret => '...'
 
+You can optionally pass a logger to log api requests made by the client.
+
+    client = Conversocial::Client.new :key => '...', :secret => '...', :logger => Logger.new(STDOUT)
+
+
 ## Resources
 
 Currently, this gem wraps most of the resources exposed by the Conversocial API. You can access these resources via the following query engines on the client object.

data/lib/conversocial.rb

@@ -1,10 +1,12 @@
 require "conversocial/version"
-require 'conversocial/client'
 
 #require utils
 require 'conversocial/utils/http'
 require 'conversocial/utils/strings'
 
+#require client
+require 'conversocial/client'
+
 #require models
 require 'conversocial/resources/models/base'
 require 'conversocial/resources/models/account'

data/lib/conversocial/client.rb

@@ -1,12 +1,12 @@
 module Conversocial
   class Client
-    attr_reader :version, :key, :secret
-
+    attr_reader :version, :key, :secret, :logger
 
     def initialize options={}
       @key = options[:key]
       @secret = options[:secret]
       @version = options[:version]
+      @logger = options[:logger]
     end
 
     def accounts
@@ -41,5 +41,13 @@ module Conversocial
     def conversations
       (@conversations ||= Conversocial::Resources::QueryEngines::Conversation.new self).clear
     end
+
+protected
+
+    def log engine, message
+      if logger
+        logger.debug "\033[32m#{[engine.class.name, message].join ' : '}\e[0m"
+      end
+    end
   end
 end

data/lib/conversocial/resources/models/base.rb

@@ -20,9 +20,7 @@ module Conversocial
         end
 
         def assign_attributes params={}
-          params.each do |k, v|
-            send "#{k}=".to_sym, v
-          end
+          params.each { |k, v| send "#{k}=".to_sym, v }
         end
 
         def fields
@@ -30,55 +28,43 @@ module Conversocial
         end
 
         def attributes mark_not_yet_loaded=true
-          inspect_unloaded_association = ->(v) do
-            "#<#{singularized_resource_type_from_association_attribute(v).capitalize}(id: #{v['id']})>"
-          end
-
-
-          attrs = nil
           disable_association_resolving do
-            attrs = self.class.fields.map do |field_name|
+            self.class.fields.map do |field_name|
               val = send(field_name.to_sym)
-              if mark_not_yet_loaded
-                if val.nil? && @loaded_attributes[field_name.to_sym].nil?
-                  val = :not_yet_loaded
-                elsif association_attribute? val
-                  val = inspect_unloaded_association.call val
-                elsif val.kind_of? Array
-                  val = val.map do |v|
-                    if association_attribute? v
-                      inspect_unloaded_association.call v
-                    else
-                      v
-                    end
-                  end
-                end
-              end
+              val = :not_yet_loaded if mark_not_yet_loaded && val.nil? && @loaded_attributes[field_name.to_sym].nil?
               [field_name, val]
             end.to_h
           end
-          attrs
         end
 
         def refresh
           disable_association_resolving do
-            assign_attributes query_engine.find(id).attributes(false)
+            fully_loaded_instance = query_engine.find id
+            if fully_loaded_instance
+              assign_attributes fully_loaded_instance.attributes(false)
+            else
+              fields.each do |f|
+                @loaded_attributes[f.to_sym] = 1
+              end
+            end
           end
           self
         end
 
-
         protected
 
         def disable_association_resolving
           @disable_association_resolving = true
-          yield
+          result = yield
           @disable_association_resolving = false
+          result
         end
 
         def self.attributize_tags
           fields.map(&:to_sym).each do |f|
-
+            #############################################
+            #### define attribute writer for field  #####
+            #############################################
             define_method "#{f}=".to_sym do |v|
               @loaded_attributes[f] = 1
 
@@ -91,12 +77,28 @@ module Conversocial
                     v = Time.parse v
                   end
                 end
+              else
+                if v.kind_of? Array
+                  v = v.map do |vv|
+                    if association_attribute? vv
+                      client.send(pluralized_resource_type_from_association_attribute(vv).to_sym).new vv
+                    else
+                      vv
+                    end
+                  end
+                end
+
+                if association_attribute? v
+                  v = client.send(pluralized_resource_type_from_association_attribute(v).to_sym).new v
+                end
               end
 
               instance_variable_set "@#{f}", v
             end
 
-
+            #############################################
+            #### define attribute reader for field  #####
+            #############################################
             define_method f do
               value = instance_variable_get "@#{f}"
               unless @disable_association_resolving
@@ -107,23 +109,7 @@ module Conversocial
                     value = instance_variable_get "@#{f}"
                   end
                 end
-
-                #lazily load association if it hasn't been loaded yet
-                if value.kind_of? Array
-                  value = value.map do |v|
-                    if association_attribute? v
-                      load_association v
-                    else
-                      v
-                    end
-                  end
-                  send "#{f}=".to_sym, value
-                else
-                  value = load_association value if association_attribute? value
-                  send "#{f}=".to_sym, value
-                end
               end
-
               value
             end
           end
@@ -151,10 +137,7 @@ module Conversocial
         end
 
         def association_attribute? attribute_value
-          if attribute_value.kind_of? Hash
-            return true if attribute_value['url'].present?
-          end
-          false
+          attribute_value.kind_of?(Hash) && attribute_value.keys.sort == %w{id url}
         end
 
         def pluralized_resource_type_from_association_attribute attribute_value

data/lib/conversocial/resources/query_engines/base.rb

@@ -128,6 +128,10 @@ module Conversocial
           absolute_path add_query_params("", default_fetch_query_params.merge(@query_params))
         end
 
+        def new params={}
+          new_instance_of_klass model_klass, params
+        end
+
         protected
 
         def comparison_filter field, comparison_operator_modifier, value
@@ -184,9 +188,10 @@ module Conversocial
         end
 
         def get_json path
-          #puts "getting json for #{absolute_path(path)}"
+          full_path = absolute_path path
+          client.send :log, self, full_path
 
-          response = https_basic_auth_get client.key, client.secret, absolute_path(path)
+          response = https_basic_auth_get client.key, client.secret, full_path
 
           if 429 == response.code.to_i
             raise Conversocial::Resources::Exceptions::RateLimitExceeded.new response.code, nil, response.body
@@ -208,14 +213,11 @@ module Conversocial
           end
         end
 
-        def new params={}
-          new_instance_of_klass model_klass, params
-        end
-
         def new_instance_of_klass klass, params
-          new_instance = klass.new params
+          new_instance = klass.new
           new_instance.send :assign_client, client
           new_instance.send :assign_query_engine, self
+          new_instance.assign_attributes params
           new_instance
         end
 

data/lib/conversocial/version.rb

@@ -1,3 +1,3 @@
 module Conversocial
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conversocial
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Misha Conway