goldman 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c43ad648ae8b70aa4fc9c685d49c4e4a51dfc5fcf8502568591a232f6456f58b
-  data.tar.gz: ed94b8ab0a2d8275e4dccba56a85f54e987afad71973086052727c545a92037f
+  metadata.gz: 8f773ac07453545627e3f47a174af08c8260d8e0146861adeea9808bc7d174ea
+  data.tar.gz: 788b04e2dba00c069d331ae648841b4ffd156b70639d4773a2cca000014625df
 SHA512:
-  metadata.gz: a67132dae664ff6501afddcdf2a04098b2e74bb7aabde76422e01b7df80e40d8f02685a7ecb862705f7b848df1e4a8d80f7c050ff87a0cd20623b3f54c2abb7f
-  data.tar.gz: b0cbf1313bef97ab2907743aed72b9e7113accf6c009ca21e46d3823cf67fee04a5ef7bad5a42bc16cf5d6b362cc316fee2e10f0815aac4d8f2d44845048966c
+  metadata.gz: 7c6bf7496046d91315c3344809ea010655d2078d9aa12932db6bb1f364b4c8d17e8b63ccccddf150f220fadc883e156160ad06f0f64b6e32f33310b97380d1b8
+  data.tar.gz: 3dae0f42687a4777fff508003d1f6d30055e1e22b71831787d19a110f45e198e1053a21aa0c2a790ac298ae279ac751752f4c5259f206eca5dc481be1715a46f

data/exe/goldman

@@ -33,19 +33,25 @@ 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)
+  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

@@ -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,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.3"
+  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_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.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Wei Chen (willsmile)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-12 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_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/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