portatext 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8ef581d57fc7b2b4a813b6522661766edc4388b
-  data.tar.gz: 4dddcf5fd947ddd806cb5d2a7fb6090720e12257
+  metadata.gz: 8060e94cc7da5a6ec5f4b61a2019438b551f8c65
+  data.tar.gz: c4648838ececee96cb984c2e4524636d604c2e11
 SHA512:
-  metadata.gz: 576c63568bd6bc6b8c6370af7d0a6302cafccf7b642a40997260d5984031adea3003f7c573c1e58d5e937f499bf2e2a5d1522034f0b6ebdc48ef14ccab06c8ef
-  data.tar.gz: e66e7fefa293cbb06b75b62ddd39f60bb9f616de78aefff46b0805caf86707d9d45cdd983ec4ff748af81974b7cac434caf14120565c0430721503931890dcdf
+  metadata.gz: 97e8c5e54143cf3a406afccd617bf7f7972856c644fda997fd8902cf58bd1670c42afc34e1e5c919b176e7544748fc029f2cf3383956214b9b1342ff08feb296
+  data.tar.gz: 71b5d73f5d6b56cf16e1004503c751255c125550a5127f6b692df83a31f4fcf0faa0f1feab6169c1493b6dffb6bfc9cef1a5c0e5a4e249182bb01bd7ec33a03b

data/lib/portatext/client/base_client.rb

@@ -17,8 +17,10 @@ module PortaText
 
       def method_missing(method, *_arguments, &_block)
         method = method.to_s.split('_').map(&:capitalize)
-        name = "PortaText::Command::Api::#{method.join('')}"
-        class_name = Object.const_get name
+        class_name = Object.const_get('PortaText')
+                     .const_get('Command')
+                     .const_get('Api')
+                     .const_get(method.join(''))
         command = class_name.new
         command.client = self
         command
@@ -26,27 +28,35 @@ module PortaText
 
       # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/AbcSize
-      def run(endpoint, method, content_type, body, auth = nil)
+      # rubocop:disable Metrics/ParameterLists
+      def run(
+        endpoint, method, content_type, accept_content_type,
+        body, output_file = nil, auth = nil
+      )
         true_endpoint = "#{@endpoint}/#{endpoint}"
         auth ||= auth_method(auth)
-        headers = form_headers content_type, auth
+        headers = form_headers content_type, accept_content_type, auth
         @logger.debug "Calling #{method} #{true_endpoint} with #{auth}"
         descriptor = PortaText::Command::Descriptor.new(
-          true_endpoint, method, headers, body
+          true_endpoint, method, headers, body, output_file
         )
         ret_code, ret_headers, ret_body = @executor.execute descriptor
         @logger.debug "Got: #{ret_code} / #{ret_headers} / #{ret_body}"
-        result = PortaText::Command::Result.new(
-          ret_code, ret_headers, JSON.parse(ret_body)
-        )
+        ret_body = '{}' if ret_body.nil?
+        ret_body = JSON.parse ret_body
+        result = PortaText::Command::Result.new ret_code, ret_headers, ret_body
         if ret_code.eql?(401) && auth.eql?(:session_token)
           login!
-          result = run endpoint, method, content_type, body
+          result = run(
+            endpoint, method, content_type, accept_content_type,
+            body, output_file, auth
+          )
         end
         assert_result descriptor, result
       end
       # rubocop:enable Metrics/MethodLength
       # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/ParameterLists
 
       def initialize
         @logger = Logger.new nil
@@ -60,7 +70,10 @@ module PortaText
       private
 
       def login!
-        result = run 'login', :post, 'application/json', '', :basic
+        result = run(
+          'login', :post, 'application/json', 'application/json',
+          '', nil, :basic
+        )
         @session_token = result.data['token']
       end
 
@@ -94,10 +107,10 @@ module PortaText
         errors[code]
       end
 
-      def form_headers(content_type, auth)
+      def form_headers(content_type, accept_content_type, auth)
         headers = {
           'Content-Type' => content_type,
-          'Accept' => 'application/json'
+          'Accept' => accept_content_type
         }
         case auth
         when :session_token

data/lib/portatext/client/http_client.rb

@@ -35,7 +35,10 @@ module PortaText
       # rubocop:disable Metrics/MethodLength
       def create_request(uri, method, body)
         method = method.to_s.capitalize
-        request = Object.const_get("Net::HTTP::#{method}").new uri
+        request = Object.const_get('Net')
+                  .const_get('HTTP')
+                  .const_get(method)
+                  .new uri
         data = /^file:(.*)$/.match(body)
         if data.nil?
           request.body = body
@@ -48,16 +51,31 @@ module PortaText
       end
       # rubocop:enable Metrics/MethodLength
 
-      def request!(descriptor, http, request)
-        descriptor.headers.each_pair do |k, v|
-          request[k] = v
+      def writer_proc(file)
+        if file.nil?
+          nil
+        else
+          proc do |response|
+            open file, 'w+' do |io|
+              response.read_body { |chunk| io.write chunk }
+            end
+          end
         end
-        result = http.request request
-        headers = result.to_hash.each_with_object({}) do |(k, v), acc|
+      end
+
+      def normalize_headers(result)
+        result.to_hash.each_with_object({}) do |(k, v), acc|
           acc[k.downcase] = v.shift
           acc
         end
-        [result.code.to_i, headers, result.body]
+      end
+
+      def request!(descriptor, http, request)
+        descriptor.headers.each_pair { |k, v| request[k] = v }
+        body = nil
+        result = http.request request, &(writer_proc descriptor.output_file)
+        body = result.body if descriptor.output_file.nil?
+        [result.code.to_i, normalize_headers(result), body]
       end
     end
   end

data/lib/portatext/command/api/blacklist.rb

@@ -16,7 +16,12 @@ module PortaText
           set :file, file
         end
 
+        def save_to(file)
+          set :accept_file, file
+        end
+
         def endpoint(_method)
+          return 'blacklist/contacts' unless @args[:accept_file].nil?
           return 'blacklist/contacts' unless @args[:file].nil?
           return 'blacklist' if @args[:number].nil?
           number = @args[:number]

data/lib/portatext/command/api/contact_lists.rb

@@ -24,11 +24,16 @@ module PortaText
           set :file, file
         end
 
+        def save_to(file)
+          set :accept_file, file
+        end
+
         def endpoint(_method)
           return 'contact_lists' if @args[:id].nil?
           id = @args[:id]
           @args.delete :id
           return "contact_lists/#{id}/contacts" unless @args[:file].nil?
+          return "contact_lists/#{id}/contacts" unless @args[:accept_file].nil?
           "contact_lists/#{id}"
         end
       end

data/lib/portatext/command/base.rb

@@ -40,6 +40,11 @@ module PortaText
         'application/json'
       end
 
+      def accept_content_type(_method)
+        return 'text/csv' unless @args[:accept_file].nil?
+        'application/json'
+      end
+
       def body(_method)
         return "file:#{@args[:file]}" unless @args[:file].nil?
         return '' if @args.size.eql? 0
@@ -53,7 +58,14 @@ module PortaText
       private
 
       def run(method)
-        @client.run endpoint(method), method, content_type(method), body(method)
+        a_type = accept_content_type method
+        command_endpoint = endpoint(method)
+        file = @args[:accept_file]
+        @args.delete :accept_file
+        @client.run(
+          command_endpoint, method, content_type(method),
+          a_type, body(method), file
+        )
       end
     end
   end

data/lib/portatext/command/descriptor.rb

@@ -11,12 +11,14 @@ module PortaText
       attr_accessor :method
       attr_accessor :headers
       attr_accessor :body
+      attr_accessor :output_file
 
-      def initialize(uri, method, headers, body)
+      def initialize(uri, method, headers, body, output_file = nil)
         @uri = uri
         @method = method
         @headers = headers
         @body = body
+        @output_file = output_file
       end
     end
   end

data/lib/portatext/command/result.rb

@@ -15,7 +15,7 @@ module PortaText
         @code = code
         @headers = headers
         @data = data
-        @success = code > 199 && code < 300 && data['success']
+        @success = code > 199 && code < 300
       end
     end
   end

data/portatext.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'portatext'
-  s.version     = '1.1.1'
+  s.version     = '1.1.2'
   s.summary     = 'Official PortaText API ruby client'
   s.description = 'This is the official PortaText API ruby client'
   s.authors     = ['PortaText']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: portatext
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - PortaText
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov