size_units 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82727be11a4559dc9b12d1dc8707ff1f6dc10aca
-  data.tar.gz: 5453daf4b4de78e89c59b1c9204718e986c43920
+  metadata.gz: 1a765f51303a450e6e60a5bb1e5009c273aad584
+  data.tar.gz: 068d511c342285a8dae8b7d330ae2de76d418ac3
 SHA512:
-  metadata.gz: 75bc86fda4b54f59748f757a986f1bb90e902687591996a2919ef0de004bb77b2b4248c19336a90064f9c9a2199a7510af6d4d0ed2ef7f2077dcefd5087317e7
-  data.tar.gz: fdc21bb0f89bb3fcd9d6638c720ddfd800ee5d51f5b461eada442e842619edcb5b4d59bfe0a140297cb0acc749c1429acb82589a2f176e6a8ab5306a0760bf2d
+  metadata.gz: be58ef8b1ef279a0c61466b1a4e7aeb739e8445b22fc311a31db92883cd12eebd16640713e0c4a0afe5a34177d114b6156c687d5cd38f4c247ec742eb838feb7
+  data.tar.gz: ba832da95d1ea94fcf2f0e8e41d558090389534f9444e1c3160e30c69ed3b4bccdb0d9f70ff4698d1abb8326819a7b748e249f2b4da88f30c17813138f50fd08

data/Gemfile

@@ -7,7 +7,6 @@ gem 'rake'
 group(:test) do
   gem 'schmurfy-bacon'
   gem 'mocha',          '~> 0.10.0'
-  gem 'factory_girl'
   
   gem 'simplecov'
   gem 'guard'

data/README.md

@@ -18,5 +18,6 @@ It works the same way:
 Another activesupport alternative
 
 ```ruby
-1500.human_size => "2 bytes"
+1500.human_size => "1KB, 476B"
+1500.human_size(1) => "1KB"
 ```

data/lib/size_units/size.rb

@@ -20,22 +20,41 @@ module HumanSize
   # 
   # @return [String] the formatted duration
   # 
-  def human_size(limit = nil)
+  def human_size(limit = nil, round = true)
     ret = []
     diff = Hash.new(0)
     t = self.to_i
-      
+    
+    highest_used_unit = nil
+    
     while t > 0
-      HumanSize.units.each do |(limit, field)|
-        if t >= limit
+      HumanSize.units.each.with_index do |(max_size, field), n|
+        if t >= max_size
+          highest_used_unit ||= n
           diff[field] += 1
-          t -= limit
+          t -= max_size
           break
         end
       end
       
     end
     
+    if limit && round
+      
+      tmp = 0
+      (HumanSize.units.size - 1).downto(highest_used_unit + 1) do |n|
+        max_size, unit_name, _ = *HumanSize.units[n]
+        if diff[unit_name] > 0
+          tmp += 1
+          if diff[unit_name] > 512
+            # increment next field
+            _, next_unit_name, _ = *HumanSize.units[n - 1]
+            diff[next_unit_name] += 1
+          end
+        end
+      end
+    end
+    
     ret = []
     
     HumanSize.units.each.with_index do |unit|

data/lib/size_units/version.rb

@@ -1,3 +1,3 @@
 module SizeUnits
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/size_units.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.name          = "size_units"
+  gem.license      = 'MIT'
   gem.require_paths = ["lib"]
   gem.version       = SizeUnits::VERSION
 end

data/specs/unit/size_spec.rb

@@ -19,8 +19,14 @@ describe 'TimeDuration' do
   end
   
   
-  should 'limite output' do
-    (2*@gb1 + 200*@mb1 + 780).human_size(1).should == "2GB"
+  should 'limit output' do
+    (2*@gb1 + 200*@mb1 + 780).human_size(1, false).should == "2GB"
+  end
+  
+  should 'limit and round output' do
+    s = 8157.megabytes
+    s.human_size(1, true).should == "8GB"
+    s.human_size(1, false).should == "7GB"
   end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: size_units
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Julien Ammous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -17,7 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - ChangeLog
 - Gemfile
 - Guardfile
@@ -33,7 +33,8 @@ files:
 - specs/unit/size_spec.rb
 - specs/unit/units_spec.rb
 homepage: https://github.com/schmurfy/size_units
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -41,17 +42,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Some size helpers