rubyhelper 1.2.3 → 1.3.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f44062bda82f0949141614ec8fb1216b20e1599
-  data.tar.gz: b4629c6c94bcf2c049adf3b1d24a65ecdce80263
+  metadata.gz: a1f4edaf82de992fef8b624d3e60f65bbf3caeba
+  data.tar.gz: 5eaab752391cac8972ab6839b1d491ce11f969cc
 SHA512:
-  metadata.gz: 6e04829054dda3c8673a88621c11119ab93eca261854cacbadd24541a4422f7978f161e88422a1662217eb18ab2bb52a1f711e09864d5c764fbf3e219dc2d83e
-  data.tar.gz: f311d972006dd62db14740e9ad53bdb7cc2f206c20886cd867fbb5ed6813fa6bdb9072bf26f3432bf79b67ee68477db1e704406657dcbb5d6c03ecfa490ad53d
+  metadata.gz: 4aa6a80fbe1c04dc7d91e14ea103976f6f16b00f65fe1aedfe5057966d7b7ecbb0e1a373377d356272265b17bdffaf8901b3e3bea204640d136ce7ca0f688172
+  data.tar.gz: a2663e6dabe5efdf00a81f8b1f00f836b1601877f2ff540ca25bcdea78cb4ede8f71628b7903f3602b5a0fe70a347fcd14ddd1c6c8d9be0e8714b89784d5e726

data/README.md

@@ -46,36 +46,55 @@ The following sources code is not only my stuff, but also an implementation of
 idea found on stackoverflow, ...  
 
 The developpement running like that :  
-1. Found idea or a bug  
+
+### Development time (dev branch) ###
+1. Found idea, create a new feature-* branch from branch#dev  
 2. Puts idea or fix it in the source code (*can be switched with 3.*)  
-3. Develops few tests and documentation  
-4. Push the new code in the dev branch (*and tag it like v1.0.alpha2*)
-5. **repeat 1-4 actions few times**  
-6. Improves tests and checks the documentation, hunts the bugs  
-7. Validates the version  
-8. Push the version into master branch and tag it as stable (*like v1.2*). Publish the gem.  
-9. Push new releases if needed (*hotfixs mainly*) (*like v1.2.2*)  
-
-Note about the first time developpement :  
+3. Develops few tests and documente the code (*can be switched with 2.*)  
+4. Merge the new code in the branch#dev with "--no-ff" option (*and optionaly tag it like v1.0.alpha2*)  
+5. Update the Changelog etc.  
+6. **repeat 1-5 actions few times until the next X or Y version**  
+
+### Release Time (release branch) ###
+7. Start a branch#release-X.Y  
+8. Improves tests and checks the documentation, hunts the bugs  
+9. Validates the version  
+10. Push the version into branch#master and tag it as stable (*like v1.2*). Publish the gem.  
+11. Merge with branch#release with branch#dev and got to the next dev version  
+
+### Bugfix time (release branch) ###
+13. Found bug in the code of a release, or an improvement  
+14. Develop the patch in branch#hotfix-*  
+15. Merge with branch#master, branch#dev  
+16. Publish the new release vX.Y.Z if needed  
+
+
+**Note about the first time developpement**  
 I didn't predict to keep this gem in dev so the first part of the dev
-is a little messy. Don't look back 1.1 ;)
+is a little messy. Don't look back 1.1 ;)  
+
 
+## Note about the development
+###Version
+Stable :  
+- X : major version, not compatible very with the previous. Lot of changes
+- X.Y : minor version, new features, almost fully compatible with other X.Y
+- X.Y.Z : release improvement, fix bugs, fully compatible with X.Y.Z
 
-# TODO
-### Benchmark
-- Hash.except with  
-	```ruby
-		h.delete_if{|k| [:a].include? k}
-	```  
+Development :  
+- X.Y-alpha : 1th dev part. Dev new features
+- X.Y-beta : 2sd part. Dev tests, documentation, improvements, fix, few other feats
+- X.Y-rc : last part. Fixs, documentation, and tests only.
 
-### Improve VersionHelper
-- Add test
-- Add more documentation
+### Branchs
+- master : contain the last vX.Y.Z version published (stable)
+- dev : contain the last alpha/beta versions (dev)
+- release : contain the last rc versions (dev)
+- feature-* : new feature to merge (dev)
+- hotfixs-* : fix from release to merge with dev and X.Y (dev)
 
-### Improve main tests
-- Add few tests for untested features
-- Improve existing tests (mainly on StringHelper)
 
 # Contributors
-- poulet_a : Creator and main developper. Feel free to ask me a question by email.  
-	email   : arthur.poulet AT cryptolab.net [OpenPGP : 0x6D9EA34A]  
+- poulet_a : Creator and main developer. Feel free to ask me a question by email.  
+	email: arthur.poulet AT cryptolab.net [OpenPGP : 0x6D9EA34A]  
+- bakhou_r : Developer from jerevedunemaison.com

data/lib/rubyhelper/array.rb

@@ -7,8 +7,7 @@ module ArrayHelper
   # Exemple : ["a", "b", "c"].joini(["x", "y"]) => "axbyc"
   #
   # @raise [ArgumentError] if sep in not an array or a string
-  # @param sep [Array] array of separators
-  # @param sep [String] uniq separator (join alias {#join})
+  # @param sep [Array or String] array of separators or string as an uniq separator (join alias {#join})
   # @return [String] string joined
   def joini sep
     if sep.is_a? Array
@@ -57,7 +56,7 @@ module ArrayHelper
   #
   # @return [Integer] self.sum / self.size. 0 if no elements
   def average
-    return (self.size > 0) ? (self.sum / self.size) : (0)
+    return (self.size > 0) ? (self.sum.to_f / self.size).round : (0)
   end
 
   # Same than {#average} but use to_f instead of to_i

data/lib/rubyhelper/gem-version.rb

@@ -1,3 +1,3 @@
 module RubyHelper
-  VERSION = '1.2.3'
+  VERSION = '1.3.rc2'
 end

data/lib/rubyhelper/integer.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+#encoding: utf-8
+
+module IntegerHelper
+
+  # return true if not odd
+  #
+  # @return [true or false]
+  def peer?
+    not odd?
+  end
+
+end
+
+class Integer
+  prepend IntegerHelper
+end

data/lib/rubyhelper/numeric.rb

@@ -44,6 +44,33 @@ module NumericHelper
     return self.replace(self.min(maximum_value))
   end
 
+  # return true if peer
+  # you can see also {#odd?}
+  #
+  # @return [true or false]
+  def peer?
+    return (self % 2).zero? ? true : false
+  end
+
+  # return true if odd
+  # you can see also {#peer?}
+  #
+  # @return [true or false]
+  def odd?
+    not peer?
+  end
+
+  # Not ready yet
+  #
+  # Resolve a simple 2sd degree equation
+  #
+  # @param a [Numeric] a*x**2+b*x+c = y
+  # @param b [Numeric] a*x**2+b*x+c = y
+  # @param c [Numeric] a*x**2+b*x+c = y
+  # @return [Array of Numeric]
+  # def self.solve_2d a, b=0, c=0
+  # end
+
 end
 
 class Numeric

data/lib/rubyhelper/string.rb

@@ -110,24 +110,6 @@ module StringHelper
     return s.to_case(case_mod)
   end
 
-  # improvement of to_f to count "," caracter as "."
-  #
-  # @return [Float] like {Integer#to_f}
-  def to_fi
-    return self.gsub(',', '.').to_f
-  end
-
-  # to_i with delimiter to remove
-  # Example : "12.000.000".to_ii => 12000000
-  #
-  # @param char [String] char to delete (default : ' ')
-  # @return [Integer] like {Integer#to_i]
-  # @raise [ArgumentError] If (param char) is not a String
-  def to_ii(char=' ')
-    raise ArgumentError, "Argument is not a String" unless char.is_a? String
-    self.delete(char).to_i
-  end
-
   # CRYXOR (one time pad dirt application)
   #
   # @raise [ArgumentError] if key is not a valid String
@@ -191,17 +173,16 @@ module StringHelper
     end
   end
 
-  # @raise [ArgumentError] via {#static}
   # see {#static}
+  #
+  # @raise [ArgumentError] via {#static}
   def static!(n, char=' ')
     return self.replace(self.static(n, char))
   end
 
   # Returns true or false if the string if "true" or "false". else nil
   #
-  # @return [TrueClass] on self == "true"
-  # @return [FalseClass] on self == "false"
-  # @return [NilClass] else
+  # @return [true or false or nil]
   def to_t
     case self
     when "true"
@@ -213,50 +194,20 @@ module StringHelper
     end
   end
 
-  # @return [TrueClass] if self == "true"
-  # @return [FalseClass] else
+  # indicate if the string is "true"
+  #
+  # @return [true or false]
   def true?
     return (self == "true")
   end
 
-  # @return [TrueClass] on self == "false"
-  # @return [FalseClass] else
+  # indicate if the string is "false"
+  #
+  # @return [true or false]
   def false?
     return (self == "false")
   end
 
-  # get only the digits and symbols in the string
-  #
-  # @param sign (true/false) if true, keep the - and + signs
-  # @return [String] epured string
-  def get_int(sign = true)
-    return self.gsub(/[^\-\+\d]/, "") if sign == true
-    return self.gsub(/[^\d]/, "")
-  end
-
-  # see {#get_int}
-  #
-  # @return [String]
-  def get_int!(sign = true)
-    return self.replace(self.get_int(sign))
-  end
-
-  # as get_int but with . and ,
-  #
-  # @param sign (true/false) if true, keep the - and + signs
-  # @return [String] epured_string
-  def get_float(sign = true)
-    return self.gsub(/[^\-\+\d\.\,]/, "") if sign == true
-    return self.gsub(/[^\d\.\,]/, "")
-  end
-
-  # see {#get_float}
-  #
-  # @return [String]
-  def get_float!(sign = true)
-    return self.replace(self.get_float(sign))
-  end
-
   # Capitalize a sequence (each word)
   #
   # @return [String] capitalized_string

data/lib/rubyhelper/string_numeric.rb

@@ -0,0 +1,163 @@
+#encoding: utf-8
+
+module StringNumericHelper
+
+  # improvement of to_f to count "," caracter as "."
+  #
+  # @return [Float] like {Integer#to_f}
+  def to_fi
+    return self.gsub(',', '.').to_f
+  end
+
+  # to_i with delimiter to remove
+  # Example : "12.000.000".to_ii => 12000000
+  #
+  # @param char [String] char to delete (default : ' ')
+  # @raise [ArgumentError] If (param char) is not a String
+  # @return [Integer] like {Integer#to_i]
+  def to_ii(char=' ')
+    raise ArgumentError, "Argument is not a String" unless char.is_a? String
+    self.delete(char).to_i
+  end
+
+  # It take every digits (and sign - see param sign) and return them
+  # you should see also {#get_float}
+  #
+  # @param sign [true or false or :less ] if true, keep the - and + signs, if :less, only keep -
+  # @return [String] epured string
+  def get_int(sign = true)
+    return self.gsub(/[^\-\+\d]/, "") if sign == true
+    return self.gsub(/[^\-\d]/, "") if sign == :less
+    return self.gsub(/[^\d]/, "")
+  end
+
+  # see {#get_int}
+  #
+  # @return [String]
+  def get_int!(sign = true)
+    return self.replace(self.get_int(sign))
+  end
+
+  # It take every digits (and sign - see param sign) of the first
+  # group of digits and return them. For exemple, "+3 4".get_1int will return "+3"
+  # you should see also {#get_int} {#get_ints} and {#get_1float}
+  #
+  # @param sign [true or false or :less ] if true, keep the - and + signs, if :less, only keep -
+  # @return [String] epured string
+  def get_1int(sign = true)
+    return self.match(/([\-\+]?\d+)/).to_a[1].to_s.get_int(sign) if sign == true
+    return self.match(/(\-?\d+)/).to_a[1].to_s.get_int(sign) if sign == :less
+    return self.match(/(\d+)/).to_a[1].to_s.get_int(sign)
+  end
+
+  # see {#get_1int}
+  #
+  # @return [String]
+  def get_1int!(sign = true)
+    return self.replace(self.get_1int(sign))
+  end
+
+  # get all digits into an array of string (split from self)
+  # if sep is a sign and the param sign == true, then theses signs will be splited first
+  # (if sep == '-' for example, "1-1".get_ints will return ["1", "1"]
+  # see also {#get_floats} and {#get_int}
+  #
+  # @param sep [String or Regexp] separator
+  # @param sign [true or false or :less ] if true, keep the - and + signs, if :less, only keep -
+  # @raise ArgumentError if sep is not a String
+  # @return [Array of String]
+  def get_ints(sep = ' ', sign = true)
+    raise ArgumentError, "sep must be a String" unless sep.is_a? String or sep.is_a? Regexp
+    return self.split(sep).map{|e| e.get_int(sign)}
+  end
+
+  # get all integer groups into an array of string (split from self)
+  # if sep is a sign and the param sign == true, then theses signs will be splited first
+  # see also {#get_ints} and {#get_1int}
+  #
+  # @param sep [String or Regexp] separator
+  # @param sign [true or false or :less ] if true, keep the - and + signs, if :less, only keep -
+  # @raise ArgumentError if sep is not a String
+  # @return [Array of String]
+  def get_1ints(sep = ' ', sign = true)
+    raise ArgumentError, "sep must be a String" unless sep.is_a? String or sep.is_a? Regexp
+    return self.split(sep).map{|e| e.get_1int(sign)}
+  end
+
+  # get every digits and + - . , symbols in the string
+  # you can also see {#to_fi} to turn the String into a Float
+  # see als {#get_1float} {#get_floats} and {#get_int}
+  #
+  # @param sign [true or false or :less ] if true, keep the - and + signs, if :less, only keep -
+  # @return [String] epured_string
+  def get_float(sign = true)
+    return self.gsub(/[^\-\+\d\.\,]/, "") if sign == true
+    return self.gsub(/[^\-\d\.\,]/, "") if sign == :less
+    return self.gsub(/[^\d\.\,]/, "")
+  end
+
+  # see {#get_float}
+  #
+  # @return [String]
+  def get_float!(sign = true)
+    return self.replace(self.get_float(sign))
+  end
+
+  # get only the digits and + - . , symbols in the string from the first group of digits
+  # you should see also {#get_float} and {#get_1int}
+  #
+  # @param sign [true or false or :less ] if true, keep the - and + signs, if :less, only keep -
+  # @return [String] epured string
+  def get_1float(sign = true)
+    return self.match(/([\d\.,\-\+]*\d[\d\.,\-\+]*)/).to_a[1].to_s.get_float(sign) if sign == true
+    return self.match(/([\d\.,\-]*\d[\d\.,\-]*)/).to_a[1].to_s.get_float(sign) if sign == :less
+    return self.match(/([\d\.,]*\d[\d\.,]*)/).to_a[1].to_s.get_float(sign)
+  end
+
+  # see {#get_1float}
+  #
+  # @return [String]
+  def get_1float!(sign = true)
+    return self.replace(self.get_1float(sign))
+  end
+
+  # get all digit and symboles from a splited string
+  # if sep is a sign and the param sign == true, then theses signs will be splited first
+  # see also {#get_1float} and {#get_floats}
+  #
+  # @param sep [String or Regexp] separator
+  # @param sign [true or false or :less ] if true, keep the - and + signs, if :less, only keep -
+  # @raise ArgumentError if sep is not a String
+  # @return [Array of String]
+  def get_floats(sep = ' ', sign = true)
+    raise ArgumentError, "sep must be a String" unless sep.is_a? String or sep.is_a? Regexp
+    return self.split(sep).map{|e| e.get_float(sign)}
+  end
+
+  # get all floats groups
+  # if sep is a sign and the param sign == true, then theses signs will be splited first
+  # see also {#get_float} and {#get_ints}
+  #
+  # @param sep [String or Regexp] separator
+  # @param sign [true or false or :less ] if true, keep the - and + signs, if :less, only keep -
+  # @raise ArgumentError if sep is not a String
+  # @return [Array of String]
+  def get_1floats(sep = ' ', sign = true)
+    raise ArgumentError, "sep must be a String" unless sep.is_a? String or sep.is_a? Regexp
+    return self.split(sep).map{|e| e.get_1float(sign)}
+  end
+
+  # transforme the string into an float in m² if containing "ha"
+  #
+  # @return [Float]
+  def ha2m2
+    return self.gsub("m2", "").get_1float.to_fi unless self.match(/(\A|[^[:alpha:]])ha(\Z|[^[:alpha:]])/i)
+    return self.gsub("m2", "").get_1float.to_fi * 10_000 unless self.match(/(\A|[^[:alpha:]])m(2|²)(\Z|[^[:alpha:]])/i)
+    return self.gsub("m2", "").get_1float.to_fi
+  end
+
+end
+
+class String
+  prepend StringNumericHelper
+end

data/lib/rubyhelper.rb

@@ -3,8 +3,10 @@
 # simple extension
 require_relative 'rubyhelper/gem-version.rb'
 require_relative 'rubyhelper/string.rb'
+require_relative 'rubyhelper/string_numeric.rb'
 require_relative 'rubyhelper/array.rb'
 require_relative 'rubyhelper/numeric.rb'
+require_relative 'rubyhelper/integer.rb'
 require_relative 'rubyhelper/time.rb'
 require_relative 'rubyhelper/hash.rb'
 
@@ -12,4 +14,3 @@ require_relative 'rubyhelper/hash.rb'
 require_relative 'rubyhelper/argumenterror.rb'
 
 # new classes
-require_relative 'rubyhelper/versionhelper.rb'

data/rubyhelper.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name        = 'rubyhelper'
   s.version     = RubyHelper::VERSION
   s.date        = Time.now.getgm.to_s.split.first
-  s.summary     = "Hotfix of get_float"
+  s.summary     = "Improvements and additions by poulet_a to the basic ruby classes"
   s.description = "Improvements and additions by poulet_a to the basic ruby classes"
   s.authors     = [
             	  "poulet_a"
@@ -14,12 +14,13 @@ Gem::Specification.new do |s|
                	  "lib/rubyhelper.rb",
                	  "lib/rubyhelper/gem-version.rb",
               	  "lib/rubyhelper/string.rb",
+              	  "lib/rubyhelper/string_numeric.rb",
               	  "lib/rubyhelper/array.rb",
             	  "lib/rubyhelper/numeric.rb",
+            	  "lib/rubyhelper/integer.rb",
                   "lib/rubyhelper/time.rb",
                   "lib/rubyhelper/hash.rb",
                   "lib/rubyhelper/argumenterror.rb",
-                  "lib/rubyhelper/versionhelper.rb",
 		  "README.md",
 		  "Rakefile",
 		  "rubyhelper.gemspec",
@@ -27,7 +28,7 @@ Gem::Specification.new do |s|
 		  "test/test_hash.rb",
 		  "test/test_numeric.rb",
 		  "test/test_string.rb",
-		  "test/test_versionhelper.rb",
+		  "test/test_string_numeric.rb",
 		  ]
   s.homepage    = "https://gitlab.com/poulet_a/rubyhelper"
   s.license     = "GNU/GPLv3"

data/test/test_array.rb

@@ -19,6 +19,7 @@ class ArrayHelperTest < Minitest::Test
   def test_sum
     assert_equal(12, [1,2,9].sum)
     assert_equal(0, [].sum)
+    assert_equal(0, [-1,1].sum)
   end
 
   def test_sum_with_array
@@ -33,12 +34,17 @@ class ArrayHelperTest < Minitest::Test
     assert_equal(12.0, [1,2, 9].sumf)
     assert_equal(0.1, [0.01, 0.09, -0, -1, 1.1, -0.1].sumf.round(2))
     assert_equal(0.0, [].sumf)
+  end
+
+  def test_sumf_with_array
     assert_equal([2.0,3.0], [1,2].sumf([1,1,1]))
     assert_equal([], [].sumf([1,1,1]))
   end
 
   def test_average
     assert_equal(2, [1,2,3].average)
+    assert_equal(1, [1,1,1].average)
+    assert_equal(2, [1,2,2].average)
   end
 
   def test_averagef

data/test/test_numeric.rb

@@ -28,4 +28,22 @@ class NumericHelperTest < Minitest::Test
     assert_equal(1, (2.2).max(1))
   end
 
+  def test_odd?
+    assert_equal(false, 0.0.odd?)
+    assert_equal(true, 1.1.odd?)
+    assert_equal(false, 2.0.odd?)
+    assert_equal(true, 3.0.odd?)
+  end
+
+  def test_peer?
+    assert_equal(true, 0.0.peer?)
+    assert_equal(false, 1.1.peer?)
+    assert_equal(true, 2.0.peer?)
+    assert_equal(false, 3.0.peer?)
+  end
+
+  def test_solve_2d
+    #assert_equal([0], Numeric.solve_2d(1,0,0))
+  end
+
 end

data/test/test_string.rb

@@ -46,21 +46,6 @@ class StringHelperTest < Minitest::Test
     assert_equal("bonjour.", "bonjour€".to_ascii("."))
   end
 
-  def test_to_fi
-    assert_equal(0.0, "bonjour".to_fi)
-    assert_equal(0.0, "bonj1our".to_fi)
-    assert_equal(1.1, "1.1.1".to_fi)
-    assert_equal(1.1, "1.1".to_fi)
-    assert_equal(1.1, "1,1".to_fi)
-    assert_equal(0.1, ",1,1".to_fi)
-  end
-
-  def test_to_ii
-    assert_equal(11, "1 1".to_ii())
-    assert_equal(60868, "06.08.68".to_ii("."))
-    assert_equal(60868, "06.08.68".to_ii("\. \t\-"))
-  end
-
   def test_static
     assert_equal("r", "bonjour".static(1, " "))
     assert_equal("our", "bonjour".static(3, " "))
@@ -98,18 +83,6 @@ class StringHelperTest < Minitest::Test
     assert_equal(false, "other".false?)
   end
 
-  def test_get_int
-    assert_equal("1312".get_int(), "1312")
-    assert_equal("ea -ze 13e12 à nnazdaz d".get_int(), "-1312")
-    assert_equal("ea\n ze +13\n12\n à nnazdaz\n\t\n\r d".get_int(), "+1312")
-  end
-
-  def test_get_int
-    assert_equal("13,12".get_float(), "13,12")
-    assert_equal("ea -ze 13e.12 à nnazdaz d".get_float(), "-13.12")
-    assert_equal("ea\n ze +13\n.12\n à nnazdaz\n\t\n\r d".get_float(), "+13.12")
-  end
-
   def test_scapitalize
     assert_equal("Bonjour Monsieur", "Bonjour Monsieur".scapitalize)
     assert_equal("Bonjour M A D & A", "BONJOUR M A D & A".scapitalize)
@@ -122,6 +95,7 @@ class StringHelperTest < Minitest::Test
     assert_equal(["bonjour", "à", "toi"], "\nbonjour\n\nà\n\ntoi\n\n\r".splity)
     assert_equal(["bonjour", "à", "toi"], "bonjourXàXtoiX".splity("X"))
     assert_equal(["bonjour", "à", "toi"], "bonjourXàYtoiX".splity(/X|Y/))
+    assert_equal(["bonjour", "à", "toi"], "\t\t\r\n\r\tbonjour\t\r\n\r\tà\r\t\n\t\rtoi\t\n\r\t\n\t\r".splity)
   end
 
 end

data/test/test_string_numeric.rb

@@ -0,0 +1,103 @@
+#encoding: utf-8
+require 'minitest/autorun'
+require_relative '../lib/rubyhelper'
+
+class StringNumericHelperTest < Minitest::Test
+
+  def test_to_fi
+    assert_equal(0.0, "bonjour".to_fi)
+    assert_equal(0.0, "bonj1our".to_fi)
+    assert_equal(1.1, "1.1.1".to_fi)
+    assert_equal(1.1, "1.1".to_fi)
+    assert_equal(1.1, "1,1".to_fi)
+    assert_equal(0.1, ",1,1".to_fi)
+  end
+
+  def test_to_ii
+    assert_equal(11, "1 1".to_ii())
+    assert_equal(60868, "06.08.68".to_ii("."))
+    assert_equal(60868, "06.08.68".to_ii("\. \t\-"))
+  end
+
+  def test_get_int
+    assert_equal("1312", "1312".get_int())
+    assert_equal("-1312", "ea -ze 13e12 à nnazdaz d".get_int())
+    assert_equal("+1312", "ea\n ze +13\n12\n à nnazdaz\n\t\n\r d".get_int())
+    assert_equal("1312", "ea\n ze -13\n12\n à nnazdaz\n\t\n\r d".get_int(false))
+    assert_equal("-1312", "ea\n ze -13\n12\n à nnazdaz\n\t\n\r d".get_int(:less))
+    assert_equal("1312", "ea\n ze +13\n12\n à nnazdaz\n\t\n\r d".get_int(false))
+  end
+
+  def test_get_1int
+    assert_equal("1312", "1312".get_1int())
+    assert_equal("-13", "ea -ze -13e12 à nnazdaz d".get_1int())
+    assert_equal("13", "13ea -ze -13e12 à nnazdaz d".get_1int())
+    assert_equal("13", "ea -ze -13e12 à nnazdaz d".get_1int(false))
+    assert_equal("-13", "ea -ze -13e12 à nnazdaz d".get_1int(:less))
+    assert_equal("13", "ea -ze 13-13e12 à nnazdaz d".get_1int(false))
+  end
+
+  def test_get_ints
+    assert_equal(["1", "-3", "+12"], "1 -3 +12".get_ints())
+    assert_equal(["1", "-3", "+12"], "a1;aaa -3eze +1ez2ez".get_ints())
+    assert_equal(["1", "3+12"], "1 -3 +12".get_ints('-'))
+  end
+
+  def test_get_1ints
+    assert_equal(["1", "-3", "+12"], "1 -3 +12".get_1ints())
+    assert_equal(["1", "-3", "+1"], "a1;aaa -3eze +1ez2ez".get_1ints())
+    assert_equal(["1", "3"], "1 -3 +12".get_1ints('-'))
+  end
+
+  def test_get_float
+    assert_equal("13,12", "13,12".get_float())
+    assert_equal("-13.12", "ea -ze 13e.12 à nnazdaz d".get_float())
+    assert_equal("+13.12", "ea\n ze +13\n.12\n à nnazdaz\n\t\n\r d".get_float())
+    assert_equal("-13.12", "ea\n ze -13\n.12\n à nnazdaz\n\t\n\r d".get_float())
+    assert_equal("--13.12", "ea\n ze- -13\n.12\n à nnazdaz\n\t\n\r d".get_float())
+    assert_equal("13.12", "ea\n ze- -13\n.12\n à nnazdaz\n\t\n\r d".get_float(false))
+    assert_equal("--13.12", "ea\n ze- -13\n.12\n à nnazdaz\n\t\n\r d".get_float(:less))
+  end
+
+  def test_get_1float
+    assert_equal("1312.1", "1312.1".get_1float())
+    assert_equal("-13,2", "ea -ze -13,2e12,2 à nnazdaz d".get_1float())
+    assert_equal("13,12", "13,12ea -ze -13,12e12,13 à nnazdaz d".get_1float())
+    assert_equal("13.0", "ea -ze -13.0e12 à nnazdaz d".get_1float(false))
+    assert_equal("13.", "ea -ze 13.-13.1e12.2 à nnazdaz d".get_1float(false))
+    assert_equal("-13.1", "ea -ze -13.1e12.2 à nnazdaz d".get_1float(:less))
+  end
+
+  def test_get_floats
+    assert_equal(["1", "-3", "+12"], "1 -3 +12".get_floats())
+    assert_equal(["1", "-3.1", "+12"], "a1;aaa -3.1eze +1ez2ez".get_floats())
+    assert_equal(["1", "3+12,2"], "1 -3 +12,2".get_floats('-'))
+  end
+
+  def test_get_1floats
+    assert_equal(["1", "-3", "+12"], "1 -3 +12".get_1floats())
+    assert_equal(["1", "-3.1", "+1"], "a1;aaa -3.1eze +1ez2ez".get_1floats())
+    assert_equal(["1", "3,1"], "1 -3,1 +12,2".get_1floats('-'))
+  end
+
+  def test_ha2m2
+    #simple match
+    assert_equal(10_000.0, "1 ha".ha2m2)
+    assert_equal(10_000.0, "1 Ha".ha2m2)
+    assert_equal(10_000.0, "ha 1".ha2m2)
+    assert_equal(10_000.0, "1ha".ha2m2)
+
+    #advanced match
+    assert_equal(12000, "1.2 Ha".ha2m2)
+    assert_equal(12000, " 1,200 Ha".ha2m2)
+
+    #not match
+    assert_equal(1.0, "1 m2".ha2m2)
+    assert_equal(1.0, "1 h a".ha2m2)
+
+    #not match advanced
+    assert_equal(1.0, "1 m2 (+ 1 ha)".ha2m2)
+    assert_equal(50.0, "50.0 m² without the 1 ha of eastead".ha2m2)
+  end
+
+end

data.tar.gz.sig

@@ -1 +1 @@
->�<R�9�Z�����(���@��+Ҷ������ް/喎:Zպ�sҸ�4d���y��1�l4�49P�_>{������%K�X�aWld�r�X'np�R��~���y(��Q�0���
���U���K�����=�S��A隤���|&��J(#[	��#4-���ٮ���p�{p%P�#?4U~�K�("ɞ�%^�j
+w��I2�韔��}�-F3��'����(n0^幜�I�0���������u��M��aFw�{"Di���S{��j�U�_l�l'�Rn�8U\
��e���*�+���b��+:=b�;�N��@J\���#O������"�w8��yW霢�i�	W�P�ju�ݴ��v�V�A,�k�x��!�\q�V�����h�ha߾�}̳.�R�P�SBӼ	kt�H{�y|��N�H�Ձ�ޱ��=?Z��,R(0n�L

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyhelper
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.rc2
 platform: ruby
 authors:
 - poulet_a
@@ -31,7 +31,7 @@ cert_chain:
   +lG6tRo8QaFrH3afOmy4VUaG84Jm1XjNYnyaOfLb9ItpcQgVySn2c3aJ2PLcPljM
   EhZUryAiV8KNMQ==
   -----END CERTIFICATE-----
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies: []
 description: Improvements and additions by poulet_a to the basic ruby classes
 email:
@@ -39,12 +39,13 @@ email:
 - - lib/rubyhelper.rb
   - lib/rubyhelper/gem-version.rb
   - lib/rubyhelper/string.rb
+  - lib/rubyhelper/string_numeric.rb
   - lib/rubyhelper/array.rb
   - lib/rubyhelper/numeric.rb
+  - lib/rubyhelper/integer.rb
   - lib/rubyhelper/time.rb
   - lib/rubyhelper/hash.rb
   - lib/rubyhelper/argumenterror.rb
-  - lib/rubyhelper/versionhelper.rb
   - README.md
   - Rakefile
   - rubyhelper.gemspec
@@ -52,7 +53,7 @@ email:
   - test/test_hash.rb
   - test/test_numeric.rb
   - test/test_string.rb
-  - test/test_versionhelper.rb
+  - test/test_string_numeric.rb
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -64,16 +65,17 @@ files:
 - lib/rubyhelper/array.rb
 - lib/rubyhelper/gem-version.rb
 - lib/rubyhelper/hash.rb
+- lib/rubyhelper/integer.rb
 - lib/rubyhelper/numeric.rb
 - lib/rubyhelper/string.rb
+- lib/rubyhelper/string_numeric.rb
 - lib/rubyhelper/time.rb
-- lib/rubyhelper/versionhelper.rb
 - rubyhelper.gemspec
 - test/test_array.rb
 - test/test_hash.rb
 - test/test_numeric.rb
 - test/test_string.rb
-- test/test_versionhelper.rb
+- test/test_string_numeric.rb
 homepage: https://gitlab.com/poulet_a/rubyhelper
 licenses:
 - GNU/GPLv3
@@ -89,14 +91,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
-summary: Hotfix of get_float
+summary: Improvements and additions by poulet_a to the basic ruby classes
 test_files: []
 has_rdoc: 

data/lib/rubyhelper/versionhelper.rb

@@ -1,94 +0,0 @@
-#encoding: utf-8
-
-module VersionHelper
-
-  class Version
-
-    attr_accessor :v
-
-    # [Integer] : 1234 => 1.2.3.4
-    # [String] : "1.2-3" => 1.2.3
-    # [Array] : like multiple arguments
-    # [multiple] : each argument is converted to a number 1,2,3 => 1.2.3
-    #
-    # @param arg : list of arguments
-    def initialize(*arg)
-      @v = []
-      if arg.size == 1
-        v = arg.first
-        case v.class.to_s
-        when 'String'
-          v.gsub!(/\A\D/, '')
-          v.gsub!(/\D/, '.')
-          @v = v.split('.').map{|e| e.to_i}
-        when 'Array'
-          @v = v.map{|e| e.to_i}
-        when 'Fixnum'
-          v = v.to_i
-          loop do
-            break if v == 0
-            @v << (v % 10)
-            v /= 10
-          end
-        else
-          raise ArgumentError, v.class.to_s
-        end
-      end
-      if arg.size > 1
-        @v = arg.map{|e| e.to_i}
-      end
-    end
-
-    def incr!(n=-1)
-      @v[n] = @v[n] += 1
-    end
-
-    def decr!(n=-1)
-      @v[n] = @v[n] -= 1
-    end
-
-    def to_a
-      return Version.to_a(self)
-    end
-
-    def to_s
-      return Version.to_s(self)
-    end
-
-    # Not work yet
-    def to_h
-      return Version.to_h(self)
-    end
-
-    def to_i
-      return Version.to_i(self)
-    end
-
-    #Return an array with each number of the version
-    def self.to_a(version)
-      raise ArgumentError unless version.is_a? Version
-      return version.v.dup
-    end
-
-    #Return an string with each number of the version, joined by '.'
-    def self.to_s(version)
-      raise ArgumentError unless version.is_a? Version
-      return version.v.join('.')
-    end
-
-    #Not work yet
-    def self.to_h(version)
-      raise ArgumentError unless version.is_a? Version
-      return nil
-    end
-
-    #Return an integer with each number of the version
-    def self.to_i(version)
-      raise ArgumentError unless version.is_a? Version
-      i = 0
-      version.v.each{|e| i = i * 10 + e}
-      return i
-    end
-  end
-
-end

data/test/test_versionhelper.rb

@@ -1,59 +0,0 @@
-#encoding: utf-8
-require 'minitest/autorun'
-require_relative '../lib/rubyhelper'
-
-class VersionHelperTest < Minitest::Test
-
-  def test_new
-    v1 = VersionHelper::Version.new 1
-    v2 = VersionHelper::Version.new [1,2]
-    v3 = VersionHelper::Version.new "v1,2.3"
-    v4 = VersionHelper::Version.new 123
-  end
-
-  def test_incr!
-    v1 = VersionHelper::Version.new 1
-    v2 = VersionHelper::Version.new 1,2
-    v3 = VersionHelper::Version.new 1,2,3
-    v1.incr!
-    v2.incr!
-    v3.incr!
-  end
-
-  def test_decr!
-    v1 = VersionHelper::Version.new 1
-    v2 = VersionHelper::Version.new 1,2
-    v3 = VersionHelper::Version.new 1,2,3
-    v1.decr!
-    v2.decr!
-    v3.decr!
-  end
-
-  def test_to_i
-    v1 = VersionHelper::Version.new 1
-    v2 = VersionHelper::Version.new 1,2
-    v3 = VersionHelper::Version.new 1,2,3
-    assert_equal(1, v1.to_i)
-    assert_equal(12, v2.to_i)
-    assert_equal(123, v3.to_i)
-  end
-
-  def test_to_s
-    v1 = VersionHelper::Version.new 1
-    v2 = VersionHelper::Version.new 1,2
-    v3 = VersionHelper::Version.new 1,2,3
-    assert_equal("1", v1.to_s)
-    assert_equal("1.2", v2.to_s)
-    assert_equal("1.2.3", v3.to_s)
-  end
-
-  def test_to_a
-    v1 = VersionHelper::Version.new 1
-    v2 = VersionHelper::Version.new 1,2
-    v3 = VersionHelper::Version.new 1,2,3
-    assert_equal([1], v1.to_a)
-    assert_equal([1,2], v2.to_a)
-    assert_equal([1,2,3], v3.to_a)
-  end
-
-end