collmex-ruby 0.1.0 → 0.2.0

data/lib/collmex.rb

@@ -4,9 +4,20 @@ require 'collmex/request'
 module Collmex
 
   class << self
-    attr_accessor :customer_id
-    attr_accessor :username
-    attr_accessor :password
+
+    attr_accessor :username, :password, :customer_id
+
+    def setup_login_data(logindata)
+      Collmex.username    = logindata[:username]
+      Collmex.password    = logindata[:password]
+      Collmex.customer_id = logindata[:customer_id]
+    end
+
+    def reset_login_data
+      Collmex.username    = nil
+      Collmex.password    = nil
+      Collmex.customer_id = nil
+    end
 
     def csv_opts
       {
@@ -14,22 +25,5 @@ module Collmex
       }
     end
 
-
-    def setup_login_data
-      config = YAML.load_file('config/collmex_config.yml')["development"]
-      Collmex.username    = config["username"]
-      Collmex.password    = config["password"]
-      Collmex.customer_id = config["customer_id"]
-    end
-
-    def reset_login_data
-      Collmex.username    = "000000"
-      Collmex.password    = "000000"
-      Collmex.customer_id = "000000"
-    end
   end
 end
-
-Collmex.reset_login_data
-
-

data/lib/collmex/api.rb

@@ -6,7 +6,7 @@ module Collmex
     def self.is_a_collmex_api_line_obj? obj
       obj.class.name =~ /Collmex\:\:Api/
     end
-    
+
     def self.line_class_exists?(class_name)
       klass = Collmex::Api.const_get(class_name)
       return klass.is_a?(Class)
@@ -16,18 +16,18 @@ module Collmex
 
     def self.parse_line(line)
       if line.is_a?(Array) and line.first.is_a?(String)
-        identifyer = line.first.split("_").map{ |s| s.downcase.capitalize }.join
+        identifyer = line.first.split(/_|-/).map { |s| s.downcase.capitalize }.join
         if self.line_class_exists?(identifyer)
           Collmex::Api.const_get(identifyer).new(line)
         else
-          raise "Could not find a Collmex::Api::Line class for \"#{identifyer}\""
+          raise "Could not find a Collmex::Api::Line class for \"#{identifyer}\" (\"#{line.first}\")"
         end
       elsif line.is_a?(String) && parsed_line = CSV.parse_line(line, Collmex.csv_opts)
-        identifyer = parsed_line.first.split("_").map{ |s| s.downcase.capitalize }.join
+        identifyer = parsed_line.first.split(/_|-/).map { |s| s.downcase.capitalize }.join
         if self.line_class_exists?(identifyer)
           Collmex::Api.const_get(identifyer).new(parsed_line)
         else
-          raise "Could not find a Collmex::Api::Line class for \"#{identifyer}\""
+          raise "Could not find a Collmex::Api::Line class for \"#{identifyer}\" (\"#{parsed_line.first}\")"
         end
       else
         raise "Could not parse a Collmex::Api Line from #{line.inspect}"
@@ -66,13 +66,13 @@ module Collmex
       when :date then data.strftime("%Y%m%d") unless data.nil?
       end
     end
-        
+
     def self.stringify_currency(data)
       case
       when data.is_a?(Integer) then sprintf("%.2f",(data.to_f / 100)).gsub('.',',')
       when data.is_a?(Float) then sprintf("%.2f",(data.to_f)).gsub('.',',')
-      when data.is_a?(String) 
-        int = self.parse_currency(data) 
+      when data.is_a?(String)
+        int = self.parse_currency(data)
         sprintf("%.2f",(int.to_f / 100)).gsub('.',',')
       else data
       end
@@ -92,7 +92,7 @@ module Collmex
 
       def self.default_hash
         hash = {}
-        self.specification.each_with_index do |field_spec, index| 
+        self.specification.each_with_index do |field_spec, index|
           if field_spec.has_key? :fix
             hash[field_spec[:name]] = field_spec[:fix]
           elsif field_spec.has_key? :default
@@ -109,21 +109,21 @@ module Collmex
         fields_spec = self.specification
 
         if data.is_a? Array
-          fields_spec.each_with_index do |field_spec, index| 
+          fields_spec.each_with_index do |field_spec, index|
             if !data[index].nil? && !field_spec.has_key?(:fix)
-              hash[field_spec[:name]] = Collmex::Api.parse_field(data[index], field_spec[:type]) 
+              hash[field_spec[:name]] = Collmex::Api.parse_field(data[index], field_spec[:type])
             end
           end
         elsif data.is_a? Hash
           fields_spec.each_with_index do |field_spec, index|
             if data.key?(field_spec[:name]) && !field_spec.has_key?(:fix)
-              hash[field_spec[:name]] = Collmex::Api.parse_field(data[field_spec[:name]], field_spec[:type]) 
+              hash[field_spec[:name]] = Collmex::Api.parse_field(data[field_spec[:name]], field_spec[:type])
             end
           end
         elsif data.is_a?(String) && parsed = CSV.parse_line(data,Collmex.csv_opts)
-          fields_spec.each_with_index do |field_spec, index| 
+          fields_spec.each_with_index do |field_spec, index|
             if !data[index].nil? && !field_spec.has_key?(:fix)
-              hash[field_spec[:name]] = Collmex::Api.parse_field(parsed[index], field_spec[:type]) 
+              hash[field_spec[:name]] = Collmex::Api.parse_field(parsed[index], field_spec[:type])
             end
           end
         end
@@ -131,8 +131,8 @@ module Collmex
       end
 
 
-      def initialize(arg = nil) 
-        #puts self.class.name 
+      def initialize(arg = nil)
+        #puts self.class.name
         @hash = self.class.default_hash
         @hash = @hash.merge(self.class.hashify(arg)) if !arg.nil?
         if self.class.specification.empty? && self.class.name.to_s != "Collmex::Api::Line"
@@ -140,7 +140,7 @@ module Collmex
         end
       end
 
-     
+
       def to_a
         array = []
         self.class.specification.each do |spec|
@@ -188,8 +188,8 @@ module Collmex
       def self.specification
           [
               { name: :identifyer,    type: :string,    fix: "LOGIN"   },
-              { name: :username,      type: :integer },
-              { name: :password,      type: :integer }
+              { name: :username,      type: :string },
+              { name: :password,      type: :string }
           ]
       end
     end
@@ -204,7 +204,7 @@ module Collmex
             { name: :title            , type: :string                             },
             { name: :firstname        , type: :string                             },
             { name: :lastname         , type: :string                             },
-            { name: :comapyn          , type: :string                             },
+            { name: :company          , type: :string                             },
             { name: :department       , type: :string                             },
             { name: :street           , type: :string                             },
             { name: :zipcode          , type: :string                             },
@@ -221,6 +221,7 @@ module Collmex
             { name: :bic              , type: :string                             },
             { name: :bank_name        , type: :string                             },
             { name: :vat_id           , type: :string                             },
+            { name: :ust_ldnr         , type: :string                             },
             { name: :payment_condition, type: :integer                            },
             { name: :dscout_group     , type: :integer                            },
             { name: :deliver_conditions, type: :string                            },
@@ -357,5 +358,142 @@ module Collmex
       end
     end
 
+    # Creating Orders
+    class Cmxord2 < Line
+      def self.specification
+          [
+            {name: :identifyer, type: :string,   fix: "CMXORD-2"},
+            {name: :order_id, type: :integer},
+            {name: :position, type: :integer},
+            {name: :order, type: :integer}, # Should be left blank
+            {name: :company_id, type: :integer, default: 1},
+            {name: :customer_id, type: :integer},
+            {name: :customer_title, type: :string},
+            {name: :customer_title_2, type: :string},
+            {name: :customer_first_name, type: :string},
+            {name: :customer_name, type: :string},
+            {name: :customer_company, type: :string},
+            {name: :customer_department, type: :string},
+            {name: :customer_street, type: :string},
+            {name: :customer_zip, type: :string},
+            {name: :customer_place, type: :string},
+            {name: :customer_country, type: :string}, # ISO code (DE)
+            {name: :customer_phone, type: :string},
+            {name: :customer_phone_2, type: :string},
+            {name: :customer_fax, type: :string},
+            {name: :customer_email, type: :string},
+            {name: :acct, type: :string},
+            {name: :customer_blz, type: :string},
+            {name: :customer_account_holders, type: :string},
+            {name: :customer_iban, type: :string},
+            {name: :customer_bic, type: :string},
+            {name: :customer_bank, type: :string},
+            {name: :customer_ustidnr, type: :string},
+            {name: :reserved, type: :integer}, # Should be left blank
+            {name: :order_id_for_customer, type: :string},
+            {name: :order_date, type: :date},
+            {name: :price_date, type: :date},
+            {name: :terms_of_payment, type: :integer},
+            {name: :currency, type: :string}, # ISO code (EUR)
+            {name: :price_group, type: :integer},
+            {name: :discount_group, type: :integer},
+            {name: :closing_off, type: :integer},
+            {name: :discount_ground, type: :string},
+            {name: :confirmation_text, type: :string},
+            {name: :final_text, type: :string},
+            {name: :internal_memo, type: :string},
+            {name: :billing_allowed, type: :integer},
+            {name: :partial_deliveries_allowed, type: :integer},
+            {name: :deleted, type: :integer},
+            {name: :status, type: :integer},
+            {name: :language, type: :integer}, # 0 = German, 1 = English
+            {name: :editor, type: :integer},
+            {name: :mediator, type: :integer},
+            {name: :system_name, type: :string},
+            {name: :closing_off_2, type: :currency},
+            {name: :closing_off_2_base, type: :string},
+            {name: :reserved_2, type: :string}, # Should be left blank
+            {name: :canceled_on, type: :date},
+            {name: :dispatch, type: :integer},
+            {name: :returns, type: :currency},
+            {name: :collection_fee, type: :currency},
+            {name: :terms_of_delivery, type: :string},
+            {name: :additional_delivery_conditions, type: :string},
+            {name: :delivery_address_title, type: :string},
+            {name: :delivery_address_title_2, type: :string},
+            {name: :delivery_address_first_name, type: :string},
+            {name: :delivery_address_name, type: :string},
+            {name: :delivery_address_company, type: :string},
+            {name: :delivery_address_department, type: :string},
+            {name: :delivery_address_street, type: :string},
+            {name: :delivery_address_zip, type: :string},
+            {name: :delivery_address_place, type: :string},
+            {name: :delivery_address_country, type: :string}, # ISO code (DE)
+            {name: :delivery_address_phone, type: :string},
+            {name: :delivery_address_phone_2, type: :string},
+            {name: :delivery_address_fax, type: :string},
+            {name: :delivery_address_email, type: :string},
+            {name: :position_type, type: :integer},
+            {name: :product_number, type: :string},
+            {name: :product_description, type: :string},
+            {name: :unit, type: :string}, # ISO code (EUR)
+            {name: :quantity, type: :float},
+            {name: :price, type: :currency},
+            {name: :delivery_date, type: :date},
+            {name: :price_quantity, type: :float},
+            {name: :item_discount, type: :currency}, # In percents
+            {name: :position_value, type: :currency},
+            {name: :product, type: :integer},
+            {name: :tax_classification, type: :integer},
+            {name: :control_abroad, type: :integer},
+            {name: :revenue_element, type: :integer},
+            {name: :fully_delivered, type: :integer},
+            {name: :finally_settled, type: :integer}
+          ]
+      end
+    end
+
+    class SalesOrderGet < Line
+      def self.specification
+        [
+          {name: :identifyer,             type: :string, fix: "SALES_ORDER_GET"},
+          {name: :order_id,               type: :string},
+          {name: :company_id,             type: :integer},
+          {name: :customer_id,            type: :integer},
+          {name: :date_from,              type: :date},
+          {name: :date_to,                type: :date},
+          {name: :order_id_for_customer,  type: :string},
+          {name: :format,                 type: :string}, # 1 means ZIP file with PDF
+          {name: :changed_only,           type: :integer},
+          {name: :system_name,            type: :string},
+          {name: :created_by_system_only, type: :integer}, # 1 means take only records created by the "system_name"
+          {name: :without_stationary,     type: :integer}
+        ]
+      end
+    end
+
+    class AccbalGet < Line
+      def self.specification
+        [
+          {name: :identifyer,     type: :string, fix: "ACCBAL_GET"},
+          {name: :company_id,     type: :integer, default: 1},
+          {name: :fiscal_year,    type: :integer, default: Date.today.year},
+          {name: :date_to,        type: :date},
+          {name: :account_number, type: :integer},
+          {name: :account_group,  type: :integer}
+        ]
+      end
+    end
+
+    class AccBal < Line
+      def self.specification
+          [
+            {name: :identifyer,      type: :string, fix: "ACC_BAL"},
+            {name: :account_number,  type: :integer},
+            {name: :account_name,    type: :string},
+            {name: :account_balance, type: :currency}
+          ]
+      end
+    end
   end
 end

data/lib/collmex/request.rb

@@ -3,10 +3,8 @@ require "uri"
 
 module Collmex
   class Request
-
-
     attr_accessor :commands, :http
-
+    attr_accessor :debug
 
     def self.run(&block)
       Request.new.tap do |request|
@@ -20,8 +18,7 @@ module Collmex
       term.to_s.split("_").collect(&:capitalize).join
     end
 
-
-    def enqueue(command, args = {}) 
+    def enqueue(command, args = {})
       if command.is_a? Symbol
         add_command Collmex::Api::const_get(self.class.classify(command)).new(args)
       elsif Collmex::Api.is_a_collmex_api_line_obj?(command)
@@ -31,35 +28,34 @@ module Collmex
       end
     end
 
-    
     def initialize
       @commands     = []
       @raw_response = {}
 
-      add_command Collmex::Api::Login.new({username: Collmex.username, password: Collmex.password})
+      if Collmex.username.nil? || Collmex.password.nil? || Collmex.customer_id.nil?
+        raise "No credentials for collmex given"
+      else
+        add_command Collmex::Api::Login.new({username: Collmex.username, password: Collmex.password})
+      end
     end
 
-
     def add_command(cmd)
       @commands << cmd
       cmd
     end
 
-
     def self.uri
       URI.parse "https://www.collmex.de/cgi-bin/cgi.exe\?#{Collmex.customer_id},0,data_exchange"
     end
 
-
     def self.header_attributes
       {"Content-Type" => "text/csv"}
     end
 
     def payload
-      @commands.map{ |c| c.to_csv }.join
+      @commands.map { |c| c.to_csv }.join
     end
 
-
     def parse_response
       @response = @raw_response[:array].map { |l| Collmex::Api.parse_line(l) }
       @response
@@ -69,27 +65,30 @@ module Collmex
       @raw_response
     end
 
-
-    def response 
+    def response
       @response
     end
 
-
     def execute
       @http = Net::HTTP.new(Collmex::Request.uri.host, Collmex::Request.uri.port)
       @http.use_ssl = true
       @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
-      response = @http.request_post(Collmex::Request.uri.request_uri, self.payload, Collmex::Request.header_attributes)
-
+      # http://www.collmex.de/faq.html#zeichensatz_import
+      encoded_body = payload.encode("ISO8859-1", undef: :replace) # Do not blow up on undefined characters in ISO8859-1
+      response = @http.request_post(Collmex::Request.uri.request_uri, encoded_body, Collmex::Request.header_attributes)
       response.body.force_encoding("ISO8859-1") if response.body.encoding.to_s == "ASCII-8BIT"
 
       @raw_response[:string] = response.body.encode("UTF-8")
-      @raw_response[:array]  = CSV.parse(@raw_response[:string], Collmex.csv_opts)
-
-      return parse_response
-    end
 
+      begin
+        @raw_response[:array]  = CSV.parse(@raw_response[:string], Collmex.csv_opts)
+      rescue => e
+        STDERR.puts "CSV.parse failed with string: #{@raw_response[:string]}" if self.debug
+        raise e
+      end
 
+      parse_response
+    end
   end
 end

data/spec/lib/collmex/api_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-sample_spec = [  
+sample_spec = [
           { name: :identifyer,    type: :string,     fix: "BLA"                },
           { name: :b,             type: :currency },
           { name: :c,             type: :float },
@@ -26,7 +26,7 @@ describe Collmex::Api do
     end
 
     it "should succeed for a Collmex::Api Object" do
-      b = Collmex::Api::AccdocGet.new() 
+      b = Collmex::Api::AccdocGet.new()
       described_class.is_a_collmex_api_line_obj?(b).should be_true
     end
   end
@@ -97,7 +97,7 @@ describe Collmex::Api do
     context "when given an invalid line" do
       it "should throw an error" do
         line = ["OMG", 2,3,4,5,6]
-        lambda { described_class.parse_line(line) }.should raise_error 'Could not find a Collmex::Api::Line class for "Omg"'
+        lambda { described_class.parse_line(line) }.should raise_error 'Could not find a Collmex::Api::Line class for "Omg" ("OMG")'
       end
     end
   end
@@ -181,10 +181,10 @@ end
 shared_examples_for "Collmex Api Command" do
 
   describe ".hashify" do
-  
+
     it "should parse the fields" do
       string    = "BLA"
-      integer   = 421 
+      integer   = 421
       float     = 123.23
       currency  = 200
       date      = Date.parse("12.10.1985")
@@ -199,16 +199,16 @@ shared_examples_for "Collmex Api Command" do
       Collmex::Api.stub(:parse_field).with(anything(),:date).and_return date
 
       tests = [
-                  [1,2,3,4],          
-                  [1,nil,3],     
-                  [1],          
-                  {a: 1, b:nil}, 
-                  {},           
-                  {c: 3},        
-                  "1;2;3",       
-                  "1;-2;3",      
-                  "1;-2,5;3",  
-                  ";;3",         
+                  [1,2,3,4],
+                  [1,nil,3],
+                  [1],
+                  {a: 1, b:nil},
+                  {},
+                  {c: 3},
+                  "1;2;3",
+                  "1;-2;3",
+                  "1;-2,5;3",
+                  ";;3",
       ]
 
       tests.each do |testdata|
@@ -217,36 +217,36 @@ shared_examples_for "Collmex Api Command" do
     end
 
     it "should set default values when nothing given" do
-      sample_default_spec = [  
+      sample_default_spec = [
                         { name: :a,       type: :string,      default: "fixvalue" },
                         { name: :b,       type: :currency,    default: 899 },
                         { name: :c,       type: :integer,     default: 10 },
                         { name: :d,       type: :float,       default: 2.99 },
-                    ] 
+                    ]
       sample_default_outcome = {a: "fixvalue", b: 899, c: 10, d: 2.99}
       described_class.stub(:specification).and_return sample_default_spec
       described_class.hashify([]).should eql sample_default_outcome
     end
 
     it "should overwrite default values when data is given" do
-      sample_default_spec = [  
+      sample_default_spec = [
                         { name: :a,       type: :string,      default: "fixvalue" },
                         { name: :b,       type: :currency,    default: 899 },
                         { name: :c,       type: :integer,     default: 10 },
                         { name: :d,       type: :float,       default: 2.99 },
-                    ] 
+                    ]
       sample_default_outcome = {a: "asd", b: 12, c: 1, d: 1.0}
       described_class.stub(:specification).and_return sample_default_spec
       described_class.hashify({a: "asd", b: 12, c: 1, d: 1}).should eql sample_default_outcome
     end
 
     it "should ignore given values for fix-value-fields" do
-      sample_fix_spec = [  
+      sample_fix_spec = [
                         { name: :a,       type: :string,      fix: "fixvalue" },
                         { name: :b,       type: :currency,    fix: 899 },
                         { name: :c,       type: :integer,     fix: 10 },
                         { name: :d,       type: :float,       fix: 2.99 },
-                    ] 
+                    ]
       sample_fix_outcome = {a: "fixvalue", b: 899, c: 10, d: 2.99}
       described_class.stub(:specification).and_return sample_fix_spec
       described_class.hashify([]).should eql sample_fix_outcome
@@ -314,7 +314,7 @@ shared_examples_for "Collmex Api Command" do
   end
 
   describe "#to_h" do
-    it "should return the hash" do 
+    it "should return the hash" do
       h = { first: 1, second: 2 }
       subject.instance_variable_set(:@hash, h)
       subject.to_h.should eql h
@@ -332,29 +332,29 @@ shared_examples_for "Collmex Api Command" do
 end
 
 describe Collmex::Api::Line do
-  it_behaves_like "Collmex Api Command" 
+  it_behaves_like "Collmex Api Command"
 end
 
 describe Collmex::Api::Login do
-  subject { Collmex::Api::Login.new({:username => 12, :password => 34}) }
-  it_behaves_like "Collmex Api Command" 
-  spec =  
+  subject { Collmex::Api::Login.new({:username => "012", :password => "34"}) }
+  it_behaves_like "Collmex Api Command"
+  spec =
           [
               { name: :identifyer,    type: :string,    fix: "LOGIN"   },
-              { name: :username,      type: :integer },
-              { name: :password,      type: :integer }
+              { name: :username,      type: :string },
+              { name: :password,      type: :string }
           ]
 
-  specify { described_class.specification.should eql spec } 
+  specify { described_class.specification.should eql spec }
 
-  output = ["LOGIN", 12, 34]
+  output = ["LOGIN", "012", "34"]
   specify { subject.to_a.should eql output }
 end
 
 describe Collmex::Api::CustomerGet do
-  it_behaves_like "Collmex Api Command" 
+  it_behaves_like "Collmex Api Command"
 
-  spec = 
+  spec =
           [
             { name: :identifyer       , type: :string    , fix: "CUSTOMER_GET"    },
             { name: :id               , type: :integer                            },
@@ -371,19 +371,19 @@ describe Collmex::Api::CustomerGet do
             { name: :inactive         , type: :integer                            },
           ]
 
-  specify { described_class.specification.should eql spec } 
+  specify { described_class.specification.should eql spec }
 
   subject { described_class.new( {:customer_id => 9999} ) }
 
-  output = ["CUSTOMER_GET", nil, 1, "", nil, "", nil, nil, nil, nil, nil, "", nil] 
+  output = ["CUSTOMER_GET", nil, 1, "", nil, "", nil, nil, nil, nil, nil, "", nil]
 
   specify { subject.to_a.should eql output }
 end
 
 describe Collmex::Api::AccdocGet do
-  it_behaves_like "Collmex Api Command" 
+  it_behaves_like "Collmex Api Command"
 
-  spec = 
+  spec =
           [
             { name: :identifyer       , type: :string    , fix: "ACCDOC_GET"     },
             { name: :company_id       , type: :integer   , default: 1             },
@@ -406,7 +406,7 @@ describe Collmex::Api::AccdocGet do
 
 
 
-  specify { described_class.specification.should eql spec } 
+  specify { described_class.specification.should eql spec }
 
   subject { described_class.new( {id: 1} ) }
 
@@ -415,11 +415,33 @@ describe Collmex::Api::AccdocGet do
   specify { subject.to_a.should eql output }
 end
 
+describe Collmex::Api::AccbalGet do
+  it_behaves_like "Collmex Api Command"
+
+  spec =
+        [
+          {name: :identifyer,             type: :string, fix: "ACCBAL_GET"},
+          {name: :company_id,             type: :integer, default: 1},
+          {name: :fiscal_year,            type: :integer, default: Date.today.year},
+          {name: :date_to,                type: :date},
+          {name: :account_number,         type: :integer},
+          {name: :account_group,          type: :integer}
+        ]
+
+  specify { described_class.specification.should eql spec }
 
-describe Collmex::Api::Cmxknd do 
+  subject { described_class.new( {id: 1} ) }
+
+  output = ["ACCBAL_GET", 1, Date.today.year, nil, nil, nil]
 
-  it_behaves_like "Collmex Api Command" 
-  spec = 
+  specify { subject.to_a.should eql output }
+end
+
+
+describe Collmex::Api::Cmxknd do
+
+  it_behaves_like "Collmex Api Command"
+  spec =
           [
             { name: :identifyer       , type: :string    , fix: "CMXKND"          },
             { name: :customer_id      , type: :integer                            },
@@ -428,7 +450,7 @@ describe Collmex::Api::Cmxknd do
             { name: :title            , type: :string                             },
             { name: :firstname        , type: :string                             },
             { name: :lastname         , type: :string                             },
-            { name: :comapyn          , type: :string                             },
+            { name: :company          , type: :string                             },
             { name: :department       , type: :string                             },
             { name: :street           , type: :string                             },
             { name: :zipcode          , type: :string                             },
@@ -445,6 +467,7 @@ describe Collmex::Api::Cmxknd do
             { name: :bic              , type: :string                             },
             { name: :bank_name        , type: :string                             },
             { name: :vat_id           , type: :string                             },
+            { name: :ust_ldnr         , type: :string                             },
             { name: :payment_condition, type: :integer                            },
             { name: :dscout_group     , type: :integer                            },
             { name: :deliver_conditions, type: :string                            },
@@ -466,21 +489,21 @@ describe Collmex::Api::Cmxknd do
             { name: :phone_2          , type: :string                             },
           ]
 
-  specify { described_class.specification.should eql spec } 
+  specify { described_class.specification.should eql spec }
 
   subject { described_class.new( {id: 1} ) }
 
-  output = ["CMXKND", nil, 1, "", "", "", "", "", "", "", "", "", "", nil, "", "", "", "", "", "", "", "", "", "", nil, nil, "", "", nil, "", nil, "", nil, "", nil, "", nil, nil, nil, "", nil, "", ""]
+  output = ["CMXKND", nil, 1, "", "", "", "", "", "", "", "", "", "", nil, "", "", "", "", "", "", "", "", "", "", "", nil, nil, "", "", nil, "", nil, "", nil, "", nil, "", nil, nil, nil, "", nil, "", ""]
 
   specify { subject.to_a.should eql output }
 end
 
 
-describe Collmex::Api::Message do 
+describe Collmex::Api::Message do
 
-  it_behaves_like "Collmex Api Command" 
+  it_behaves_like "Collmex Api Command"
 
-  spec = 
+  spec =
           [
             { name: :identifyer       , type: :string    , fix: "MESSAGE"         },
             { name: :type             , type: :string                             },
@@ -489,25 +512,25 @@ describe Collmex::Api::Message do
             { name: :line             , type: :integer                            },
           ]
 
-  specify { described_class.specification.should eql spec } 
+  specify { described_class.specification.should eql spec }
 
   subject { described_class.new(  ) }
 
   output = ["MESSAGE", "", nil, "", nil]
 
   specify { subject.to_a.should eql output }
-  
+
   context "success" do
     subject { described_class.new(type: "S") }
-    specify do 
-      subject.success?.should eql true 
-      subject.result.should eql :success 
+    specify do
+      subject.success?.should eql true
+      subject.result.should eql :success
     end
   end
 
   context "warning" do
     subject { described_class.new(type: "W") }
-    specify do 
+    specify do
       subject.success?.should eql false
       subject.result.should eql :warning
     end
@@ -515,7 +538,7 @@ describe Collmex::Api::Message do
 
   context "error" do
     subject { described_class.new(type: "E") }
-    specify do 
+    specify do
       subject.success?.should eql false
       subject.result.should eql :error
     end
@@ -523,7 +546,7 @@ describe Collmex::Api::Message do
 
   context "undefined" do
     subject { described_class.new() }
-    specify do 
+    specify do
       subject.success?.should eql false
       subject.result.should eql :undefined
     end
@@ -535,9 +558,9 @@ end
 
 describe Collmex::Api::Accdoc do   # fixme ACCDOC
 
-  it_behaves_like "Collmex Api Command" 
+  it_behaves_like "Collmex Api Command"
 
-  spec = 
+  spec =
           [
             { name: :identifyer       , type: :string    , fix: "ACCDOC"          },
             { name: :company_id       , type: :integer   , default: 1             },
@@ -569,7 +592,7 @@ describe Collmex::Api::Accdoc do   # fixme ACCDOC
 
 
 
-  specify { described_class.specification.should eql spec } 
+  specify { described_class.specification.should eql spec }
 
   subject { described_class.new( {id: 1} ) }
 
@@ -579,4 +602,24 @@ describe Collmex::Api::Accdoc do   # fixme ACCDOC
 end
 
 
+describe Collmex::Api::AccBal do
+
+  it_behaves_like "Collmex Api Command"
+
+  spec =
+          [
+            {name: :identifyer,      type: :string, fix: "ACC_BAL"},
+            {name: :account_number,  type: :integer},
+            {name: :account_name,    type: :string},
+            {name: :account_balance, type: :currency}
+          ]
+
+  specify { described_class.specification.should eql spec }
+
+  subject { described_class.new( {id: 1} ) }
+
+  output = ["ACC_BAL", nil, "", nil]
+
+  specify { subject.to_a.should eql output }
+end
 

data/spec/lib/collmex/request_spec.rb

@@ -29,6 +29,11 @@ describe Collmex::Request do
 
   describe "#initialize" do
 
+    it "should raise an error if no credentials given" do
+      Collmex.reset_login_data
+      lambda { Collmex::Request.new }.should raise_error "No credentials for collmex given"
+    end
+
     it "should add the Login command to its own queue" do
       request = Collmex::Request.new
       request.commands.count.should eql 1

data/spec/lib/collmex_spec.rb

@@ -15,11 +15,7 @@ end
 describe "CollmexIntegration" do
 
   before(:each) do 
-    Collmex.setup_login_data
-  end
-
-  after(:each) do
-    Collmex.reset_login_data
+    Collmex.setup_login_data({username: 4109488, password: 6642111, customer_id: 112249})
   end
 
   it "should work with the long form" do
@@ -33,21 +29,18 @@ describe "CollmexIntegration" do
     VCR.use_cassette('standard_request') do
       request.execute
     end
-
-      
   end
 
   it "should work with the block form" do
 
-   # ap  Collmex::Api::AccdocGet.new("ASDASD;2;2")
-
     request = Collmex::Request.run do
       enqueue :customer_get, id: 9999
     end
+    
+    VCR.use_cassette('standard_request') do
+      request.response.last.success?.should eql true
+    end
 
-    #ap request.response
-
-    request.response.last.success?.should eql true
   end
 end
 

data/spec/spec_helper.rb

@@ -1,22 +1,23 @@
-require 'rspec'
+require "rspec"
 require "awesome_print"
 require "vcr"
 
 RSpec.configure do |config|
-
   config.color_enabled = true
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
 
   config.before(:each) do
-
+    Collmex.setup_login_data({username: "8866413", password: "2291502", customer_id: "104156"})
   end
 
+  config.after(:each) do
+    Collmex.reset_login_data
+  end
 end
 
-
-def timed(name)  
+def timed(name)
   start = Time.now
   puts "\n[STARTED: #{name}]"
   yield if block_given?
@@ -24,10 +25,9 @@ def timed(name)
   puts "[FINISHED: #{name} in #{(finish - start) * 1000} milliseconds]"
 end
 
-
 VCR.configure do |c|
   c.allow_http_connections_when_no_cassette = true
-  c.cassette_library_dir = 'fixtures/vcr_cassettes'
+  c.cassette_library_dir = "spec/fixtures/vcr_cassettes"
   c.hook_into :webmock
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collmex-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70139378772860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,50 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70139378772860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A lib written in ruby that talks to the german accounting software collmex.
 email: roman.lehnert@googlemail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/collmex/api/line.rb
-- lib/collmex/api/lines.rb
 - lib/collmex/api.rb
 - lib/collmex/request.rb
 - lib/collmex.rb
@@ -38,7 +73,8 @@ files:
 - spec/lib/collmex_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/romanlehnert/collmex-ruby
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -57,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A ruby api lib for collmex