payment_day 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e8eac69e44a25f3069daac105862597e6f763fbe4594828b5b5b1d6a500f5b5
-  data.tar.gz: ca33ec1cb95f81285f18fdaf6d77dccc4d75ebc11b4fb62689d1c0f38e974393
+  metadata.gz: 9cff6548d69331df6551413e6022e1096cd9c98229bcc609c1d2eb4ff532411d
+  data.tar.gz: a794a8df445185ee98c59b8425cfdf9237a24fc384f6c21559be6699355d4d70
 SHA512:
-  metadata.gz: 07f40ba0b61cebf07ca5f8a2430f059bf52b9af6182a4bb4f6c38f7d9045771645e01074faf1cbcc8072f9c12acae43398322b148b78662fe44ecab85056e412
-  data.tar.gz: d4dd9e1c99c42e93197aeef849eb229c70fecb1ef3be93d09905af25667b648589af3ccf44c78b769e76bc733a1662ad69ef208d193b48c66bf107ac87a1aec1
+  metadata.gz: 53b211a666cddc455973b8e52705316ee9e854b8cbe1f5b88c371c412861b57749a2cb76dbff7b91c7a41ccb7dfd8c38b4f2a404231807670433fff2fdd1c87e
+  data.tar.gz: c65095ab77e8d6574e9aea507d7ca5b6e9356604b747d486fa19dbaffa62f730e74721d7e1fa8669b0253c2af0b78707612f156476a046844d7cbbc43fdaa4f9

data/README.md

@@ -1,34 +1,36 @@
 # 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
 
 Install the gem and add to the application's Gemfile by executing:
 
-    $ bundle add pay_day
+    $ bundle add payment_day
 
 If bundler is not being used to manage dependencies, install the gem by executing:
 
-    $ gem install pay_day
+    $ gem install payment_day
 
 ## Usage
 
 ```ruby
 # Get the pay days
-PaymentDay::View(2023).pay_days # return Array of Hash(es) with the pay_days
-PaymentDay::View("2023").pay_days # accept String as input
-PaymentDay::View(2023, 2024).pay_days # accept multiple years
-PaymentDay::View([2023]).pay_days # accept Array's as input
-PaymentDay::View("2023-2024").pay_days # accept String ranges
-PaymentDay::View(2023..2024).pay_days # accept Range as input
-PaymentDay::View(2023..2024, 2025, '2026').pay_days # accept a mix of all of them
+PaymentDay::View.create(2023).pay_days # return Array of Hash(es) with the pay_days
+PaymentDay::View.create("2023").pay_days # accept String as input
+PaymentDay::View.create(2023, 2024).pay_days # accept multiple years
+PaymentDay::View.create([2023]).pay_days # accept Array's as input
+PaymentDay::View.create("2023-2024").pay_days # accept String ranges
+PaymentDay::View.create(2023..2024).pay_days # accept Range as input
+PaymentDay::View.create(2023..2024, 2025, '2026').pay_days # accept a mix of all of them
 
 # Last parameter defines the options if set
 # shows 2023 twice in the list of pay_days, default is false
-PaymentDay::View(2023..2024, 2023, duplicates: true).pay_days
+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,19 +13,20 @@ 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?"
     method_option :header, aliases: "-h", type: :boolean, default: true, desc: "Do you wanna see the table title?"
     method_option :separator, aliases: "-s", type: :boolean, default: true, desc: "Do you want to have a separator for the rows printed?"
     def view(*years)
-      years = PaymentDay::View.new(years, options).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.new(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.0"
+  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,
@@ -18,6 +20,8 @@ module PaymentDay
       separator: true
     }.freeze
 
+    private_class_method :new
+
     attr_reader :pay_days, :years
 
     def initialize(*years)
@@ -28,12 +32,18 @@ module PaymentDay
       @pay_days = find_pay_days
     end
 
+    def self.create(*years)
+      new(*years)
+    end
+
     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]
@@ -48,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
@@ -70,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.0
+  version: 0.2.2
 platform: ruby
 authors:
 - PuLLi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-31 00:00:00.000000000 Z
+date: 2023-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -64,7 +64,6 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,29 +0,0 @@
-PATH
-  remote: .
-  specs:
-    payment_day (0.1.2)
-      rainbow (~> 3.1)
-      terminal-table (~> 3.0)
-      thor (~> 1.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    minitest (5.16.3)
-    rainbow (3.1.1)
-    rake (13.0.6)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    thor (1.2.1)
-    unicode-display_width (2.3.0)
-
-PLATFORMS
-  arm64-darwin-22
-
-DEPENDENCIES
-  minitest (~> 5.0)
-  payment_day!
-  rake (~> 13.0)
-
-BUNDLED WITH
-   2.4.1