snail 2.0.0 → 2.2.3

data/lib/snail/initializable.rb

@@ -1,13 +1,10 @@
 class Snail
   module Initializable
-    def initialize(attrs = {}, &block)
+    def initialize(attrs = {})
       attrs.each do |k, v|
         m = "#{k}="
-        if respond_to? m
-          self.send(m, v)
-        else
-          raise UnknownAttribute.new(k)
-        end
+        raise UnknownAttribute, k unless respond_to? m
+        send(m, v)
       end
       yield self if block_given?
     end

data/lib/snail/version.rb

@@ -1,3 +1,3 @@
 class Snail
-  VERSION = '2.0.0'
+  VERSION = '2.2.3'.freeze
 end

data/test/snail_test.rb

@@ -72,20 +72,48 @@ class SnailTest < Snail::TestCase
     assert s.city_line.match(/NY  12345/)
   end
 
-  test "does not include country name for domestic addresses" do
+  test "does not include country name for domestic addresses by default" do
     s = Snail.new(@us.merge(:origin => 'US'))
     assert !s.to_s.match(/United States/i)
     s = Snail.new(@ca.merge(:origin => 'CA'))
     assert !s.to_s.match(/Canada/i)
   end
 
-  test "includes country name for international addresses" do
+  test "includes country name for domestic addresses if with_country parameter is true" do
+    s = Snail.new(@us.merge(:origin => 'US'))
+    assert s.to_s(with_country: true).match(/United States/i)
+    s = Snail.new(@ca.merge(:origin => 'CA'))
+    assert s.to_s(with_country: true).match(/Canada/i)
+  end
+
+  test "does not include country name for domestic addresses if with_country parameter is false" do
+    s = Snail.new(@us.merge(:origin => 'US'))
+    assert !s.to_s(with_country: false).match(/United States/i)
+    s = Snail.new(@ca.merge(:origin => 'CA'))
+    assert !s.to_s(with_country: false).match(/Canada/i)
+  end
+
+  test "includes country name for international addresses by default" do
     s = Snail.new(@us.merge(:origin => 'CA'))
     assert s.to_s.match(/United States/i)
     s = Snail.new(@ca.merge(:origin => 'US'))
     assert s.to_s.match(/Canada/i)
   end
 
+  test "includes country name for international addresses if with_country parameter is true" do
+    s = Snail.new(@us.merge(:origin => 'CA'))
+    assert s.to_s(with_country: true).match(/United States/i)
+    s = Snail.new(@ca.merge(:origin => 'US'))
+    assert s.to_s(with_country: true).match(/Canada/i)
+  end
+
+  test "does not include country name for international addresses if with_country parameter is false" do
+    s = Snail.new(@us.merge(:origin => 'CA'))
+    assert !s.to_s(with_country: false).match(/United States/i)
+    s = Snail.new(@ca.merge(:origin => 'US'))
+    assert !s.to_s(with_country: false).match(/Canada/i)
+  end
+
   test "includes translated country name for international addresses" do
     s = Snail.new(@us.merge(:origin => 'FR'))
     assert s.to_s.match(/ÉTATS-UNIS/i)
@@ -118,12 +146,24 @@ class SnailTest < Snail::TestCase
     assert_equal "John Doe\n12345 5th St\nSomewheres NY  12345\nCANADA", s.to_s
   end
 
+  test "to_s ireland doesn't show a linebreak if zip is empty" do
+    s = Snail.new(@ie.merge(:zip => ""))
+    puts s.to_s
+    assert_equal "John Doe\n12345 5th St\nSomewheres, Dublin\nIRELAND", s.to_s
+  end
+
   test "to_html" do
     s = Snail.new(@ca)
     s.name = 'John & Jane Doe'
     assert_equal "John &amp; Jane Doe<br />12345 5th St<br />Somewheres NY  12345<br />CANADA", s.to_html
     assert s.to_html.html_safe?
   end
+
+  test "to_html ireland doesn't show a linebreak if zip is empty" do
+    s = Snail.new(@ie.merge(:zip => ""))
+    s.name = 'John & Jane Doe'
+    assert_equal "John &amp; Jane Doe<br />12345 5th St<br />Somewheres, Dublin<br />IRELAND", s.to_html
+  end
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snail
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.3
 platform: ruby
 authors:
 - Lance Ivy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -310,8 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Easily format snail mail addresses for international delivery