merchant_e_solutions 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35998008dbdf12b863aa699240c8857aaeba469a
-  data.tar.gz: a5165942271e73270c351152e3f5e67e463f50b9
+  metadata.gz: 84550333afd6acc5e0b4f4eaca679cdf55a0ec41
+  data.tar.gz: 92d3ae4bc28465a85d3f109f938533b8aa8c4b7f
 SHA512:
-  metadata.gz: f234059d25c33dba5f2a7e19f88300f5bf034b4a0bd0b2921bae344cbbc69dfc3928dc4f7ec7bf413cf4f63c26a3d3e4445e73a2ae000fee397214ceb9d6fd20
-  data.tar.gz: 7aa4a3f42ca41833b94d254f71dd18c0efa642e59d924c4ac4ebfb2ea54af7b73935455c9e1c0578f8cffdcfa54028b0c4f2a2ed223be7453a00dbcc84325159
+  metadata.gz: 9f01b2763eaa5abbdc14b72fb1994083444faba8bccb95d4e9429d337b3e5ee91f4c31f5eacbf5c161ff24a1868b70634b96410134854596ed7cb7498daee577
+  data.tar.gz: 2226690b22c075426736a8ce4007296459a04c778efd28b3ea836ab599d447bfc3dd3b52b3183e98e34381ac11b7ac9b1f735204afec729e76b59cae94433e2f

data/lib/merchant_e_solutions.rb

@@ -1,9 +1,10 @@
 require 'merchant_e_solutions/configuration'
 require 'merchant_e_solutions/report'
 require 'merchant_e_solutions/request'
-require 'merchant_e_solutions/deposit_report'
+require 'merchant_e_solutions/adjustment_report'
 require 'merchant_e_solutions/batch_detail_report'
 require 'merchant_e_solutions/batch_summary_report'
+require 'merchant_e_solutions/deposit_report'
 require 'merchant_e_solutions/settlement_detail_report'
 require 'merchant_e_solutions/settlement_summary_report'
 
@@ -33,6 +34,10 @@ module MerchantESolutions
     def deposit_report(options = {})
       DepositReport.new(options)
     end
+
+    def adjustment_report(options = {})
+      AdjustmentReport.new(options)
+    end
   end
 
 end

data/lib/merchant_e_solutions/adjustment_record.rb

@@ -0,0 +1,31 @@
+require 'merchant_e_solutions/record'
+
+module MerchantESolutions
+  class AdjustmentRecord < Record
+
+    attr_reader :organization_id, :organization_name, :control_number, :incoming_date,
+      :card_number, :reference_id, :transaction_date, :transaction_amount,
+      :authorization_code, :adjustment_date, :adjustment_reference_number,
+      :reason, :first_time, :reason_code, :cb_reference_number, :terminal_id
+
+
+    def initialize(row)
+      @organization_id = row[0]
+      @organization_name = row[1]
+      @control_number = row[2]
+      @incoming_date = parse_date(row[3])
+      @card_number = row[4]
+      @reference_id = row[5]
+      @transaction_date = parse_date(row[6])
+      @transaction_amount = row[7]
+      @authorization_code = row[8]
+      @adjustment_date = parse_date(row[9])
+      @adjustment_reference_number = row[10]
+      @reason = row[11]
+      @first_time = parse_boolean(row[12])
+      @reason_code = row[13]
+      @cb_reference_number = row[14]
+      @terminal_id = row[15]
+    end
+  end
+end

data/lib/merchant_e_solutions/adjustment_report.rb

@@ -0,0 +1,21 @@
+require 'merchant_e_solutions/adjustment_record'
+
+module MerchantESolutions
+  class AdjustmentReport < Report
+
+
+    private
+
+    def report_id
+      5
+    end
+
+    def report_type
+      1
+    end
+
+    def record_class
+      AdjustmentRecord
+    end
+  end
+end

data/lib/merchant_e_solutions/record.rb

@@ -5,7 +5,13 @@ module MerchantESolutions
     private
 
     def parse_date(date)
-      Date.strptime(date, "%m/%d/%Y") if date
+      if date && !date.empty?
+        Date.strptime(date, "%m/%d/%Y")
+      end
+    end
+
+    def parse_boolean(string)
+      ['y', 'yes'].include? string.downcase
     end
 
   end

data/lib/merchant_e_solutions/report.rb

@@ -5,7 +5,7 @@ module MerchantESolutions
     attr_reader :records, :request
 
     def initialize(params = {})
-      self.options = params
+      self.options = parse_params(params)
       @request = Request.new(request_params)
       parse_records(request.body)
     end
@@ -47,5 +47,23 @@ module MerchantESolutions
         records << record_class.new(csv)
       end
     end
+
+    def parse_params(params)
+      parse_out_date(params, "begin")
+      parse_out_date(params, "end")
+
+      params
+    end
+
+    def parse_out_date(params, type)
+      key = "#{type}_date"
+      if date = params.delete(key) || params.delete(key.to_sym)
+        params.merge!({
+          "#{type}Date.day" => date.day,
+          "#{type}Date.month" => (date.month - 1),
+          "#{type}Date.year" => date.year,
+        })
+      end
+    end
   end
 end

data/lib/merchant_e_solutions/version.rb

@@ -1,3 +1,3 @@
 module MerchantESolutions
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/fixtures/adjustment_report.csv

@@ -0,0 +1,3 @@
+"Merchant Id","DBA Name","Control Number","Incoming Date","Card Number","Reference Number","Tran Date","Tran Amount","Auth Code","Adj Date","Adj Ref Num","Reason","First Time","Reason Code","CB Ref Num","Terminal ID"
+44,"Hamazon",224,08/11/2014,654321xxxxxx1234,'1176620,07/27/2014,15.0,,"08/10/2013-","1176538","Fraud - Card Not Present Transaction",Y,UA02,802061219,""
+44,"Hamazon",248,10/13/2014,123456xxxxxx4321,'16768007605410284,10/10/2014,40.0,03500P,"10/10/2013-","00001471124","No Cardholder Authorization",Y,4837,319290029,""

data/spec/lib/merchant_e_solutions/adjustment_record_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe MerchantESolutions::AdjustmentRecord do
+  describe "#initialize" do
+    subject { MerchantESolutions::AdjustmentRecord.new(csv_row) }
+
+    #"Merchant Id","DBA Name","Control Number","Incoming Date","Card Number","Reference Number","Tran Date","Tran Amount","Auth Code","Adj Date","Adj Ref Num","Reason","First Time","Reason Code","CB Ref Num","Terminal ID"
+    let(:csv_row) { [44, "Hamazon", 224, "08/11/2014", "654321xxxxxx1234", "'1176620", "07/27/2014", 15.0, 'aaa', "08/10/2013-", "1176538", "Fraud - Card Not Present Transaction", "Y", "UA02", 802061219, "b"] }
+
+    its(:organization_id) { should == 44 }
+    its(:organization_name) { should == "Hamazon" }
+    its(:control_number) { should == 224 }
+    it "parses out the incoming date" do
+      subject.incoming_date.day.should == 11
+      subject.incoming_date.month.should == 8
+      subject.incoming_date.year.should == 2014
+    end
+    its(:card_number) { "654321xxxxxx1234" }
+    its(:reference_id) { "1176620" }
+    it "parses out the transaction date" do
+      subject.transaction_date.day.should == 27
+      subject.transaction_date.month.should == 7
+      subject.transaction_date.year.should == 2014
+    end
+    its(:transaction_amount) { should == 15.0 }
+    its(:authorization_code) { 'aaa' }
+    it "parses out the adjustment date" do
+      subject.adjustment_date.day.should == 10
+      subject.adjustment_date.month.should == 8
+      subject.adjustment_date.year.should == 2013
+    end
+    its(:adjustment_reference_number) { should == '1176538' }
+    its(:reason) { should == "Fraud - Card Not Present Transaction" }
+    its(:first_time) { should == true }
+    its(:reason_code) { should == "UA02" }
+    its(:cb_reference_number) { should == 802061219 }
+    its(:terminal_id) { should == "b" }
+  end
+end

data/spec/lib/merchant_e_solutions/adjustment_report_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe MerchantESolutions::AdjustmentReport do
+  before { stub_net_http_requests }
+
+  describe "#initialize" do
+    let(:request) { double(:request, body: request_fixture('adjustment_report')) }
+    before { MerchantESolutions::Request.stub(:new).and_return(request) }
+
+    it "parses the body of the request as a CSV" do
+      report = MerchantESolutions::AdjustmentReport.new
+
+      report.records.size.should be > 0
+
+      report.records.each do |record|
+        record.should be_a MerchantESolutions::AdjustmentRecord
+      end
+    end
+  end
+
+  describe "#request_params" do
+    let(:request_params) { MerchantESolutions::AdjustmentReport.new(options).request_params }
+    let(:options) { Hash.new }
+
+    it "knows its dsReportId" do
+      request_params[:dsReportId].should == 5
+    end
+
+    it "knows its reportType" do
+      request_params[:reportType].should == 1
+    end
+
+    context "when options are passed in" do
+      let(:options) { {test: 'params'} }
+
+      it "merges in the options" do
+        request_params[:test].should == 'params'
+      end
+    end
+  end
+end

data/spec/lib/merchant_e_solutions/deposit_report_spec.rb

@@ -4,7 +4,7 @@ describe MerchantESolutions::DepositReport do
   before { stub_net_http_requests }
 
   describe "#initialize" do
-    let(:request) { double(:request, body: request_fixture('detail_report')) }
+    let(:request) { double(:request, body: request_fixture('deposit_report')) }
     before { MerchantESolutions::Request.stub(:new).and_return(request) }
 
     it "parses the body of the request as a CSV" do

data/spec/lib/merchant_e_solutions/report_spec.rb

@@ -22,6 +22,21 @@ describe MerchantESolutions::Report do
 
       TestSubReport.new
     end
+
+    it "parses out a date into usable request params for start and end dates" do
+      begin_date = Date.parse('10/11/2012')
+      end_date = Date.parse('11/12/2013')
+
+      report = TestSubReport.new(begin_date: begin_date, end_date: end_date)
+
+      report.request_params["beginDate.day"].should == begin_date.day
+      report.request_params["beginDate.month"].should == (begin_date.month - 1)
+      report.request_params["beginDate.year"].should == begin_date.year
+
+      report.request_params["endDate.day"].should == end_date.day
+      report.request_params["endDate.month"].should == (end_date.month - 1)
+      report.request_params["endDate.year"].should == end_date.year
+    end
   end
 
   describe "#request_params" do

data/spec/lib/merchant_e_solutions_spec.rb

@@ -72,4 +72,18 @@ describe MerchantESolutions do
       MerchantESolutions.deposit_report(options)
     end
   end
+
+  describe ".adjustment_report" do
+    it "returns an Instance of MerchantESolution::SettlementReport" do
+      MerchantESolutions.adjustment_report.should be_a MerchantESolutions::AdjustmentReport
+    end
+
+    it "passes all options directly through to the new SettlementReport" do
+      options = {hash: "with", any: "keys", and: "values"}
+
+      MerchantESolutions::AdjustmentReport.should_receive(:new).with(options)
+
+      MerchantESolutions.adjustment_report(options)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merchant_e_solutions
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Steve Ellis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,6 +82,8 @@ files:
 - README.md
 - Rakefile
 - lib/merchant_e_solutions.rb
+- lib/merchant_e_solutions/adjustment_record.rb
+- lib/merchant_e_solutions/adjustment_report.rb
 - lib/merchant_e_solutions/batch_detail_report.rb
 - lib/merchant_e_solutions/batch_summary_report.rb
 - lib/merchant_e_solutions/configuration.rb
@@ -96,10 +98,13 @@ files:
 - lib/merchant_e_solutions/summary_record.rb
 - lib/merchant_e_solutions/version.rb
 - merchant_e_solutions.gemspec
+- spec/fixtures/adjustment_report.csv
 - spec/fixtures/batch_summary.csv
-- spec/fixtures/detail_report.csv
+- spec/fixtures/deposit_report.csv
 - spec/fixtures/settlement_detail.csv
 - spec/fixtures/settlement_summary.csv
+- spec/lib/merchant_e_solutions/adjustment_record_spec.rb
+- spec/lib/merchant_e_solutions/adjustment_report_spec.rb
 - spec/lib/merchant_e_solutions/batch_detail_report_spec.rb
 - spec/lib/merchant_e_solutions/batch_summary_report_spec.rb
 - spec/lib/merchant_e_solutions/deposit_record_spec.rb
@@ -137,10 +142,13 @@ signing_key:
 specification_version: 4
 summary: Wrapper for the Settlement Report API
 test_files:
+- spec/fixtures/adjustment_report.csv
 - spec/fixtures/batch_summary.csv
-- spec/fixtures/detail_report.csv
+- spec/fixtures/deposit_report.csv
 - spec/fixtures/settlement_detail.csv
 - spec/fixtures/settlement_summary.csv
+- spec/lib/merchant_e_solutions/adjustment_record_spec.rb
+- spec/lib/merchant_e_solutions/adjustment_report_spec.rb
 - spec/lib/merchant_e_solutions/batch_detail_report_spec.rb
 - spec/lib/merchant_e_solutions/batch_summary_report_spec.rb
 - spec/lib/merchant_e_solutions/deposit_record_spec.rb