simple_form-bank_account_number 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2188cdec0054eac3d21d6f8a3140a0f9583dc13f
-  data.tar.gz: fbfcc9ff25ecda050792cf5e484b14fd2cda5738
+  metadata.gz: 89400455ffe9eb2f250fbd14802352f6c89e3ec5
+  data.tar.gz: a3eea1f96cceda733ae7f0bd2d59d966459f956d
 SHA512:
-  metadata.gz: e3eb8e1be8822635d0b19754ff813e5e3dd00d3344d389d460dfa8ede534b76b57ff82cf0977e5f79741c45d19cdc7dc30b444f753a798082746266cb19873d6
-  data.tar.gz: 088c58a15718874b6f7c72c22d5348e21ab6557a62d25cd867dd6403c4d07ac8a9120e9483f76d1405b04aab76e05175fb3561be9d91f5d2d4d89e3cc38b6c04
+  metadata.gz: 68828827190438e6a1d99bffdddbf15dc3e551f850da24b310ff837f53a0fe0ccf502252a43b0dcf5139078ef3f355b4fb6d02bef1fe432e1ee69304cece0809
+  data.tar.gz: b8ad4bdcb94676adf92f65e9f545cbce636ef716e84bb3d208cc0bb33ce28684c60561a1d43c4749e4a870cf29478c0536b4ab29bfee69e730b2e453ef5bd67c

data/.rubocop.yml

@@ -0,0 +1,45 @@
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 120
+  Exclude: [spec/**/*.rb]
+
+Lint/AssignmentInCondition:
+  Enabled: false
+
+Lint/EndAlignment:
+  Enabled: false
+
+Style/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Style/AndOr:
+  EnforcedStyle: conditionals
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/ElseAlignment:
+  Enabled: false
+
+Style/IndentationWidth:
+  Enabled: false
+
+Style/SignalException:
+  EnforcedStyle: only_raise
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/SpecialGlobalVars:
+  Enabled: false
+
+Style/TrailingComma:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false

data/.travis.yml

@@ -1,9 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.1
-notifications:
-  email:
-    on_success: always
-    on_failure: always
+  - 2.1
+  - 2.2

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in simple_form-bank_account_number.gemspec
 gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Bucky Box Limited
+Copyright (c) 2013-2015 Bucky Box Limited
 
 MIT License
 

data/README.md

@@ -1,5 +1,9 @@
 # SimpleForm::BankAccountNumber
 
+[![Build Status](https://travis-ci.org/buckybox/simple_form-bank_account_number.svg?branch=master)](https://travis-ci.org/buckybox/simple_form-bank_account_number)
+[![Dependency Status](http://img.shields.io/gemnasium/buckybox/simple_form-bank_account_number.svg)](https://gemnasium.com/buckybox/simple_form-bank_account_number)
+[![Gem Version](http://img.shields.io/gem/v/simple_form-bank_account_number.svg)](https://rubygems.org/gems/simple_form-bank_account_number)
+
 A [SimpleForm](https://github.com/plataformatec/simple_form) input field for bank account numbers.
 
 ## Usage
@@ -17,3 +21,6 @@ You probably want to concatenate them into one single number for your backend wi
 
 `params[:bank_deposit][:account_number] = params[:bank_deposit][:account_number].join`
 
+## License
+
+MIT

data/Rakefile

@@ -1,8 +1,11 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
 
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.ruby_opts = "-w"
 end
 
-task :default => :spec
+require "rubocop/rake_task"
+RuboCop::RakeTask.new
+
+task default: [:rubocop, :spec]

data/lib/simple_form/bank_account_number.rb

@@ -1,46 +1,33 @@
 require "simple_form"
-require "simple_form/bank_account_number/countries"
-require "simple_form/bank_account_number/version"
+require "simple_form/bank_account_number/formatter"
 
 module SimpleForm
   module Inputs
     class BankAccountNumberInput < NumericInput
-      def self.formatted_bank_account_number(full_number, country)
-        full_number = full_number.dup
-
-        fields = number_format(country).map do |part|
-          length = part[:format].source.scan(/\b\d}/).map(&:to_i).max
-          full_number.slice!(0, length || full_number.length)
-        end
-
-        unless full_number.empty?
-          raise ArgumentError, "format does not match (#{full_number.length} extra digits)"
-        end
-
-        fields.join("-")
-      end
-
-      # requires to set :country and :value
       def input
         country = options.delete(:country) || raise(ArgumentError, "You must set the :country key.")
-        full_number = options.fetch(:value) || ""
-        parts = self.class.formatted_bank_account_number(full_number, country).split("-").reverse
+        full_number = options.fetch(:value, "")
+        parts = BankAccountNumber::Formatter.formatted_bank_account_number(full_number, country).to_h.values
+        format = BankAccountNumber::Formatter.number_format(country)
+
+        format.fetch(:parts).map do |part|
+          input_html_options.delete(:country) # don't include it in the markup
 
-        fields = self.class.number_format(country).map do |part|
           input_html_options[:required] = "required"
           input_html_options[:autocomplete] = "off"
-          input_html_options[:name] = "#{lookup_model_names.join("_")}[#{reflection_or_attribute_name}][]"
-          input_html_options[:pattern] = "^#{part[:format].source}$"
-          input_html_options[:title] = part[:label]
+          input_html_options[:name] = "#{lookup_model_names.join('_')}[#{reflection_or_attribute_name}][]"
+          input_html_options[:pattern] = "^#{part.fetch(:format).source}$"
+          input_html_options[:title] = part.fetch(:title)
           input_html_options[:style] = "width: auto; display: inline; margin-right: .2em"
-          input_html_options.delete(:country) # don't include it in the markup
+          input_html_options["data-label"] = part.fetch(:label)
+          input_html_options["data-multiline"] = format.fetch(:multiline)
 
           # Twitter Bootstrap tooltips
           input_html_options["data-toggle"] = "tooltip"
-          input_html_options["data-original-title"] = part[:label]
+          input_html_options["data-original-title"] = part.fetch(:title)
           input_html_options["data-placement"] = "bottom"
 
-          if length = part[:format].source.scan(/\b\d}/).map(&:to_i).max
+          if length = part.fetch(:format).source.scan(/\b\d}/).map(&:to_i).max
             input_html_options[:size] = length
             input_html_options[:maxlength] = length
           else
@@ -48,21 +35,11 @@ module SimpleForm
             input_html_options[:maxlength] = nil
           end
 
-          input_html_options[:value] = parts.pop
+          input_html_options[:value] = parts.shift
 
           super
-        end
-
-        fields.join
-      end
-
-    private
-
-      def self.number_format(country)
-        SimpleForm::BankAccountNumber::COUNTRIES[country.upcase] ||
-          SimpleForm::BankAccountNumber::DEFAULT_FORMAT
+        end.join
       end
     end
   end
 end
-

data/lib/simple_form/bank_account_number/countries.rb

@@ -1,29 +1,44 @@
+require "simple_form"
+
 module SimpleForm
   module BankAccountNumber
     COUNTRIES = {
-      "AU" => [
-        { label: "6 digit BSB number", format: /\d{6}/ },
-        { label: "6 to 9 digit account number", format: /\d{6,9}/ },
-      ],
-      "CA" => [
-        { label: "8 or 9 digit transit number", format: /\d{8,9}/ },
-        { label: "7 to 12 digit account number", format: /\d{7,12}/ },
-      ],
-      "GB" => [
-        { label: "6 digit sort code", format: /\d{6}/ },
-        { label: "7 to 10 digit account number", format: /\d{7,10}/ },
-      ],
-      "NZ" => [
-        { label: "2 digit bank number", format: /\d{2}/ },
-        { label: "4 digit branch number", format: /\d{4}/ },
-        { label: "7 digit account number", format: /\d{7}/ },
-        { label: "2 or 3 digit suffix", format: /\d{2,3}/ },
-      ],
-    }
-
-    DEFAULT_FORMAT = [
-      { label: "account number", format: /[A-Z0-9]+/ }
-    ]
+      "AU" => {
+        parts: [
+          { label: "BSB Number", title: "6 digit BSB number", format: /\d{6}/ },
+          { label: "Account Number", title: "6 to 9 digit account number", format: /\d{6,9}/ },
+        ],
+        multiline: true,
+      },
+      "CA" => {
+        parts: [
+          { label: "Transit Number", title: "8 or 9 digit transit number", format: /\d{8,9}/ },
+          { label: "Account Number", title: "7 to 12 digit account number", format: /\d{7,12}/ },
+        ],
+        multiline: true,
+      },
+      "GB" => {
+        parts: [
+          { label: "Sort Code", title: "6 digit sort code", format: /\d{6}/ },
+          { label: "Account Number", title: "7 to 10 digit account number", format: /\d{7,10}/ },
+        ],
+        multiline: true,
+      },
+      "NZ" => {
+        parts: [
+          { label: "Bank Number", title: "2 digit bank number", format: /\d{2}/ },
+          { label: "Branch Number", title: "4 digit branch number", format: /\d{4}/ },
+          { label: "Account Number", title: "7 digit account number", format: /\d{7}/ },
+          { label: "Suffix", title: "2 or 3 digit suffix", format: /\d{2,3}/ },
+        ],
+        multiline: false,
+      },
+      nil => { # NOTE: default format
+        parts: [
+          { label: "Account Number", title: "account number", format: /[A-Z0-9]+/ }
+        ],
+        multiline: false,
+      }
+    }.freeze
   end
 end
-

data/lib/simple_form/bank_account_number/formatter.rb

@@ -0,0 +1,57 @@
+require "simple_form"
+require "simple_form/bank_account_number/countries"
+
+module SimpleForm
+  module BankAccountNumber
+    class Formatter
+      def self.number_format(country)
+        BankAccountNumber::COUNTRIES.fetch(
+          country.upcase, BankAccountNumber::COUNTRIES[nil]
+        )
+      end
+
+      def self.formatted_bank_account_number(full_number, country)
+        full_number = full_number.to_s.dup
+        format = number_format(country)
+
+        fields = format.fetch(:parts).inject({}) do |hash, part|
+          length = part.fetch(:format).source.scan(/\b\d}/).map(&:to_i).max
+          field = full_number.slice!(0, length || full_number.length)
+
+          hash.merge!(part.fetch(:label) => field)
+        end
+
+        unless full_number.empty?
+          raise ArgumentError, "format does not match (#{full_number.length} extra digits)"
+        end
+
+        new(fields, country)
+      end
+
+      def initialize(fields, country)
+        @fields = fields
+        @country = country
+      end
+
+      def to_s(value_separator: ": ", field_separator: "\n")
+        hash = if multiline?
+          to_h
+        else
+          { "Account Number" => to_h.values.join("-") } # TODO: i18n
+        end
+
+        hash.map do |label, value|
+          [label, value_separator, value].join
+        end.join(field_separator)
+      end
+
+      def to_h
+        @fields
+      end
+
+      def multiline?
+        self.class.number_format(@country).fetch(:multiline)
+      end
+    end
+  end
+end

data/simple_form-bank_account_number.gemspec

@@ -1,16 +1,15 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'simple_form/bank_account_number/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "simple_form-bank_account_number"
-  spec.version       = SimpleForm::BankAccountNumber::VERSION
+  spec.version       = "1.1.0"
   spec.authors       = ["Cédric Félizard"]
   spec.email         = ["cedric@felizard.fr"]
-  spec.description   = %q{A SimpleForm input field for bank account numbers}
-  spec.summary       = %q{Bank account number field for SimpleForm}
-  spec.homepage      = ""
+  spec.description   = "A SimpleForm input field for bank account numbers"
+  spec.summary       = "Bank account number field for SimpleForm"
+  spec.homepage      = "https://github.com/buckybox/simple_form-bank_account_number"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -18,8 +17,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency             "simple_form", "~> 2.1.0"
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_dependency "simple_form", "~> 2.1.0"
+
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop"
 end

data/spec/simple_form/bank_account_number/formatter_spec.rb

@@ -0,0 +1,38 @@
+require "simple_form/bank_account_number/formatter"
+
+module SimpleForm
+  module BankAccountNumber
+    describe Formatter do
+      describe ".formatted_bank_account_number" do
+        def assert(country, number, formatted_number)
+          expect(Formatter.formatted_bank_account_number(number, country).to_h).to eq formatted_number
+        end
+
+        specify do
+          assert "AU", "484795453513423", "BSB Number" => "484795", "Account Number" => "453513423"
+          assert "GB", "40142431565517", "Sort Code" => "401424", "Account Number" => "31565517"
+          assert "NZ", "041587005000000", "Bank Number" => "04", "Branch Number" => "1587", "Account Number" => "0050000", "Suffix" => "00"
+          assert "XX", "1234", "Account Number" => "1234"
+        end
+
+        it "honors the multiline flag" do
+          gb = Formatter.formatted_bank_account_number("40142431565517", "GB")
+          expect(gb.to_s).to eq "Sort Code: 401424\nAccount Number: 31565517"
+
+          nz = Formatter.formatted_bank_account_number("041587005000000", "NZ")
+          expect(nz.to_s).to eq "Account Number: 04-1587-0050000-00"
+
+          xx = Formatter.formatted_bank_account_number("1234", "XX")
+          expect(xx.to_s).to eq "Account Number: 1234" # TODO: support i18n
+        end
+
+        it "preserves the given number" do
+          number = "484795453513423"
+          Formatter.formatted_bank_account_number(number, "AU")
+
+          expect(number).to eq "484795453513423"
+        end
+      end
+    end
+  end
+end

data/spec/simple_form/bank_account_number_spec.rb

@@ -17,26 +17,6 @@ end
 
 module SimpleForm::Inputs
   describe BankAccountNumberInput do
-    describe ".formatted_bank_account_number" do
-      def assert country, number, formatted_number
-        expect(BankAccountNumberInput.formatted_bank_account_number(number, country)).to eq formatted_number
-      end
-
-      specify do
-        assert "AU", "484795453513423", "484795-453513423"
-        assert "GB", "40142431565517", "401424-31565517"
-        assert "NZ", "041587005000000", "04-1587-0050000-00"
-        assert "XX", "1234", "1234"
-      end
-
-      it "preserves the given number" do
-        number = "484795453513423"
-        BankAccountNumberInput.formatted_bank_account_number(number, "AU")
-
-        expect(number).to eq "484795453513423"
-      end
-    end
-
     describe "#input" do
       let(:options) do
         {
@@ -59,4 +39,3 @@ module SimpleForm::Inputs
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form-bank_account_number
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Cédric Félizard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form
@@ -25,21 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A SimpleForm input field for bank account numbers
 email:
 - cedric@felizard.fr
@@ -74,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -81,10 +96,11 @@ files:
 - Rakefile
 - lib/simple_form/bank_account_number.rb
 - lib/simple_form/bank_account_number/countries.rb
-- lib/simple_form/bank_account_number/version.rb
+- lib/simple_form/bank_account_number/formatter.rb
 - simple_form-bank_account_number.gemspec
+- spec/simple_form/bank_account_number/formatter_spec.rb
 - spec/simple_form/bank_account_number_spec.rb
-homepage: ''
+homepage: https://github.com/buckybox/simple_form-bank_account_number
 licenses:
 - MIT
 metadata: {}
@@ -104,9 +120,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Bank account number field for SimpleForm
 test_files:
+- spec/simple_form/bank_account_number/formatter_spec.rb
 - spec/simple_form/bank_account_number_spec.rb

data/lib/simple_form/bank_account_number/version.rb

@@ -1,5 +0,0 @@
-module SimpleForm
-  module BankAccountNumber
-    VERSION = "1.0.0"
-  end
-end