rails_pdate 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90947e0fa28720b304d9047a786df4a75fb44ffb
-  data.tar.gz: dfb2c7548876c67646bc4e2351d82eb6c32ee7f0
+  metadata.gz: 3eaf9bbdcedef776086d9069afa8b4a0d0c51d90
+  data.tar.gz: dabada713dffd5ca1dafc2e406166ba6a0ddd887
 SHA512:
-  metadata.gz: 6064cd98d1efb075abe8645a5d9b46fc9e5437380d56a56690bc0cc65429db7b3259cabc3e6aff521400c36822aa366bb3cc47363ad250580eb8876650e8a0bc
-  data.tar.gz: 059afac43cc89cea3c126f9a3495060d4e8b611d95cfbd3795226bcfee783444d12a7e6772468062b8e55e307fe2be6c2d2c77cf4bc7dff9315efd19f7d1f6c8
+  metadata.gz: a901337c73b542a5205acb47d2caeede1e3b6ba91da29d21e055e308062b1e8dd043013442fbd8995b4b2b2b7d8bb0eba88d805fea4e37e584d7597dede2e3bc
+  data.tar.gz: ca0f8642c9745188d72cdba970483351016a56e187e678e1e3009666f719a0a99abf77ac205563e707ce96f9ed2d1a2876e769018dc183fd0d5cdccd0423f824

data/MIT-LICENSE

@@ -1,20 +1,21 @@
-Copyright 2013 YOURNAME
+MIT License
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2016 Mohsen Alizadeh
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/lib/core_date.rb

@@ -3,4 +3,8 @@ Date.class_eval do
   def to_pdate
     PDate.new(self)
   end
-end
+
+  def to_pdatetime
+    PDateTime.new(self)
+  end
+end

data/lib/core_date_time.rb

@@ -0,0 +1,10 @@
+
+DateTime.class_eval do
+  def to_pdate
+    PDate.new(self)
+  end
+
+  def to_pdatetime
+    PDateTime.new(self)
+  end
+end

data/lib/rails_pdate.rb

@@ -7,9 +7,11 @@ end
 
 require 'core_date'
 require 'core_string'
-require 'rails_pdate/pconvertor'
 require 'rails_pdate/constants'
+require 'rails_pdate/pconvertor'
+require 'rails_pdate/time_shifting'
+require 'rails_pdate/initializer'
+require 'rails_pdate/formats'
+require 'rails_pdate/base_date_time'
 require 'rails_pdate/p_date'
-
-
-
+require 'rails_pdate/p_date_time'

data/lib/rails_pdate/base_date_time.rb

@@ -0,0 +1,94 @@
+module RailsPdate
+  class BaseDateTime
+
+    attr_accessor :year, :month, :day
+
+    include RailsPdate::Constants
+    include RailsPdate::TimeShifting
+
+    def initialize *args
+
+      @year = @month = @day = @hour = @minute = @second = 0
+
+      if (args.size == 1)
+        @year, @month, @day = Pconvertor.new.gregorian_to_persian(args.first.year, args.first.month, args.first.day)
+
+        if (args.first.is_a?(DateTime))
+          @hour = args.first.hour
+          @minute = args.first.minute
+          @second = args.first.second
+        end
+      else
+        @year, @month, @day, @hour, @minute, @second = args
+      end
+    end
+
+    def ==(other)
+      return true if to_s == other.to_s
+      false
+    end
+
+    # day of calendar week (1-7, Shanbe is 1).
+    def cwday
+      cwday = to_date.cwday + 2
+      cwday -= 7 if cwday > 7
+      cwday
+    end
+
+    # get day of year ( 1 - 365 )
+    def yday
+      day_of_year = 0
+
+      (1..(@month-1)).to_a.each do |month|
+        day_of_year += PDaysInMonth[month-1]
+      end
+
+      day_of_year += day
+
+      day_of_year
+    end
+
+    def cweek
+      (yday / 7) + (@day % 7 == 0 ? 0 : 1)
+    end
+
+    def pdayname
+      PERSIAN_WEEKDAY_NAMES[self.cwday-1]
+    end
+
+    def to_date
+      year, month, day = Pconvertor.new.persian_to_gregorian(@year, @month, @day)
+      Date.new(year, month, day)
+    end
+
+
+    def <=(other)
+      self.to_i <= other.to_i
+    end
+
+    def <(other)
+      self.to_i < other.to_i
+    end
+
+    def >=(other)
+      self.to_i >= other.to_i
+    end
+
+    def >(other)
+      self.to_i > other.to_i
+    end
+
+    def ==(other)
+      self.to_i == other.to_i
+    end
+
+    def to_i
+      to_datetime.to_i
+    end
+
+
+
+    # Overrides the default inspect method with a human readable one, e.g., "Mon, 21 Feb 2005"
+    alias_method :default_inspect, :inspect
+  end
+end

data/lib/rails_pdate/constants.rb

@@ -1,12 +1,16 @@
 # encoding: utf-8
 
 #:stopdoc:
-GDaysInMonth = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
-PDaysInMonth = [31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29]
-PERSIAN_MONTH_NAMES = [nil, "فروردین","اردیبهشت","خرداد","تیر","مرداد","شهریور","مهر","آبان","آذر","دی","بهمن","اسفند"]
-PERSIAN_MONTH_NAMES_PINGLISH = [nil, "Farvardin", "Ordibehesht", "Khordad", "Tir", "Mordad", "Shahrivar", "Mehr", "Aban", "Azar", "Dey", "Bahman", "Esfand"]
-PERSIAN_WEEKDAY_NAMES = ["یک‌شنبه","دوشنبه","سه‌شنبه","چهارشنبه","پنج‌شنبه","جمعه","شنبه"]
-PERSIAN_ABBR_WEEKDAY_NAMES = ["۱ش ","۲ش","۳ش","۴ش","۵ش","ج ","ش"]
-PERSIAN_MERIDIAN_INDICATOR = ["قبل از ظهر","بعد از ظهر"]
-PERSIAN_ABBR_MERIDIAN_INDICATOR = ["ق.ظ","ب.ظ"]
+module RailsPdate
+  module Constants
+    GDaysInMonth = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+    PDaysInMonth = [31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29]
+    PERSIAN_MONTH_NAMES = [nil, "فروردین","اردیبهشت","خرداد","تیر","مرداد","شهریور","مهر","آبان","آذر","دی","بهمن","اسفند"]
+    PERSIAN_MONTH_NAMES_PINGLISH = [nil, "Farvardin", "Ordibehesht", "Khordad", "Tir", "Mordad", "Shahrivar", "Mehr", "Aban", "Azar", "Dey", "Bahman", "Esfand"]
+    PERSIAN_WEEKDAY_NAMES = ["شنبه", "یک‌شنبه","دوشنبه","سه‌شنبه","چهارشنبه","پنج‌شنبه","جمعه"]
+    PERSIAN_ABBR_WEEKDAY_NAMES = ["۱ش ","۲ش","۳ش","۴ش","۵ش","ج ","ش"]
+    PERSIAN_MERIDIAN_INDICATOR = ["قبل از ظهر","بعد از ظهر"]
+    PERSIAN_ABBR_MERIDIAN_INDICATOR = ["ق.ظ","ب.ظ"]
+  end
+end
 #:startdoc:

data/lib/rails_pdate/formats.rb

@@ -0,0 +1,49 @@
+module RailsPdate
+  module Formats
+    module DateTime
+
+      FORMATS = {
+          :short        => '%e %b',
+          :long         => '%B %e, %Y',
+          :db           => '%Y-%m-%d',
+          :number       => '%Y%m%d',
+          :long_ordinal => lambda { |date|
+            day_format = ActiveSupport::Inflector.ordinalize(date.day)
+            date.strftime("%B #{day_format}, %Y") # => "April 25th, 2007"
+          },
+          :rfc822       => '%e %b %Y',
+          :iso8601      => lambda { |date| date.iso8601 },
+          :default      => '%Y-%m-%d %h:%i'
+      }
+
+      def to_formatted_s
+        strftime(RailsPdate::Formats::DateTime::FORMATS[:default])
+      end
+      alias_method :to_default_s, :to_s
+      alias_method :to_s, :to_formatted_s
+    end
+
+    module Date
+
+      FORMATS = {
+          :short        => '%e %b',
+          :long         => '%B %e, %Y',
+          :db           => '%Y-%m-%d',
+          :number       => '%Y%m%d',
+          :long_ordinal => lambda { |date|
+            day_format = ActiveSupport::Inflector.ordinalize(date.day)
+            date.strftime("%B #{day_format}, %Y") # => "April 25th, 2007"
+          },
+          :rfc822       => '%e %b %Y',
+          :iso8601      => lambda { |date| date.iso8601 },
+          :default      => '%Y-%m-%d'
+      }
+
+      def to_formatted_s
+        strftime(RailsPdate::Formats::Date::FORMATS[:default])
+      end
+      alias_method :to_default_s, :to_s
+      alias_method :to_s, :to_formatted_s
+    end
+  end
+end

data/lib/rails_pdate/initializer.rb

@@ -0,0 +1,5 @@
+module RailsPdate
+  module Initializer
+
+  end
+end

data/lib/rails_pdate/p_date.rb

@@ -1,74 +1,11 @@
 # encoding: utf-8
 
 # :title:PDate (Persian Date) #
-class PDate
+class PDate < RailsPdate::BaseDateTime
 
-  DATE_FORMATS = {
-      :short        => '%e %b',
-      :long         => '%B %e, %Y',
-      :db           => '%Y-%m-%d',
-      :number       => '%Y%m%d',
-      :long_ordinal => lambda { |date|
-        day_format = ActiveSupport::Inflector.ordinalize(date.day)
-        date.strftime("%B #{day_format}, %Y") # => "April 25th, 2007"
-      },
-      :rfc822       => '%e %b %Y',
-      :iso8601      => lambda { |date| date.iso8601 },
-      :default      => '%Y-%m-%d'
-  }
-
-  def initialize *args
-
-    if (args.size == 1) && (args.first.is_a?(Date))
-      year, month, day = Pconvertor.new.gregorian_to_persian(args.first.year, args.first.month, args.first.day)
-    else
-      year,month,day,hour,min,sec,zone,utc_offset = args
-    end
-
-    @year = year
-    @month = month
-    @day = day
-    @hour ||= hour || 0
-    @min ||= min || 0
-    @sec ||= sec || 0
-    @zone ||= zone || "UTC"
-    @utc_offset ||= utc_offset || 0
-  end
-
-  def to_date
-    year, month, day = Pconvertor.new.persian_to_gregorian(@year, @month, @day)
-    Date.new(year, month, day)
-  end
-
-
-  def to_formatted_s(format = :default)
-    if formatter = DATE_FORMATS[format]
-      if formatter.respond_to?(:call)
-        formatter.call(self).to_s
-      else
-        strftime(formatter)
-      end
-    else
-      to_default_s
-    end
-  end
-
-  alias_method :to_default_s, :to_s
-  alias_method :to_s, :to_formatted_s
-
-  # Overrides the default inspect method with a human readable one, e.g., "Mon, 21 Feb 2005"
-  def readable_inspect
-    strftime('%a, %d %b %Y')
-  end
-  alias_method :default_inspect, :inspect
-  alias_method :inspect, :readable_inspect
-
-  def to_formatted_s
-    strftime(DATE_FORMATS[:default])
-  end
+  include RailsPdate::Formats::Date
 
   def strftime(format)
-
     format
       .gsub('%Y', '%d' % @year)
       .gsub('%m', '%02d' % @month)
@@ -78,12 +15,7 @@ class PDate
       .gsub('%B', '%s' %  PERSIAN_MONTH_NAMES_PINGLISH[@month])
       .gsub('%b', '%s' %  PERSIAN_MONTH_NAMES[@month])
       .gsub('%e', '%d' % @day)
-
-  end
-
-  def ==(other)
-    return true if to_s == other.to_s
-    false
+      .gsub('%A', '%s' % PERSIAN_WEEKDAY_NAMES[self.cwday-1])
   end
 
   def clone
@@ -94,8 +26,17 @@ class PDate
     [@year, @month, @day]
   end
 
-  def inspect
-    to_s
+  def +(other)
+    ( to_date + other ).to_pdate
+  end
+
+  def -(other)
+    ( to_date - other ).to_pdate
+  end
+
+  def to_datetime
+    to_date.to_datetime
   end
 
-end
+  alias_method :inspect, :to_s
+end

data/lib/rails_pdate/p_date_time.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+
+# :title:PDateTime (Persian DateTime) #
+class PDateTime < RailsPdate::BaseDateTime
+
+  attr_accessor :hour, :minute, :second
+
+  include RailsPdate::Formats::DateTime
+
+  def to_a
+    [@year, @month, @day, @hour, @minute, @second]
+  end
+
+  def strftime(format)
+    format
+        .gsub('%Y', '%d' % @year)
+        .gsub('%m', '%02d' % @month)
+        .gsub('%d', '%02d' % @day)
+        .gsub('%C', '%d' % (@year / 100) )
+        .gsub('%y', '%d' % (@year % 100) )
+        .gsub('%B', '%s' %  PERSIAN_MONTH_NAMES_PINGLISH[@month])
+        .gsub('%b', '%s' %  PERSIAN_MONTH_NAMES[@month])
+        .gsub('%e', '%d' % @day)
+        .gsub('%A', '%s' % PERSIAN_WEEKDAY_NAMES[self.cwday-1])
+        .gsub('%H', '%d' % @hour)
+        .gsub('%h', '%02d' % @hour)
+        .gsub('%i', '%02d' % @minute)
+        .gsub('%I', '%d' % @minute)
+        .gsub('%s', '%02d' % @second)
+        .gsub('%S', '%d' % @second)
+  end
+
+  def clone
+    PDateTime.new(@year, @month, @day, @hour, @minute, @second)
+  end
+
+  def to_datetime
+    year, month, day = Pconvertor.new.persian_to_gregorian(@year, @month, @day)
+    DateTime.new(year, month, day, @hour, @minute, @second)
+  end
+
+  def +(other)
+    ( to_datetime + other ).to_pdatetime
+  end
+
+  def -(other)
+    ( to_datetime - other ).to_pdatetime
+  end
+end

data/lib/rails_pdate/pconvertor.rb

@@ -2,6 +2,8 @@
 
 class Pconvertor
 
+  include RailsPdate::Constants
+
   def gregorian_to_persian(year, month, day) # :nodoc:
     jj=0
     gy = year - 1600

data/lib/rails_pdate/time_shifting.rb

@@ -0,0 +1,76 @@
+module RailsPdate
+  module TimeShifting
+
+    def self.included( other )
+      other.extend( RailsPdate::Constants )
+    end
+
+    def beginning_of_year
+      beginning_of_month
+      @month = 1
+      self
+    end
+
+    def beginning_of_month
+      beginning_of_day
+      @day = 1
+      self
+    end
+
+    def beginning_of_week
+      beginning_of_day
+      self - ( cwday - 1)
+    end
+
+    def beginning_of_day
+      beginning_of_hour
+      @hour = 0
+      self
+    end
+
+    def beginning_of_hour
+      beginning_of_minute
+      @min = 0
+      self
+    end
+
+    def beginning_of_minute
+      @sec = 0
+      self
+    end
+
+    def end_of_year
+      @month = 12
+      end_of_month
+      self
+    end
+
+    def end_of_month
+      end_of_day
+      @day = RailsPdate::Constants::PDaysInMonth[@month-1]
+      self
+    end
+
+    def end_of_week
+      end_of_day
+      self + ( 7 - cwday )
+    end
+
+    def end_of_day
+      end_of_hour
+      @hour = 23
+      self
+    end
+
+    def end_of_hour
+      end_of_minute
+      @minute = 59
+      self
+    end
+
+    def end_of_minute
+      @sec = 59
+      self
+    end
+  end
+end