conversocial 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd5391669fb7b337fafadf1f2345946e680305ee
-  data.tar.gz: 0f1aff374699fa9d68dec55eda315e0cadc88636
+  metadata.gz: da63dfa82a8c5eea9d576e2b53aa4a49e4b1e6d9
+  data.tar.gz: 73121a7f101b21496f2a9619b90b82386ca610d0
 SHA512:
-  metadata.gz: 780aa670a939f2401b4aec2da2a78d06b07b6e8f555a162a60f4095e2b0e55d16a58670e9ce91d5335d9e4bc4f25bb5bc97ae256ed18bc17e463b4bec340f8ff
-  data.tar.gz: 51afe9ebbb71953bae4b9806707d50f47450045b70ce3304efd52222b418fe58f5e27bbee7cc9d22fc58981301750c21d0e2b672b1b88e3e92aa283a02a2b9e4
+  metadata.gz: 3ef6fc9d185148037ad701a8921c87e10a31509cc91875d3c14cc055fb83033d38382a5920560278f543960fda751d6742b3f3a0eb2b2e7f2e96c12cfbb1fa69
+  data.tar.gz: 2ae5a97a6778e0d27dbbed132608efd9572b729d74a9526557acd72b89353044a81d06a12ac3c6490a296667eafc1555fb32009fb01213747ae3dca4bd7edd83

data/README.md

@@ -66,6 +66,9 @@ It is possible to chain filters
 
 ## Comparison Filters
 
+    #get all tags with id larger than 30000
+    client.tags.greater_than(:id, 30000).fetch
+
     #get all conversations where oldest sort date is greater than or equal to today
     client.conversations.greater_than_or_equal_to(:oldest_sort_date, Date.today ).fetch 
 
@@ -78,6 +81,12 @@ It is possible to chain filters
     #get all conversations where oldest sort date is lesser than today
     client.conversations.lesser_than(:oldest_sort_date, Date.today ).fetch
 
+    #get all users where first name is nil
+    client.users.is_nil(:first_name).fetch
+
+    #get all users where first name is not nil
+    client.users.is_not_nil(:first_name).fetch
+
 ## Sorting
 It is possible to sort your queries
 
@@ -119,7 +128,7 @@ To get all the conversations for today
       conversations.each do |conversation|
         puts "conversation #{conversation.id}"
         conversation.contents.each do |content|
-          puts "#{content.author.real_name}: #{content.text}"
+          puts "#{content.author.try(:real_name)}: #{content.text}"
         end
         puts "\n"
       end

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

@@ -2,9 +2,7 @@ module Conversocial
   module Resources
     module Exceptions
       class Base < ::StandardError
-
         attr_reader :status_code, :server_message, :application_message
-        attr_writer :default_message
 
         def initialize(status_code = nil, server_message = nil, application_message = nil)
           @status_code = status_code
@@ -13,7 +11,11 @@ module Conversocial
         end
 
         def to_s
-          "\nStatus: #{status_code}\nServer Message: #{server_message}\nApplication Message: #{application_message}"
+          lines = []
+          lines << "Status: #{status_code}" if status_code.present?
+          lines << "Server Message: #{server_message}" if server_message.present?
+          lines << "Application Message: #{application_message}" if application_message.present?
+          "\n" + lines.join("\n")
         end
       end
     end

data/lib/conversocial/resources/exceptions/rate_limit_exceeded.rb

@@ -0,0 +1,8 @@
+module Conversocial
+  module Resources
+    module Exceptions
+      class RateLimitExceeded < Base
+      end
+    end
+  end
+end

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

@@ -2,6 +2,8 @@ module Conversocial
   module Resources
     module Models
       class Base
+        include Conversocial::Utils::Strings
+
         attr_reader :loaded_attributes, :contents
 
         def initialize params={}
@@ -65,6 +67,7 @@ module Conversocial
           self
         end
 
+
         protected
 
         def disable_association_resolving
@@ -121,8 +124,6 @@ module Conversocial
                 end
               end
 
-
-
               value
             end
           end
@@ -167,8 +168,6 @@ module Conversocial
         def load_association value
           client.send(pluralized_resource_type_from_association_attribute(value).to_sym).find value['id']
         end
-
-
       end
     end
   end

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

@@ -3,12 +3,10 @@ module Conversocial
     module Models
       class Keyvalue < Base
         def self.fields
-          %w{}
+          %w{key value value_type}
         end
 
         attributize_tags
-
-
       end
     end
   end

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

@@ -7,8 +7,6 @@ module Conversocial
         end
 
         attributize_tags
-
-
       end
     end
   end

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

@@ -7,8 +7,6 @@ module Conversocial
         end
 
         attributize_tags
-
-
       end
     end
   end

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

@@ -7,8 +7,6 @@ module Conversocial
         end
 
         attributize_tags
-
-
       end
     end
   end

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

@@ -5,6 +5,8 @@ module Conversocial
     module QueryEngines
       class Base
         include Enumerable
+        include Conversocial::Utils::Strings
+        include Conversocial::Utils::HTTP
 
         attr_reader :client, :query_params
 
@@ -114,6 +116,14 @@ module Conversocial
           comparison_filter field, "lte", value
         end
 
+        def is_nil field
+          comparison_filter field, "isnull", 1
+        end
+
+        def is_not_nil field
+          comparison_filter field, "isnull", 0
+        end
+
         def to_fetch_url
           absolute_path add_query_params("", default_fetch_query_params.merge(@query_params))
         end
@@ -153,8 +163,6 @@ module Conversocial
           items
         end
 
-
-
         def resource_name
           demodulize(model_klass.name).downcase
         end
@@ -178,19 +186,13 @@ module Conversocial
         def get_json path
           #puts "getting json for #{absolute_path(path)}"
 
-          uri = URI absolute_path(path)
-          response = Net::HTTP.start(uri.host, uri.port,
-                          :use_ssl => uri.scheme == 'https',
-                          :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
+          response = https_basic_auth_get client.key, client.secret, absolute_path(path)
 
-            request = Net::HTTP::Get.new uri.request_uri
-            request.basic_auth client.key, client.secret
-
-            http.request request # Net::HTTPResponse object
+          if 429 == response.code.to_i
+            raise Conversocial::Resources::Exceptions::RateLimitExceeded.new response.code, nil, response.body
           end
 
           json = JSON.parse response.body
-
           if response.kind_of? Net::HTTPSuccess
             json
           else
@@ -206,23 +208,6 @@ module Conversocial
           end
         end
 
-        def add_query_params(url, params_to_add)
-          uri    = URI url
-          params = (params_to_add || {}).merge URI.decode_www_form(uri.query.to_s).to_h
-          return url if params.blank?
-          uri.query = URI.encode_www_form(params)
-          uri.to_s
-        end
-
-        def demodulize(path)
-          path = path.to_s
-          if i = path.rindex('::')
-            path[(i+2)..-1]
-          else
-            path
-          end
-        end
-
         def new params={}
           new_instance_of_klass model_klass, params
         end

data/lib/conversocial/utils/http.rb

@@ -0,0 +1,41 @@
+module Conversocial
+  module Utils
+    module HTTP
+      def https_basic_auth_get basic_auth_name, basic_auth_pass, url
+        uri = URI url
+        Net::HTTP.start(uri.host, uri.port,
+                                   :use_ssl => uri.scheme == 'https',
+                                   :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
+
+          request = Net::HTTP::Get.new uri.request_uri
+          request.basic_auth basic_auth_name, basic_auth_pass
+
+          http.request request # Net::HTTPResponse object
+        end
+      end
+
+      def https_basic_auth_post basic_auth_name, basic_auth_pass, url, post_params
+        uri = URI url
+        Net::HTTP.start(uri.host, uri.port,
+                        :use_ssl => uri.scheme == 'https',
+                        :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
+
+          request = Net::HTTP::Post.new uri.request_uri
+          request.basic_auth basic_auth_name, basic_auth_pass
+          request.set_form_data post_params
+
+          http.request request # Net::HTTPResponse object
+        end
+      end
+
+
+      def add_query_params(url, params_to_add)
+        uri    = URI url
+        params = (params_to_add || {}).merge URI.decode_www_form(uri.query.to_s).to_h
+        return url if params.blank?
+        uri.query = URI.encode_www_form(params)
+        uri.to_s
+      end
+    end
+  end
+end

data/lib/conversocial/utils/strings.rb

@@ -0,0 +1,16 @@
+module Conversocial
+  module Utils
+    module Strings
+
+
+      def demodulize(path)
+        path = path.to_s
+        if i = path.rindex('::')
+          path[(i+2)..-1]
+        else
+          path
+        end
+      end
+    end
+  end
+end

data/lib/conversocial/version.rb

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

data/lib/conversocial.rb

@@ -1,6 +1,10 @@
 require "conversocial/version"
 require 'conversocial/client'
 
+#require utils
+require 'conversocial/utils/http'
+require 'conversocial/utils/strings'
+
 #require models
 require 'conversocial/resources/models/base'
 require 'conversocial/resources/models/account'
@@ -26,6 +30,7 @@ require 'conversocial/resources/query_engines/user'
 
 #require exceptions
 require 'conversocial/resources/exceptions/base'
+require 'conversocial/resources/exceptions/rate_limit_exceeded'
 
 module Conversocial
   # Your code goes here...

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conversocial
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Misha Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,6 +55,7 @@ files:
 - lib/conversocial/client.rb
 - lib/conversocial/resources.rb
 - lib/conversocial/resources/exceptions/base.rb
+- lib/conversocial/resources/exceptions/rate_limit_exceeded.rb
 - lib/conversocial/resources/models.rb
 - lib/conversocial/resources/models/account.rb
 - lib/conversocial/resources/models/author.rb
@@ -76,6 +77,8 @@ files:
 - lib/conversocial/resources/query_engines/report.rb
 - lib/conversocial/resources/query_engines/tag.rb
 - lib/conversocial/resources/query_engines/user.rb
+- lib/conversocial/utils/http.rb
+- lib/conversocial/utils/strings.rb
 - lib/conversocial/version.rb
 homepage: https://github.com/MishaConway/ruby-conversocial
 licenses: