cowtech-extensions 1.6.4 → 2.0.0

data/cowtech-extensions.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
 	gem.add_dependency("actionpack", "~> 3.0")
+  gem.add_dependency("tzinfo", "~> 0.3.33")
 
   gem.add_development_dependency("rspec", "~> 2.10")
   gem.add_development_dependency("rcov", "~> 1.0.0")

data/lib/cowtech-extensions/boolean.rb

@@ -9,10 +9,6 @@ module Cowtech
 		module Boolean
 			extend ActiveSupport::Concern
 
-      included do
-        cattr_accessor :boolean_names
-      end
-
 			def to_i
 				(self == true) ? 1 : 0
 			end

data/lib/cowtech-extensions/datetime.rb

@@ -4,24 +4,30 @@
 # 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 DateTime
       extend ActiveSupport::Concern
 
-      included do
-        cattr_accessor :date_names
-      end
-
       module ClassMethods
+        def days(short = true)
+          days = Cowtech::Extensions.settings.date_names[short ? :short_days : :long_days]
+          (1..7).to_a.collect { |i|
+            {:value => i.to_s, :label=> days[i - 1]}
+          }
+
+        end
+
         def months(short = true)
-          12.times.collect { |i| {:value => (i + 1).to_s.rjust(2, "0"), :description => self.send("localized_#{short ? "short_" : ""}months").at(i)} }
+          months = Cowtech::Extensions.settings.date_names[short ? :short_months : :long_months]
+          (1..12).collect { |i|
+            {:value => i.to_s.rjust(2, "0"), :label=> months.at(i - 1)}
+          }
         end
 
         def years(offset = 10, also_future = true, reference = nil)
           y = (reference || Date.today).year
-          (y - offset..(also_future ? y + offset : y)).collect { |year| {:value => year} }
+          (y - offset..(also_future ? y + offset : y)).collect { |year| {:value => year, :label => year} }
         end
 
         def easter(year = nil)
@@ -51,94 +57,78 @@ module Cowtech
           Date.civil(year, month, day)
         end
 
-        def cowtech_extensions_setup
-          DateTime::date_names ||= {
-              :months => ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
-              :short_months => ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
-              :days => ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
-              :short_days => ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
-          }
-
-          self.custom_formats.each_pair do |k, v| Time::DATE_FORMATS[k] = v end
-        end
-
-        def custom_formats
-          @@custom_formats ||= {
-            :ct_date => "%Y-%m-%d",
-            :ct_time => "%H:%M:%S",
-            :ct_date_time => "%F %T",
-            :ct_iso_8601 => "%FT%T%z"
-          }
-        end
-
         def custom_format(key)
-          self.custom_formats.fetch(key.to_sym, key)
+          Cowtech::Extensions.settings.date_formats.fetch(key.to_sym, key).ensure_string
         end
 
         def is_valid?(value, format = "%F %T")
           rv = true
 
+          format = self.custom_format(format)
+
           begin
-            DateTime.strptime(value, format)
-          rescue
+            ::DateTime.strptime(value, format)
+          rescue => e
             rv = false
           end
 
           rv
         end
-      end
 
-      #module InstanceMethods
-        def utc_time
-          ua = (self.respond_to?(:utc) ? self : self.to_datetime).utc
-          ::Time.utc(ua.year, ua.month, ua.day, ua.hour, ua.min, ua.sec)
+        def rational_offset(tz = ::Time.zone)
+          Rational((tz.tzinfo.current_period.utc_offset / 3600), 24)
         end
+      end
 
-        def in_months(base = 2000)
-          ((self.year - 1) - base) * 12 + self.month
-        end
+      def utc_time
+        ua = (self.respond_to?(:utc) ? self : self.to_datetime).utc
+        ::Time.utc(ua.year, ua.month, ua.day, ua.hour, ua.min, ua.sec)
+      end
 
-        def padded_month
-          self.month.to_s.rjust(2, "0")
-        end
+      def in_months(base = nil)
+        base ||= Date.today.year
+        ((self.year) - base) * 12 + self.month
+      end
+
+      def padded_month
+        self.month.to_s.rjust(2, "0")
+      end
 
-        def lstrftime(format = nil)
-          localized_format = format.gsub(/(%{1,2}[ab])/i) do |match|
-            mrv = match
-
-            if match !~ /^%%/ then
-              case match
-                when "%a"
-                  mrv = ::DateTime.date_names[:short_days][self.wday]
-                when "%A"
-                  mrv = ::DateTime.date_names[:days][self.wday]
-                when "%b"
-                  mrv = ::DateTime.date_names[:short_months][self.month]
-                when "%B"
-                  mrv = ::DateTime.date_names[:months][self.month]
-              end
-
-              mrv.sub!("%", "%%")
+      def lstrftime(format = nil)
+        rv = nil
+        names = Cowtech::Extensions.settings.date_names
+
+        final_format = ::DateTime.custom_format(format).ensure_string.gsub(/(%{1,2}[ab])/i) do |match|
+          mrv = match
+
+          if match !~ /^%%/ then
+            case match
+              when "%a"
+                mrv = names[:short_days][self.wday]
+              when "%A"
+                mrv = names[:long_days][self.wday]
+              when "%b"
+                mrv = names[:short_months][self.month - 1]
+              when "%B"
+                mrv = names[:long_months][self.month - 1]
             end
 
-            mrv
+            mrv.sub!("%", "%%")
           end
 
-          self.to_formatted_s(localized_format)
+          mrv
         end
 
-        def to_localized_s(format = nil)
-          self.lstrftime(format = nil)
-        end
+        self.strftime(final_format)
+      end
 
-        def local_strftime(format = nil)
-          (self.respond_to?(:in_time_zone) ? self.in_time_zone : self).strftime(format)
-        end
+      def local_strftime(format = nil)
+        (self.respond_to?(:in_time_zone) ? self.in_time_zone : self).strftime(::DateTime.custom_format(format))
+      end
 
-        def local_lstrftime(format = nil)
-          (self.respond_to?(:in_time_zone) ? self.in_time_zone : self).lstrftime(format)
-        end
-      #end
+      def local_lstrftime(format = nil)
+        (self.respond_to?(:in_time_zone) ? self.in_time_zone : self).lstrftime(format)
+      end
     end
   end
 end

data/lib/cowtech-extensions/utils.rb

@@ -7,7 +7,7 @@
 module Cowtech
 	module Extensions
     class Settings
-      attr_reader :format_number, :date_names, :boolean_names
+      attr_reader :format_number, :boolean_names, :date_names, :date_formats
 
       def self.instance
         @@instance ||= Cowtech::Extensions::Settings.new
@@ -16,6 +16,8 @@ module Cowtech
       def initialize
         self.setup_format_number
         self.setup_boolean_names
+        self.setup_date_formats
+        self.setup_date_names
       end
 
       def setup_format_number(prec = 2, decimal_separator = ".", add_string = "", k_separator = ",")
@@ -30,6 +32,38 @@ module Cowtech
       def setup_boolean_names(true_name = "Yes", false_name = "No")
         @boolean_names = {true => true_name, false => false_name}
       end
+
+      def setup_date_formats(formats = nil, replace = false)
+        formats = {
+            :ct_date => "%Y-%m-%d",
+            :ct_time => "%H:%M:%S",
+            :ct_date_time => "%F %T",
+            :ct_iso_8601 => "%FT%T%z"
+        } if formats.blank?
+
+        if !replace then
+          @date_formats ||= {}
+          @date_formats.merge!(formats)
+        else
+          @date_formats = formats
+        end
+
+        @date_formats.each_pair do |k, v| Time::DATE_FORMATS[k] = v end
+      end
+
+      def setup_date_names(long_months = nil, short_months = nil, long_days = nil, short_days = nil)
+        long_months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"] if long_months.blank?
+        short_months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] if short_months.blank?
+        long_days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]  if long_days.blank?
+        short_days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]  if short_days.blank?
+
+        @date_names = {
+          :long_months => long_months,
+          :short_months => short_months,
+          :long_days => long_days,
+          :short_days => short_days
+        }
+      end
     end
 
 		module Exceptions

data/lib/cowtech-extensions/version.rb

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

data/spec/cowtech-extensions/datetime_spec.rb

@@ -7,5 +7,151 @@
 require "spec_helper"
 
 describe Cowtech::Extensions::DateTime do
+  let(:random_reference) { DateTime.civil(1990 + rand(30), 1 + rand(10), 1 + rand(25), 1 + rand(20), 1 + rand(58), 1 + rand(58)).in_time_zone }
+  let(:fixed_reference){
+    tz = ActiveSupport::TimeZone[7]
+    date = DateTime.civil(2005, 6, 7, 8, 9, 10, DateTime.rational_offset(tz))
+  }
 
+  describe "#days" do
+    it "should return the list of the days of the week" do
+      DateTime.days.should be_kind_of(Array)
+      DateTime.days[3].should == {:value => "4", :label => "Wed"}
+      DateTime.days(false).should be_kind_of(Array)
+      DateTime.days(false)[3].should == {:value => "4", :label => "Wednesday"}
+
+      Cowtech::Extensions.settings.setup_date_names(nil, nil, 7.times.collect {|i| (i + 1).to_s * 2}, 7.times.collect {|i| (i + 1).to_s})
+      DateTime.days.should be_kind_of(Array)
+      DateTime.days[3].should == {:value => "4", :label => "4"}
+      DateTime.days(false).should be_kind_of(Array)
+      DateTime.days(false)[3].should == {:value => "4", :label => "44"}
+    end
+  end
+
+  describe "#months" do
+    it "should return the list of the months of the year" do
+      DateTime.months.should be_kind_of(Array)
+      DateTime.months[6].should == {:value => "07", :label => "Jul"}
+      DateTime.months(false).should be_kind_of(Array)
+      DateTime.months(false)[6].should == {:value => "07", :label => "July"}
+
+      Cowtech::Extensions.settings.setup_date_names(12.times.collect {|i| (i + 1).to_s * 2}, 12.times.collect {|i| (i + 1).to_s}, nil, nil)
+      DateTime.months.should be_kind_of(Array)
+      DateTime.months[6].should == {:value => "07", :label => "7"}
+      DateTime.months(false).should be_kind_of(Array)
+      DateTime.months(false)[6].should == {:value => "07", :label => "77"}
+    end
+
+  end
+
+  describe "#years" do
+    it "should return a range of years" do
+      DateTime.years.collect(&:value).should == (Date.today.year - 10..Date.today.year + 10).to_a
+      DateTime.years(5).collect(&:value).should == (Date.today.year - 5..Date.today.year + 5).to_a
+      DateTime.years(5, false).collect(&:value).should == (Date.today.year - 5..Date.today.year).to_a
+      DateTime.years(5, false, Date.civil(1900, 1, 1)).collect(&:value).should == (1895..1900).to_a
+    end
+  end
+
+  describe "#easter" do
+    it "should compute the valid Easter day" do
+      {1984 => "0422", 1995 => "0416", 2006 => "0416", 2017 => "0416"}.each do |year, date|
+        DateTime.easter(year).strftime("%Y%m%d").should == "#{year}#{date}"
+      end
+    end
+  end
+
+  describe "#custom_format" do
+    it "should find the format" do
+      DateTime.custom_format(:ct_date).should == "%Y-%m-%d"
+      DateTime.custom_format("ct_date").should == "%Y-%m-%d"
+
+      Cowtech::Extensions.settings.setup_date_formats({:ct_foo => "%ABC"})
+
+      DateTime.custom_format(:ct_foo).should == "%ABC"
+      DateTime.custom_format("ct_foo").should == "%ABC"
+    end
+
+    it "should return the key if format is not found" do DateTime.custom_format(:ct_unused) == "ct_unused" end
+  end
+
+  describe "#is_valid?" do
+    it "should recognize a valid date" do
+      DateTime.is_valid?("2012-04-05", "%F").should be_true
+      DateTime.is_valid?("2012-04-05", :ct_date).should be_true
+    end
+
+    it "should fail if the argument or the format is not valid" do
+      DateTime.is_valid?("ABC", "%F").should be_false
+      DateTime.is_valid?("2012-04-05", "%X").should be_false
+    end
+  end
+
+  describe "#rational_offset" do
+    it "should return the correct rational value" do
+      DateTime.rational_offset(ActiveSupport::TimeZone[4]).should == Rational(4, 24)
+      DateTime.rational_offset(ActiveSupport::TimeZone[-7]).should == Rational(-7, 24)
+    end
+  end
+
+  describe "#utc_time" do
+    it "should convert to UTC Time" do random_reference.utc_time.should be_kind_of(Time) end
+  end
+
+  describe "#in_months" do
+    it "should return the amount of months passed since the start of the reference year" do
+      Date.today.in_months.should == Date.today.month
+      fixed_reference.in_months(2000).should == 66
+    end
+  end
+
+  describe "#padded_month" do
+    it "should pad the month number" do
+      random_reference.padded_month.should == random_reference.month.to_s.rjust(2, "0")
+      Date.civil(2000, 8, 8).padded_month.should == "08"
+    end
+  end
+
+  describe "#lstrftime" do
+    it "should return corrected formatted string" do
+      fixed_reference.lstrftime(:db).should == "db"
+      fixed_reference.lstrftime("%F").should == "2005-06-07"
+      fixed_reference.lstrftime(:ct_iso_8601).should == "2005-06-07T08:09:10+0700"
+
+      Cowtech::Extensions.settings.setup_date_names
+      Cowtech::Extensions.settings.setup_date_formats({:ct_local_test => "%a %A %b %B %d %Y %H"})
+      fixed_reference.lstrftime(:ct_local_test).should == "Tue Tuesday Jun June 07 2005 08"
+
+      Cowtech::Extensions.settings.setup_date_names(
+          12.times.collect {|i| (i + 1).to_s * 2}, 12.times.collect {|i| (i + 1).to_s},
+          7.times.collect {|i| (i + 1).to_s * 2}, 7.times.collect {|i| (i + 1).to_s}
+      )
+
+      fixed_reference.lstrftime(:ct_local_test).should == "3 33 6 66 07 2005 08"
+      end
+  end
+
+  describe "#local_strftime" do
+    it "should retrieve the date in the current timezone" do
+      ::Time.zone = ActiveSupport::TimeZone[0]
+      Cowtech::Extensions.settings.setup_date_formats({:ct_local_test => "%a %A %b %B %d %Y %H"})
+      fixed_reference.local_strftime(:ct_local_test).should == "Tue Tuesday Jun June 07 2005 01"
+    end
+  end
+
+  describe "#local_lstrftime" do
+    it "should retrieve the date in the current timezone" do
+      ::Time.zone = ActiveSupport::TimeZone[0]
+
+      Cowtech::Extensions.settings.setup_date_names
+      Cowtech::Extensions.settings.setup_date_formats({:ct_local_test => "%a %A %b %B %d %Y %H"})
+
+      Cowtech::Extensions.settings.setup_date_names(
+          12.times.collect {|i| (i + 1).to_s * 2}, 12.times.collect {|i| (i + 1).to_s},
+          7.times.collect {|i| (i + 1).to_s * 2}, 7.times.collect {|i| (i + 1).to_s}
+      )
+
+      fixed_reference.local_lstrftime(:ct_local_test).should == "3 33 6 66 07 2005 01"
+    end
+  end
 end

data/spec/cowtech-extensions/object_spec.rb

@@ -30,7 +30,7 @@ describe Cowtech::Extensions::Object do
     it "should return true for a invalid number" do
       "s213".is_number?.should be_false
       nil.is_number?.should be_false
-      end
+    end
   end
 
   describe "#is_integer?" do
@@ -80,9 +80,7 @@ describe Cowtech::Extensions::Object do
       0.is_boolean?.should be_true
     end
 
-    it "should return true for a invalid boolean" do
-      "11".is_boolean?.should be_false
-    end
+    it "should return true for a invalid boolean" do  "11".is_boolean?.should be_false end
   end
 
   describe "#ensure_string" do
@@ -106,13 +104,9 @@ describe Cowtech::Extensions::Object do
       "+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 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
+    it "should return the default for a invalid number" do "s213".to_float(1.0).should == 1.0 end
   end
 
   describe "#to_integer" do
@@ -123,13 +117,9 @@ describe Cowtech::Extensions::Object do
       "-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 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
+    it "should return the default for a invalid number" do "s213".to_integer(1).should == 1 end
   end
 
   describe "#to_boolean" do
@@ -206,8 +196,6 @@ describe Cowtech::Extensions::Object do
       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
+    it "should raise an exception if requested" do expect { {:a => "b"}.debug_dump }.to raise_error(Cowtech::Extensions::Exceptions::Dump) end
   end
 end

data/spec/cowtech-extensions/pathname_spec.rb

@@ -10,8 +10,6 @@ describe Cowtech::Extensions::Pathname do
   let(:reference) { Pathname.new($0) }
 
   describe "#components" do
-    it "should return the components of the path" do
-      ([""] + reference.components).should == reference.to_s.split("/")
-    end
+    it "should return the components of the path" do ([""] + reference.components).should == reference.to_s.split("/") end
   end
 end

data/spec/cowtech-extensions_spec.rb

@@ -1,9 +1,27 @@
 require "spec_helper"
 
 describe Cowtech::Extensions do
-  describe "#load!" do
-    it "should load the extensions" do
-      Cowtech::Extensions.load!
+  describe "#load! should load extensions" do
+    Cowtech::Extensions.load!
+
+    it "for Boolean" do
+      true.should respond_to("value")
+      true.should respond_to("to_i")
+    end
+
+    it "for DateTime" do
+      DateTime.should respond_to("custom_format")
+      DateTime.now.should respond_to("lstrftime")
     end
+
+    it "for Hash" do {:a => "b"}.should respond_to("a") end
+
+    it "for Math" do Math.should respond_to("min") end
+
+    it "for Object" do 0.should respond_to("debug_dump") end
+
+    it "for Pathname" do Pathname.new($0).should respond_to("components") end
+
+    it "for String" do "".should respond_to("remove_accents") end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cowtech-extensions
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 15
   prerelease: 
   segments: 
-  - 1
-  - 6
-  - 4
-  version: 1.6.4
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Shogun
@@ -33,9 +33,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: tzinfo
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 81
+        segments: 
+        - 0
+        - 3
+        - 33
+        version: 0.3.33
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,11 +62,11 @@ dependencies:
         - 10
         version: "2.10"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,11 +78,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: pry
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,7 +94,7 @@ dependencies:
         - 9
         version: 0.9.9
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: Several Ruby object enhancements.
 email: 
 - shogun_panda@me.com