cowtech-extensions 1.6.3 → 1.6.4

data/lib/cowtech-extensions.rb

@@ -20,6 +20,10 @@ require "cowtech-extensions/pathname"
 
 module Cowtech
 	module Extensions
+    def self.settings
+      Cowtech::Extensions::Settings.instance
+    end
+
 		def self.load!(*what)
 			what = ["object", "boolean", "string", "hash", "datetime", "math", "pathname"] if what.count == 0
 			what.collect! { |w| w.to_s }
@@ -42,8 +46,6 @@ module Cowtech
           include Cowtech::Extensions::Object
           include Cowtech::Extensions::Boolean
 				end
-
-        TrueClass.cowtech_extensions_setup
       end
 
 			if what.include?("string") then

data/lib/cowtech-extensions/boolean.rb

@@ -13,13 +13,6 @@ module Cowtech
         cattr_accessor :boolean_names
       end
 
-      module ClassMethods
-        # TODO: To test
-        def cowtech_extensions_setup
-          TrueClass::boolean_names = ["No", "Yes"]
-        end
-      end
-
 			def to_i
 				(self == true) ? 1 : 0
 			end

data/lib/cowtech-extensions/object.rb

@@ -4,27 +4,33 @@
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
-# TODO: To test
 module Cowtech
 	module Extensions
 		module Object
 			include ActionView::Helpers::NumberHelper
 			extend ActiveSupport::Concern
 
+      def normalize_number
+        rv = self.ensure_string.strip
+        rv = rv.split(/[\.,]/)
+        rv[-1] = "." + rv[-1] if rv.length > 1
+        rv.join("")
+      end
+
       def is_number?
 				self.is_float?
 			end
 
 			def is_integer?
-				self.is_a?(Integer) || /^([+-]?)(\d+)$/.match(self.ensure_string.strip)
+				self.is_a?(Integer) || /^([+-]?)(\d+)$/.match(self.normalize_number)
 			end
 
 			def is_float?
-				self.is_a?(Float) || /^([+-]?)(\d+)([.,]\d+)?$/.match(self.ensure_string.strip)
+				self.is_a?(Float) || /^([+-]?)(\d+)([.,]\d+)?$/.match(self.normalize_number)
 			end
 
 			def is_boolean?
-				self.is_a?(TrueClass) || self.is_a?(FalseClass) || self.is_a?(NilClass) || /^(1|0|true|false|yes|no|t|f|y|n)$/i.match(self.ensure_string.strip)
+				self.is_a?(TrueClass) || self.is_a?(FalseClass) || self.is_a?(NilClass) || (self.ensure_string.strip =~ /^(1|0|true|false|yes|no|t|f|y|n)$/i)
 			end
 
 			def ensure_array
@@ -35,28 +41,51 @@ module Cowtech
 				self.present? ? self.to_s : ""
 			end
 
-			def to_float
-				self.is_float? ? Kernel.Float(self.respond_to?(:gsub) ? self.gsub(",", ".") : self) : 0.0
+			def to_float(default_value = 0.0)
+        if self.is_a?(Float)
+          self
+        elsif self.is_a?(Integer)
+          self.to_f
+        else
+				  self.is_float? ? Kernel.Float(self.normalize_number) : default_value
+        end
 			end
 
-			def to_integer
-        self.is_integer? ? Kernel.Integer(self) : 0
+			def to_integer(default_value = 0)
+        if self.is_a?(Integer)
+          self
+        elsif self.is_a?(Float)
+          self.to_i
+        else
+          self.is_integer? ? Kernel.Integer(self.normalize_number) : default_value
+        end
       end
 
 			def to_boolean
-				(self.is_a?(TrueClass) || /^(1|on|true|yes|t|y)$/i.match(self.ensure_string.strip)) ? true : false
+        rv = self
+        rv = rv.to_i if rv.is_a?(Float)
+				(rv.is_a?(TrueClass) || /^(1|on|true|yes|t|y)$/i.match(rv.ensure_string.strip)) ? true : false
 			end
 
 			def round_to_precision(prec = 2)
-				number_with_precision(self, :precision => prec)
+        (self.is_number? && prec >= 0) ? number_with_precision(self, :precision => prec) : nil
 			end
 
-			def format_number(prec = 2, decimal_separator = ",", add_string = "", k_separator = ".")
-				number_to_currency(self, {:precision => prec, :separator => decimal_separator, :delimiter => k_separator, :format => add_string.blank? ? "%n" : "%n %u", :unit => add_string.blank? ? "" : add_string.strip})
+			def format_number(prec = nil, decimal_separator = nil, add_string = nil, k_separator = nil)
+        prec = Cowtech::Extensions.settings.format_number[:prec] if prec.nil?
+        decimal_separator = Cowtech::Extensions.settings.format_number[:decimal_separator] if decimal_separator.nil?
+        add_string = Cowtech::Extensions.settings.format_number[:add_string] if add_string.nil?
+        k_separator = Cowtech::Extensions.settings.format_number[:k_separator] if k_separator.nil?
+
+        (self.is_number? && prec >= 0) ? number_to_currency(self, {:precision => prec, :separator => decimal_separator, :delimiter => k_separator, :format => add_string.blank? ? "%n" : "%n %u", :unit => add_string.blank? ? "" : add_string.strip}) : nil
 			end
 
+      def set_defaults_for_format_number
+
+      end
+
 			def format_boolean
-        TrueClass.boolean_names[self.to_boolean.to_i]
+        Cowtech::Extensions.settings.boolean_names[self.to_boolean]
 			end
 
 			def debug_dump(format = :yaml, must_raise = true)

data/lib/cowtech-extensions/utils.rb

@@ -6,6 +6,32 @@
 
 module Cowtech
 	module Extensions
+    class Settings
+      attr_reader :format_number, :date_names, :boolean_names
+
+      def self.instance
+        @@instance ||= Cowtech::Extensions::Settings.new
+      end
+
+      def initialize
+        self.setup_format_number
+        self.setup_boolean_names
+      end
+
+      def setup_format_number(prec = 2, decimal_separator = ".", add_string = "", k_separator = ",")
+        @format_number = {
+          :prec => prec,
+          :decimal_separator => decimal_separator,
+          :add_string => add_string,
+          :k_separator => k_separator
+        }
+      end
+
+      def setup_boolean_names(true_name = "Yes", false_name = "No")
+        @boolean_names = {true => true_name, false => false_name}
+      end
+    end
+
 		module Exceptions
 			class Dump < ::RuntimeError
 			end

data/lib/cowtech-extensions/version.rb

@@ -9,7 +9,7 @@ module Cowtech
 		module Version
 			MAJOR = 1
 			MINOR = 6
-			PATCH = 3
+			PATCH = 4
 
 			STRING = [MAJOR, MINOR, PATCH].compact.join(".")
 		end

data/spec/cowtech-extensions/datetime_spec.rb

@@ -2,4 +2,10 @@
 #
 # This file is part of the cowtech-extensions gem. Copyright (C) 2011 and above Shogun <shogun_panda@me.com>.
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
-#
+#
+
+require "spec_helper"
+
+describe Cowtech::Extensions::DateTime do
+
+end

data/spec/cowtech-extensions/object_spec.rb

@@ -2,4 +2,212 @@
 #
 # This file is part of the cowtech-extensions gem. Copyright (C) 2011 and above Shogun <shogun_panda@me.com>.
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
-#
+#
+
+require "spec_helper"
+
+describe Cowtech::Extensions::Object do
+  describe "#normalize_number" do
+    it "should correctly sanitize numbers" do
+      123.normalize_number.should == "123"
+      "123.45".normalize_number.should == "123.45"
+      "1,23.45".normalize_number.should == "123.45"
+      "-1.23.45".normalize_number.should == "-123.45"
+      "+123.45".normalize_number.should == "+123.45"
+      "+1.231,45".normalize_number.should == "+1231.45"
+    end
+  end
+
+  describe "#is_number?" do
+    it "should return true for a valid number" do
+      "123.45".is_number?.should be_true
+      "1,23.45".is_number?.should be_true
+      "-1.23.45".is_number?.should be_true
+      "+123.45".is_number?.should be_true
+      "+1.231,45".is_number?.should be_true
+    end
+
+    it "should return true for a invalid number" do
+      "s213".is_number?.should be_false
+      nil.is_number?.should be_false
+      end
+  end
+
+  describe "#is_integer?" do
+    it "should return true for a valid number" do
+      "123".is_integer?.should be_true
+      "-123".is_integer?.should be_true
+      "+123".is_integer?.should be_true
+    end
+
+    it "should return true for a invalid number" do
+      "s123".is_integer?.should be_false
+      "123.12".is_integer?.should be_false
+    end
+  end
+
+  describe "#is_float?" do
+    it "should return true for a valid number" do
+      "123.45".is_float?.should be_true
+      "1,23.45".is_float?.should be_true
+      "-1.23.45".is_float?.should be_true
+      "+123.45".is_float?.should be_true
+      "+1.231,45".is_float?.should be_true
+    end
+
+    it "should return true for a invalid number" do
+      "s213".is_float?.should be_false
+      nil.is_float?.should be_false
+    end
+  end
+
+  describe "#is_boolean?" do
+    it "should return true for a valid boolean" do
+      true.is_boolean?.should be_true
+      false.is_boolean?.should be_true
+      nil.is_boolean?.should be_true
+      "y".is_boolean?.should be_true
+      "n".is_boolean?.should be_true
+      "yes".is_boolean?.should be_true
+      "no".is_boolean?.should be_true
+      "1".is_boolean?.should be_true
+      "0".is_boolean?.should be_true
+      "true".is_boolean?.should be_true
+      "false".is_boolean?.should be_true
+      "t".is_boolean?.should be_true
+      "f".is_boolean?.should be_true
+      1.is_boolean?.should be_true
+      0.is_boolean?.should be_true
+    end
+
+    it "should return true for a invalid boolean" do
+      "11".is_boolean?.should be_false
+    end
+  end
+
+  describe "#ensure_string" do
+    it "should correctly handle strings" do
+      " abc ".ensure_string.should == " abc "
+      1.ensure_string == "1"
+      1.0.ensure_string.should == "1.0"
+      :abc.ensure_string.should == "abc"
+      nil.ensure_string.should == ""
+    end
+  end
+
+  describe "#to_float" do
+    it "should correctly convert number" do
+      123.45.to_float.should == 123.45
+      123.to_float.should == 123.00
+      "123.45".to_float.should == 123.45
+      "1,23.45".to_float.should == 123.45
+      "-1.23.45".to_float.should == -123.45
+      "+123.45".to_float.should == 123.45
+      "+1.231,45".to_float.should == 1231.45
+    end
+
+    it "should return 0.0 for a invalid number without a default" do
+      "s213".to_float.should == 0.0
+    end
+
+    it "should return the default for a invalid number" do
+      "s213".to_float(1.0).should == 1.0
+    end
+  end
+
+  describe "#to_integer" do
+    it "should correctly convert number" do
+      123.45.to_integer.should == 123
+      123.to_integer.should == 123
+      "+123".to_integer.should == 123
+      "-123".to_integer.should == -123
+    end
+
+    it "should return 0 for a invalid number without a default" do
+      "s213".to_integer.should == 0
+    end
+
+    it "should return the default for a invalid number" do
+      "s213".to_integer(1).should == 1
+    end
+  end
+
+  describe "#to_boolean" do
+    it "should return true for a valid true boolean" do
+      true.to_boolean.should be_true
+      "y".to_boolean.should be_true
+      "yes".to_boolean.should be_true
+      "1".to_boolean.should be_true
+      1.to_boolean.should be_true
+      1.0.to_boolean.should be_true
+    end
+
+    it "should return false for all other values" do
+      false.to_boolean.should be_false
+      nil.to_boolean.should be_false
+      "n".to_boolean.should be_false
+      "no".to_boolean.should be_false
+      "2".to_boolean.should be_false
+      2.0.to_boolean.should be_false
+      "false".to_boolean.should be_false
+      "abc".to_boolean.should be_false
+      0.to_boolean.should be_false
+    end
+  end
+
+  describe "#round_to_precision" do
+    it "should round number" do
+      123.456789.round_to_precision(2).should == "123.46"
+      123.456789.round_to_precision(0).should == "123"
+      "123.456789".round_to_precision(2).should == "123.46"
+    end
+
+    it "should return nil for non numeric values" do
+      123.456789.round_to_precision(-1).should == nil
+      "abc".round_to_precision(-1).should == nil
+    end
+  end
+
+  describe "#format_number" do
+    it "should format number" do
+      123123.456789.format_number.should == "123,123.46"
+      123123.456789.format_number(2).should == "123,123.46"
+      123123.456789.format_number(3, "@").should == "123,123@457"
+      123123.456789.format_number(3, "@", "$").should == "123,123@457 $"
+      "123123.456789".format_number(3, "@", "$", "!").should == "123!123@457 $"
+
+      Cowtech::Extensions.settings.setup_format_number(5, ",", "£", ".")
+      123123.456789.format_number.should == "123.123,45679 £"
+    end
+
+    it "should return nil for non numeric values" do
+      123.456789.format_number(-1).should == nil
+      "abc".format_number(-1).should == nil
+    end
+  end
+
+  describe "#format_boolean" do
+    it "should return the correct string for all values" do
+      "yes".format_boolean.should == "Yes"
+      "abc".format_boolean.should == "No"
+    end
+
+    it "should support localization" do
+      Cowtech::Extensions.settings.setup_boolean_names("YYY", "NNN")
+      "yes".format_boolean.should == "YYY"
+      "abc".format_boolean.should == "NNN"
+    end
+  end
+
+  describe "#debug_dump" do
+    it "should return the correct representation for an object" do
+      reference = {:a => "b"}
+      reference.debug_dump(:json, false).should == reference.to_json
+      reference.debug_dump(:yaml, false).should == reference.to_yaml
+    end
+
+    it "should raise an exception if requested" do
+      expect { {:a => "b"}.debug_dump }.to raise_error(Cowtech::Extensions::Exceptions::Dump)
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cowtech-extensions
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 6
-  - 3
-  version: 1.6.3
+  - 4
+  version: 1.6.4
 platform: ruby
 authors: 
 - Shogun
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-06 00:00:00 Z
+date: 2012-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack