Skip to content
This repository has been archived by the owner on Dec 5, 2019. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #3 from salrepe/fix-date-specs
HTTParty gem updated and date specs fixed.
  • Loading branch information
tanob committed Apr 3, 2013
2 parents 9e09e36 + 1287408 commit 1999fef
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion global_collect.gemspec
Expand Up @@ -22,7 +22,7 @@ extensibility in mind.
s.rdoc_options = ['--charset=UTF-8']
s.require_paths = ['lib']

s.add_dependency 'httparty', '= 0.5.2'
s.add_dependency 'httparty'
s.add_dependency 'builder'
s.add_dependency 'fixed_width'
s.add_dependency 'fakeweb'
Expand Down
8 changes: 4 additions & 4 deletions lib/global_collect/api_client.rb
Expand Up @@ -32,20 +32,20 @@ def make_request(request, add_mixins=true)
:timeout => DEFAULT_TIMEOUT
)
end

unless response
error_message = "Request [#{request.action} v#{request.version}] => [#{@service_url}] failed! No response!"
GlobalCollect.wire_logger.error(error_message)
raise error_message
end
GlobalCollect.wire_logger.info("RESP [#{request.action} v#{request.version}] => #{response.code} - #{request_time} s - body:\n#{response.body}")
base = GlobalCollect::Responses::Base.new(response.delegate, response.body)

base = GlobalCollect::Responses::Base.new(response.parsed_response, response.body)
raise "Malformed response to #{request.action} request! Body: '#{response.body}'" if base.malformed?
request.suggested_response_mixins.each{|m| base.extend(m) } if add_mixins
base
end

def self.service_url(service, environment, authentication)
# WDL §§3.4-5 specify the allowed arguments
raise ArgumentError.new("Only [Hosted] Merchant Link is currently supported!") unless [:merchant_link].include?(service)
Expand Down
6 changes: 3 additions & 3 deletions lib/global_collect/request_models/base.rb
Expand Up @@ -22,14 +22,14 @@ def validate
@errors = { field => "is invalid. Should conform to #{validations.inspect}" }
end
end
return @errors.blank?
return @errors.nil? || @errors.empty?
end

def [](key)
raise ArgumentError.new("Invalid attribute name '#{key}'!") unless fields.key?(key)
@attributes[key]
end

def []=(key, value)
raise ArgumentError.new("Invalid attribute name '#{key}'!") unless fields.key?(key)
@attributes[key] = value
Expand Down
6 changes: 3 additions & 3 deletions spec/api_client_spec.rb
Expand Up @@ -76,13 +76,13 @@ def foobar;end
)
lambda { client.make_request(request) }.should raise_error(Exception, /No response/)
end

it "should error on a malformed response" do
wire_up_response(:successful, :iowp, :v1)
client = GlobalCollect::ApiClient.new(:merchant_link, :test, :ip_check)
response = mock(:response, :body => "Foo bar", :code => "200", :delegate => {})
response = mock(:response, :body => "Foo bar", :code => "200", :parsed_response => {})
client.class.should_receive(:post).and_return(response)

request = mock(
:action => 'foo',
:version => '1.0',
Expand Down
Expand Up @@ -12,7 +12,7 @@
it "should parse" do
report = GlobalCollect::LogParsing::CollectionReport::AppendixReportFile.new(support_path("555520100602.csv"))
report.parse
report.data.should_not be_blank
report.data.should_not be_empty
report.data.should == {
:data_records => [
{
Expand Down
4 changes: 2 additions & 2 deletions spec/log_parsing/collection_report/report_file_spec.rb
Expand Up @@ -6,13 +6,13 @@
report = GlobalCollect::LogParsing::CollectionReport::ReportFile.new("555555550145.mt1")
report.account_id.should == "5555"
report.master_account_id.should == "5555"
report.date.should == Date.ordinal(2012, 145)
report.date.should == Date.ordinal(Date.today.year, 145)
report.environment.should == :production
end

it "should parse" do
report = GlobalCollect::LogParsing::CollectionReport::ReportFile.new(support_path("555555550145.mt1"))
report.parse
report.data.should_not be_blank
report.data.should_not be_empty
end
end
4 changes: 2 additions & 2 deletions spec/log_parsing/financial_statement/report_file_spec.rb
Expand Up @@ -5,12 +5,12 @@
it "should sort out the metadata from the file name" do
report = GlobalCollect::LogParsing::FinancialStatement::ReportFile.new("FS55550148COMPANY.asc")
report.account_id.should == "5555"
report.date.should == Date.ordinal(2012, 148)
report.date.should == Date.ordinal(Date.today.year, 148)
report.environment.should == :production
end

def check_report(report)
report.data.should_not be_blank
report.data.should_not be_empty
report.data[:header][:record_type].should == :file_header
report.data[:header][:relation_number].should == 'R0555500'
report.data[:header][:date_production].should == Date.ordinal(2010, 148)
Expand Down
6 changes: 3 additions & 3 deletions spec/log_parsing/payment_report/report_file_spec.rb
Expand Up @@ -5,20 +5,20 @@
it "should sort out the metadata from the file name (prod)" do
report = GlobalCollect::LogParsing::PaymentReport::ReportFile.new("55550141.wr1")
report.account_id.should == "5555"
report.date.should == Date.ordinal(2012, 141)
report.date.should == Date.ordinal(Date.today.year, 141)
report.environment.should == :production
end

it "should sort out the metadata from the file name (test)" do
report = GlobalCollect::LogParsing::PaymentReport::ReportFile.new("55550141.wrt")
report.account_id.should == "5555"
report.date.should == Date.ordinal(2012, 141)
report.date.should == Date.ordinal(Date.today.year, 141)
report.environment.should == :test
end

it "should parse" do
report = GlobalCollect::LogParsing::PaymentReport::ReportFile.new(support_path("55550141.wr1"))
report.parse
report.data.should_not be_blank
report.data.should_not be_empty
end
end
6 changes: 3 additions & 3 deletions spec/responses/base_spec.rb
Expand Up @@ -17,7 +17,7 @@
end

it "should give you the raw hash to access" do
@response.hash.should_not be_blank
@response.hash.should_not be_nil
end

it "should not provide the errors" do
Expand Down Expand Up @@ -47,8 +47,8 @@

it "should provide the errors" do
@response.errors.should_not be_empty
@response.errors.first.code.should_not be_blank
@response.errors.first.message.should_not be_blank
@response.errors.first.code.should_not be_nil
@response.errors.first.message.should_not be_nil
end

it "should provide the raw and parsed response" do
Expand Down
6 changes: 3 additions & 3 deletions spec/responses/succcess_row_spec.rb
Expand Up @@ -6,14 +6,14 @@
before(:each) do
@response = parse_canned_response(:successful, :iowp, :v1)
end

it "should provide the success data hash" do
@response.extend(GlobalCollect::Responses::SuccessRow)
@response.row.should be_a Hash
@response.row.should_not be_blank
@response.row.should_not be_empty
end
end

describe "on an unsuccessful response" do
before(:each) do
@response = parse_canned_response(:unsuccessful, :iowp, :v1)
Expand Down

0 comments on commit 1999fef

Please sign in to comment.