tick_tack 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9225c172ca33abb06528f7c4f31f2fda4e8ce7f1
-  data.tar.gz: 34f43809643df0284dd534aa90e9b7d1d2a3ce10
+  metadata.gz: 754c58f89be99bf3d6205cdc6a1e6de8b3fb7241
+  data.tar.gz: 23722a172c09b1678410806560c208a1a7235eb0
 SHA512:
-  metadata.gz: 8bf18d94b15f5dfcaea0a596d4bca9c78278ce6a50c4854f718b631392a711b8aa8b01e9c718e28c4107d0b929b1259033c0758cfa81b68496649d0771aae993
-  data.tar.gz: 087d17b46e899886237d737c75ab8209c56ad5b1f5a536f3363c3eef413d1ddfa43224b519c5153b985be946ccafc7654cae4e9127cadd30d1b05ddeeb6016fd
+  metadata.gz: 8da0da836bb99b1024a5bc76adda2b2add3a0973be1aed88f69b9ad069b44f906dc60a16d57d9b3db09e5d04ace78ecdbfabcd688c459599ace2d755e44b8014
+  data.tar.gz: 390ed8a0c11dcc465bc49d9dc679aa706310b4ec0cda350c7818e5697735540d28b036f3885e270e22caacfa5f493e5c55a7c99de876b0336b375e097323883c

data/README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/tomraithel/tick_tack.svg?branch=master)](https://travis-ci.org/tomraithel/tick_tack)
+[![Gem Version](https://badge.fury.io/rb/tick_tack.svg)](https://badge.fury.io/rb/tick_tack)
 
 # TickTack
 

data/lib/tick_tack.rb

@@ -1,18 +1,16 @@
 require 'date'
 
 require 'tick_tack/version'
+
+require 'tick_tack/scope/year'
+require 'tick_tack/scope/month'
+require 'tick_tack/scope/day'
+
+require 'tick_tack/calendar'
 require 'tick_tack/year'
 require 'tick_tack/month'
 require 'tick_tack/day'
 
 module TickTack
-  @now = nil
-
-  def self.now=(now)
-    @now = now
-  end
 
-  def self.now
-    @now.nil? ? Date.new : @now
-  end
 end

data/lib/tick_tack/calendar.rb

@@ -0,0 +1,43 @@
+module TickTack
+  class Calendar
+
+    attr_reader :conf
+
+    def initialize(now = nil, conf = {})
+      self.now = now
+      @conf = {
+        dow: 0 # day of week - 0 = sunday, 1 = monday
+      }.merge!(conf)
+    end
+
+    def now=(now)
+      @now = now
+    end
+
+    def now
+      @now.nil? ? DateTime.now.to_date : @now
+    end
+
+    def year(*args)
+      self.class.factory(:Year).new(self, *args)
+    end
+
+    def month(*args)
+      self.class.factory(:Month).new(self, *args)
+    end
+
+    def day(*args)
+      self.class.factory(:Day).new(self, *args)
+    end
+
+    protected
+
+    def self.factory class_id
+      {
+        :Year => Year,
+        :Month => Month,
+        :Day => Day
+      }[class_id]
+    end
+  end
+end

data/lib/tick_tack/day.rb

@@ -1,24 +1,53 @@
 module TickTack
   class Day
-    attr_accessor :year
-    attr_accessor :month
-    attr_accessor :day
-
-    def initialize(year = nil, month = nil, day = nil)
-      @year = year || TickTack.now.year
-      @month = month || TickTack.now.month
-      @day = day || TickTack.now.day
+    include Comparable
+    include TickTack::Scope::Day
+
+    attr_reader :date
+
+    def initialize(calendar, year_i = nil, month_i = nil, day_i = nil)
+      @calendar = calendar
+      init_year(year_i)
+      init_month(month_i)
+      init_day(day_i)
+
+      @date = Date.new(self.year_i, self.month_i, self.day_i)
+    end
+
+    def week_start
+      week_start = date - (date.wday - @calendar.conf[:dow]) % 7
+      @calendar.day(week_start.year, week_start.month, week_start.day)
+    end
+
+    def week_end
+      week_end = week_start.date + 6
+      @calendar.day(week_end.year, week_end.month, week_end.day)
     end
 
-    def date
-      Date.new(year, month, day)
+    def weekdays
+      (week_start..week_end).to_a
     end
 
-    def ==(o)
-      o.class == self.class &&
-          o.year == year &&
-          o.month == month &&
-          o.day == day
+    def next
+      next_date = @date.next_day
+      @calendar.day(next_date.year, next_date.month, next_date.day)
     end
+    alias_method :succ, :next
+
+    def previous
+      prev_date = @date.prev_day
+      @calendar.day(prev_date.year, prev_date.month, prev_date.day)
+    end
+    alias_method :prev, :previous
+
+    def <=>(other)
+      self.date <=> other.date
+    end
+
+    # def inspect
+    #   "#{year_i}-#{month_i}-#{day_i}"
+    # end
+
+    private
   end
 end

data/lib/tick_tack/month.rb

@@ -1,30 +1,66 @@
 module TickTack
   class Month
-    attr_accessor :year
-    attr_accessor :month
+    include Comparable
+    include TickTack::Scope::Month
 
-    def initialize(year = nil, month = nil)
-      @year = year || TickTack.now.year
-      @month = month || TickTack.now.month
+    def initialize(calendar, year_i = nil, month_i = nil)
+      @calendar = calendar
+
+      init_year(year_i)
+      init_month(month_i)
+
+      @first_day_date = Date.new(self.year_i, self.month_i, 1)
     end
 
     def first_day
-      TickTack::Day.new(year, month, 1)
+      @calendar.day(year_i, month_i, 1)
     end
 
     def last_day
-      date = (first_day.date >> 1) - 1
-      TickTack::Day.new(year, month, date.day)
+      date = (@first_day_date >> 1) - 1
+      @calendar.day(year_i, month_i, date.day)
+    end
+
+    def day(day_i)
+      @calendar.day(year_i, month_i, day_i)
+    end
+
+    def weekdays
+      first = first_day.week_start
+      last = last_day.week_end
+      weeks = []
+
+      while first < last
+        weeks << first.weekdays
+        first = first.week_end.next
+      end
+
+      weeks
+    end
+
+    def contains?(other)
+      range = (first_day.date.jd..last_day.date.jd)
+      if other.is_a? Day
+        range === other.date.jd
+      else
+        false
+      end
+    end
+
+    def next
+      next_date = @first_day_date.next_month
+      @calendar.month(next_date.year, next_date.month)
     end
+    alias_method :succ, :next
 
-    def day(day)
-      TickTack::Day.new(year, month, day)
+    def previous
+      prev_date = @first_day_date.prev_month
+      @calendar.month(prev_date.year, prev_date.month)
     end
+    alias_method :prev, :previous
 
-    def ==(o)
-      o.class == self.class &&
-          o.year == year &&
-          o.month == month
+    def <=>(other)
+      self.first_day.date <=> other.first_day.date
     end
   end
 end

data/lib/tick_tack/scope/day.rb

@@ -0,0 +1,17 @@
+module TickTack
+  module Scope
+    module Day
+      include TickTack::Scope::Month
+
+      attr_accessor :day_i
+
+      def init_day(day_i = nil)
+        @day_i = day_i || @calendar.now.day
+      end
+
+      def month
+        @calendar.month(year_i, month_i)
+      end
+    end
+  end
+end

data/lib/tick_tack/scope/month.rb

@@ -0,0 +1,17 @@
+module TickTack
+  module Scope
+    module Month
+      include TickTack::Scope::Year
+
+      attr_accessor :month_i
+
+      def init_month(month_i = nil)
+        @month_i = month_i || @calendar.now.month
+      end
+
+      def year
+        @calendar.year(year_i)
+      end
+    end
+  end
+end

data/lib/tick_tack/scope/year.rb

@@ -0,0 +1,11 @@
+module TickTack
+  module Scope
+    module Year
+      attr_accessor :year_i
+
+      def init_year(year_i = nil)
+        @year_i = year_i || @calendar.now.year
+      end
+    end
+  end
+end

data/lib/tick_tack/version.rb

@@ -1,3 +1,3 @@
 module TickTack
-  VERSION = '0.1.0'
+  VERSION = '1.0.0'
 end

data/lib/tick_tack/year.rb

@@ -1,25 +1,59 @@
 module TickTack
   class Year
-    attr_accessor :year
+    include Comparable
+    include TickTack::Scope::Year
 
-    def initialize(year = nil)
-      @year = year || TickTack.now.year
+    def initialize(calendar, year_i = nil)
+      @calendar = calendar
+      init_year(year_i)
+
+      @first_day_date = Date.new(self.year_i, 1, 1)
     end
 
     def first_day
-      TickTack::Day.new(year, 1, 1)
+      @calendar.day(year_i, 1, 1)
     end
 
     def last_day
-      TickTack::Day.new(year, 12, 31)
+      date = (@first_day_date >> 12) - 1
+      @calendar.day(year_i, date.month, date.day)
+    end
+
+    def month(month_i)
+      @calendar.month(year_i, month_i)
+    end
+
+    def months
+      (1..12).map do |i|
+        month(i)
+      end
+    end
+
+    def contains?(other)
+      range = (first_day.date.jd..last_day.date.jd)
+      if other.is_a? Month
+        range === other.first_day.date.jd
+      elsif other.is_a? Day
+        range === other.date.jd
+      else
+        false
+      end
+    end
+
+    def next
+      next_date = @first_day_date.next_year
+      @calendar.year(next_date.year)
     end
+    alias_method :succ, :next
 
-    def month(month)
-      Month.new(year, month)
+    def previous
+      prev_date = @first_day_date.prev_year
+      @calendar.year(prev_date.year)
     end
+    alias_method :prev, :previous
 
-    def ==(o)
-      o.class == self.class && o.year == year
+    def <=>(other)
+      self.first_day.date <=> other.first_day.date
     end
   end
 end

data/tick_tack.gemspec

@@ -14,6 +14,9 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/tomraithel/tick_tack"
   spec.license       = "MIT"
 
+  spec.required_ruby_version     = '>= 2.2.2'
+  spec.required_rubygems_version = '>= 2.0.0'
+
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
   if spec.respond_to?(:metadata)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tick_tack
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Tom Raithel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,8 +70,12 @@ files:
 - bin/console
 - bin/setup
 - lib/tick_tack.rb
+- lib/tick_tack/calendar.rb
 - lib/tick_tack/day.rb
 - lib/tick_tack/month.rb
+- lib/tick_tack/scope/day.rb
+- lib/tick_tack/scope/month.rb
+- lib/tick_tack/scope/year.rb
 - lib/tick_tack/version.rb
 - lib/tick_tack/year.rb
 - tick_tack.gemspec
@@ -88,12 +92,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1