filesize 0.0.3 → 0.0.4

data/README.markdown

@@ -10,28 +10,43 @@ That means:
 
 ## Usage
 ### Parsing a string
-    Filesize.from("1 GiB") # => #<Filesize:0x93c06c8 @bytes=1073741824, @type={:regexp=>/^([\d,.]+)?\s?(?:([kmgtpezy])i)?b$/i, :multiplier=>1024, :presuffix=>"i"}>
+```ruby
+Filesize.from("1 GiB")
+# => #<Filesize:0x93c06c8 @bytes=1073741824, @type={:regexp=>/^([\d,.]+)?\s?(?:([kmgtpezy])i)?b$/i, :multiplier=>1024, :presuffix=>"i"}>
+```
 
 ### Converting filesizes
-    Filesize.from("1 GiB").to_f('KiB') # => 1048576.0
-    Filesize.from("1 GiB").to_f('KB')  # => 1073741.824
-    Filesize.from("1 GB").to_i         # => 1000000000
+```ruby
+Filesize.from("1 GiB").to_f('KiB') # => 1048576.0
+Filesize.from("1 GiB").to_f('KB')  # => 1073741.824
+Filesize.from("1 GB").to_i         # => 1000000000
+```
 
 ### Outputting filesizes
-    Filesize.from("12502343 B").to_s('GiB') # => "0.01 GiB"
-    Filesize.from("12502343 B").pretty      # => "11.92 MiB"
+```ruby
+Filesize.from("12502343 B").to_s('GiB') # => "0.01 GiB"
+Filesize.from("12502343 B").pretty      # => "11.92 MiB"
+```
 
 ### Calculating with filesizes
 #### The file size on the left side sets the type
-    (Filesize.from("1400 MB")  + Filesize.from("1400 MiB")).pretty # => "2.87 GB"
-    (Filesize.from("1400 MiB") + Filesize.from("1400 MB")).pretty  # => "2.67 GiB"
+```ruby
+(Filesize.from("1400 MB")  + Filesize.from("1400 MiB")).pretty # => "2.87 GB"
+(Filesize.from("1400 MiB") + Filesize.from("1400 MB")).pretty  # => "2.67 GiB"
+```
 
 #### Filesizes can also be coerced
-    (Filesize.from("1400 MiB") + 1024).pretty # => "1.37 GiB"
-    (1024 + Filesize.from("1400 MB")).pretty  # => "1.40 GB"
+```ruby
+(Filesize.from("1400 MiB") + 1024).pretty # => "1.37 GiB"
+(1024 + Filesize.from("1400 MB")).pretty  # => "1.40 GB"
+```
 
 #### filesize.rb is smart about the return value
-    Filesize.from("1400 MiB") / Filesize.from("700 MiB") # => 2.0
+```ruby
+Filesize.from("1400 MiB") / Filesize.from("700 MiB") # => 2.0
+```
 
 #### One can also use predefined sizes
-    Filesize::DVD / Filesize::CD # => 6.13566756571429
+```ruby
+Filesize::DVD / Filesize::CD # => 6.13566756571429
+```

data/filesize.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name = "filesize"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.authors = ["Dominik Honnef"]
   s.date = %q{2009-07-26}
@@ -14,4 +14,6 @@ Gem::Specification.new do |s|
   s.homepage = "http://filesize.rubyforge.org/"
   s.required_ruby_version = ">= 1.8.6"
   s.rubyforge_project = "filesize"
+
+  s.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/filesize.rb

@@ -1,10 +1,28 @@
 class Filesize
+  TYPE_PREFIXES = {
+    # Unit prefixes used for SI file sizes.
+    SI: %w{k M G T P E Z Y},
+    # Unit prefixes used for binary file sizes.
+    BINARY: %w{Ki Mi Gi Ti Pi Ei Zi Yi}
+  }
+
+  # @deprecated Please use TYPE_PREFIXES[:SI] instead
+  PREFIXES = TYPE_PREFIXES[:SI]
+
   # Set of rules describing file sizes according to SI units.
-  SI     = {:regexp => /^([\d,.]+)?\s?([kmgtpezy]?)b$/i, :multiplier => 1000, :presuffix => ''}
+  SI = {
+    :regexp => /^([\d,.]+)?\s?([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, :multiplier => 1024, :presuffix => 'i'}
-  # Unit prefixes used for file sizes.
-  PREFIXES  = %w{k M G T P E Z Y}
+  BINARY = {
+    :regexp => /^([\d,.]+)?\s?(?:([kmgtpezy])i)?b$/i,
+    :multiplier => 1024,
+    :prefixes => TYPE_PREFIXES[:BINARY],
+    :presuffix => 'i' # deprecated
+  }
 
   # @param [Number] size A file size, in bytes.
   # @param [SI, BINARY] type Which type to use for conversions.
@@ -32,7 +50,7 @@ class Filesize
     to_type = to_parts[:type]
     size    = @bytes
 
-    pos = (PREFIXES.map{|s|s.downcase}.index(prefix.downcase) || -1) + 1
+    pos = (@type[:prefixes].map { |s| s[0].downcase }.index(prefix.downcase) || -1) + 1
 
     size = size/(to_type[:multiplier].to_f**(pos)) unless pos < 1
   end
@@ -56,9 +74,9 @@ class Filesize
       unit = "B"
     else
       pos = (Math.log(size) / Math.log(@type[:multiplier])).floor
-      pos = PREFIXES.size-1 if pos > PREFIXES.size - 1
+      pos = @type[:prefixes].size-1 if pos > @type[:prefixes].size - 1
 
-      unit = PREFIXES[pos-1].to_s + @type[:presuffix] + "B"
+      unit = @type[:prefixes][pos-1] + "B"
     end
 
     to_s(unit)
@@ -89,6 +107,7 @@ class Filesize
     end
   end
 
+  # @return [Boolean]
   def ==(other)
     other.is_a?(self.class) && other.to_i == self.to_i
   end
@@ -114,7 +133,7 @@ class Filesize
 
       raise ArgumentError, "Unparseable filesize" unless type
 
-      offset = (PREFIXES.map{|s|s.downcase}.index(prefix.downcase) || -1) + 1
+      offset = (type[:prefixes].map { |s| s[0].downcase }.index(prefix.downcase) || -1) + 1
 
       new(size * (type[:multiplier] ** (offset)), type)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filesize
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2009-07-26 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: filesize is a small class for handling filesizes with both the SI and
   binary prefixes, allowing conversion from any size to any other size.
 email: dominikh@fork-bomb.org
@@ -51,3 +67,4 @@ specification_version: 3
 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: