merchant_e_solutions 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e767aa0bd99777d38ddc626e68de1bf4e6ba6081
-  data.tar.gz: 438be6695dfc51170b25d9488152cd9042dea91b
+  metadata.gz: 0e98e8dda31cee47dca4fa9abbf168ebabd009d3
+  data.tar.gz: 433d2c8db0bc33f1a7b10b9dc8b3f09480128872
 SHA512:
-  metadata.gz: 66057cc796b9f806c0de9e9eeeccbe92b327d69bd8c60e8a52438d747d8797f1e367e3aa7fdb0e46ecf21657d8515be0efad4d2d063d36cefa596ba60c5f80d1
-  data.tar.gz: c69957292063d26c1f8bfd0f46e8bf50a5dbbe2abc6ab769bd9381e1f54dc6f43e0ba4c76745645f880ff6f13e3ab3775259d00206802de0bfe559154fdc91ff
+  metadata.gz: 3d8f5c46dc6e91b9b323826703ab56eb3167b960dd001ccbc1118a4e11d860e189c2db9e4b2fbc0a6133fcab23669cc1424800766f2cab7baab5b3c1b00b1418
+  data.tar.gz: cc4c67fb1604fbf8fe392e86f7f9d4e020dc781b3fc69bfc40c4b2f98ad8f96ac0f67e63df4b40e12ba23188e35361a229130bde746b7ed2c4f7786be2201168

data/lib/merchant_e_solutions.rb

@@ -1,10 +1,12 @@
 require 'merchant_e_solutions/configuration'
 require 'merchant_e_solutions/report'
 require 'merchant_e_solutions/request'
+require 'merchant_e_solutions/detail_record'
+require 'merchant_e_solutions/batch_detail_report'
+require 'merchant_e_solutions/batch_summary_report'
 require 'merchant_e_solutions/settlement_detail_report'
-require 'merchant_e_solutions/settlement_detail_record'
-require 'merchant_e_solutions/settlement_summary_record'
 require 'merchant_e_solutions/settlement_summary_report'
+require 'merchant_e_solutions/summary_record'
 
 module MerchantESolutions
 

data/lib/merchant_e_solutions/batch_detail_report.rb

@@ -0,0 +1,21 @@
+require 'csv'
+
+module MerchantESolutions
+  class BatchDetailReport < Report
+
+
+    private
+
+    def report_id
+      1
+    end
+
+    def report_type
+      1
+    end
+
+    def record_class
+      DetailRecord
+    end
+  end
+end

data/lib/merchant_e_solutions/batch_summary_report.rb

@@ -0,0 +1,21 @@
+require 'csv'
+
+module MerchantESolutions
+  class BatchSummaryReport < Report
+
+
+    private
+
+    def report_id
+      1
+    end
+
+    def report_type
+      0
+    end
+
+    def record_class
+      SummaryRecord
+    end
+  end
+end

data/lib/merchant_e_solutions/{settlement_detail_record.rb → detail_record.rb}

@@ -1,7 +1,7 @@
 module MerchantESolutions
-  class SettlementDetailRecord
+  class DetailRecord
 
-    attr_accessor :organization_id, :organization_name, :term_number, :batch_number, :batch_date,
+    attr_reader :organization_id, :organization_name, :term_number, :batch_number, :batch_date,
       :transaction_date, :card_code, :card_number, :reference_number, :purchase_id, :auth_code,
       :entry_mode, :transaction_amount, :trident_transaction_id, :client_reference_number
 

data/lib/merchant_e_solutions/report.rb

@@ -1,17 +1,20 @@
 module MerchantESolutions
   class Report
-    attr_reader :request, :records
+    attr_reader :records, :request
 
     def initialize(params = {})
       self.options = params
-      @request = Request.new(request_params).body
-      parse_records(request)
+      @request = Request.new(request_params)
+      parse_records(request.body)
     end
 
     def request_params
       {
         dsReportId: report_id,
-        reportType: report_type
+        reportType: report_type,
+        includeTridentTranId: true,
+        includePurchaseId: true,
+        includeClientRefNum: true
       }.merge(report_specific_params)
     end
 

data/lib/merchant_e_solutions/settlement_detail_report.rb

@@ -15,7 +15,7 @@ module MerchantESolutions
     end
 
     def record_class
-      SettlementDetailRecord
+      DetailRecord
     end
   end
 end

data/lib/merchant_e_solutions/settlement_summary_report.rb

@@ -15,7 +15,7 @@ module MerchantESolutions
     end
 
     def record_class
-      SettlementSummaryRecord
+      SummaryRecord
     end
   end
 end

data/lib/merchant_e_solutions/{settlement_summary_record.rb → summary_record.rb}

@@ -1,5 +1,5 @@
 module MerchantESolutions
-  class SettlementSummaryRecord
+  class SummaryRecord
 
     attr_reader :organization_id, :organization_name, :credit_company,
       :sales_count, :sales_amount, :credits_count, :credits_amount, :net_amount

data/lib/merchant_e_solutions/version.rb

@@ -1,3 +1,3 @@
 module MerchantESolutions
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/fixtures/batch_summary.csv

@@ -0,0 +1,9 @@
+"Org Id","Org Name","Card Type","Sales Cnt","Sales Amt","Credits Cnt","Credits Amt","Net Amt"
+42,"Hamazon",Visa,27,3049.24,122,-43.61,30005.63
+42,"Hamazon",Mastercard,10,3656.910000000003,57,-430.44,3226.470000000005
+42,"Hamazon",Debit/EBT,0,0.0,0,0.0,0.0
+42,"Hamazon",Bill Me Later,0,0.0,0,0.0,0.0
+42,"Hamazon",American Express,9,469.96,30,-54.63,415.329999999998
+42,"Hamazon",Discover,2,959.95,11,-33.09000000000003,926.8599999999997
+42,"Hamazon",Diners Club,0,0.0,0,0.0,0.0
+42,"Hamazon",JCB,0,0.0,0,0.0,0.0

data/spec/lib/merchant_e_solutions/batch_detail_report_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe MerchantESolutions::BatchDetailReport do
+  before { stub_net_http_requests }
+
+  describe "#initialize" do
+    let(:request) { double(:request, body: request_fixture('settlement_detail')) }
+
+    before { MerchantESolutions::Request.stub(:new).and_return(request) }
+
+    it "parses the body of the request as a CSV" do
+      report = MerchantESolutions::BatchDetailReport.new
+
+      report.records.size.should be > 0
+
+      report.records.each do |record|
+        record.should be_a MerchantESolutions::DetailRecord
+      end
+    end
+  end
+
+  describe "#request_params" do
+    let(:request_params) { MerchantESolutions::BatchDetailReport.new(options).request_params }
+    let(:options) { Hash.new }
+
+    it "knows its dsReportId" do
+      request_params[:dsReportId].should == 1
+    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/batch_summary_report_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe MerchantESolutions::BatchSummaryReport do
+  before { stub_net_http_requests }
+
+  describe "#initialize" do
+    let(:request) { double(:request, body: request_fixture('settlement_summary')) }
+
+    before { MerchantESolutions::Request.stub(:new).and_return(request) }
+
+    it "parses the body of the request as a CSV" do
+      report = MerchantESolutions::BatchSummaryReport.new
+
+      report.records.size.should be > 0
+
+      report.records.each do |record|
+        record.should be_a MerchantESolutions::SummaryRecord
+      end
+    end
+  end
+
+  describe "#request_params" do
+    let(:request_params) { MerchantESolutions::BatchSummaryReport.new(options).request_params }
+    let(:options) { Hash.new }
+
+    it "knows its dsReportId" do
+      request_params[:dsReportId].should == 1
+    end
+
+    it "knows its reportType" do
+      request_params[:reportType].should == 0
+    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/{settlement_detail_record_spec.rb → detail_record_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe MerchantESolutions::SettlementDetailRecord do
+describe MerchantESolutions::DetailRecord do
   describe "#initialize" do
-    subject { MerchantESolutions::SettlementDetailRecord.new(csv_row) }
+    subject { MerchantESolutions::DetailRecord.new(csv_row) }
 
     # "Merchant Id","DBA Name","Term Num","Batch Num","Batch Date","Tran Date","Card Type","Card Number","Reference","Purchase Id","Auth Code","Entry Mode","Tran Amount","Trident Tran Id","Client Ref Num"
     let(:csv_row) { [42, "Hamazon", 1, 220, "10/07/2013", "10/06/2013", "AM", "000000xxxxxx1234", "'0000213", "AAAAAAAAAAA0", "100000", "KEYED", 7.09, "T.T.ID", "clientRefNumber"] }
@@ -34,7 +34,7 @@ describe MerchantESolutions::SettlementDetailRecord do
   end
 
   describe "credit cards" do
-    subject { MerchantESolutions::SettlementDetailRecord.new([nil, nil, nil, nil, nil, nil, card_code]) }
+    subject { MerchantESolutions::DetailRecord.new([nil, nil, nil, nil, nil, nil, card_code]) }
 
     context "when the code is AM" do
       let(:card_code) { "AM" }

data/spec/lib/merchant_e_solutions/report_spec.rb

@@ -1,5 +1,43 @@
 require 'spec_helper'
 
 describe MerchantESolutions::Report do
-  #Abstract class, tested in each subclass
+
+  class TestRecord
+    def initialize(row);end
+  end
+
+  class TestSubReport < MerchantESolutions::Report
+    def report_id; 0; end
+    def report_type; 9; end
+    def record_class; TestRecord; end
+  end
+
+  before { stub_net_http_requests }
+
+  describe "#initialize" do
+    let(:request) { double(:request, body: request_fixture('settlement_detail')) }
+
+    it "gets a new report from the MerchantESolutions API" do
+      MerchantESolutions::Request.should_receive(:new).and_return(request)
+
+      TestSubReport.new
+    end
+  end
+
+  describe "#request_params" do
+    let(:report) { TestSubReport.new(testing: "tested", includeClientRefNum: false) }
+
+    it "includes a dsReportID and reportType set in the subclass" do
+      report.request_params[:dsReportId].should == report.report_id
+      report.request_params[:reportType].should == report.report_type
+    end
+
+    it "pulls in the params from the report specific params" do
+      report.request_params[:testing].should == "tested"
+    end
+
+    it "allows it's options to be overwritten" do
+      report.request_params[:includeClientRefNum].should be_false
+    end
+  end
 end

data/spec/lib/merchant_e_solutions/settlement_detail_report_spec.rb

@@ -5,22 +5,15 @@ describe MerchantESolutions::SettlementDetailReport do
 
   describe "#initialize" do
     let(:request) { double(:request, body: request_fixture('settlement_detail')) }
-
     before { MerchantESolutions::Request.stub(:new).and_return(request) }
 
-    it "gets a new report from the MerchantESolutions API" do
-      MerchantESolutions::Request.should_receive(:new).and_return(request)
-
-      MerchantESolutions::SettlementDetailReport.new
-    end
-
     it "parses the body of the request as a CSV" do
       report = MerchantESolutions::SettlementDetailReport.new
 
       report.records.size.should be > 0
 
       report.records.each do |record|
-        record.should be_a MerchantESolutions::SettlementDetailRecord
+        record.should be_a MerchantESolutions::DetailRecord
       end
     end
   end

data/spec/lib/merchant_e_solutions/settlement_summary_report_spec.rb

@@ -8,19 +8,13 @@ describe MerchantESolutions::SettlementSummaryReport do
 
     before { MerchantESolutions::Request.stub(:new).and_return(request) }
 
-    it "gets a new report from the MerchantESolutions API" do
-      MerchantESolutions::Request.should_receive(:new).and_return(request)
-
-      MerchantESolutions::SettlementSummaryReport.new
-    end
-
     it "parses the body of the request as a CSV" do
       report = MerchantESolutions::SettlementSummaryReport.new
 
       report.records.size.should be > 0
 
       report.records.each do |record|
-        record.should be_a MerchantESolutions::SettlementSummaryRecord
+        record.should be_a MerchantESolutions::SummaryRecord
       end
     end
   end

data/spec/lib/merchant_e_solutions/{settlement_summary_record_spec.rb → summary_record_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe MerchantESolutions::SettlementSummaryRecord do
+describe MerchantESolutions::SummaryRecord do
   describe "#initialize" do
-    subject { MerchantESolutions::SettlementSummaryRecord.new(csv_row) }
+    subject { MerchantESolutions::SummaryRecord.new(csv_row) }
     # "Org Id","Org Name","Card Type","Sales Cnt","Sales Amt","Credits Cnt","Credits Amt","Net Amt"
     let(:csv_row) { ['42', "Hamazon", "Visa", 1337, 1000000000.0, 1, 0.01, 999999999.99] }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merchant_e_solutions
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Steve Ellis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,23 +82,28 @@ files:
 - README.md
 - Rakefile
 - lib/merchant_e_solutions.rb
+- lib/merchant_e_solutions/batch_detail_report.rb
+- lib/merchant_e_solutions/batch_summary_report.rb
 - lib/merchant_e_solutions/configuration.rb
+- lib/merchant_e_solutions/detail_record.rb
 - lib/merchant_e_solutions/report.rb
 - lib/merchant_e_solutions/request.rb
-- lib/merchant_e_solutions/settlement_detail_record.rb
 - lib/merchant_e_solutions/settlement_detail_report.rb
-- lib/merchant_e_solutions/settlement_summary_record.rb
 - lib/merchant_e_solutions/settlement_summary_report.rb
+- lib/merchant_e_solutions/summary_record.rb
 - lib/merchant_e_solutions/version.rb
 - merchant_e_solutions.gemspec
+- spec/fixtures/batch_summary.csv
 - spec/fixtures/settlement_detail.csv
 - spec/fixtures/settlement_summary.csv
+- 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/detail_record_spec.rb
 - spec/lib/merchant_e_solutions/report_spec.rb
 - spec/lib/merchant_e_solutions/request_spec.rb
-- spec/lib/merchant_e_solutions/settlement_detail_record_spec.rb
 - spec/lib/merchant_e_solutions/settlement_detail_report_spec.rb
-- spec/lib/merchant_e_solutions/settlement_summary_record_spec.rb
 - spec/lib/merchant_e_solutions/settlement_summary_report_spec.rb
+- spec/lib/merchant_e_solutions/summary_record_spec.rb
 - spec/lib/merchant_e_solutions_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/harrystech/merchant_e_solutions
@@ -126,13 +131,16 @@ signing_key:
 specification_version: 4
 summary: Wrapper for the Settlement Report API
 test_files:
+- spec/fixtures/batch_summary.csv
 - spec/fixtures/settlement_detail.csv
 - spec/fixtures/settlement_summary.csv
+- 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/detail_record_spec.rb
 - spec/lib/merchant_e_solutions/report_spec.rb
 - spec/lib/merchant_e_solutions/request_spec.rb
-- spec/lib/merchant_e_solutions/settlement_detail_record_spec.rb
 - spec/lib/merchant_e_solutions/settlement_detail_report_spec.rb
-- spec/lib/merchant_e_solutions/settlement_summary_record_spec.rb
 - spec/lib/merchant_e_solutions/settlement_summary_report_spec.rb
+- spec/lib/merchant_e_solutions/summary_record_spec.rb
 - spec/lib/merchant_e_solutions_spec.rb
 - spec/spec_helper.rb