printnode 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d69c7a9f6b920b956b7e38311e5d03483b60ef8
-  data.tar.gz: a08d4ba140e4581f76e2566da10e326409a314de
+  metadata.gz: d695182e835ba0775915de715ca18878b1634199
+  data.tar.gz: c9dd27039dbb57a324ff180dbea704b7c85e50e2
 SHA512:
-  metadata.gz: 3bb35b3b7bdfcf2b9e811e3fdc9690c5e2c48999f5f4a9bd20de80b73044111b2d5e4f8e9ec4cd9452d5a9db85f5fe951a634714f57b8f648b290d840bc81332
-  data.tar.gz: 6fca3b7776a3e393d51fa52b71350c3ecad85d4d841c4c515e5671ba938a8812e5f554790f5e6b3294866bf97870a5aacf5cb101a0ed823c04282a9c62c03087
+  metadata.gz: 5f67ec8fcb1c0f825334d4733221fc424eb19319ed611f0c212b29a2c438c0af74154014a9aaa5a4002d0031d525f51988715487e536cb654487b5f00b1c0835
+  data.tar.gz: 45563ed39f6cbd49ff40f13fb420da3dccea2415534620e96caf583b6d09809e26e89627354751ce9ef5dfd85bfa99c1a4d8eee9a061062e46a44eb4ef2713da

data/lib/printnode/client.rb

@@ -2,7 +2,6 @@ require 'net/https'
 require 'uri'
 require 'json'
 require 'ostruct'
-require 'base64'
 require 'cgi'
 
 module PrintNode
@@ -11,6 +10,8 @@ module PrintNode
   # @author PrintNode
   class Client
 
+    attr_reader :headers
+
     # If an argument is not a string, map it to a string so it can be escaped
     # and put into a URL.
     #
@@ -23,7 +24,6 @@ module PrintNode
       CGI.escape(obj)
     end
 
-    attr_reader :headers
     # Initializes auth object, api url and headers.
     #
     # @param auth [PrintNode::Auth] auth object with credentials.
@@ -100,7 +100,7 @@ module PrintNode
     def start_response(request, uri)
       response = Net::HTTP.start(uri.hostname,
                                  uri.port,
-                                 use_ssl: uri.scheme = 'https') do |http|
+                                 use_ssl: uri.scheme == 'https') do |http|
         http.request(request)
       end
       http_error_handler(response)

data/lib/printnode/printjob.rb

@@ -1,4 +1,5 @@
 require 'base64'
+
 module PrintNode
   # An object for printjob creation.
   # @author Jake Torrance
@@ -10,21 +11,6 @@ module PrintNode
     attr_accessor :content
     attr_accessor :source
 
-    # Maps the object into a hash ready for JSON Encoding.
-    def to_hash
-      hash = {}
-      hash['printerId'] = @printer_id
-      hash['title'] = @title
-      hash['contentType'] = @content_type
-      if @content_type.match('base64$')
-        hash ['content'] = Base64.encode64(IO.read(@content))
-      else
-        hash ['content'] = @content
-      end
-      hash['source'] = @source
-      hash
-    end
-
     # Initializes the object with the variables required.
     def initialize(printer_id, title, content_type, content, source)
       @printer_id = printer_id
@@ -33,5 +19,36 @@ module PrintNode
       @content = content
       @source = source
     end
+
+    # Maps the object into a hash ready for JSON Encoding.
+    def to_hash
+      {
+          'printerId' => @printer_id,
+          'title' => @title,
+          'contentType' => @content_type,
+          'content' => load_content,
+          'source' => @source
+      }
+    end
+
+    def load_content
+      # Used to be, we only supported file names for Base64, but it's actually better
+      # to allow the user to send us a data string if they desire.  Testing the
+      # content to see if it's a path allows for backwards compatibility
+      if @content_type.match('base64$') && content_is_existing_file?
+        Base64.encode64(IO.read(@content))
+      else
+        @content
+      end
+    end
+
+    def content_is_existing_file?
+        begin
+            File.exist?(@content)
+        rescue
+            false
+        end
+    end
+
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: printnode
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - PrintNode
-- Jake Torrance
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -72,9 +71,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: PrintNode-Ruby
 test_files: []
-has_rdoc: