monkeylearn 0.2.2 → 3.0.0

data/lib/monkeylearn/response.rb

@@ -1,6 +1,6 @@
 module Monkeylearn
   class Response
-    attr_reader :raw_response, :result, :query_limit_remaining
+    attr_reader :raw_response, :status, :body, :plan_queries_allowed, :plan_queries_remaining, :request_queries_used
 
     def initialize(raw_response)
       self.raw_response = raw_response
@@ -8,24 +8,37 @@ module Monkeylearn
 
     def raw_response=(raw_response)
       @raw_response = raw_response
-      @result = JSON.parse(raw_response.body)
-      @query_limit_remaining = raw_response.headers['X-Query-Limit-Remaining'].to_i
+      @status = raw_response.status
+      if raw_response.body != ''
+        @body = JSON.parse(raw_response.body, symbolize_keys: true)
+      else
+        @body = nil
+      end
+      @plan_queries_allowed = @raw_response.headers['X-Query-Limit-Limit'].to_i
+      @plan_queries_remaining = @raw_response.headers['X-Query-Limit-Remaining'].to_i
+      @request_queries_used = @raw_response.headers['X-Query-Limit-Request-Queries'].to_i
     end
   end
 
   class MultiResponse
-    attr_reader :responses, :result, :query_limit_remaining
+    attr_reader :responses, :body, :plan_queries_allowed, :plan_queries_remaining, :request_queries_used
 
     def initialize(responses)
       self.responses = responses
     end
 
+    def body
+      responses.collect do |r|
+        r.body
+      end.reduce(:+)
+    end
+
     def responses=(responses)
       @responses = responses
       @query_limit_remaining = responses[-1].raw_response.headers['X-Query-Limit-Remaining'].to_i
-      @result = responses.collect do |r|
-        r.result['result']
-      end.reduce(:+)
+      @plan_queries_allowed = @responses[-1].plan_queries_allowed
+      @plan_queries_remaining = @responses[-1].plan_queries_remaining
+      @request_queries_used = @responses.inject(0){|sum, r| sum + r.request_queries_used }
     end
   end
 end

data/monkeylearn.gemspec

@@ -10,8 +10,9 @@ Gem::Specification.new do |spec|
   spec.email = ['hello@monkeylearn.com']
   spec.homepage = 'https://github.com/monkeylearn/monkeylearn-ruby'
 
-  spec.version = '0.2.2'
-  spec.add_dependency 'faraday', '>= 0.9.2'
+  spec.version = '3.0.0'
+
+  spec.add_dependency 'faraday', '= 0.15.0'
 
   spec.licenses = ['MIT']
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: monkeylearn
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Monkeylearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.15.0
 description: A simple client for the MonkeyLearn API
 email:
 - hello@monkeylearn.com
@@ -32,16 +32,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- monkeylearn.gemspec
+- lib/monkeylearn.rb
 - lib/monkeylearn/classifiers.rb
 - lib/monkeylearn/configurable.rb
 - lib/monkeylearn/defaults.rb
 - lib/monkeylearn/exceptions.rb
 - lib/monkeylearn/extractors.rb
-- lib/monkeylearn/pipelines.rb
 - lib/monkeylearn/requests.rb
 - lib/monkeylearn/response.rb
-- lib/monkeylearn.rb
+- monkeylearn.gemspec
 homepage: https://github.com/monkeylearn/monkeylearn-ruby
 licenses:
 - MIT
@@ -52,17 +51,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Ruby client for the MonkeyLearn API

data/lib/monkeylearn/pipelines.rb

@@ -1,28 +0,0 @@
-require 'monkeylearn/requests'
-
-module Monkeylearn
-  class << self
-    def pipelines
-      return Pipelines
-    end
-  end
-
-  module Pipelines
-    class << self
-      include Monkeylearn::Requests
-
-      def build_endpoint(*args)
-        File.join('pipelines', *args) + '/'
-      end
-
-      def run(module_id, data, options = {})
-        query_params = { sandbox: true } if options[:sandbox]
-        endpoint = build_endpoint(module_id, 'run')
-        unless data.is_a?(Hash)
-          raise MonkeylearnError, 'The data param must be a hash'
-        end
-        request :post, endpoint, data
-      end
-    end
-  end
-end