formatting 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8a92f61e13526876dc609e99cabc25252e14303
-  data.tar.gz: 804ee6b74f3f1521075dd601a8d90b169c2fa0f8
+  metadata.gz: 31a50e279bf40d7bd3e6a284ab518d258d0f1120
+  data.tar.gz: 66448a804ff7bc12a5dfaba0dbcfe9643221b66a
 SHA512:
-  metadata.gz: c3d5b1625686c2dc865841a1800d2b971604f951086570c80961acf75a72154dcd0747c54b54a11380fcd45f0be29163510a971ec99f9346846300d4093322c7
-  data.tar.gz: 591e74fcd72914b2f3afe535e13c0d31e6935b5930495f373ce1fd16194e158bd8204153b6cb7c5dc10992dfcd2f9e253814f6dca37c9afd91db888a33a42fb6
+  metadata.gz: f19832f4814387e8397459f2d7c038684832235987d7c2d05c8ddc00a66f76358adfc9d2052f605a5b280796f1adb4907e328d09deb5f671be7ca3fdea529862
+  data.tar.gz: e95ab8b878a6f1b081ee28fd261385aa13e7229019467ce9ea92bde2ae0b02ef3ac7d71bc1b0c8a9a53c3aa3abc7f7e843cce167fd47b931a840874b48baa0de

data/README.md

@@ -99,7 +99,11 @@ Formatting.format_percent(12.3)  # => "12.3%"
 
 #### Options
 
-Passes on all the number options.
+Passes on all the number options and also takes these:
+
+name            | default                                           | explanation
+----------------|---------------------------------------------------|------------
+format          | `"<number>%"` or `<number> %` depending on locale | A format string.
 
 
 ## Installation

data/lib/formatting/number.rb

@@ -73,7 +73,7 @@ module Formatting
     end
 
     def t_format(key, default)
-      if defined?(I18n)
+      if defined?(I18n) && I18n.respond_to?(:t)
         I18n.t(key, scope: "number.format", default: default)
       else
         default

data/lib/formatting/percent.rb

@@ -1,12 +1,26 @@
-# http://en.wikipedia.org/wiki/Percent_sign#Spacing
-
 require "attr_extras"
 
 module Formatting
   module Percent
     def format_percent(number, opts = {})
+      format_string = opts.fetch(:format) { default_percent_format_string }
       formatted_number = Formatting.format_number(number, opts)
-      "#{formatted_number}%"
+      format_string.gsub("<number>", formatted_number)
+    end
+
+    private
+
+    # http://en.wikipedia.org/wiki/Percent_sign#Spacing
+    # Rails i18n doesn't have a conventional format string for this.
+    def default_percent_format_string
+      locale = defined?(I18n) && I18n.locale
+
+      case locale
+      when :sv, :fi, :fr, :de
+        "<number>#{Formatting::NON_BREAKING_SPACE}%"
+      else
+        "<number>%"
+      end
     end
   end
 end

data/lib/formatting/version.rb

@@ -1,3 +1,3 @@
 module Formatting
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/spec/percent_spec.rb

@@ -14,7 +14,22 @@ describe Formatting, ".format_percent" do
   end
 
   it "passes on number formatting options" do
-    expect_formatted(1.567, round: 2).to include "1.57"
+    expect_formatted(1.567, round: 1).to include "1.6"
+  end
+
+  context "format string option" do
+    it "is used if provided" do
+      expect_formatted(1, format: "%<number>%").to eq "%1.00%"
+    end
+
+    context "if I18n.locale is available" do
+      let(:i18n) { stub_const("I18n", double) }
+
+      it "defaults sensibly for some locales that require spacing the sign" do
+        i18n.stub(locale: :sv)
+        expect_formatted(1).to eq space_to_nbsp("1.00 %")
+      end
+    end
   end
 
   def expect_formatted(number, opts = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formatting
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Henrik Nyh