eropple-biggs 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e85e26e3b8e91e6ad36b4a977eb0612533919305
-  data.tar.gz: 531cbd742daa5ba9a44363ddb23c7714e5997be5
+  metadata.gz: ba52b6f49f745b5693ccd402be95ac1a8a32d248
+  data.tar.gz: 0e9d5ecc6f3d80d12e8c6fa41afda797a4e5b31f
 SHA512:
-  metadata.gz: 22ff1be8108399d33269fcf39c29648e0302d7857839fe26a94be1e80c8267244488721da1dad40ea9c241d2be1a3dd9acb1c7fbc559b976759269c7e9b1f20c
-  data.tar.gz: c03358b221cc0b23d5cc1d56737fb7f0b602fa65314604a09429222acbe0122c00d81fb35f1d42adb0020c039ca45facb8efd237436091f557f8fe66368833fe
+  metadata.gz: 667b32fa70a75bc63ee6a41a4d5886c5f5da103d1f846ad6c1274e472d86d617f7e3433fc6beb0ed34916b21699ead42a384ae88e5743b4d75810108882c0311
+  data.tar.gz: a5cf23dd469b672190fcdcb9d861a7128080304c7de0cd14a461b5a912ad36360a3a44bd5e651677572d194ea047d02371f2b6382cccadd89231cec55d0ad886

data/.gitignore

@@ -1,3 +1,4 @@
 biggs-*.*.*.gem
 Gemfile.lock
-.rbenv-*
+.rbenv-*
+pkg

data/Gemfile

@@ -1,6 +1,3 @@
 source 'http://rubygems.org'
 
-gem 'countries', :git => 'https://github.com/burningpony/countries.git'
-
-# Specify your gem's dependencies in dar_da_da.gemspec
 gemspec

data/README.md

@@ -4,11 +4,11 @@ biggs is a small ruby gem/rails plugin for formatting postal addresses from over
 
 As a ruby gem:
 
-    sudo gem install biggs
+    sudo gem install eropple-biggs
 
-If your rather prefer to install it as a plugin for rails, from your application directory simply run:
+Or in a Gemfile:
 
-    script/plugin install git://github.com/yolk/biggs.git
+    gem 'eropple-biggs', '~> 0.4.0'
 
 ### Standalone usage
 
@@ -144,6 +144,6 @@ biggs knows how to format addresses of over 60 different countries. If you are m
 * United States
 * Yemen
 
-biggs is tested to behave well with Rails 3.0, 3.1, 3.2 and 4.0
+biggs is tested to behave well with Rails 3.0, 3.1, 3.2 and 4.0.
 
-Copyright (c) 2009-2013 Yolk Sebastian Munz & Julia Soergel GbR
+Copyright (c) 2009-2013 Yolk Sebastian Munz & Julia Soergel GbR, 2015 Ed Ropple

data/biggs.gemspec

@@ -6,11 +6,11 @@ Gem::Specification.new do |s|
   s.name        = 'eropple-biggs'
   s.version     = Biggs::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Sebastian Munz']
-  s.email       = ['sebastian@yo.lk']
-  s.homepage    = 'https://github.com/yolk/biggs'
+  s.authors     = ['Sebastian Munz', 'Ed Ropple']
+  s.email       = ['sebastian@yo.lk', 'ed+biggs@edropple.com']
+  s.homepage    = 'https://github.com/eropple/biggs'
   s.summary     = 'biggs is a small ruby gem/rails plugin for formatting postal addresses from over 60 countries.'
-  s.description = 'biggs is a small ruby gem/rails plugin for formatting postal addresses from over 60 countries.'
+  s.description = 'biggs is a small ruby gem/rails plugin for formatting postal addresses from over 60 countries. This version is maintained by Ed Ropple off of the abandoned source.'
 
   s.rubyforge_project = 'biggs'
 
@@ -20,9 +20,11 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'activerecord',            '>= 3.0'
-  # s.add_dependency 'countries',            '>= 0.9.3'
+  s.add_dependency 'countries',            '>= 0.11.0'
+
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec',       '>= 3.0.0'
   s.add_development_dependency 'rspec-its',       '>= 1.1.0'
   s.add_development_dependency 'sqlite3',     '>= 1.3.5'
+  s.add_development_dependency 'pry'
 end

data/lib/biggs/formatter.rb

@@ -1,15 +1,39 @@
 module Biggs
   class Formatter
-    FIELDS = [:recipient, :street, :city, :region, :postalcode, :country]
+    FIELDS = [:recipient, :street, :city, :region, :region_short, :postalcode, :country]
 
     def initialize(options = {})
       @blank_country_on = [options[:blank_country_on]].compact.flatten.map { |s| s.to_s.downcase }
     end
 
     def format(iso_code, values = {})
+      # HACK: most of this method, honestly. I needed to get {{region_short}} working and
+      #       bring this into compliance with countries v0.11.x.
       values.symbolize_keys! if values.respond_to?(:symbolize_keys!)
 
       format = Biggs::Format.find(iso_code)
+      raise "Could not find country with code '#{iso_code}'." unless format && format.country
+
+      format_string = (format.format_string || default_format_string(values[:region])).dup.to_s
+
+      if values[:region_short] && !values[:region] && format_string.include?("{{region}}")
+        region_code = values[:region_short]
+
+        region = format.country.subdivisions[:region_short]
+        raise "Could not find region/subdivision with code '#{region_code}'. " + 
+              "To override, specify both :region and :region_short." unless region
+
+        values[:region] = region[:name]
+      elsif values[:region] && !values[:region_short] && format_string.include?("{{region_short}}")
+        # FIXME: this is an iterative search over all names in the countries list. Not great, Bob.
+        subdivision = format.country.subdivisions.find do |sub_kvp|
+          sub_kvp[1]["name"] == values[:region] || sub_kvp[1]["names"].include?(values[:region])
+        end
+        raise "Could not find short_code" unless subdivision
+
+        values[:region_short] = subdivision[0]
+      end
+
       format_string = (format.format_string || default_format_string(values[:region])).dup.to_s
       country_name = blank_country_on.include?(format.iso_code) ? '' : format.country_name || format.iso_code
 

data/lib/biggs/version.rb

@@ -1,3 +1,3 @@
 module Biggs
-  VERSION = '0.3.4'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: eropple-biggs
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Sebastian Munz
+- Ed Ropple
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -24,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: countries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,10 +95,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: biggs is a small ruby gem/rails plugin for formatting postal addresses
-  from over 60 countries.
+  from over 60 countries. This version is maintained by Ed Ropple off of the abandoned
+  source.
 email:
 - sebastian@yo.lk
+- ed+biggs@edropple.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -106,7 +137,7 @@ files:
 - spec/unit/activerecord_spec.rb
 - spec/unit/biggs_spec.rb
 - spec/unit/format_spec.rb
-homepage: https://github.com/yolk/biggs
+homepage: https://github.com/eropple/biggs
 licenses: []
 metadata: {}
 post_install_message: 
@@ -135,3 +166,4 @@ test_files:
 - spec/unit/activerecord_spec.rb
 - spec/unit/biggs_spec.rb
 - spec/unit/format_spec.rb
+has_rdoc: