payment_day 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 473ff17dc41c8fe9778cb7f81ad6d5d563eb1ae8a62a83f6cc535e3b0dcd76d8
-  data.tar.gz: f8080f220c6816d42f7588ce612ce22948e0b678f0b54c2dcdace2f9051cb314
+  metadata.gz: 9cff6548d69331df6551413e6022e1096cd9c98229bcc609c1d2eb4ff532411d
+  data.tar.gz: a794a8df445185ee98c59b8425cfdf9237a24fc384f6c21559be6699355d4d70
 SHA512:
-  metadata.gz: 336accb29ed0eaf542c978da383bb9233084071bb57fcd116e3ab573f62dc4e33c8283c1594835315c05d2bd87c9c0c082a98fc01e8503c9840524c279bcae25
-  data.tar.gz: 1b2a327752a17619233ad74985d9844b37da95aa8704bb838f5ae4a0a10a56832b441896dd703ccb20cc3a722c7b68016921308f957bb1f2280abd224884b2d8
+  metadata.gz: 53b211a666cddc455973b8e52705316ee9e854b8cbe1f5b88c371c412861b57749a2cb76dbff7b91c7a41ccb7dfd8c38b4f2a404231807670433fff2fdd1c87e
+  data.tar.gz: c65095ab77e8d6574e9aea507d7ca5b6e9356604b747d486fa19dbaffa62f730e74721d7e1fa8669b0253c2af0b78707612f156476a046844d7cbbc43fdaa4f9

data/README.md

@@ -1,5 +1,7 @@
 # PaymentDay
 
+[![Build Status](https://app.travis-ci.com/the-pulli/payment_day.svg?branch=main)](https://app.travis-ci.com/the-pulli/payment_day)
+
 Provides a class PaymentDay::View. This class generates the pay days for the given year(s).
 
 ## Installation
@@ -28,7 +30,7 @@ PaymentDay::View.create(2023..2024, 2025, '2026').pay_days # accept a mix of all
 # shows 2023 twice in the list of pay_days, default is false
 PaymentDay::View.create(2023..2024, 2023, duplicates: true).pay_days
 
-table = PaymentDay::View(2023).list # returns a Terminal::Table instance
+table = PaymentDay::View.create(2023).list # returns a Terminal::Table instance
 puts table # which can be printed like this
 ```
 
@@ -37,6 +39,7 @@ puts table # which can be printed like this
 Option | Negated | Shortcut | Default
 --- | ---: | ---: | ---:
 --ascii | --no-ascii | -a | false
+--colors | --no-colors | | true
 --columns | | -c | 10
 --dayname | --no-dayname | -e | true
 --duplicates | --no-duplicates | -d | false

data/lib/payment_day/cli.rb

@@ -13,6 +13,7 @@ module PaymentDay
     desc "view YEARS", "Lists all pay days for the given year(s)"
     method_option :ascii, aliases: "-a", type: :boolean, default: false, desc: "Do you want to have a ASCII table printed?"
     method_option :columns, aliases: "-c", type: :numeric, default: 10, desc: "How many years (columns) do you wanna display in one table?"
+    method_option :colors, type: :boolean, default: true, desc: "Do you want colored output?"
     method_option :dayname, aliases: "-e", type: :boolean, default: true, desc: "Do you want see the day name?"
     method_option :duplicates, aliases: "-d", type: :boolean, default: false, desc: "Do you want see duplicates?"
     method_option :footer, aliases: "-f", type: :boolean, default: true, desc: "Do you want see the table footer?"
@@ -21,11 +22,11 @@ module PaymentDay
     def view(*years)
       years = PaymentDay::View.create(years, options).years
       years = years.each_slice(options[:columns])
-      years.each_with_index do |yearsChunk, page|
+      years.each_with_index do |years_chunk, page|
         year_options = options.dup
         year_options[:page] = page.next
         year_options[:pages] = years.to_a.length
-        puts PaymentDay::View.create(yearsChunk, year_options).list()
+        puts PaymentDay::View.create(years_chunk, year_options).list
       end
     end
   end

data/lib/payment_day/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PaymentDay
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/payment_day.rb

@@ -10,6 +10,8 @@ module PaymentDay
   class View
     DEFAULT_OPTIONS = {
       ascii: false,
+      colors: true,
+      columns: 10,
       dayname: false,
       duplicates: false,
       footer: true,
@@ -36,10 +38,12 @@ module PaymentDay
 
     def list
       Terminal::Table.new do |t|
-        t.title = Rainbow("Pay days").bright
-        t.headings = [Rainbow("Month").bright] + @years.map { |y| { value: Rainbow(y).bright, alignment: :center } }
+        t.title = format("Pay days", :bright)
+        t.headings = [format("Month", :bright)] + @years.map do |y|
+          { value: format(y, :bright), alignment: :center }
+        end
         t.style = { all_separators: @options[:separator], border: border }
-        t.rows = @months.map { |m| Rainbow(m).cyan }.zip(*format_pay_days)
+        t.rows = @months.map { |m| format(m, :cyan) }.zip(*format_pay_days)
         @years.each_index { |v| t.align_column v.next, :center }
         page = @options[:page]
         pages = @options[:pages]
@@ -54,6 +58,10 @@ module PaymentDay
 
     private
 
+    def format(value, color)
+      @options[:colors] ? Rainbow(value).send(color) : value
+    end
+
     def prepare_years(years)
       result = years.flatten.map do |year|
         case year
@@ -76,32 +84,32 @@ module PaymentDay
     end
 
     def find_pay_days
-      unless @options[:duplicates]
-        year_hsh = {}
-        @years.each.with_index do |year, index|
-          year_hsh[year] = (1..12).to_a.map do |month|
-            last_day = Date.parse("#{year}-#{month}-01").next_month.prev_day
-            @months.push(last_day.strftime("%B")) if index.zero?
-            prev(last_day)
-          end
-        end
-        return year_hsh
-      end
-
-      @years.map.with_index do |year, index|
-        (1..12).to_a.map do |month|
+      year_hsh = {}
+      years_ary = @years.map.with_index do |year, index|
+        year_hsh[year] = (1..12).to_a.map do |month|
           last_day = Date.parse("#{year}-#{month}-01").next_month.prev_day
           @months.push(last_day.strftime("%B")) if index.zero?
           prev(last_day)
         end
       end
+      return years_ary if @options[:duplicates]
+
+      year_hsh
     end
 
     def format_pay_days
       format = @options[:dayname] ? "%a, %d" : "%d"
-      return @pay_days.map { |_, year| year.map { |d| Rainbow(d.strftime(format)).green } } unless @options[:duplicates]
-
-      @pay_days.map { |year| year.map { |d| Rainbow(d.strftime(format)).green } }
+      formatter = lambda { |d|
+        day = d.strftime(format)
+        format(day, :green)
+      }
+
+      p @pay_days.is_a?(Hash)
+      @pay_days.map do |_, years|
+        p years
+       # mapping_object = @options[:duplicates] ? year : days
+        years.map { |d| formatter.call(d) }
+      end
     end
 
     def prev(day)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: payment_day
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - PuLLi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-01 00:00:00.000000000 Z
+date: 2023-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow