kontoapi-rails 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -2,12 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.6)
-      actionpack (= 3.0.6)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
       mail (~> 2.2.15)
-    actionpack (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -15,19 +15,19 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.6)
-      activesupport (= 3.0.6)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
-    activesupport (3.0.6)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
     addressable (2.2.5)
     arel (2.0.9)
     builder (2.1.2)
@@ -43,7 +43,7 @@ GEM
     kontoapi-ruby (0.1.0)
       addressable
       yajl-ruby
-    mail (2.2.16)
+    mail (2.2.17)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -55,17 +55,17 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.6)
-      actionmailer (= 3.0.6)
-      actionpack (= 3.0.6)
-      activerecord (= 3.0.6)
-      activeresource (= 3.0.6)
-      activesupport (= 3.0.6)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
       bundler (~> 1.0)
-      railties (= 3.0.6)
-    railties (3.0.6)
-      actionpack (= 3.0.6)
-      activesupport (= 3.0.6)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)

data/README.markdown

@@ -30,17 +30,38 @@ Then, in one of the models you want to validate bank account data with:
     
       # account data validation
       # (really just a shortcut for `validates_with KontoAPI::BankAccountValidator`)
-      # takes any of the following options (the defaults are shown here):
+      # Takes any of the following options (the defaults are shown here):
       #   :account_number_field => :account_number,
       #   :bank_code_field      => :bank_code,
       #   :allow_nil            => true,    <-- don't validate if one of them is nil
       #   :on_timeout           => :ignore  <-- do nothing if a timeout occurs, others:
       #                            :fail    <-- throw a validation error
       #                            :retry   <-- (not supported yet)
+      #
+      # If validations fails, an error within the standard ActiveRecord I18n scopes
+      # will be added to the :account_number_field:
+      # :invalid <-- if it is invalid
+      # :timeout <-- if :on_timeout is set to :fail and the api call timed out
       validates_account_data
     
     end
 
+And if you want to autocomplete the bank name:
+
+    class PaymentData < ActiveRecord::Base
+
+      # bank name autocompletion
+      # takes any of the following options (the defaults are shown here):
+      #   :bank_code_field      => :bank_code,
+      #   :bank_name_field      => :bank_name,
+      #   :always_overwrite     => false,         <-- autocomplete even if bank name already present
+      #   :on_timeout           => :ignore        <-- do nothing if a timeout occurs, others:
+      #                            :retry         <-- (not supported yet)
+      #                             'any string'  <-- use this string as the value
+      autocomplete_bank_name
+    
+    end
+
 Copyright
 ---------
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/kontoapi-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kontoapi-rails}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Schwenzien"]
-  s.date = %q{2011-04-18}
+  s.date = %q{2011-04-20}
   s.description = %q{This library is a wrapper for the Konto API (https://www.kontoapi.de/). It provides a validation method for models that checks if a given account number and bank code represent a valid combination.}
   s.email = %q{jan@schwenzien.org}
   s.extra_rdoc_files = [

data/lib/kontoapi-rails/orm/active_record_extension.rb

@@ -8,6 +8,12 @@ module KontoAPI
     module ClassMethods
       def validates_bank_account(options={})
         options.symbolize_keys!
+        options.reverse_merge!(
+          :account_number_field => :account_number,
+          :bank_code_field      => :bank_code,
+          :allow_nil            => true,
+          :on_timeout           => :ignore
+        )
         validates_with KontoAPI::BankAccountValidator, options
       end
 
@@ -15,13 +21,24 @@ module KontoAPI
         options.symbolize_keys!
         options.reverse_merge!(
           :bank_code_field  => :bank_code,
-          :bank_name_field  => :bank_name
+          :bank_name_field  => :bank_name,
+          :always_overwrite => false
         )
-        #write_inheritable_attribute(:autocomplete_bank_name_options, options)
         define_method :autocomplete_bank_name do
           current_value = send(:"#{options[:bank_name_field]}")
           blz           = send(:"#{options[:bank_code_field]}")
-          self.send(:"#{options[:bank_name_field]}=", KontoAPI::bank_name(blz)) if current_value.blank? && blz.present?
+          begin
+            self.send(:"#{options[:bank_name_field]}=", KontoAPI::bank_name(blz)) if (options[:always_overwrite] || current_value.blank?) && blz.present?
+          rescue Timeout::Error => ex
+            case options[:on_timeout]
+            when String
+              self.send(:"#{options[:bank_name_field]}=", options[:on_timeout])
+            when nil, :ignore
+              # nop
+            when :retry
+              raise 'not implemented yet'
+            end
+          end
         end
         before_save :autocomplete_bank_name
       end

data/lib/kontoapi-rails/validators/bank_account_validator.rb

@@ -3,22 +3,15 @@ require 'active_model/validator'
 module KontoAPI
   class BankAccountValidator < ActiveModel::Validator
 
-    DEFAULTS = {
-      :account_number_field => :account_number,
-      :bank_code_field      => :bank_code,
-      :allow_nil            => true,
-      :on_timeout           => :ignore
-    }
-
     def validate(record)
-      record_options  = options.reverse_merge(DEFAULTS)
-      account_number  = record.send(:"#{record_options[:account_number_field]}")
-      bank_code       = record.send(:"#{record_options[:bank_code_field]}")
-      record.errors.add(:"#{record_options[:account_number_field]}", :invalid) unless KontoAPI::valid?(account_number, bank_code)
+      account_number  = record.send(:"#{options[:account_number_field]}")
+      bank_code       = record.send(:"#{options[:bank_code_field]}")
+      return true if options[:allow_nil] && (account_number.nil? || bank_code.nil?)
+      record.errors.add(:"#{options[:account_number_field]}", :invalid) unless KontoAPI::valid?(account_number, bank_code)
     rescue Timeout::Error => ex
-      case record_options[:on_timeout]
+      case options[:on_timeout]
       when :fail
-        record.errors.add(:"#{record_options[:account_number_field]}", :timeout)
+        record.errors.add(:"#{options[:account_number_field]}", :timeout)
       when :ignore
         # nop
       when :retry

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kontoapi-rails
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jan Schwenzien
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 Z
+date: 2011-04-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails