conversocial 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef8feb5467b16254c542a01b58fd1001df721499
-  data.tar.gz: a1a4267eeb246cb6a1d6218173c1832fcbda5fe5
+  metadata.gz: 4ab11c32b300c1ed689033d453cd12f5adf2b878
+  data.tar.gz: ec30b42553642dc80875d15bb793bd9546694bcf
 SHA512:
-  metadata.gz: c1f31b5dc24413551180556a05c390cc883463247d235d43ff81ba500e8504cbb266ff303bbddf798053a285090e295860426d62799d21cadf5728e5d017ebf4
-  data.tar.gz: 1530913cc3cbbea2d7e72aa190aed25f04df0792ec6ff833b1a662b0d1ce030386073fb20c55cad4606613ae737c5595a673a04c58a443388ee51aa2fe4775bb
+  metadata.gz: ca7341f396e2cbe583cb948783880eb72b96035705c432c535809635a2696a5a00751a0b4e7be09381447795821675830d888590559da6f744b5def21460ef69
+  data.tar.gz: b4dde8d4c0429669fc3b724b2d3d819927edba1ff77ef5117ac9fc7dbc186cacbbcf84b3fb2257084e87848b04d53c5cff12c97752c9e9c408d0d8298fa915fd

data/lib/conversocial.rb

@@ -6,6 +6,7 @@ require 'conversocial/resources/models/base'
 require 'conversocial/resources/models/account'
 require 'conversocial/resources/models/author'
 require 'conversocial/resources/models/channel'
+require 'conversocial/resources/models/content'
 require 'conversocial/resources/models/conversation'
 require 'conversocial/resources/models/keyvalue'
 require 'conversocial/resources/models/report'

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

@@ -2,11 +2,12 @@ module Conversocial
   module Resources
     module Models
       class Base
-        attr_reader :loaded_attributes
+        attr_reader :loaded_attributes, :contents
 
         def initialize params={}
           disable_association_resolving do
             @loaded_attributes = {}
+            @contents = []
             assign_attributes params
           end
         end
@@ -144,6 +145,10 @@ module Conversocial
           @query_engine = v
         end
 
+        def append_content content
+          @contents << content
+        end
+
         def association_attribute? attribute_value
           if attribute_value.kind_of? Hash
             return true if attribute_value['url'].present?

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

@@ -0,0 +1,16 @@
+module Conversocial
+  module Resources
+    module Models
+      class Content < Base
+        def self.fields
+          %w{attachments parent author is_priority text tags sentiment channels platform link created_date type id is_private}
+        end
+        attributize_tags
+
+
+
+
+      end
+    end
+  end
+end

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

@@ -13,9 +13,12 @@ author
 channels
 assigned_to
 content_ids
+contents
 handling_times}.map &:to_sym
         end
 
+
+
         attributize_tags
 
 

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

@@ -60,20 +60,14 @@ module Conversocial
           self
         end
 
-        def new params={}
-          new_instance = model_klass.new params
-          new_instance.send :assign_client, client
-          new_instance.send :assign_query_engine, self
-          new_instance
-        end
-
         def find find_id
           @query_params[:fields] ||= model_klass.fields.join(',')
 
           json = get_json add_query_params("/#{find_id}", default_find_query_params.merge(@query_params))
           clear
           if json
-            new json[resource_name]
+            item = new json[resource_name]
+            attach_content_to_items( [item], json['content']).first
           end
         end
 
@@ -135,13 +129,31 @@ module Conversocial
           clear
           items = []
           if json
+
+
             items = json[plural_resource_name].map do |instance_params|
               new instance_params
             end
+            items = attach_content_to_items items, json['content']
           end
           {:items => items, :json => json}
         end
 
+        def attach_content_to_items items, content_json_array
+          if content_json_array.present?
+            items.each do |item|
+              item.content_ids.each do |content_id|
+                content_json = content_json_array.find{ |ct| ct['id'] == content_id }
+                if content_json
+                  item.send :append_content, new_instance_of_klass(Conversocial::Resources::Models::Content, content_json)
+                end
+              end
+            end
+          end
+          items
+        end
+
+
 
         def resource_name
           demodulize(model_klass.name).downcase
@@ -211,6 +223,17 @@ 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.send :assign_client, client
+          new_instance.send :assign_query_engine, self
+          new_instance
+        end
+
       end
     end
   end

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

@@ -12,6 +12,10 @@ module Conversocial
           {:is_priority => false, :include => 'content'}
         end
 
+        def default_find_query_params
+          {:include => 'content'}
+        end
+
         def limit l
           where :page_size => l
         end

data/lib/conversocial/version.rb

@@ -1,3 +1,3 @@
 module Conversocial
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conversocial
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Misha Conway
@@ -60,6 +60,7 @@ files:
 - lib/conversocial/resources/models/author.rb
 - lib/conversocial/resources/models/base.rb
 - lib/conversocial/resources/models/channel.rb
+- lib/conversocial/resources/models/content.rb
 - lib/conversocial/resources/models/conversation.rb
 - lib/conversocial/resources/models/keyvalue.rb
 - lib/conversocial/resources/models/report.rb