simple_form-bank_account_number 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89400455ffe9eb2f250fbd14802352f6c89e3ec5
-  data.tar.gz: a3eea1f96cceda733ae7f0bd2d59d966459f956d
+  metadata.gz: 39782379daf3648e7540fe25b5ac71379d3c77c4
+  data.tar.gz: d2578ac282f742c95490b2a2b8a7f5fde99c2af8
 SHA512:
-  metadata.gz: 68828827190438e6a1d99bffdddbf15dc3e551f850da24b310ff837f53a0fe0ccf502252a43b0dcf5139078ef3f355b4fb6d02bef1fe432e1ee69304cece0809
-  data.tar.gz: b8ad4bdcb94676adf92f65e9f545cbce636ef716e84bb3d208cc0bb33ce28684c60561a1d43c4749e4a870cf29478c0536b4ab29bfee69e730b2e453ef5bd67c
+  metadata.gz: a88c957d2c044502f1c20e140e361261673c9936102608c2f0393679f3b5b38c64d5d5b776349c1d83632f17afd9c558d387cf91395c9d4fa07b92287bffc6fc
+  data.tar.gz: 9bfd107bf9076eefd508c98fbd51036d557ce76ae2463ca49ee9c7baa93c49965ddd7aa3f1caaada34cc802a368a950b513d4df8cc8c776a5b0a021611ace3b1

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.rubocop.yml

@@ -5,7 +5,7 @@ Metrics/MethodLength:
   Enabled: false
 
 Metrics/LineLength:
-  Max: 120
+  Max: 160
   Exclude: [spec/**/*.rb]
 
 Lint/AssignmentInCondition:

data/lib/simple_form/bank_account_number.rb

@@ -3,31 +3,32 @@ require "simple_form/bank_account_number/formatter"
 
 module SimpleForm
   module Inputs
-    class BankAccountNumberInput < NumericInput
+    class BankAccountNumberInput < StringInput
       def input
         country = options.delete(:country) || raise(ArgumentError, "You must set the :country key.")
         full_number = options.fetch(:value, "")
-        parts = BankAccountNumber::Formatter.formatted_bank_account_number(full_number, country).to_h.values
-        format = BankAccountNumber::Formatter.number_format(country)
+        number_parts = SimpleForm::BankAccountNumber::Formatter.formatted_bank_account_number(full_number, country).parts
+        format = SimpleForm::BankAccountNumber::Format.for_country(country)
 
-        format.fetch(:parts).map do |part|
+        format.parts.map do |part|
           input_html_options.delete(:country) # don't include it in the markup
 
+          input_html_options[:type] = "text"
           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.fetch(:format).source}$"
-          input_html_options[:title] = part.fetch(:title)
+          input_html_options[:pattern] = "^#{part.format.source}$"
+          input_html_options[:title] = part.title
           input_html_options[:style] = "width: auto; display: inline; margin-right: .2em"
-          input_html_options["data-label"] = part.fetch(:label)
-          input_html_options["data-multiline"] = format.fetch(:multiline)
+          input_html_options["data-label"] = part.label
+          input_html_options["data-multiline"] = format.multiline
 
           # Twitter Bootstrap tooltips
           input_html_options["data-toggle"] = "tooltip"
-          input_html_options["data-original-title"] = part.fetch(:title)
+          input_html_options["data-original-title"] = part.title
           input_html_options["data-placement"] = "bottom"
 
-          if length = part.fetch(:format).source.scan(/\b\d}/).map(&:to_i).max
+          if length = part.format.source.scan(/\b\d}/).map(&:to_i).max
             input_html_options[:size] = length
             input_html_options[:maxlength] = length
           else
@@ -35,7 +36,7 @@ module SimpleForm
             input_html_options[:maxlength] = nil
           end
 
-          input_html_options[:value] = parts.shift
+          input_html_options[:value] = number_parts.shift
 
           super
         end.join

data/lib/simple_form/bank_account_number/countries.rb

@@ -1,44 +1,75 @@
 require "simple_form"
+require "virtus"
 
 module SimpleForm
   module BankAccountNumber
-    COUNTRIES = {
-      "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
+    module ValueObject
+      def self.included(base)
+        base.instance_eval do
+          include Virtus.model(strict: true)
+          private :attributes=
+        end
+      end
+    end
+
+    # A partial bank account number
+    class Part
+      include ValueObject
+
+      attribute :label, String
+      attribute :title, String
+      attribute :format, Regexp
+    end
+
+    # A full bank account number format
+    class Format
+      include ValueObject
+
+      attribute :parts, Array[Part]
+      attribute :multiline, Boolean
+
+      def self.for_country(alpha2)
+        COUNTRIES[alpha2.upcase] || COUNTRIES[nil]
+      end
+
+      COUNTRIES = {
+        "AU" => Format.new(
+          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" => Format.new(
+          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" => Format.new(
+          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" => Format.new(
+          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 => Format.new( # NOTE: default format
+          parts: [
+            { label: "Account Number", title: "account number", format: /[A-Z0-9]+/ }
+          ],
+          multiline: false,
+        )
+      }.freeze
+    end
   end
 end

data/lib/simple_form/bank_account_number/formatter.rb

@@ -4,21 +4,15 @@ 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)
+        format = Format.for_country(country)
 
-        fields = format.fetch(:parts).inject({}) do |hash, part|
-          length = part.fetch(:format).source.scan(/\b\d}/).map(&:to_i).max
+        fields = format.parts.inject({}) do |hash, part|
+          length = part.format.source.scan(/\b\d}/).map(&:to_i).max
           field = full_number.slice!(0, length || full_number.length)
 
-          hash.merge!(part.fetch(:label) => field)
+          hash.merge!(part.label => field)
         end
 
         unless full_number.empty?
@@ -49,8 +43,12 @@ module SimpleForm
         @fields
       end
 
+      def parts
+        @fields.values
+      end
+
       def multiline?
-        self.class.number_format(@country).fetch(:multiline)
+        Format.for_country(@country).multiline
       end
     end
   end

data/simple_form-bank_account_number.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "simple_form-bank_account_number"
-  spec.version       = "1.1.0"
+  spec.version       = "2.0.0"
   spec.authors       = ["Cédric Félizard"]
   spec.email         = ["cedric@felizard.fr"]
   spec.description   = "A SimpleForm input field for bank account numbers"
@@ -17,10 +17,15 @@ 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_dependency "simple_form", "~> 3.0"
+  spec.add_dependency "virtus", "~> 1.0"
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rubocop"
+
+  # XXX: actionpack 4.2 requires rails-html-sanitizer which has a soft dependency on Rails
+  # this breaks simple_form when testing without Rails
+  spec.add_development_dependency "actionpack", "~> 4.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form-bank_account_number
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Cédric Félizard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 description: A SimpleForm input field for bank account numbers
 email:
 - cedric@felizard.fr
@@ -88,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
@@ -100,6 +129,7 @@ files:
 - simple_form-bank_account_number.gemspec
 - spec/simple_form/bank_account_number/formatter_spec.rb
 - spec/simple_form/bank_account_number_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/buckybox/simple_form-bank_account_number
 licenses:
 - MIT
@@ -127,3 +157,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
+- spec/spec_helper.rb