easypost 2.6.2 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e4ea608f9ed59cd8a5aa358e373884c2b37798f
-  data.tar.gz: 4949b48d8f227a058a28fca0de286eb4b1ccfea7
+  metadata.gz: 1f178b47d51bce112434a172275e8f6c1b5772c4
+  data.tar.gz: 5de1c530ac6212a5fe80e47346ef06f2e2b1eb22
 SHA512:
-  metadata.gz: ac2d5c374ddebbf47902f745019154164650f334a48e96b0a21d010e54eb696f7f2bc1be0a5e0b3759dc34018bdad5ac5904b69adb39120aa868b38f1960b700
-  data.tar.gz: 375b18e205f8baea6ca2978f266604910dce987351b88e89df5799a6eb049bba85c9355208ab3b8343a6c99267fd2056b246ff6eef74d80d7a52cacd86b76685
+  metadata.gz: 24ec4dc5c4f23dedc19a21431773ef0370935946d3b7a9a5b8f767b63a4782b694dd5fe81534838a1e379b78b4aaf9ccb25bb1138c30f10bdfc48336a4268f3f
+  data.tar.gz: 722b3a9549d80060324b576068e1094d235edcd8daa13e2e96d73c555ac827678ee4a50a78964fdd3fcbe44f07eaeded42b1d1b9cb10093ebd2d850697a85531

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 2.7.0 2017-04-04
+
+* Changed Report CRUD signatures. requires report type to be passed
+
 === 2.6.2 2017-02-14
 
 * Added get_rates method for Orders

data/VERSION

@@ -1 +1 @@
-2.6.2
+2.7.0

data/lib/easypost/report.rb

@@ -1,44 +1,24 @@
 module EasyPost
   class Report < Resource
-    REPORT_TYPES = { shprep: 'shipment', plrep: 'payment_log', trkrep: 'tracker' }
-
     def self.create(params={}, api_key=nil)
-      url = self.url
+      url = "#{self.url}/#{params[:type]}"
       wrapped_params = {}
       wrapped_params[class_name.to_sym] = params
 
-      if REPORT_TYPES.values.include?(params[:type].to_s)
-        url += "/#{params[:type]}"
-      else
-        raise Error.new("Undetermined Report Type")
-      end
-
       response, api_key = EasyPost.request(:post, url, api_key, params)
       return Util.convert_to_easypost_object(response, api_key)
     end
 
     def self.retrieve(params, api_key=nil)
-      url = self.url
+      url = "#{self.url}/#{params[:type]}/#{params[:id]}"
       obj_id = params[:id].split("_")[0]
 
-      if REPORT_TYPES.has_key?(obj_id.to_sym)
-        url += "/#{REPORT_TYPES[obj_id.to_sym]}/#{params[:id]}"
-      else
-        raise Error.new("Undetermined Report Type")
-      end
-
       response, api_key = EasyPost.request(:get, url, api_key, params)
       return EasyPost::Util::convert_to_easypost_object(response, api_key) if response
     end
 
     def self.all(filters={}, api_key=nil)
-      url = self.url
-
-      if REPORT_TYPES.values.include?(filters[:type].to_s)
-        url += "/#{filters[:type]}"
-      else
-        raise Error.new("Undetermined Report Type")
-      end
+      url = "#{self.url}/#{filters[:type]}"
 
       response, api_key = EasyPost.request(:get, url, api_key, filters)
       return EasyPost::Util::convert_to_easypost_object(response, api_key) if response

data/spec/report_spec.rb

@@ -1,76 +1,48 @@
 require 'spec_helper'
 
 describe EasyPost::Report do
-  [:shipment, :tracker, :payment_log].each do |report_type|
-    context "report" do
-      let(:type) { report_type }
-      let(:type_name) {
-        case type
-        when :shipment
-          "ShipmentReport"
-        when :tracker
-          "TrackerReport"
-        when :payment_log
-          "PaymentLogReport"
-        else
-          raise "Invalid type!"
-        end
-      }
-
-      describe '#create' do
-        it 'creates a report object' do
-          report = EasyPost::Report.create(
-                                           start_date: Date.today - 30,
-                                           end_date: Date.today,
-                                           type: type
-                                           )
-          expect(report.object).to eq type_name
-          # will switch that test on when tracker status is deployed
-          # expect(report.status).to eq 'available'
-        end
-      end
-
-      describe '#retrieve' do
-        it 'retrieves a user created report by public_id' do
-          report_1 = EasyPost::Report.create(
-                                             start_date: Date.today - 30,
-                                             end_date: Date.today,
-                                             type: type
-                                             )
-          report_2 = EasyPost::Report.retrieve(id: report_1.id)
-
-          expect(report_1.object).to eq type_name
-          expect(report_2.object).to eq type_name
-          expect(report_2.id).to eq(report_1.id)
-        end
-      end
-
-      describe '#all' do
-        it 'retrieves all user created reports' do
-          report_1 = EasyPost::Report.create(
-                                             start_date: Date.today - 25,
-                                             end_date: Date.today,
-                                             type: type
-                                             )
+  TYPE = 'shipment'
+  describe '#create' do
+    it 'creates a report object' do
+      report = EasyPost::Report.create(
+                                       start_date: Date.today - 30,
+                                       end_date: Date.today,
+                                       type: TYPE
+                                       )
+      expect(report.object).to eq 'ShipmentReport'
+      expect(['available', 'new']).to include(report.status)
+    end
+  end
 
-          report_2 = EasyPost::Report.create(
-                                             start_date: Date.today - 29,
-                                             end_date: Date.today,
-                                             type: type
-                                             )
-          reports = EasyPost::Report.all(type: type)
+  describe '#retrieve' do
+    it 'retrieves a user created report by public_id' do
+      report_1 = EasyPost::Report.create(
+                                         start_date: Date.today - 30,
+                                         end_date: Date.today,
+                                         type: TYPE
+                                         )
+      report_2 = EasyPost::Report.retrieve(type: TYPE, id: report_1.id)
 
-          expect(reports.count).to eq 2
-        end
-      end
+      expect(report_2.id).to eq(report_1.id)
     end
   end
 
-  it 'fails to create a report object' do
-    expect { EasyPost::Report.create(
-      start_date: Date.today - 30,
-      end_date: Date.today,
-      type: 'foobar'
-      ) }.to raise_exception(EasyPost::Error)
+  describe '#all' do
+    it 'retrieves all user created reports' do
+      report_1 = EasyPost::Report.create(
+                                         start_date: Date.today - 25,
+                                         end_date: Date.today,
+                                         type: TYPE
+                                         )
+
+      report_2 = EasyPost::Report.create(
+                                         start_date: Date.today - 29,
+                                         end_date: Date.today,
+                                         type: TYPE
+                                         )
+      reports = EasyPost::Report.all(type: TYPE)
+
+      expect(reports.count).to eq 2
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easypost
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.7.0
 platform: ruby
 authors:
 - Sawyer Bateman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client