lib/parcel_api/label.rb in parcel_api-1.2.0 vs lib/parcel_api/label.rb in parcel_api-1.2.1

@@ -4,56 +4,63 @@
   # and download labels.
 
   class Label
     LABEL_URL = '/ParcelLabel/2.0/labels'
 
+    attr_accessor :connection, :labels, :label_request, :label_response
+
     # Creates a new ParcelApi::Label instance.
 
-    def initialize(connection=nil)
-      @connection ||= connection || ParcelApi::Client.connection
+    def initialize(connection = nil)
+      self.connection ||= connection || ParcelApi::Client.connection
     end
 
     # Create a label with the specified options
     # @param label_options [Hash]
     # @return Single or array of label objects
 
     def create(label_options)
-      domestic_url = File.join(LABEL_URL, 'domestic')
-      response = @connection.post domestic_url, body: label_options.to_json.to_ascii, headers: { 'Content-Type' => 'application/json' }
-      labels = response.parsed['labels'].map {|label| OpenStruct.new(label)}
-      labels.first if labels.count == 1
+      create_label File.join(LABEL_URL, 'domestic'), label_options
     end
 
     # Create an international label with the specified options
     # @param label_options [Hash]
     # @return Single or array of label objects
 
     def international_create(label_options)
-      international_url = File.join(LABEL_URL, 'international')
-      response = @connection.post international_url, body: label_options.to_json.to_ascii, headers: { 'Content-Type' => 'application/json' }
-      labels = response.parsed['labels'].map {|label| OpenStruct.new(label)}
-      labels.first if labels.count == 1
+      create_label File.join(LABEL_URL, 'international', label_options)
     end
 
     # Get label details
     # @param label_id [String]
     # @return Object of label details
 
     def details(label_id)
       details_url = File.join(LABEL_URL, "#{label_id}.json")
-      response = @connection.get details_url
+      response = connection.get details_url
       details = response.parsed.tap {|d| d.delete('success')}
       OpenStruct.new(details)
     end
 
     # Download label
     # @param label_id [String]
     # @return Object of label
 
     def download(label_id)
       download_url = File.join(LABEL_URL, "#{label_id}.pdf")
-      response = @connection.get download_url
+      response = connection.get download_url
       StringIO.new(response.body)
+    end
+
+    private
+
+    def create_label(url, label_options)
+      self.label_request = {
+        body: label_options.to_json.to_ascii,
+        headers: { 'Content-Type' => 'application/json' }
+      }
+      self.label_response = connection.post(url, label_request)
+      self.label_response.parsed['labels'].map {|label| OpenStruct.new(label)}.first
     end
 
   end
 
 end