cowtech-extensions 1.5.2 → 1.6.0

data/Gemfile

@@ -6,4 +6,4 @@
 
 source "http://rubygems.org"
 
-gemspec
+gemspec

data/{README.rdoc → README.md}

@@ -1,9 +1,9 @@
-= cowtech-lib
+# cowtech-lib
 
 Several Ruby object enhancements
 http://github.com/ShogunPanda/cowtech-extensions
 
-== Contributing to cowtech-extensions
+## Contributing to cowtech-extensions
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
@@ -13,7 +13,7 @@ http://github.com/ShogunPanda/cowtech-extensions
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
+## Copyright
 
 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.

data/cowtech-extensions.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 	s.authors = ["Shogun"]
 	s.email = ["shogun_panda@me.com"]
 	s.homepage = "http://github.com/ShogunPanda/cowtech-extensions"
-	s.summary = %q{A Rails blog engine plugin.}
-	s.description = %q{A Rails blog engine plugin.}
+	s.summary = %q{Several Ruby object enhancements.}
+	s.description = %q{Several Ruby object enhancements.}
 
 	s.rubyforge_project = "cowtech-extensions"
 	s.files = `git ls-files`.split("\n")
@@ -21,6 +21,5 @@ Gem::Specification.new do |s|
 	s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 	s.require_paths = ["lib"]
 
-	s.required_ruby_version = ">= 1.9.2"
 	s.add_dependency("actionpack", "~> 3.0")
 end

data/lib/cowtech-extensions.rb

@@ -15,7 +15,7 @@ require "cowtech-extensions/pathname"
 
 module Cowtech
 	module Extensions
-		def self.load!(what = [])
+		def self.load(what = [])
 			what = ["object", "boolean", "string", "hash", "datetime", "math", "pathname"] if what.count == 0
 			what.collect! { |w| w.to_s }
 
@@ -31,13 +31,15 @@ module Cowtech
 				::TrueClass.class_eval do
 					include Cowtech::Extensions::Object
 					include Cowtech::Extensions::Boolean
-				end
+        end
 
 				::FalseClass.class_eval do
-					include Cowtech::Extensions::Object
-					include Cowtech::Extensions::Boolean
+          include Cowtech::Extensions::Object
+          include Cowtech::Extensions::Boolean
 				end
-			end
+
+        TrueClass.cowtech_extensions_setup
+      end
 
 			if what.include?("string") then
 				::String.class_eval do
@@ -64,9 +66,7 @@ module Cowtech
 					include Cowtech::Extensions::DateTime
 				end
 
-				::Date.setup_localization
-				::Time.setup_localization
-				::DateTime.setup_localization
+        #DateTime.cowtech_extensions_setup
 			end
 
 			if what.include?("math") then

data/lib/cowtech-extensions/boolean.rb

@@ -9,6 +9,16 @@ module Cowtech
 		module Boolean
 			extend ActiveSupport::Concern
 
+      included do
+        cattr_accessor :boolean_names
+      end
+
+      module ClassMethods
+        def cowtech_extensions_setup
+          TrueClass::boolean_names = ["No", "Yes"]
+        end
+      end
+
 			def to_i
 				(self == true) ? 1 : 0
 			end

data/lib/cowtech-extensions/datetime.rb

@@ -7,125 +7,128 @@
 require "active_support/all"
 
 module Cowtech
-	module Extensions
-		module DateTime
-			extend ActiveSupport::Concern
-
-			included do
-				cattr_accessor :default_localized_months
-				cattr_accessor :default_localized_short_months
-				cattr_accessor :default_localized_days
-				cattr_accessor :default_localized_short_days
-				cattr_accessor :localized_months
-				cattr_accessor :localized_short_months
-				cattr_accessor :localized_days
-				cattr_accessor :localized_short_days
-			end
-
-			module ClassMethods
-				def setup_localization
-					self.default_setup_locale
-					self.setup_locale
-				end
-
-				def default_setup_locale
-					self.default_localized_months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]
-					self.default_localized_short_months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
-					self.default_localized_days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
-					self.default_localized_short_days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
-				end
-
-				def setup_locale
-					self.localized_months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]
-					self.localized_short_months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
-					self.localized_days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
-					self.localized_short_days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
-				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) } }
-				end
-
-				def years(offset = 10, also_future = true)
-					y = Date.today.year
-					(y - offset..(also_future ? y + offset : y)).collect { |year| {value: year} }
-				end
-
-				def custom_formats
-					@@custom_formats ||= {
-						"date" => "%d/%m/%Y",
-						"time" => "%H:%M:%S",
-						"date-8601" => "%Y-%m-%d",
-						"date-time-8601" => "%Y-%m-%d %H:%M:%S",
-						"iso-8601" => "%FT%T%z",
-						"update" => "%d/%m/%Y %H:%M"
-					}
-				end
-
-				def custom_format(key = "date")
-					self.custom_formats.fetch(key.to_s, "%d/%m/%Y")
-				end
-
-				def easter(year = nil)
-					day = 1
-					month = 3
-					year = Date.today.year if !year.is_integer?
-
-					# GAUSS METHOD
-					a = year % 19
-					d = ((19 * a) + 24) % 30
-					e = ((2 * (year % 4)) + (4 * (year % 7)) + (6 * d) + 5) % 7
-
-					if d + e < 10 then
-						day = d + e + 22
-					else
-						day = d + e - 9
-						month = 4
-					end
-
-					if day == 26 && month == 4 then
-						day = 19
-					elsif day == 25 && month == 4 && d == 28 && e == 6 && a > 10 then
-						day = 18
-					end
-					#END
-
-					Date.civil(year, month, day)
-				end
-			end
-
-			def lstrftime(format = nil)
-				format = self.class.custom_format($1) if format =~ /^custom::(.+)/
-				format ||= self.class.custom_format("update")
-				unlocal = self.strftime(format)
-
-				{ "%a" => "short_days", "%A" => "days", "%b" => "short_months", "%B" => "months" }.each_pair do |specifier, method|
-					if format.include?(specifier) then
-						from = self.class.send("default_localized_" + method)
-						to = self.class.send("localized_" + method)
-						unlocal.gsub!(/(#{from.join("|")})/i) { |s| to[from.index($1)] }
-					end
-				end
-
-				unlocal
-			end
-
-			def local_lstrftime(format = nil)
-				(self.respond_to?(:in_time_zone) ? self.in_time_zone : self).lstrftime(format)
-			end
-
-			def padded_month
-				self.month.to_s.rjust(2, "0")
-			end
-
-			def in_months
-				((self.year - 1) % 2000) * 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
-		end
-	end
+  module Extensions
+    module DateTime
+      extend ActiveSupport::Concern
+
+      included do
+        cattr_accessor :date_names
+      end
+
+      module ClassMethods
+        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)} }
+        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} }
+        end
+
+        def easter(year = nil)
+          day = 1
+          month = 3
+          year = Date.today.year if !year.is_integer?
+
+          # Compute using Gauss Method
+          a = year % 19
+          d = ((19 * a) + 24) % 30
+          e = ((2 * (year % 4)) + (4 * (year % 7)) + (6 * d) + 5) % 7
+
+          if d + e < 10 then
+            day = d + e + 22
+          else
+            day = d + e - 9
+            month = 4
+          end
+
+          if day == 26 && month == 4 then
+            day = 19
+          elsif day == 25 && month == 4 && d == 28 && e == 6 && a > 10 then
+            day = 18
+          end
+          # End
+          
+          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 = "date")
+          key = "ct_#{key}" if key !~ /^ct_/
+          self.custom_formats.fetch(key.to_sym, "%d/%m/%Y")
+        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)
+        end
+
+        def in_months(base = 2000)
+          ((self.year - 1) - 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!("%", "%%")
+            end
+
+            mrv
+          end
+
+          self.strftime(localized_format)
+        end
+
+        def to_localized_s(format = nil)
+          self.lstrftime(format = nil)
+        end
+
+        def local_strftime(format = nil)
+          (self.respond_to?(:in_time_zone) ? self.in_time_zone : self).strftime(format)
+        end
+
+        def local_lstrftime(format = nil)
+          (self.respond_to?(:in_time_zone) ? self.in_time_zone : self).lstrftime(format)
+        end
+      #end
+    end
+  end
 end

data/lib/cowtech-extensions/object.rb

@@ -13,7 +13,7 @@ module Cowtech
 			include ActionView::Helpers::NumberHelper
 			extend ActiveSupport::Concern
 
-			def is_number?
+      def is_number?
 				self.is_float?
 			end
 
@@ -42,23 +42,23 @@ module Cowtech
 			end
 
 			def to_integer
-				self.is_integer? ? Kernel.Integer(self, self.is_a?(String) ? 10 : 0) : 0
-			end
+        self.is_integer? ? Kernel.Integer(self) : 0
+      end
 
 			def to_boolean
 				(self.is_a?(TrueClass) || /^(1|on|true|yes|t|y)$/i.match(self.ensure_string.strip)) ? true : false
 			end
 
 			def round_to_precision(prec = 2)
-				number_with_precision(self, precision: prec)
+				number_with_precision(self, :precision => prec)
 			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 = 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})
 			end
 
 			def format_boolean
-				self.to_boolean ? "Yes" : "No"
+        TrueClass.boolean_names[self.to_boolean.to_i]
 			end
 
 			def debug_dump(format = :yaml, must_raise = true)

data/lib/cowtech-extensions/version.rb

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

metadata

@@ -1,38 +1,51 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cowtech-extensions
-version: !ruby/object:Gem::Version
-  version: 1.5.2
+version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
+  segments: 
+  - 1
+  - 6
+  - 0
+  version: 1.6.0
 platform: ruby
-authors:
+authors: 
 - Shogun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-06-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: actionpack
-  requirement: &70350714263580 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70350714263580
-description: A Rails blog engine plugin.
-email:
+  version_requirements: *id001
+description: Several Ruby object enhancements.
+email: 
 - shogun_panda@me.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - Gemfile.lock
-- README.rdoc
+- README.md
 - Rakefile
 - cowtech-extensions.gemspec
 - lib/cowtech-extensions.rb
@@ -47,26 +60,37 @@ files:
 - lib/cowtech-extensions/version.rb
 homepage: http://github.com/ShogunPanda/cowtech-extensions
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: cowtech-extensions
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A Rails blog engine plugin.
+summary: Several Ruby object enhancements.
 test_files: []
+
+has_rdoc: