bytes_converter 0.0.3 → 0.0.4

data/lib/bytes_converter.rb

@@ -2,20 +2,57 @@ require "bytes_converter/version"
 
 module BytesConverter
 
+  # default available values
+  @sizes = {
+      "k" => 1024,
+      "m" => 1024*1024,
+      "g" => 1024*1024*1024
+    }
+
   # method converting size into bytes
   def self.convert size
-    sizes = {
-      "K" => 1024,
-      "M" => 1024*1024,
-      "G" => 1024*1024*1024
-    }
-    m = size.scan(/(\d*\.\d*)+(\w)?/).collect { |serwer| serwer }
 
-    unless m[0].nil?
-      out = m[0][0].to_f * sizes[m[0][1]].to_f
-    else
-      out = size
+    # replacing comma with dot
+    size_converted = size.downcase.gsub(',','.')
+
+    # separating digits (size) from rest of the string (unit)
+    x = size_converted.scan(/(\d*\.?\d*)(.*)/).collect { |found| found }
+
+    # stripping whitespaces
+    x[0][0].strip!
+    x[0][1].strip!
+
+    # limiting unit to first letter (k,m and so on)
+    x[0][1] = x[0][1][/\w{1}/]
+
+    # if unit is present (not nil) -> getting multiplier from sizes array
+    # and calculating bytes
+    unless x[0][1].nil?
+      out = x[0][0].to_f * @sizes[x[0][1]].to_f
+    else # if unit is not present -> we assume that size is already in bytes.
+      out = x[0][0].to_f
     end
+
+    # returning calculated (or not) value
     out
   end
+
+  # method adding new unit to @sizes hash
+  def self.add_unit new_unit
+    @sizes.merge!(new_unit)
+    true
+  end
+
+  # getter for sizes
+  def self.get_units
+    @sizes.each do | key, value |
+      puts "unit: #{key} = #{value}"
+    end
+    "end of list"
+  end
+
+  # method removing size
+  def self.remove_unit unit
+    @sizes.delete(unit) { |key| "Unit \"#{key}\" not found among sizes!" }
+  end
 end

data/lib/bytes_converter/version.rb

@@ -1,3 +1,3 @@
 module BytesConverter
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bytes_converter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies: []
 description: Gem converting Kilobytes, Megabytes and Gigabytes to bytes
 email: