eztime 1.0.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDdjMWM5MDM5ODYzMDI3NTQ0Nzk0ODQ4YzEzMjk2MzBkZGQyZGViNA==
+  data.tar.gz: !binary |-
+    ZDZiMDNmYjJlOTA5YzZiODg0MGMxYmNhODY4YTc0ZmQ1OTFiZTY3NQ==
+SHA512:
+  metadata.gz: !binary |-
+    NzhkZDg5MDc4YmEzMzg3NTViZDE1Y2VkYWU4ODZmNjAwZTllNjI1MzMxMDA3
+    MGIyZmNlYjU2ZDNlZTdhMGI3OWE2MDU1MjA2OGY1MTAxNjliNjUyMzUyM2My
+    YmExNDI3OWFkMDk4ZGE5YTA5OGEyYzlkYWRiZGE5NzEyZGYyNmY=
+  data.tar.gz: !binary |-
+    YzhlNjU1MmIyMDNmMWRjNzg2ZmNmMTgyYTRjNTRmMTNjNzQ3MDg5YjM5ZTRj
+    ODQ1ZDMxNzlmNGY2ZGJmYjdmN2ZmOGI3ZDA3N2ZkMGQ5ZGU4MjE2NDk4YzZm
+    NjZiNDZjNTEwMzBmMTkwNTlmODg0OWVmZWQ5MjliMmQ0ZmFiNTA=

data/VERSION

@@ -1 +1 @@
-1.0.0
+2.0.0

data/eztime.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eztime}
-  s.version = "1.0.0"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Scharf"]
-  s.date = %q{2012-07-05}
+  s.date = %q{2015-02-27}
   s.description = %q{Easier date/time manipulation}
   s.email = %q{scharfie@gmail.com}
   s.extra_rdoc_files = [
@@ -17,8 +17,6 @@ Gem::Specification.new do |s|
     "README.textile"
   ]
   s.files = [
-    "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.textile",
     "Rakefile",
@@ -35,20 +33,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.4.2}
   s.summary = %q{Easier date/time manipulation}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
 end
 

data/lib/eztime.rb

@@ -1,12 +1,13 @@
 require 'date'
+require 'forwardable'
 
-# The following code was based on work found at:
-# http://www.bigbold.com/snippets/user/jswizard#post2368
-class Numeric
-  # Returns the cardinal (number) and ordinal (st, nd, rd, th, etc.)
-  # Pass include_cardinal as false to only return the ordinal
-  def ordinal(include_cardinal=true)
-    cardinal = self.to_i.abs
+module EZTime
+  def self.ordinal(number, include_cardinal=false)
+    # The following code was based on work found at:
+    # http://www.bigbold.com/snippets/user/jswizard#post2368
+    # Returns the cardinal (number) and ordinal (st, nd, rd, th, etc.)
+    # Pass include_cardinal as false to only return the ordinal
+    cardinal = number.to_i.abs
     if (10...20).include?(cardinal) then
       include_cardinal ? cardinal.to_s << 'th' : 'th'
     else
@@ -14,84 +15,103 @@ class Numeric
       include_cardinal ? cardinal.to_s << ord : ord
     end
   end
-end
 
-module EZTime
+  class FormattedTime
+    extend Forwardable
+    attr_accessor :time
+
+    def_delegators :@time,
+      :hour, 
+      :min,
+      :sec, 
+      :day, :wday, :mday,
+      :month,
+      :year
+
+    def initialize(time)
+      @time = time
+    end
+
+    def format(format_str)
+      eval("'" + format_str.gsub(/:([a-z_]{1,}[0-9]{0,2})/, '\' + \1.to_s + \'') + "'")
+    end
+
   public
-  # Returns only the lower two digits of the year
-  # (i.e. 2006 => 06)
-  def syear; year.to_s[-2..-1]; end
-  
-  # Returns the name of the month 
-  # (January, February, etc.)
-  def month_name; Date::MONTHNAMES[month]; end
-  
-  # Returns the abbreviated name of the month 
-  # (Jan, Feb, etc.)
-  def month_abbr; Date::ABBR_MONTHNAMES[month]; end
-  
-  # Returns the name of the weekday
-  # (Sunday, Monday, etc.)
-  def day_name; Date::DAYNAMES[wday]; end
-  
-  # Returns the abbreviated name of the weekday
-  # (Sun, Mon, etc.)
-  def day_abbr; Date::ABBR_DAYNAMES[wday]; end
-  
-  alias :nmonth :month_name
-  alias :amonth :month_abbr
-  
-  alias :nday   :day_name
-  alias :aday   :day_abbr
+    # Returns only the lower two digits of the year
+    # (i.e. 2006 => 06)
+    def syear; year.to_s[-2..-1]; end
+    
+    # Returns the name of the month 
+    # (January, February, etc.)
+    def month_name; Date::MONTHNAMES[month]; end
+    
+    # Returns the abbreviated name of the month 
+    # (Jan, Feb, etc.)
+    def month_abbr; Date::ABBR_MONTHNAMES[month]; end
+    
+    # Returns the name of the weekday
+    # (Sunday, Monday, etc.)
+    def day_name; Date::DAYNAMES[wday]; end
+    
+    # Returns the abbreviated name of the weekday
+    # (Sun, Mon, etc.)
+    def day_abbr; Date::ABBR_DAYNAMES[wday]; end
+    
+    alias :nmonth :month_name
+    alias :amonth :month_abbr
+    
+    alias :nday   :day_name
+    alias :aday   :day_abbr
 
-  # Returns the month as a zero-padded string
-  # (i.e. June => 06)  
-  def zmonth; '%02d' % month; end
-  
-  # Returns the day as a zero-padded string
-  # (5 => 05)
-  def zday;   '%02d' % mday;  end
-  
-  # Returns the hour as a zero-padded string
-  # (3 => 03)
-  def zhour;  '%02d' % hour; end
-  
-  # Returns the hour in 12-hour format
-  # (5:00pm => 5)
-  def hour12;  hour % 12 == 0 ? 12 : hour % 12; end
-  
-  # Returns the hour in 12-hour format as a zero-padded string
-  # (5:00pm => 05)
-  def zhour12; '%02d' % hour12; end
-  
-  # Returns the minute as a zero-padded string 
-  # Note: If you need just the minute, use min
-  def minute;  '%02d' % min; end
-  
-  # Returns the second as a zero-padded string
-  # Note: If you need just the second, use sec
-  def second;  '%02d' % sec; end
-  
-  # Returns the meridian 
-  # (AM/PM)
-  def meridian;   hour >= 12 ? 'PM' : 'AM'; end
-  
-  # Returns the meridian in short form (first letter)
-  # (A/P)
-  def smeridian;  meridian[0].chr; end
-  
-  # Returns the meridian in lowercase
-  # (am/pm)
-  def lmeridian;  meridian.downcase; end
-  
-  # Returns the meridian in lowercase, short form (first letter)
-  # (a/p)
-  def lsmeridian; smeridian.downcase; end
-  
-  # Returns the ordinal of the day
-  # (1 => st, 2 => nd, 3 => rd, 4.. => th)
-  def ordinal; mday.ordinal(false); end
-  alias :ord :ordinal
+    # Returns the month as a zero-padded string
+    # (i.e. June => 06)  
+    def zmonth; '%02d' % month; end
+    
+    # Returns the day as a zero-padded string
+    # (5 => 05)
+    def zday;   '%02d' % mday;  end
+    
+    # Returns the hour as a zero-padded string
+    # (3 => 03)
+    def zhour;  '%02d' % hour; end
+    
+    # Returns the hour in 12-hour format
+    # (5:00pm => 5)
+    def hour12;  hour % 12 == 0 ? 12 : hour % 12; end
+    
+    # Returns the hour in 12-hour format as a zero-padded string
+    # (5:00pm => 05)
+    def zhour12; '%02d' % hour12; end
+    
+    # Returns the minute as a zero-padded string 
+    # Note: If you need just the minute, use min
+    def minute;  '%02d' % min; end
+    
+    # Returns the second as a zero-padded string
+    # Note: If you need just the second, use sec
+    def second;  '%02d' % sec; end
+    
+    # Returns the meridian 
+    # (AM/PM)
+    def meridian;   hour >= 12 ? 'PM' : 'AM'; end
+    
+    # Returns the meridian in short form (first letter)
+    # (A/P)
+    def smeridian;  meridian[0].chr; end
+    
+    # Returns the meridian in lowercase
+    # (am/pm)
+    def lmeridian;  meridian.downcase; end
+    
+    # Returns the meridian in lowercase, short form (first letter)
+    # (a/p)
+    def lsmeridian; smeridian.downcase; end
+    
+    # Returns the ordinal of the day
+    # (1 => st, 2 => nd, 3 => rd, 4.. => th)
+    def ordinal; EZTime.ordinal(mday, false); end
+    alias :ord :ordinal
+  end
   
   # Formats the date/time according to the formatting string format_str
   # The formatting string consists of any of the methods defined in EZTime
@@ -107,7 +127,7 @@ module EZTime
   #
   #   Output: 20 December 2003 at 5:30:00 pm
   def eztime(format_str)
-    eval("'" + format_str.gsub(/:([a-z_]{1,}[0-9]{0,2})/, '\' + \1.to_s + \'') + "'")
+    EZTime::FormattedTime.new(self).format(format_str)
   end
 end  
 
@@ -121,4 +141,4 @@ class Date; include EZTime; end
 #   include EZTime
 #   def ordinal; mday.ordinal(false); end
 #   def self.ordinal; mday.ordinal(false); end
-# end
+# end

data/test/helper.rb

@@ -1,16 +1,17 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+# require 'rubygems'
+# require 'bundler'
+# begin
+#   Bundler.setup(:default, :development)
+# rescue Bundler::BundlerError => e
+#   $stderr.puts e.message
+#   $stderr.puts "Run `bundle install` to install missing gems"
+#   exit e.status_code
+# end
 require 'test/unit'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+# require File.dirname(__FILE__) . '/../lib/eztime.rb'
 require 'eztime'
 
 class Test::Unit::TestCase

data/test/test_eztime.rb

@@ -59,7 +59,10 @@ class EZTimeTest < Test::Unit::TestCase
   end
   
   def test_everything
+    assert_equal '00', ('%02d' % 0)
+
     d = DateTime.civil(2000, 1, 1, 0, 0, 0)
+
     0.upto(1440/5) do |min|
       d += 300 if min > 0
       assert_equal d.strftime('%I:%M'), d.eztime(':hour12::minute') 
@@ -93,7 +96,7 @@ class EZTimeTest < Test::Unit::TestCase
   end
   
   def test_ordinals
-    assert_equal 'st', @ny.ord
+    assert_equal 'st', EZTime.ordinal(1)
     assert_equal 'January 1st', @ny.eztime(':month_name :day:ord')
     
     ordinals = %w{
@@ -108,4 +111,4 @@ class EZTimeTest < Test::Unit::TestCase
       assert_equal ordinals[mday], d.eztime(':ord'), "Failed on " + d.to_s
     end
   end
-end
+end

metadata

@@ -1,65 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: eztime
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 2.0.0
 platform: ruby
-authors: 
+authors:
 - Chris Scharf
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-05 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: jeweler
-  type: :development
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 1
-        - 8
-        - 4
-        version: 1.8.4
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rcov
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
+date: 2015-02-27 00:00:00.000000000 Z
+dependencies: []
 description: Easier date/time manipulation
 email: scharfie@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.textile
-files: 
-- Gemfile
-- Gemfile.lock
+files:
 - LICENSE.txt
 - README.textile
 - Rakefile
@@ -70,39 +28,29 @@ files:
 - lib/eztime.rb
 - test/helper.rb
 - test/test_eztime.rb
-has_rdoc: true
 homepage: http://github.com/scharfie/eztime
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+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: 1.4.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easier date/time manipulation
 test_files: []
-
+has_rdoc: 

data/Gemfile

@@ -1,11 +0,0 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "jeweler", "~> 1.8.4"
-  gem "rcov"
-end

data/Gemfile.lock

@@ -1,21 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    git (1.2.5)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.3)
-    rake (0.9.2.2)
-    rcov (1.0.0)
-    rdoc (3.12)
-      json (~> 1.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  jeweler (~> 1.8.4)
-  rcov