time_overlap 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe42dea32866719b9df3b106e76b6e637a79896c
-  data.tar.gz: 36e9ce5de6e746da4db57ed5e78ec4557000fb0a
+  metadata.gz: ac731a50647898c03ac78d6a3b28f0035a8cd084
+  data.tar.gz: 51e0cfb23c2e9e37dfc7fd986e82e0f495d2baa9
 SHA512:
-  metadata.gz: cf66448ec73c94b4f2f5c60140b0d445ebaaca0cd908f90374c2533e15d99f12a82ec59ecc17ee176a869aeb5b05e1b1a34863691c2db4f7b046a941fad29dae
-  data.tar.gz: 51c3eecb0c11c8d473550c324a29603315ce98d4dd6fe2d5b8c36322c3651825eacb485e27b8f1b3d6529954c0eca62e5d25799884823e4d1f05c2dcb7401154
+  metadata.gz: af67e6cc0e4fa6bc52e8356f56a3ac99dda323c8716ef36f23ffe356ed05c67748084428850303fd527341e37a74669aacd3b87eb3cb032932e04db3c9b834d1
+  data.tar.gz: 168fdc74d095e38b911009a55a74d6856098d5bad729b133f1e7955103a66f56d879cad97bcaeb1a7078d3b68fbe6b441631c1672cce86c4b856901f092370ed

data/lib/time_overlap/cli.rb

@@ -12,7 +12,7 @@ module TimeOverlap
        4       -> min_overlap (hours, integer)
       "
     def count(from, to, time_zone, my_time_zone, min_overlap)
-      TimeOverlap.count(
+      TimeOverlap::Calculator.count(
         from: from.to_i,
         to: to.to_i,
         time_zone: time_zone,

data/lib/time_overlap/presenter.rb

@@ -6,26 +6,78 @@ module TimeOverlap
       @format = format
     end
 
-    def self.print(*args)
-      new(*args).print
+    def self.generate_output(*args)
+      new(*args).generate_output
     end
 
-    def print
+    def show_it(s, e)
+      print"|AM| "
+      # puts (s.hour..e.hour).inspect
+
+      (0..23).each do |hour|
+        print ' |NOON| ' if hour == 12
+
+        if s.hour < e.hour
+          if (s.hour..e.hour).cover?(hour)
+            if e.hour != hour
+              print "[✓]"
+            else
+              print "[ ]"
+            end
+          else
+            print "[ ]"
+          end
+        else
+          if s.hour <= 12
+            if (e.hour..s.hour).cover?(hour)
+              if e.hour != hour
+                print "[✓]"
+              else
+                print "[ ]"
+              end
+            else
+              print "[ ]"
+            end
+          else
+            if (e.hour..s.hour).cover?(hour)
+              print "[ ]"
+            else
+              if e.hour != hour
+                print "[✓]"
+              else
+                print "[ ]"
+              end
+            end
+          end
+        end
+
+      end
+      print " |PM|"
+      puts ""
+      separator
+    end
+
+    def generate_output
       puts "Original:"
       puts "#{formated_time(@data[:original][:start])} - #{formated_time(@data[:original][:end])}"
+
       separator
 
       puts "Full overlap:"
       puts "#{formated_time(@data[:full_overlap][:start])} - #{formated_time(@data[:full_overlap][:end])}"
-      separator
+
+      show_it(@data[:full_overlap][:start], @data[:full_overlap][:end])
 
       puts "Overlap 1:"
       puts "#{formated_time(@data[:overlap_1][:start])} - #{formated_time(@data[:overlap_1][:end])}"
-      separator
+
+      show_it(@data[:overlap_1][:start], @data[:overlap_1][:end])
 
       puts "Overlap 2:"
       puts "#{formated_time(@data[:overlap_2][:start])} - #{formated_time(@data[:overlap_2][:end])}"
 
+      show_it(@data[:overlap_2][:start], @data[:overlap_2][:end])
+
       @data
     end
 
@@ -36,7 +88,7 @@ module TimeOverlap
     end
 
     def formated_time(time)
-      time#.strftime("%T %:z")
+      time.strftime("%T %:z")
     end
   end
 end

data/lib/time_overlap/version.rb

@@ -1,3 +1,3 @@
 module TimeOverlap
- VERSION = "0.1.0"
+ VERSION = "0.1.1"
 end

data/lib/time_overlap.rb

@@ -5,65 +5,107 @@ require 'time'
 require 'active_support/core_ext/time'
 
 module TimeOverlap
+  class Calculator
 
-  # TODO: add meeting time to choose overlap 1 or overlap 2
-
-  def self.count(from:, to:, time_zone:, my_time_zone:, min_overlap:)
-    current_year = Time.current.year
-    current_month = Time.current.month
-    current_day = Time.current.day
-
-    start_time = Time.new(
-      current_year,
-      current_month,
-      current_day,
-      from,
-      0,
-      0,
-      Time.zone_offset(time_zone)
-    )
+    # TODO: add meeting time to choose overlap 1 or overlap 2
 
-    end_time = Time.new(
-      current_year,
-      current_month,
-      current_day,
-      to,
-      0,
-      0,
-      Time.zone_offset(time_zone)
-    )
+    def initialize(from:, to:, time_zone:, my_time_zone:, min_overlap:)
+      @current_year = Time.current.year
+      @current_month = Time.current.month
+      @current_day = Time.current.day
+      @from = from
+      @to = to
+      @time_zone = time_zone
+      @my_time_zone = my_time_zone
+      @min_overlap = min_overlap
+
+      @duration = (end_time - start_time).to_i / 60 / 60
+
+      @data = {}
+    end
+
+    def self.count(*args)
+      self.new(*args).execute
+    end
+
+    def execute
+      offset = duration - min_overlap
+
+      start_time_in_my_time_zone = start_time.in_time_zone(my_time_zone)
+      end_time_in_my_time_zone = end_time.in_time_zone(my_time_zone)
+
+      x_start_time = (start_time - offset * 60 * 60).in_time_zone(my_time_zone)
+      x_end_time = (end_time - offset * 60 * 60).in_time_zone(my_time_zone)
 
-    duration = (end_time - start_time).to_i / 60 / 60
-    offset = duration - min_overlap
-
-    start_time_in_my_time_zone = start_time.in_time_zone(my_time_zone)
-    end_time_in_my_time_zone = end_time.in_time_zone(my_time_zone)
-
-    x_start_time = (start_time - min_overlap * 60 * 60).in_time_zone(my_time_zone)
-    x_end_time = (end_time - offset * 60 * 60).in_time_zone(my_time_zone)
-
-    y_start_time = (end_time - min_overlap * 60 * 60).in_time_zone(my_time_zone)
-    y_end_time = (y_start_time + duration * 60 * 60).in_time_zone(my_time_zone)
-
-    data = {
-      original: {
-        start: start_time,
-        end: end_time
-      },
-      full_overlap: {
-        start: start_time_in_my_time_zone,
-        end: end_time_in_my_time_zone
-      },
-      overlap_1: {
-        start: x_start_time,
-        end: x_end_time
-      },
-      overlap_2: {
-        start: y_start_time,
-        end: y_end_time
+      y_start_time = (end_time - min_overlap * 60 * 60).in_time_zone(my_time_zone)
+      y_end_time = (y_start_time + duration * 60 * 60).in_time_zone(my_time_zone)
+
+      @data = {
+        original: {
+          start: start_time,
+          end: end_time
+        },
+        full_overlap: {
+          start: start_time_in_my_time_zone,
+          end: end_time_in_my_time_zone
+        },
+        overlap_1: {
+          start: x_start_time,
+          end: x_end_time
+        },
+        overlap_2: {
+          start: y_start_time,
+          end: y_end_time
+        }
       }
-    }
 
-    Presenter.print(data)
+      check
+      Presenter.new(@data).generate_output
+      @data
+    end
+
+    private
+
+    attr_reader(
+      :current_year,
+      :current_month,
+      :current_day,
+      :from,
+      :to,
+      :time_zone,
+      :my_time_zone,
+      :min_overlap,
+      :data,
+      :duration
+    )
+
+    def start_time
+      @start_time ||= Time.new(
+        current_year,
+        current_month,
+        current_day,
+        from,
+        0,
+        0,
+        Time.zone_offset(time_zone)
+      )
+    end
+
+    def end_time
+      @end_time ||= Time.new(
+        current_year,
+        current_month,
+        current_day,
+        to,
+        0,
+        0,
+        Time.zone_offset(time_zone)
+      )
+    end
+
+    def check
+      raise "Wrong Overlap 1" unless (data[:overlap_1][:end] - data[:overlap_1][:start]).to_i / 60 / 60 == duration
+      raise "Wrong Overlap 2" unless (data[:overlap_2][:end] - data[:overlap_2][:start]).to_i / 60 / 60 == duration
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_overlap
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Rafał Trojanowski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport