humanize-bytes 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b822e696f285eb1cef5a3adc0a204264a9e18acf
-  data.tar.gz: b6a0b750bdb3063662be4e4c998cea19dfe767e8
+  metadata.gz: 352f1ea83c8657e52cb904728a2590f16046d29d
+  data.tar.gz: 977d5f597321d04bd045c64a34964e1e482b811d
 SHA512:
-  metadata.gz: 550886946965209414c1257ed751400961ce4454176b872e5b31775c350e429a0cbf14ec67eff914f4829c8ef97cf8896381c764eff3cf9ed3e231c8334b7464
-  data.tar.gz: 6745bafdf1844cc8f252f40243a4bacd2b2e39e2dc733742be0e41cb4ad16265ff447b2533c51df0835e729e5b4db7472175812e46336be48abab78771a82f45
+  metadata.gz: ab986f567924b55a5c5fb7468e1e399fd1d088f7090813191a3f3ba00f0907d3b03831bedcbd160e5ad82deb52047bd948ece35938855b00f2f92e0408d6ca9e
+  data.tar.gz: b0052290ed4a4abfe29c9df40444c1b5b82a14455b68ca8df4b0ae71ab67cef48c86364f9ccfa4c46c3531e1f647a7934fcab4f714a94c020d04107cfce6f66d

data/lib/humanize/byte.rb

@@ -1,13 +1,5 @@
 module Humanize
-  class Byte
-    def initialize(value)
-      @value = value
-    end
-
-    def value
-      @value
-    end
-
+  class Byte < Bytes
     def to_b
       self
     end
@@ -23,11 +15,5 @@ module Humanize
     def to_g
       Giga.new @value / 1024.0 / 1024 / 1024
     end
-
-    def to_s(options = {})
-      size = options.fetch(:decimal_digits, nil)
-      size ||= value.to_s.split('.').size == 1 ? 0 : value.to_s.split('.').last.size
-      ("%.#{size}f" % value).to_s
-    end
   end
 end

data/lib/humanize/bytes.rb

@@ -1,5 +1,20 @@
 module Humanize
   class Bytes
-    VERSION = '2.0.1'
+    VERSION = '2.1.0'
+
+    def initialize(value)
+      @value = value.to_f
+    end
+
+    def value
+      @value
+    end
+
+    def to_s(options = {})
+      size = options.fetch(:decimal_digits, nil)
+      size ||= value.to_s.split('.').size == 1 ? 0 : value.to_s.split('.').last.size
+      size = 0 if value.to_s.split('.').size >= 2 and value.to_s.split('.').last.to_s == '0'
+      ("%.#{size}f" % value).to_s
+    end
   end
 end

data/lib/humanize/giga.rb

@@ -1,13 +1,5 @@
 module Humanize
-  class Giga
-    def initialize(value)
-      @value = value
-    end
-
-    def value
-      @value
-    end
-
+  class Giga < Bytes
     def to_b
       Byte.new @value * 1024 * 1024 * 1024
     end
@@ -23,11 +15,5 @@ module Humanize
     def to_g
       self
     end
-
-    def to_s(options = {})
-      size = options.fetch(:decimal_digits, nil)
-      size ||= value.to_s.split('.').size == 1 ? 0 : value.to_s.split('.').last.size
-      ("%.#{size}f" % value).to_s
-    end
   end
 end

data/lib/humanize/kilo.rb

@@ -1,13 +1,5 @@
 module Humanize
-  class Kilo
-    def initialize(value)
-      @value = value
-    end
-
-    def value
-      @value
-    end
-
+  class Kilo < Bytes
     def to_b
       Byte.new @value * 1024
     end
@@ -23,11 +15,5 @@ module Humanize
     def to_g
       Giga.new @value / 1024.0 / 1024
     end
-
-    def to_s(options = {})
-      size = options.fetch(:decimal_digits, nil)
-      size ||= value.to_s.split('.').size == 1 ? 0 : value.to_s.split('.').last.size
-      ("%.#{size}f" % value).to_s
-    end
   end
 end

data/lib/humanize/mega.rb

@@ -1,13 +1,5 @@
 module Humanize
-  class Mega
-    def initialize(value)
-      @value = value
-    end
-
-    def value
-      @value
-    end
-
+  class Mega < Bytes
     def to_b
       Byte.new @value * 1024 * 1024
     end
@@ -23,11 +15,5 @@ module Humanize
     def to_g
       Giga.new @value / 1024.0
     end
-
-    def to_s(options = {})
-      size = options.fetch(:decimal_digits, nil)
-      size ||= value.to_s.split('.').size == 1 ? 0 : value.to_s.split('.').last.size
-      ("%.#{size}f" % value).to_s
-    end
   end
 end

data/spec/humanize/byte_spec.rb

@@ -3,6 +3,12 @@ require 'spec_helper'
 describe Humanize::Byte do
   let(:b) { Humanize::Byte.new(2147843648) }
 
+  context "initialize" do
+    it "should convert the number to float" do
+      expect(Humanize::Byte.new('3').value).to be_an_instance_of(Float)
+    end
+  end
+
   context "#value" do
     it "should return the value" do
       expect(b.value).to eq(2147843648)

data/spec/humanize/giga_spec.rb

@@ -3,6 +3,12 @@ require 'spec_helper'
 describe Humanize::Giga do
   let(:g) { Humanize::Giga.new(3.25) }
 
+  context "initialize" do
+    it "should convert the number to float" do
+      expect(Humanize::Giga.new('3').value).to be_an_instance_of(Float)
+    end
+  end
+
   context "#value" do
     it "should return the value" do
       expect(g.value).to eq(3.25)

data/spec/humanize/kilo_spec.rb

@@ -3,6 +3,12 @@ require 'spec_helper'
 describe Humanize::Kilo do
   let(:k) { Humanize::Kilo.new(5000) }
 
+  context "initialize" do
+    it "should convert the number to float" do
+      expect(Humanize::Kilo.new('3').value).to be_an_instance_of(Float)
+    end
+  end
+
   context "#value" do
     it "should return the value" do
       expect(k.value).to eq(5000)

data/spec/humanize/mega_spec.rb

@@ -3,6 +3,12 @@ require 'spec_helper'
 describe Humanize::Mega do
   let(:m) { Humanize::Mega.new(4.8828125) }
 
+  context "initialize" do
+    it "should convert the number to float" do
+      expect(Humanize::Mega.new('3').value).to be_an_instance_of(Float)
+    end
+  end
+
   context "#value" do
     it "should return the value" do
       expect(m.value).to eq(4.8828125)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: humanize-bytes
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Paulo Henrique Lopes Ribeiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake