rconomic 0.4.1 → 0.5.0

data/lib/economic/proxies/entry_proxy.rb

@@ -3,12 +3,10 @@ require 'economic/proxies/entity_proxy'
 module Economic
   class EntryProxy < EntityProxy
     def find_by_date_interval(from_date, to_date)
-      response = session.request(entity_class.soap_action('FindByDateInterval')) do
-        soap.body = {
-          'fromDate' => from_date,
-          'toDate'   => to_date
-        }
-      end
+      response = request('FindByDateInterval', {
+        'fromDate' => from_date,
+        'toDate'   => to_date
+      })
 
       build_array(response)
     end
@@ -19,29 +17,25 @@ module Economic
     #   max_number = 2**31 - 1  # Maximum int32.
     #
     def find_by_serial_number_interval(min_number, max_number)
-      response = session.request(entity_class.soap_action('FindBySerialNumberInterval')) do
-        soap.body = {
-          'minNumber' => min_number,
-          'maxNumber' => max_number
-        }
-      end
+      response = request('FindBySerialNumberInterval', {
+        'minNumber' => min_number,
+        'maxNumber' => max_number
+      })
 
       build_array(response)
     end
 
     def get_last_used_serial_number
-      response = session.request(entity_class.soap_action('GetLastUsedSerialNumber'))
+      response = request('GetLastUsedSerialNumber')
       response.to_i
     end
 
     def find(serial_number)
-      response = session.request(entity_class.soap_action('GetData')) do
-        soap.body = {
-          'entityHandle' => {
-            'SerialNumber' => serial_number
-           }
-        }
-      end
+      response = request('GetData', {
+        'entityHandle' => {
+          'SerialNumber' => serial_number
+         }
+      })
 
       build(response)
     end

data/lib/economic/session.rb

@@ -8,24 +8,18 @@ module Economic
       self.password = password
     end
 
-    # Returns the Savon::Client used to connect to e-conomic
-    def client
-      @client ||= Savon::Client.new do
-        wsdl.document = File.expand_path(File.join(File.dirname(__FILE__), "economic.wsdl"))
-      end
-    end
-
     # Authenticates with e-conomic
     def connect
+      client.http.headers.delete("Cookie")
       response = client.request :economic, :connect do
         soap.body = {
           :agreementNumber => self.agreement_number,
           :userName => self.user_name,
-          :password => self.password,
-          :order! => [:agreementNumber, :userName, :password]
+          :password => self.password
         }
       end
-      client.http.headers["Cookie"] = response.http.headers["Set-Cookie"]
+
+      @cookie = response.http.headers["Set-Cookie"]
     end
 
     # Provides access to the DebtorContacts
@@ -77,8 +71,13 @@ module Economic
       @entries ||= EntryProxy.new(self)
     end
 
-    def request(action, &block)
-      response = client.request :economic, action, &block
+    # Requests an action from the API endpoint
+    def request(action, data = nil)
+      client.http.headers["Cookie"]  = @cookie
+
+      response = client.request(:economic, action) do
+        soap.body = data if data
+      end
       response_hash = response.to_hash
 
       response_key = "#{action}_response".intern
@@ -94,5 +93,15 @@ module Economic
     def session
       self
     end
+
+    private
+
+    # Returns the Savon::Client used to connect to e-conomic
+    # Cached on class-level to avoid loading the big wsdl file more than once (can take several hunder megabytes of ram after a while...)
+    def client
+      @@client ||= Savon::Client.new do
+        wsdl.document = File.expand_path(File.join(File.dirname(__FILE__), "economic.wsdl"))
+      end
+    end
   end
 end

data/lib/economic/support/string.rb

@@ -1,6 +1,10 @@
 module Economic
   module Support
     module String
+      def self.camel_back(name)
+        name[0,1].downcase + name[1..-1]
+      end
+
       def self.demodulize(class_name_in_module)
         class_name_in_module.to_s.gsub(/^.*::/, '')
       end
@@ -21,4 +25,4 @@ module Economic
       end
     end
   end
-end
+end

data/lib/rconomic.rb

@@ -1,7 +1,6 @@
 # Dependencies
 require 'time'
 require 'savon'
-require 'active_support/ordered_hash'
 
 require 'economic/support/string'
 require 'economic/session'
@@ -34,6 +33,8 @@ require 'economic/proxies/debtor_entry_proxy'
 require 'economic/proxies/creditor_entry_proxy'
 require 'economic/proxies/entry_proxy'
 
+require 'economic/proxies/actions/find_by_name'
+
 # http://www.e-conomic.com/apidocs/Documentation/index.html
 # https://www.e-conomic.com/secure/api1/EconomicWebService.asmx
 #

data/lib/rconomic/version.rb

@@ -1,3 +1,3 @@
 module Rconomic
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/rconomic.gemspec

@@ -23,8 +23,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "savon", "0.9.5"
   s.add_runtime_dependency "gyoku", "0.4.4"
 
-  s.add_runtime_dependency "activesupport", "~> 3.0"
-
   s.files         = `git ls-files`.split("\n").reject { |filename| ['.gitignore'].include?(filename) }
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
   s.require_paths = ["lib"]

data/spec/economic/current_invoice_spec.rb

@@ -116,7 +116,7 @@ describe Economic::CurrentInvoice do
 
     it 'should request with the right key for handle' do
       savon.stubs('Invoice_GetData').returns(:success)
-      savon.expects("CurrentInvoice_BookWithNumber").with('currentInvoiceHandle' => { 'Id' => 512 }, 'number' => 123, :order! => ['currentInvoiceHandle', 'number']).returns(:success)
+      savon.expects("CurrentInvoice_BookWithNumber").with('currentInvoiceHandle' => { 'Id' => 512 }, 'number' => 123).returns(:success)
       subject.book_with_number(123)
     end
   end

data/spec/economic/entity_spec.rb

@@ -3,6 +3,7 @@ require './spec/spec_helper'
 class SpecEntity < Economic::Entity
   has_properties :id, :foo, :baz
 
+  def build_soap_data; {}; end
   def existing_method; end
 
   def proxy; Economic::SpecEntityProxy.new(session); end
@@ -75,11 +76,11 @@ describe Economic::Entity do
 
     describe "soap_action" do
       it "returns the name for the given soap action on this class" do
-        subject.soap_action(:get_data).should == :spec_entity_get_data
+        subject.soap_action_name(:get_data).should == :spec_entity_get_data
 
         class Car < Economic::Entity; end
-        Car.soap_action(:start_engine).should == :car_start_engine
-        Car.soap_action('StartEngine').should == :car_start_engine
+        Car.soap_action_name(:start_engine).should == :car_start_engine
+        Car.soap_action_name('StartEngine').should == :car_start_engine
       end
     end
   end

data/spec/economic/proxies/actions/find_by_name_spec.rb

@@ -0,0 +1,48 @@
+require './spec/spec_helper'
+
+describe Economic::Proxies::Actions::FindByName do
+  let(:session) { make_session }
+  let(:proxy) { Economic::CreditorContactProxy.new(session) }
+
+  subject {
+    Economic::Proxies::Actions::FindByName.new(proxy, "Bob")
+  }
+
+  describe "#call" do
+    before :each do
+      savon.stubs('CreditorContact_FindByName').returns(:multiple)
+    end
+
+    it "gets contact data from the API" do
+      savon.expects('CreditorContact_FindByName').with('name' => 'Bob').returns(:multiple)
+      subject.call
+    end
+
+    it "returns creditor contacts" do
+      subject.call.first.should be_instance_of(Economic::CreditorContact)
+    end
+
+    it "returns empty when nothing is found" do
+      savon.stubs('CreditorContact_FindByName').returns(:none)
+      subject.call.should be_empty
+    end
+
+    context "when calling proxy is owned by session" do
+      it "returns all creditor contacts" do
+        subject.call.size.should == 2
+      end
+    end
+
+    context "when calling proxy is owned by a creditor" do
+      it "returns only contacts for creditor" do
+        savon.stubs("CreditorContact_GetData").returns(:success)
+        savon.stubs("Creditor_GetData").returns(:success)
+        creditor = session.creditors.build
+        proxy = Economic::CreditorContactProxy.new(creditor)
+        action = Economic::Proxies::Actions::FindByName.new(proxy, "Bob")
+        action.call.each { |contact| contact.creditor.should == creditor }
+      end
+    end
+  end
+
+end

data/spec/economic/proxies/cash_book_proxy_spec.rb

@@ -28,15 +28,23 @@ describe Economic::CashBookProxy do
   describe ".all" do
 
     it "returns multiple cashbooks" do
-      savon.expects('CashBook_GetAll').returns(:multiple)
-      savon.expects('CashBook_GetName').returns(:success)
-      savon.expects('CashBook_GetName').returns(:success)
+      savon.stubs('CashBook_GetAll').returns(:multiple)
+      savon.stubs('CashBook_GetDataArray').returns(:multiple)
+
       all = subject.all
       all.size.should == 2
-      all[0].should be_instance_of(Economic::CashBook)
-      all[1].should be_instance_of(Economic::CashBook)
+      all.each { |cash_book| cash_book.should be_instance_of(Economic::CashBook) }
     end
 
+    it "properly fills out handles of cash books" do
+      # Issue #12
+      savon.stubs('CashBook_GetAll').returns(:multiple)
+      savon.stubs('CashBook_GetData').returns(:success)
+      savon.stubs('CashBook_GetDataArray').returns(:multiple)
+
+      cash_book = subject.find(subject.all.first.handle)
+      subject.all.first.handle.should == cash_book.handle
+    end
   end
 
   describe ".get_name" do
@@ -51,4 +59,21 @@ describe Economic::CashBookProxy do
 
   end
 
+  describe "#last" do
+    it "returns the last cash book" do
+      savon.stubs('CashBook_GetAll').returns(:multiple)
+      savon.stubs('CashBook_GetDataArray').returns(:multiple)
+
+      subject.all.last.name.should == "Another cash book"
+    end
+  end
+
+  describe "#[]" do
+    it "returns the specific cash book" do
+      savon.stubs('CashBook_GetAll').returns(:multiple)
+      savon.stubs('CashBook_GetDataArray').returns(:multiple)
+
+      subject.all[1].name.should == "Another cash book"
+    end
+  end
 end

data/spec/economic/proxies/creditor_contact_proxy_spec.rb

@@ -52,4 +52,14 @@ describe Economic::CreditorContactProxy do
       subject.find(42).should be_instance_of(Economic::CreditorContact)
     end
   end
+
+  describe "#find_by_name" do
+    it "uses the FindByName command" do
+      Economic::Proxies::Actions::FindByName.expects(:new).
+        with(subject, "Bob").
+        returns(lambda { "Result" })
+      subject.find_by_name("Bob").should == "Result"
+    end
+  end
 end
+

data/spec/economic/proxies/current_invoice_line_proxy_spec.rb

@@ -20,7 +20,7 @@ describe Economic::CurrentInvoiceLineProxy do
       line = Economic::CurrentInvoiceLine.new
       subject.append(line)
       subject.append(line)
-      subject.items.should == [line]
+      subject.size.should == 1
     end
   end
 
@@ -39,7 +39,7 @@ describe Economic::CurrentInvoiceLineProxy do
 
     it "adds the built line to proxy items" do
       line = subject.build
-      subject.items.should == [line]
+      subject.first.should == line
     end
 
     context "when owner is a CurrentInvoice" do
@@ -79,7 +79,7 @@ describe Economic::CurrentInvoiceLineProxy do
     it "can be appended to" do
       line = Economic::CurrentInvoiceLine.new
       subject << line
-      subject.items.should == [line]
+      subject.last.should == line
     end
 
     it "can be iterated over" do

data/spec/economic/proxies/current_invoice_proxy_spec.rb

@@ -68,7 +68,7 @@ describe Economic::CurrentInvoiceProxy do
     let(:unto) { Time.now }
 
     it "should be able to return a single current invoice" do
-      savon.expects('CurrentInvoice_FindByDateInterval').with('first' => from.iso8601, 'last' => unto.iso8601, :order! => ['first', 'last']).returns(:single)
+      savon.expects('CurrentInvoice_FindByDateInterval').with('first' => from.iso8601, 'last' => unto.iso8601).returns(:single)
       savon.expects('CurrentInvoice_GetDataArray').returns(:single)
       results = subject.find_by_date_interval(from, unto)
       results.size.should == 1
@@ -76,7 +76,7 @@ describe Economic::CurrentInvoiceProxy do
     end
 
     it "should be able to return multiple invoices" do
-      savon.expects('CurrentInvoice_FindByDateInterval').with('first' => from.iso8601, 'last' => unto.iso8601, :order! => ['first', 'last']).returns(:many)
+      savon.expects('CurrentInvoice_FindByDateInterval').with('first' => from.iso8601, 'last' => unto.iso8601).returns(:many)
       savon.expects('CurrentInvoice_GetDataArray').returns(:multiple)
       results = subject.find_by_date_interval(from, unto)
       results.size.should == 2
@@ -84,7 +84,7 @@ describe Economic::CurrentInvoiceProxy do
     end
 
     it "should be able to return nothing" do
-      savon.expects('CurrentInvoice_FindByDateInterval').with('first' => from.iso8601, 'last' => unto.iso8601, :order! => ['first', 'last']).returns(:none)
+      savon.expects('CurrentInvoice_FindByDateInterval').with('first' => from.iso8601, 'last' => unto.iso8601).returns(:none)
       results = subject.find_by_date_interval(from, unto)
       results.size.should == 0
     end
@@ -115,8 +115,8 @@ describe Economic::CurrentInvoiceProxy do
 
       current_invoices = subject.all
       current_invoices.size.should == 2
-      current_invoices.items.first.should be_instance_of(Economic::CurrentInvoice)
-      current_invoices.items.last.should be_instance_of(Economic::CurrentInvoice)
+      current_invoices.first.should be_instance_of(Economic::CurrentInvoice)
+      current_invoices.last.should be_instance_of(Economic::CurrentInvoice)
     end
 
   end

data/spec/economic/proxies/debtor_contact_proxy_spec.rb

@@ -52,4 +52,13 @@ describe Economic::DebtorContactProxy do
       subject.find(42).should be_instance_of(Economic::DebtorContact)
     end
   end
-end
+
+  describe "#find_by_name" do
+    it "uses the FindByName command" do
+      Economic::Proxies::Actions::FindByName.expects(:new).
+        with(subject, "Bob").
+        returns(lambda { "Result" })
+      subject.find_by_name("Bob").should == "Result"
+    end
+  end
+end

data/spec/economic/proxies/debtor_entry_proxy_spec.rb

@@ -12,12 +12,12 @@ describe Economic::DebtorEntryProxy do
 
   describe "#find_by_invoice_number" do
     it 'should be able to find multiple debtor entries' do
-      savon.expects("DebtorEntry_FindByInvoiceNumber").with('from' => '123', 'to' => '456', :order! => ['from', 'to']).returns(:many)
+      savon.expects("DebtorEntry_FindByInvoiceNumber").with('from' => '123', 'to' => '456').returns(:many)
       subject.find_by_invoice_number('123', '456').should == [1, 2]
     end
 
     it 'should be able to find debtor entries with one invoice id' do
-      savon.expects("DebtorEntry_FindByInvoiceNumber").with('from' => '123', 'to' => '123', :order! => ['from', 'to']).returns(:many)
+      savon.expects("DebtorEntry_FindByInvoiceNumber").with('from' => '123', 'to' => '123').returns(:many)
       subject.find_by_invoice_number('123').should == [1, 2]
     end
 

data/spec/economic/proxies/invoice_proxy_spec.rb

@@ -45,7 +45,7 @@ describe Economic::InvoiceProxy do
     let(:unto) { Time.now }
 
     it "should be able to return a single current invoice" do
-      savon.expects('Invoice_FindByDateInterval').with('first' => from.iso8601, 'last' => unto.iso8601, :order! => ['first', 'last']).returns(:single)
+      savon.expects('Invoice_FindByDateInterval').with('first' => from.iso8601, 'last' => unto.iso8601).returns(:single)
       savon.expects('Invoice_GetDataArray').returns(:single)
       results = subject.find_by_date_interval(from, unto)
       results.size.should == 1
@@ -53,7 +53,7 @@ describe Economic::InvoiceProxy do
     end
 
     it "should be able to return multiple invoices" do
-      savon.expects('Invoice_FindByDateInterval').with('first' => from.iso8601, 'last' => unto.iso8601, :order! => ['first', 'last']).returns(:many)
+      savon.expects('Invoice_FindByDateInterval').with('first' => from.iso8601, 'last' => unto.iso8601).returns(:many)
       savon.expects('Invoice_GetDataArray').returns(:multiple)
       results = subject.find_by_date_interval(from, unto)
       results.size.should == 2
@@ -61,7 +61,7 @@ describe Economic::InvoiceProxy do
     end
 
     it "should be able to return nothing" do
-      savon.expects('Invoice_FindByDateInterval').with('first' => from.iso8601, 'last' => unto.iso8601, :order! => ['first', 'last']).returns(:none)
+      savon.expects('Invoice_FindByDateInterval').with('first' => from.iso8601, 'last' => unto.iso8601).returns(:none)
       results = subject.find_by_date_interval(from, unto)
       results.size.should == 0
     end

data/spec/economic/session_spec.rb

@@ -1,6 +1,8 @@
 require './spec/spec_helper'
 
 describe Economic::Session do
+  let(:client) { subject.send(:client) }
+
   subject { Economic::Session.new(123456, 'api', 'passw0rd') }
 
   describe "new" do
@@ -15,7 +17,7 @@ describe Economic::Session do
     subject { Economic::Session.new(123456, 'api', 'passw0rd') }
 
     it "returns a Savon::Client" do
-      subject.client.should be_instance_of(::Savon::Client)
+      client.should be_instance_of(::Savon::Client)
     end
   end
 
@@ -25,10 +27,30 @@ describe Economic::Session do
       subject.connect
     end
 
-    it "stores the cookie for later connections" do
+    it "stores the cookie for later requests" do
+      savon.expects('Connect').returns({:headers => {'Set-Cookie' => 'cookie'}})
+      subject.connect
+      client.stubs(:request).returns({})
+      subject.request(:foo) { }
+      client.http.headers['Cookie'].should == 'cookie'
+    end
+
+    it "updates the cookie for new sessions" do
       savon.expects('Connect').returns({:headers => {'Set-Cookie' => 'cookie'}})
       subject.connect
-      subject.client.http.headers['Cookie'].should == 'cookie'
+      other_session = Economic::Session.new(123456, 'api', 'passw0rd')
+      savon.expects('Connect').returns({:headers => {'Set-Cookie' => 'other-cookie'}})
+      other_session.connect
+
+      client.stubs(:request).returns({})
+      subject.request(:foo) { }
+      client.http.headers['Cookie'].should == 'cookie'
+    end
+
+    it "removes existing cookie header before connecting" do
+      client.http.headers.expects(:delete).with('Cookie')
+      savon.stubs('Connect').returns({:headers => {'Set-Cookie' => 'cookie'}})
+      subject.connect
     end
   end
 
@@ -79,6 +101,25 @@ describe Economic::Session do
   end
 
   describe "request" do
+    it "sends a request to API" do
+      client.expects(:request).with(:economic, :foo).returns({})
+      subject.request(:foo, {})
+    end
+
+    it "sends data if given" do
+      savon.expects('CurrentInvoice_GetAll').with(:bar => :baz).returns(:none)
+      subject.request(:current_invoice_get_all, {:bar => :baz})
+    end
+
+    it "returns a hash with data" do
+      savon.stubs('CurrentInvoice_GetAll').returns(:single)
+      subject.request(:current_invoice_get_all).should == {:current_invoice_handle => {:id => "1"}}
+    end
+
+    it "returns an empty hash if no data returned" do
+      savon.stubs('CurrentInvoice_GetAll').returns(:none)
+      subject.request(:current_invoice_get_all).should be_empty
+    end
   end
 
 end