goldman 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 313cb238421a3fb15dc26ca2c6ee4ccb12016fa177ffe50070d34c4e71f5c43b
-  data.tar.gz: 33440dc517e091c34a781d474eb902e7225e431c99689b7cf4ace6dfa46b2c12
+  metadata.gz: 8f773ac07453545627e3f47a174af08c8260d8e0146861adeea9808bc7d174ea
+  data.tar.gz: 788b04e2dba00c069d331ae648841b4ffd156b70639d4773a2cca000014625df
 SHA512:
-  metadata.gz: 0b751499deeeb6e35928493b41a559287c04c9933d3be4b6d0e4d9b6c5ab4afa3aff4e0d43efbb34b8dd25f312e1e677b30c0eb73b57f4a9366f3d62a86026dc
-  data.tar.gz: 9329e65c929da794f4a2da183e34b21dae32e50699659cd449496a3f3345ba6be68ee09646158eb94288acb18800df9c6cae154f9b6635bbded5a9dc97644828
+  metadata.gz: 7c6bf7496046d91315c3344809ea010655d2078d9aa12932db6bb1f364b4c8d17e8b63ccccddf150f220fadc883e156160ad06f0f64b6e32f33310b97380d1b8
+  data.tar.gz: 3dae0f42687a4777fff508003d1f6d30055e1e22b71831787d19a110f45e198e1053a21aa0c2a790ac298ae279ac751752f4c5259f206eca5dc481be1715a46f

data/Rakefile

@@ -14,3 +14,21 @@ require "rubocop/rake_task"
 RuboCop::RakeTask.new
 
 task default: %i[test rubocop]
+
+namespace "gem" do
+  desc "Build a gem package"
+  task :build do
+    sh "gem build goldman.gemspec"
+  end
+
+  desc "Push a gem package"
+  task :push do
+    Rake::Task["gem:build"].execute
+    sh "gem push goldman-#{Goldman::VERSION}.gem"
+  end
+
+  desc "Clean built gem packages"
+  task :clean do
+    sh "rm goldman-*.gem"
+  end
+end

data/exe/goldman

@@ -33,16 +33,25 @@ def error(message)
 end
 
 begin
-  date_form = Goldman::DateForm.new(@options)
-  config = Goldman::Config.new(@options[:config])
-  formatter = Goldman::Formatter.new(config)
-  data = Goldman::DataLoader.new(config).data
-  generator = Goldman::Generator.new(data, formatter, date_form)
+  dates = Goldman::DateRange.new(
+    start_date_str: @options[:start_date],
+    end_date_str: @options[:end_date],
+    day_str: @options[:day],
+    week_str: @options[:week]
+  ).to_a
+  config = Goldman::Config.new(path: @options[:config])
+  formatter = Goldman::Formatter.new(customized: config.format)
+  schedules = Goldman::Schedule.new(data: config.data).generate
+  presenter = Goldman::Presenter.new(
+    schedules: schedules,
+    formatter: formatter,
+    dates: dates
+  )
 
   @options.each do |k, v|
     case k
     when :generate
-      generator.exec
+      presenter.exec
     when *NON_OPERATIONAL_OPTS
       # Do nothing here
     when :version

data/lib/goldman/config.rb

@@ -4,13 +4,13 @@ require "psych"
 
 module Goldman
   class Config
-    attr_reader :raw_data, :customized_format
+    attr_reader :data, :format
 
-    def initialize(path)
+    def initialize(path:)
       @path = path
       @config = load_file
-      @raw_data = load_data
-      @customized_format = load_customized_format
+      @data = load_data
+      @format = load_format
     end
 
     private
@@ -25,7 +25,7 @@ module Goldman
       @config[:data]
     end
 
-    def load_customized_format
+    def load_format
       return {} unless @config.has_key?(:format)
 
       @config[:format]

data/lib/goldman/date_range.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require "date"
+
+module Goldman
+  class DateRange
+    attr_reader :start_date, :end_date
+
+    def initialize(start_date_str:, end_date_str:, day_str:, week_str:)
+      @week = to_integer!(week_str, "week") || default_week
+      @day = to_integer!(day_str, "day") || default_day
+      @start_date = to_date!(start_date_str, "start_date") || default_start_date
+      @end_date = to_date!(end_date_str, "end_date") || calculate_end_date
+      validate!
+    end
+
+    def to_array
+      (@start_date..@end_date).to_a
+    end
+
+    alias_method :to_a, :to_array
+
+    private
+
+    def calculate_end_date
+      if @week > 0
+        @start_date + @week * 7 - 1
+      elsif @day > 0
+        @start_date + @day - 1
+      else
+        nil
+      end
+    end
+
+    def validate!
+      if @end_date.nil?
+        end_date_err_msg = "The parameter of week (#{@week}) or day (#{@day}) is invalid."
+        raise Goldman::ParameterError.new(end_date_err_msg)
+      elsif @start_date > @end_date
+        date_range_err_msg = "The start_date (#{@start_date}) should be before end_date (#{@end_date})."
+        raise Goldman::ParameterError.new(date_range_err_msg)
+      end
+    end
+
+    def to_date!(str, source)
+      return if str.nil?
+
+      begin
+        Date.parse(str)
+      rescue Date::Error, TypeError
+        raise Goldman::ParameterError.new("The parameter of #{source} (#{str}) is invalid.")
+      end
+    end
+
+    def to_integer!(str, source)
+      return if str.nil?
+
+      begin
+        Integer(str)
+      rescue ArgumentError, TypeError
+        raise Goldman::ParameterError.new("The parameter of #{source} (#{str}) is invalid.")
+      end
+    end
+
+    def default_start_date
+      Date.today
+    end
+
+    def default_week
+      0
+    end
+
+    def default_day
+      7
+    end
+  end
+end

data/lib/goldman/formatter.rb

@@ -4,9 +4,9 @@ module Goldman
   class Formatter
     attr_reader :customized_format, :default_format
 
-    def initialize(config)
-      @customized_format = config.customized_format
-      @default_format = DEFAULT_FORMAT
+    def initialize(customized:, default: DEFAULT_FORMAT)
+      @customized_format = customized
+      @default_format = default
     end
 
     def schedule(date, time_str)

data/lib/goldman/presenter.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "date"
+
+module Goldman
+  class Presenter
+    def initialize(schedules:, formatter:, dates:)
+      @schedules = schedules
+      @formatter = formatter
+      @dates = dates
+    end
+
+    def exec
+      raise Goldman::OperationError.new("No data for schedule. Please define them in the config file.") \
+        if @schedules.empty?
+
+      @dates.each do |date|
+        @schedules[date.cwday]&.each do |time|
+          @formatter.schedule(date, time)
+        end
+      end
+    end
+  end
+end

data/lib/goldman/{data_loader.rb → schedule.rb}

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 module Goldman
-  class DataLoader
-    def initialize(config)
-      @raw_data = config.raw_data
+  class Schedule
+
+    def initialize(data:)
+      @data = data
     end
 
-    def data
+    def generate
       result = {}
       Goldman::Wday.members.each do |w|
         periods = []
@@ -20,26 +21,24 @@ module Goldman
       result
     end
 
-    private
-
     def sort(periods)
       periods.sort_by { _1.split(":").first.to_i }
     end
 
     def wday(name)
-      @raw_data[name]
+      @data[name]
     end
 
     def weekday
-      @raw_data[:Weekday]
+      @data[:Weekday]
     end
 
     def weekend
-      @raw_data[:Weekend]
+      @data[:Weekend]
     end
 
     def everyday
-      @raw_data[:Everyday]
+      @data[:Everyday]
     end
   end
 end

data/lib/goldman/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Goldman
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 
   def self.version
     puts "Goldman version #{VERSION}"

data/lib/goldman.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require_relative "goldman/config"
-require_relative "goldman/data_loader"
-require_relative "goldman/date_form"
+require_relative "goldman/date_range"
 require_relative "goldman/formatter"
-require_relative "goldman/generator"
+require_relative "goldman/presenter"
+require_relative "goldman/schedule"
 require_relative "goldman/version"
 require_relative "goldman/wday"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldman
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Wei Chen (willsmile)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-05-13 00:00:00.000000000 Z
 dependencies: []
 description: goldman for generating option list of schedule
 email:
@@ -28,10 +28,10 @@ files:
 - goldman.gemspec
 - lib/goldman.rb
 - lib/goldman/config.rb
-- lib/goldman/data_loader.rb
-- lib/goldman/date_form.rb
+- lib/goldman/date_range.rb
 - lib/goldman/formatter.rb
-- lib/goldman/generator.rb
+- lib/goldman/presenter.rb
+- lib/goldman/schedule.rb
 - lib/goldman/version.rb
 - lib/goldman/wday.rb
 homepage: https://github.com/willsmile/goldman-rb

data/lib/goldman/date_form.rb

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-require "date"
-
-module Goldman
-  class DateForm
-    def initialize(options)
-      @week_num = parse_num!(options[:week], "week")
-      @day_num = parse_num!(options[:day], "day") || default_day_num
-      @start_date = parse_date!(options[:start_date], "start_date") || today
-      @end_date = parse_date!(options[:end_date], "end_date")
-      validate_end_date!
-    end
-
-    def range
-      return @start_date..@end_date if @end_date
-
-      @start_date..(@start_date + interval_day)
-    end
-
-    def interval_day
-      return @week_num * 7 - 1 if @week_num
-
-      @day_num - 1
-    end
-
-    private
-
-    def validate_end_date!
-      return if @end_date.nil?
-
-      err_msg = "The date in start_date (#{@start_date}) should be before the date in end_date (#{@end_date})."
-      raise Goldman::ParameterError.new(err_msg) if @start_date > @end_date
-    end
-
-    def parse_date!(str, source)
-      return if str.nil?
-
-      begin
-        Date.parse(str)
-      rescue Date::Error, TypeError
-        raise Goldman::ParameterError.new("The parameter of #{source} (#{str}) is invalid.")
-      end
-    end
-
-    def parse_num!(str, source)
-      return if str.nil?
-
-      begin
-        Integer(str)
-      rescue ArgumentError, TypeError
-        raise Goldman::ParameterError.new("The parameter of #{source} (#{str}) is invalid.")
-      end
-    end
-
-    def today
-      Date.today
-    end
-
-    def default_day_num
-      7
-    end
-  end
-end

data/lib/goldman/generator.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require "date"
-
-module Goldman
-  class Generator
-    def initialize(data, formatter, date_form)
-      @data = data
-      @formatter = formatter
-      @date_form = date_form
-    end
-
-    def exec
-      raise Goldman::OperationError.new("No data for schedule. Please define them in the config file.") if @data.empty?
-
-      @date_form.range.each do |date|
-        @data[date.cwday]&.each do |time|
-          @formatter.schedule(date, time)
-        end
-      end
-    end
-  end
-end