jemquarie 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a2746b8aec042d1fef65285aea4ecc836adc01b
-  data.tar.gz: 8fee3681f1b83ee9b1ff05c941cd10054e3baa10
+  metadata.gz: 2483dc8664dc67791d1212dcc5cecb059e08d670
+  data.tar.gz: c31b6b5832813df0bb32a748e1dbcec1a06938b7
 SHA512:
-  metadata.gz: d99a395882946ed6e34752cdbc7ba176625d39edf2631f5c6fc69271e07177b3d94b57b7c5a1da59c878f00308717e8edd66fc00022bad5263985101b7378c25
-  data.tar.gz: 96c7dd6a274aad261c037a198541c356d854a04be926c36451a90a4d64e89ba311e7bfbe6710776fcda1d2341e646585aea246ab0f337412a66ecae0092ec39a
+  metadata.gz: d8c6edbf4d4274773f17e4aaf4eea5aac09fcbe8419698f89d424db338bf03f5604c16573426ec63e26ce223e56dbf166d0902538e659bcca070dc25efa9dbe6
+  data.tar.gz: 4808404adef840d4cfecdcedbdd9b390b0acb11a0d3e037f2e22c0a6395430a63bfdcee9820ec6f7c28443230ba1209da2104a789adc04b0a32daf447a005b07

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
   - 2.1.1
+  - 2.2.3
+  - 2.3.0
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-2.2.1
 

data/jemquarie.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "savon",                   '~> 2.0'
-  spec.add_runtime_dependency "activesupport",   '>= 3.0'
+  spec.add_dependency "savon",                   '~> 2.11'
+  spec.add_runtime_dependency "activesupport",   '~> 3.0'
 
-  spec.add_development_dependency "bundler",     '>= 1.3'
-  spec.add_development_dependency "rake",        '>= 10.3.0'
-  spec.add_development_dependency "fakeweb",     '>= 1.3.0'
-  spec.add_development_dependency "rspec",       '~> 2'
+  spec.add_development_dependency "bundler",     '~> 1.11'
+  spec.add_development_dependency "rake",        '~> 11.2'
+  spec.add_development_dependency "fakeweb",     '~> 1.3'
+  spec.add_development_dependency "rspec",       '~> 3.4'
 end

data/lib/jemquarie/importer.rb

@@ -5,8 +5,14 @@ module Jemquarie
     include Parser::CashTransactions
 
     def cash_transactions(date_from = (Date.today - 1.day), date_to = Date.today, account_number = '', include_closed = 'Y')
-      if account_number.blank? && ((date_to - date_from).days > 2.days) # if no account specified, ESI api doesn't allow to ask more than 2 days of transactions
-        return {:error => "Cannot request more than 2 days of transactions if not account is specified"}
+      if account_number.blank?
+        if (date_to && date_from)
+          if (date_to - date_from).days > 2.days # With no account_number you can only get 2 days
+            return {:error => "Cannot request more than 2 days of transactions if not account is specified"}
+          end
+        else # With no account_number you need dates
+          return {:error => "Missing from and to dates"}
+        end
       end
       response = @client.call(:generate_xml_extract, :message => create_message(date_from, date_to, account_number, include_closed))
       return parse_cash_transactions_response(response) if response.success?
@@ -26,8 +32,8 @@ private
         :strings => [
           {
             :item0 => account_number,                          # Account Number
-            :item1 => date_from.strftime("%Y-%m-%dT%H:%M:%S"), # START DATE
-            :item2 => date_to.strftime("%Y-%m-%dT%H:%M:%S"),   # TO DATE
+            :item1 => date_from ? date_from.strftime("%Y-%m-%dT%H:%M:%S") : '', # START DATE
+            :item2 => date_to ? date_to.strftime("%Y-%m-%dT%H:%M:%S") : '',   # TO DATE
             :item3 => include_closed                           # Include closed accounts flag
           }
         ]

data/lib/jemquarie/parser/account_details.rb

@@ -2,7 +2,7 @@ module Jemquarie
   module Parser
     module AccountDetails
 
-       def parse_account_details(response)
+      def parse_account_details(response)
         result = generic_request_response(response)
         return result if result[:error]
         details = []

data/lib/jemquarie/parser/cash_transactions.rb

@@ -23,6 +23,7 @@ private
       def parse_single_transaction(transaction)
         {
           :foreign_identifier => transaction["TransactionId"],
+          :account_number     => transaction["AccountNumber"],
           :date_time          => Time.parse(transaction["TransactionDate"] + " UTC"),
           :amount             => transaction["DebitCredit"] == 'C' ? transaction["Amount"] : ('-' + transaction["Amount"]),
           :type_name          => translate_transaction_type(transaction["TransactionType"]),

data/lib/jemquarie/version.rb

@@ -1,3 +1,3 @@
 module Jemquarie
-  VERSION = "1.2.0"
+  VERSION = "1.2.2"
 end

data/spec/lib/{accont_details_spec.rb → account_details_spec.rb}

@@ -18,7 +18,7 @@ describe Jemquarie::AccountDetails do
       @result = importer.details(Date.parse("01/01/2000"), Date.today)
     end
     it "should work" do
-      expect(@result).to have(182).items
+      expect(@result.size).to eq(182)
       first_res = @result.first
       expect(first_res[:account_number]).to eq("118115765")
       expect(first_res[:account_name]).to eq("JAMES ANDREW LOCKETT")

data/spec/lib/balance_spec.rb

@@ -19,7 +19,7 @@ describe Jemquarie::Balance do
         @result = importer.balance
       end
       it "should work" do
-        expect(@result).to have(106).items
+        expect(@result.size).to eq(106)
         first_result = @result.first
         expect(first_result[:account_number]).to eq("118498062")
         expect(first_result[:ledger_balance]).to eq("0.0000")

data/spec/lib/importer_spec.rb

@@ -19,10 +19,11 @@ describe Jemquarie::Importer do
     end
     it "should work" do
       expect(@result).to be_kind_of Array
-      expect(@result).to have(186).items
+      expect(@result.size).to eq(186)
 
       first_item = @result.first
       expect(first_item[:foreign_identifier]).to eq("0132058314")
+      expect(first_item[:account_number]).to eq("121741987")
       expect(first_item[:date_time]).to eq(Time.parse("2008-12-19 00:00:00 UTC"))
       expect(first_item[:amount]).to eq("-2.4100")
       expect(first_item[:type_name]).to eq("B-PAY WITHDRAWAL")
@@ -32,6 +33,7 @@ describe Jemquarie::Importer do
 
       last_item = @result.last
       expect(last_item[:foreign_identifier]).to eq("0342606112")
+      expect(last_item[:account_number]).to eq("121741987")
       expect(last_item[:date_time]).to eq(Time.parse("2014-04-30 00:00:00 UTC"))
       expect(last_item[:amount]).to eq("0.0600")
       expect(last_item[:type_name]).to eq("INTEREST PAID")
@@ -42,6 +44,7 @@ describe Jemquarie::Importer do
 
       reverse_item = @result.detect{ |row| row[:reverse] == true }
       expect(reverse_item[:foreign_identifier]).to eq(first_item[:foreign_identifier])
+      expect(reverse_item[:account_number]).to eq("121741987")
       expect(reverse_item[:date_time]).to eq(Time.parse("2008-12-23 00:00:00 UTC"))
       expect(reverse_item[:amount]).to eq(first_item[:amount])
       expect(reverse_item[:type_name]).to eq(first_item[:type_name])
@@ -65,7 +68,7 @@ describe Jemquarie::Importer do
     end
     it "should work" do
       expect(@result).to be_kind_of Array
-      expect(@result).to have(1).items
+      expect(@result.size).to eq(1)
     end
   end
 
@@ -149,4 +152,27 @@ describe Jemquarie::Importer do
     end
   end
 
+  describe "with no date parameters" do
+    let(:importer) do
+      Jemquarie::Importer.new('valid_code', 'valid_password')
+    end
+    before(:each) do
+      FakeWeb.register_uri(:post, Jemquarie::Jemquarie::BASE_URI,
+        body: File.read('spec/files/transactions/transactions.xml'),
+        content_type: 'text/xml'
+      )
+    end
+    it "should return error when trying to get transactions with no date and no account" do
+      @result = importer.cash_transactions(nil, nil, nil)
+      expect(@result).to be_kind_of Hash
+      expect(@result[:error]).to eq("Missing from and to dates")
+    end
+
+    it "should accept parameters with account number but no date parameters without error" do
+      @result = importer.cash_transactions(nil, nil, '12345')
+      expect(@result).to be_kind_of Array
+      expect(FakeWeb.last_request.body.include?("<tns:item1></tns:item1>")).to be true
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@ require 'fakeweb'
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jemquarie
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Claudio Contin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -16,84 +16,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: '11.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.4'
 description: Connect to Macquarie ESI web services
 email:
 - contin@gmail.com
@@ -131,7 +131,7 @@ files:
 - spec/files/transactions/transactions.xml
 - spec/files/transactions/wrong_account_number.xml
 - spec/files/transactions/wrong_authentication.xml
-- spec/lib/accont_details_spec.rb
+- spec/lib/account_details_spec.rb
 - spec/lib/balance_spec.rb
 - spec/lib/expiry_spec.rb
 - spec/lib/importer_spec.rb
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby Gem for extracting cash transactions from Macquarie ESI web service
@@ -172,7 +172,7 @@ test_files:
 - spec/files/transactions/transactions.xml
 - spec/files/transactions/wrong_account_number.xml
 - spec/files/transactions/wrong_authentication.xml
-- spec/lib/accont_details_spec.rb
+- spec/lib/account_details_spec.rb
 - spec/lib/balance_spec.rb
 - spec/lib/expiry_spec.rb
 - spec/lib/importer_spec.rb