filesize 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4a40982cb8ea531ae79dfce2cd06391e4f00f4cd
-  data.tar.gz: 1ec01b8c640c1788a4668f1de8ffb1427cbf113e
+SHA256:
+  metadata.gz: 4fffde69cad6cbd10d4fc4bc0e5ca8c2148dad349621778dcdd89dcff6fd4a04
+  data.tar.gz: 1835c6a095c92206331410d9a5dee93c16aa856cfe4fde0cacb4e0a0d0904d3b
 SHA512:
-  metadata.gz: e039c7cfce3ea31ddf7b013e4250e942d835fa975ee1a8fbda57eda779fea9c4bcec72c6a0763afac893bcbbc02245d74ae2ca98fccd743688c1cdcb8d90373f
-  data.tar.gz: 2d208660a67c829b4e3fa2c5a81685a9e65311dfe3f1ba3e12733263bac9b1b54d9a9ba2c0f1c81c3430c1788aea4da3b4c8559294721f582e5c18d57406cbda
+  metadata.gz: b6acf41642a5ac6d062c5a4f061b561b0ac2ee08e5f6a43e6fba5621a2f3128468fe909907eece7896864c3305adcad0b6af9795b609fd51cf3dc45bbb8ad1e7
+  data.tar.gz: e73c2e947e014e02785deb668467ea8720f24210b56113a1761229e4b4ff50472297d6dfe6be9bb5c78198c4ab25336fa8d52d5fe5deaa68c755be975b0bd15d

data/lib/filesize.rb

@@ -13,19 +13,22 @@ class Filesize
 
   # Set of rules describing file sizes according to SI units.
   SI = {
-    :regexp => /^([\d,.]+)?\s?([kmgtpezy]?)b$/i,
+    :regexp => /^([\d,.]+)?[[:space:]]?([kmgtpezy]?)b?$/i,
     :multiplier => 1000,
     :prefixes => TYPE_PREFIXES[:SI],
     :presuffix => '' # deprecated
   }
   # Set of rules describing file sizes according to binary units.
   BINARY = {
-    :regexp => /^([\d,.]+)?\s?(?:([kmgtpezy])i)?b$/i,
+    :regexp => /^([\d,.]+)?[[:space:]]?(?:([kmgtpezy])i)?b?$/i,
     :multiplier => 1024,
     :prefixes => TYPE_PREFIXES[:BINARY],
     :presuffix => 'i' # deprecated
   }
 
+  # Set default precision
+  PRECISION = 2
+
   # @param [Number] size A file size, in bytes.
   # @param [SI, BINARY] type Which type to use for conversions.
   def initialize(size, type = BINARY)
@@ -61,8 +64,10 @@ class Filesize
   # @param (see #to_f)
   # @return [String] Same as {#to_f}, but as a string, with the unit appended.
   # @see #to_f
-  def to_s(unit = 'B')
-    "%.2f %s" % [to(unit).to_f.to_s, unit]
+  def to_s(unit = 'B', args = {})
+    precision = args[:precision] || PRECISION
+    
+    "%.#{precision}f %s" % [to(unit).to_f.to_s, unit]
   end
 
   # Same as {#to_s} but with an automatic determination of the most
@@ -70,7 +75,7 @@ class Filesize
   #
   # @return [String]
   # @see #to_s
-  def pretty
+  def pretty(args = {})
     size = @bytes
     if size < @type[:multiplier]
       unit = "B"
@@ -81,7 +86,7 @@ class Filesize
       unit = @type[:prefixes][pos-1] + "B"
     end
 
-    to_s(unit)
+    to_s(unit, args)
   end
 
   # @return [Filesize]
@@ -132,7 +137,7 @@ class Filesize
       size   = parts[:size]
       type   = parts[:type]
 
-      raise ArgumentError, "Unparseable filesize" unless type
+      raise ArgumentError, "Unparseable filesize: #{arg}" unless type
 
       offset = (type[:prefixes].map { |s| s[0].chr.downcase }.index(prefix.downcase) || -1) + 1
 

data/spec/lib/filesize_spec.rb

@@ -38,6 +38,10 @@ describe Filesize do
       it 'parses megabytes' do
         expect(Filesize.from('1 MB').to).to eq 1000 * 1000
       end
+
+      it 'parses megabytes without b suffix' do
+        expect(Filesize.from('1 M').to).to eq 1000 * 1000
+      end
     end
 
     context 'BINARY units' do
@@ -48,6 +52,10 @@ describe Filesize do
       it 'parses megabytes' do
         expect(Filesize.from('1 MiB').to).to eq 1024 * 1024
       end
+
+      it 'parses mebibytes without b suffix' do
+        expect(Filesize.from('1 Mi').to).to eq 1024 * 1024
+      end
     end
   end
 
@@ -94,6 +102,10 @@ describe Filesize do
     it 'returns the number of for the specified unit with its unit (SI)' do
       expect(Filesize.new(1000).to_s('kB')).to eq '1.00 kB'
     end
+
+    it 'returns the number with another precision' do
+      expect(Filesize.new(1360).to_s('kB', :precision => 1)).to eq '1.4 kB'
+    end
   end
 
   describe '#pretty' do
@@ -101,9 +113,16 @@ describe Filesize do
       expect(Filesize.new(1024).pretty).to eq '1.00 KiB'
     end
 
-    it 'returns the number of the most matching prefix with its unit (SI)' do
-      expect(Filesize.new(1000, Filesize::SI).pretty).to eq '1.00 kB'
+    describe 'returns the number of the most matching prefix with its unit (SI)' do
+      it 'default precision Filesize::PRECISION' do 
+        expect(Filesize.new(1000, Filesize::SI).pretty).to eq '1.00 kB'
+      end
+      
+      it 'zero decimals' do
+        expect(Filesize.new(1000, Filesize::SI).pretty(:precision => 0)).to eq '1 kB'
+      end
     end
+
   end
 
   describe '::Floppy' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filesize
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Dominik Honnef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-05 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -56,10 +56,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: filesize is a small class for handling filesizes with both the SI and binary
   prefixes, allowing conversion from any size to any other size.
 test_files: []
-has_rdoc: yard