goldman 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c43ad648ae8b70aa4fc9c685d49c4e4a51dfc5fcf8502568591a232f6456f58b
-  data.tar.gz: ed94b8ab0a2d8275e4dccba56a85f54e987afad71973086052727c545a92037f
+  metadata.gz: 1b2b295e5ec720d4b21567f3dab4a266f24a65e765e93941122d2291f86aeb11
+  data.tar.gz: 522073bb4ad24a862c3554d8232ac7de700fc3f187d07a76439f8566bc9e9908
 SHA512:
-  metadata.gz: a67132dae664ff6501afddcdf2a04098b2e74bb7aabde76422e01b7df80e40d8f02685a7ecb862705f7b848df1e4a8d80f7c050ff87a0cd20623b3f54c2abb7f
-  data.tar.gz: b0cbf1313bef97ab2907743aed72b9e7113accf6c009ca21e46d3823cf67fee04a5ef7bad5a42bc16cf5d6b362cc316fee2e10f0815aac4d8f2d44845048966c
+  metadata.gz: 7619fed6a8146dd32bb1a4993c806addca42c948c0877291d78ad215abadee958b2da15b701a8dce477637aeba1dce58e8a0731b9fdd8e5bbe3a003ffb6f2af2
+  data.tar.gz: 1eec49aba2251e932cbe5a57863e7e693903779290ed3db6a22fdfb026ac962521d4a63a128ca189412bab3685e6ce06712110d276d20d4afb98a0e6affebf3e

data/exe/goldman

@@ -33,19 +33,26 @@ def error(message)
 end
 
 begin
-  date_list = Goldman::DateRange.new(start_date_str: @options[:start_date],
-                                     end_date_str: @options[:end_date],
-                                     day_str: @options[:day],
-                                     week_str: @options[:week]).date_list
-  config = Goldman::Config.new(@options[:config])
-  formatter = Goldman::Formatter.new(config)
-  data = Goldman::DataLoader.new(config).data
-  generator = Goldman::Generator.new(data, formatter, date_list)
+  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)
+  list = Goldman::ScheduleList.new(
+    data: config.data,
+    dates: dates
+  ).generate
 
   @options.each do |k, v|
     case k
     when :generate
-      generator.exec
+      Goldman::Presenter.print_schedule_list(
+        list: list,
+        formatter: formatter
+      )
     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

@@ -14,10 +14,12 @@ module Goldman
       validate!
     end
 
-    def date_list
+    def to_array
       (@start_date..@end_date).to_a
     end
 
+    alias_method :to_a, :to_array
+
     private
 
     def calculate_end_date
@@ -31,11 +33,13 @@ module Goldman
     end
 
     def validate!
-      end_date_err_msg = "The parameter of week (#{@week}) or day (#{@day}) is invalid."
-      raise Goldman::ParameterError.new(end_date_err_msg) if @end_date.nil?
-
-      date_range_err_msg = "The start_date (#{@start_date}) should be before end_date (#{@end_date})."
-      raise Goldman::ParameterError.new(date_range_err_msg) if @start_date > @end_date
+      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)

data/lib/goldman/formatter.rb

@@ -4,13 +4,21 @@ 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)
-      puts format(:schedule) % { date: formatted_date(date), wday: formatted_wday(date.cwday), time: time_str }
+    def schedule(date, option)
+      {
+        date: formatted_date(date),
+        wday: formatted_wday(date.cwday),
+        time: option
+      }
+    end
+
+    def schedule_format
+      format(:schedule)
     end
 
     def format(target)

data/lib/goldman/presenter.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "date"
+
+module Goldman
+  class Presenter
+    class << self
+      def print_schedule_list(list:, formatter:)
+        print_no_schedule and return if list.empty?
+
+        list.each do |s|
+          puts formatter.schedule_format % formatter.schedule(s.date, s.option)
+        end
+      end
+
+      private
+
+      def print_no_schedule
+        puts "There is no schedule in the period."
+      end
+    end
+  end
+end

data/lib/goldman/schedule_list.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Goldman
+  class ScheduleList
+    Schedule = Struct.new(:date, :option)
+
+    def initialize(data:, dates:)
+      @data = data
+      @dates = dates
+    end
+
+    def generate
+      return [] if @data.nil? || @data.empty?
+
+      list = []
+      @dates.each do |date|
+        options = select_options_by_date(date)
+        next if options.empty?
+        sorted_options = sort(options)
+        sorted_options.each do |option|
+          list << Schedule.new(date, option)
+        end
+      end
+
+      list
+    end
+
+    private
+
+    def select_options_by_date(date)
+      options = []
+      wday_name = Goldman::Wday.to_name(date.cwday)
+      options += wday(wday_name) unless wday(wday_name).nil?
+      options += everyday unless everyday.nil?
+      options += weekday if Goldman::Wday.weekday?(wday_name) && !weekday.nil?
+      options += weekend if Goldman::Wday.weekend?(wday_name) && !weekend.nil?
+
+      return options
+    end
+
+    def sort(options)
+      options.sort_by { _1.split(":").first.to_i }
+    end
+
+    def wday(name)
+      @data[name]
+    end
+
+    def weekday
+      @data[:Weekday]
+    end
+
+    def weekend
+      @data[:Weekend]
+    end
+
+    def everyday
+      @data[:Everyday]
+    end
+  end
+end

data/lib/goldman/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Goldman
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 
   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_range"
 require_relative "goldman/formatter"
-require_relative "goldman/generator"
+require_relative "goldman/presenter"
+require_relative "goldman/schedule_list"
 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.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Wei Chen (willsmile)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-12 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies: []
 description: goldman for generating option list of schedule
 email:
@@ -25,13 +25,12 @@ files:
 - README.md
 - Rakefile
 - exe/goldman
-- goldman.gemspec
 - lib/goldman.rb
 - lib/goldman/config.rb
-- lib/goldman/data_loader.rb
 - lib/goldman/date_range.rb
 - lib/goldman/formatter.rb
-- lib/goldman/generator.rb
+- lib/goldman/presenter.rb
+- lib/goldman/schedule_list.rb
 - lib/goldman/version.rb
 - lib/goldman/wday.rb
 homepage: https://github.com/willsmile/goldman-rb

data/goldman.gemspec

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/goldman/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "goldman"
-  spec.version = Goldman::VERSION
-  spec.authors = ["Wei Chen (willsmile)"]
-  spec.email = ["willsmile.me@gmail.com"]
-
-  spec.summary = %q{goldman}
-  spec.description = %q{goldman for generating option list of schedule}
-  spec.homepage = "https://github.com/willsmile/goldman-rb"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.0.0"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (File.expand_path(f) == __FILE__) || f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor])
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end

data/lib/goldman/data_loader.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module Goldman
-  class DataLoader
-    def initialize(config)
-      @raw_data = config.raw_data
-    end
-
-    def data
-      result = {}
-      Goldman::Wday.members.each do |w|
-        periods = []
-        periods += wday(w) unless wday(w).nil?
-        periods += everyday unless everyday.nil?
-        periods += weekday if Goldman::Wday.weekday?(w) && !weekday.nil?
-        periods += weekend if Goldman::Wday.weekend?(w) && !weekend.nil?
-        result[Goldman::Wday.to_num(w)] = sort(periods) unless periods.empty?
-      end
-
-      result
-    end
-
-    private
-
-    def sort(periods)
-      periods.sort_by { _1.split(":").first.to_i }
-    end
-
-    def wday(name)
-      @raw_data[name]
-    end
-
-    def weekday
-      @raw_data[:Weekday]
-    end
-
-    def weekend
-      @raw_data[:Weekend]
-    end
-
-    def everyday
-      @raw_data[:Everyday]
-    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_list)
-      @data = data
-      @formatter = formatter
-      @date_list = date_list
-    end
-
-    def exec
-      raise Goldman::OperationError.new("No data for schedule. Please define them in the config file.") if @data.empty?
-
-      @date_list.each do |date|
-        @data[date.cwday]&.each do |time|
-          @formatter.schedule(date, time)
-        end
-      end
-    end
-  end
-end