utiles 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -0,0 +1,42 @@
+PATH
+  remote: .
+  specs:
+    utiles (0.0.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    ffi (1.0.11)
+    guard (1.2.3)
+      listen (>= 0.4.2)
+      thor (>= 0.14.6)
+    guard-rspec (1.1.0)
+      guard (>= 1.1)
+    listen (0.4.7)
+      rb-fchange (~> 0.0.5)
+      rb-fsevent (~> 0.9.1)
+      rb-inotify (~> 0.8.8)
+    rb-fchange (0.0.5)
+      ffi
+    rb-fsevent (0.9.1)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    thor (0.15.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  guard
+  guard-rspec
+  rspec
+  utiles!

data/Guardfile

@@ -0,0 +1,8 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/lib/utiles/version.rb

@@ -2,5 +2,5 @@
 module Utiles
 
   # Gem version
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/utiles_integer.rb

@@ -22,25 +22,7 @@ class Integer
   #   18539311.to_date_vol => "185 MB"
   #   18532.to_date_vol => "18,5 kB"
   def to_data_vol
-      if self > 1000000000
-        gb = self / 1000000000
-        rest = self % 1000000000
-        s = gb < 10 ? "#{gb},#{rest.to_s[0,2]}" : gb < 100 ? "#{gb},#{(rest.to_s)[0,1]}" : "#{gb}"
-        "#{s} GB"
-      elsif self > 1000000
-        mb = self / 1000000
-        rest = self % 1000000
-        s = mb < 10 ? "#{mb},#{rest.to_s[0,2]}" : mb < 100 ? "#{mb},#{(rest.to_s)[0,1]}" : "#{mb}"
-        "#{s} MB"
-      elsif self > 1000
-        kb = self / 1000
-        rest = self % 1000
-        s = kb < 10 ? "#{kb},#{rest.to_s[0,2]}" : kb < 100 ? "#{kb},#{(rest.to_s)[0,1]}" : "#{kb}"
-        "#{s} kB"
-      elsif self > 0
-        "#{self} B"
-      else
-        "0"
-      end
-    end
+    to_s.to_data_vol
+  end
+  
 end

data/lib/utiles_string.rb

@@ -32,7 +32,25 @@ class String
   #   "18539311".to_date_vol => "185 MB"
   #   "18532".to_date_vol => "18,5 kB"
   def to_data_vol
-    to_i.to_data_vol
+    case
+      when length > 9
+        label = "GB"
+        border = 9
+      when length > 6
+        label = "MB"
+        border = 6
+      when length > 3
+        label = "kB"
+        border = 3
+      else
+        label = "B"
+        return self == "0" ? "0" : "#{self} #{label}"
+    end
+    int = self[0,length-border].to_i
+    rest = self[-border,border]
+    sets = int < 10 ? rest[0,2] : int < 100 ? rest[0,1] : ""
+    setss = int < 100 ? sets.to_i.zero? ? "" : ",#{sets}" : ""
+    "#{int}#{setss} #{label}"
   end
 
 end

data/{test → spec}/utiles_spec.rb

@@ -1,4 +1,4 @@
-require 'utiles'
+require 'lib/utiles'
 
 describe NilClass do
 
@@ -67,6 +67,18 @@ describe String do
   it "Data in 185 GB" do
     "185393114721".to_data_vol.should eq("185 GB")
   end
+  
+  it "Data in 18 GB" do
+    "18093114721".to_data_vol.should eq("18 GB")
+  end
+  
+  it "Data in 1,05 GB" do
+    "1053114721".to_data_vol.should eq("1,05 GB")
+  end
+  
+  it "Data in 1 GB" do
+    "1003114721".to_data_vol.should eq("1 GB")
+  end
 
   it "Data in 18 GB" do
     "18539311472".to_data_vol.should eq("18,5 GB")
@@ -92,6 +104,10 @@ describe String do
     "18532".to_data_vol.should eq("18,5 kB")
   end
   
+  it "Data in 1,08 kB" do
+    "1080".to_data_vol.should eq("1,08 kB")
+  end
+  
   it "Data in 185 B" do
     "185".to_data_vol.should eq("185 B")
   end
@@ -138,6 +154,58 @@ describe Integer do
     a = 2
     a.is_blank?.should be_false
   end
+  
+  it "Data in 185 GB" do
+    185393114721.to_data_vol.should eq("185 GB")
+  end
+  
+  it "Data in 18 GB" do
+    18093114721.to_data_vol.should eq("18 GB")
+  end
+  
+  it "Data in 1,05 GB" do
+    1053114721.to_data_vol.should eq("1,05 GB")
+  end
+  
+  it "Data in 1 GB" do
+    1003114721.to_data_vol.should eq("1 GB")
+  end
+
+  it "Data in 18 GB" do
+    18539311472.to_data_vol.should eq("18,5 GB")
+  end
+    
+  it "Data in 185 MB" do
+    185393114.to_data_vol.should eq("185 MB")
+  end
+  
+  it "Data in 18 MB" do
+    18539311.to_data_vol.should eq("18,5 MB")
+  end
+  
+  it "Data in 1 MB" do
+    1853931.to_data_vol.should eq("1,85 MB")
+  end
+  
+  it "Data in 185 kB" do
+    185322.to_data_vol.should eq("185 kB")
+  end
+  
+  it "Data in 18 kB" do
+    18532.to_data_vol.should eq("18,5 kB")
+  end
+  
+  it "Data in 1,08 kB" do
+    1080.to_data_vol.should eq("1,08 kB")
+  end
+  
+  it "Data in 185 B" do
+    185.to_data_vol.should eq("185 B")
+  end
+  
+  it "Data in 0" do
+    0.to_data_vol.should eq("0")
+  end
 
 end
 

data/utiles.gemspec

@@ -19,4 +19,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.add_development_dependency "rspec", [">= 0"]
+  s.add_development_dependency "guard", [">= 0"]
+  s.add_development_dependency "guard-rspec", [">= 0"]
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: utiles
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Wojciech Todryk
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-05 00:00:00 Z
+date: 2012-07-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -31,6 +31,34 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: guard
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: guard-rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Extends standard classes
 email: 
 - wojciech@todryk.pl
@@ -42,6 +70,8 @@ extra_rdoc_files: []
 
 files: 
 - Gemfile
+- Gemfile.lock
+- Guardfile
 - README.md
 - Rakefile
 - lib/utiles.rb
@@ -50,7 +80,7 @@ files:
 - lib/utiles_integer.rb
 - lib/utiles_nil.rb
 - lib/utiles_string.rb
-- test/utiles_spec.rb
+- spec/utiles_spec.rb
 - utiles.gemspec
 homepage: http://todryk.pl/utiles
 licenses: []
@@ -86,5 +116,4 @@ signing_key:
 specification_version: 3
 summary: Utiles
 test_files: 
-- test/utiles_spec.rb
-has_rdoc: 
+- spec/utiles_spec.rb