zakuro 0.6.1 → 0.7.0

data/lib/zakuro/merchant.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_relative './era/western/calendar'
+require_relative './gateway/single'
 
-require_relative './calculation/summary/single'
-
-require_relative './calculation/summary/range'
+require_relative './gateway/range'
 
 require_relative './condition'
 
@@ -55,52 +53,18 @@ module Zakuro
     # @return [Result::Range] 和暦日範囲
     #
     def commit
-      date = condition.date
-
-      return single(date: date) if date
-
-      range = condition.range
-
-      return range(range: range) if range
-
-      {}
-    end
-
-    private
-
-    #
-    # 1日検索
-    #
-    # @param [Date] date 西暦日
-    #
-    # @return [Result::Single] 検索結果
-    #
-    def single(date:)
-      western_date = Western::Calendar.create(date: date)
-
       # TODO: condition で設定する
       context = Context.new(version_name: '')
 
-      Calculation::Summary::Single.get(context: context, date: western_date)
-    end
+      single = Gateway::Single.new(context: context, date: condition.date)
 
-    #
-    # 期間検索
-    #
-    # @param [Catalog::Range] range 期間
-    #
-    # @return [Result::Range] 和暦日範囲
-    #
-    def range(range:)
-      start_date = Western::Calendar.create(date: range[:start])
-      last_date = Western::Calendar.create(date: range[:last])
+      return single.get unless single.invalid?
 
-      # TODO: condition で設定する
-      context = Context.new(version_name: '')
+      range = Gateway::Range.new(context: context, range: condition.range)
+
+      return range.get unless range.invalid?
 
-      Calculation::Summary::Range.get(
-        context: context, start_date: start_date, last_date: last_date
-      )
+      {}
     end
   end
 end

data/lib/zakuro/operation/month/parser.rb

@@ -80,7 +80,7 @@ module Zakuro
       def self.western_date(str:)
         return Western::Calendar.new if invalid?(str: str)
 
-        Western::Calendar.parse(str: str)
+        Western::Calendar.parse(text: str)
       end
 
       #
@@ -311,8 +311,8 @@ module Zakuro
 
       def self.create_solar_term(yaml_hash: {})
         SolarTerm::Direction.new(
-          source: create_source_solar_term(yaml_hash: yaml_hash['calc']),
-          destination: create_destination_solar_term(yaml_hash: yaml_hash['actual']),
+          source: create_source_solar_term(yaml_hash: yaml_hash['src']),
+          destination: create_destination_solar_term(yaml_hash: yaml_hash['dest']),
           days: Operation::TypeParser.days(str: yaml_hash['days'])
         )
       end
@@ -347,24 +347,24 @@ module Zakuro
 
       def self.create_month_number(yaml_hash: {})
         Number.new(
-          calc: Operation::TypeParser.month_number(str: yaml_hash['calc']),
-          actual: Operation::TypeParser.month_number(str: yaml_hash['actual'])
+          src: Operation::TypeParser.month_number(str: yaml_hash['src']),
+          dest: Operation::TypeParser.month_number(str: yaml_hash['dest'])
         )
       end
       private_class_method :create_month_number
 
       def self.create_month_leaped(yaml_hash: {})
         Leaped.new(
-          calc: Operation::TypeParser.month_leaped(str: yaml_hash['calc']),
-          actual: Operation::TypeParser.month_leaped(str: yaml_hash['actual'])
+          src: Operation::TypeParser.month_leaped(str: yaml_hash['src']),
+          dest: Operation::TypeParser.month_leaped(str: yaml_hash['dest'])
         )
       end
       private_class_method :create_month_leaped
 
       def self.create_month_day(yaml_hash: {})
         Days.new(
-          calc: yaml_hash['calc'],
-          actual: yaml_hash['actual']
+          src: yaml_hash['src'],
+          dest: yaml_hash['dest']
         )
       end
       private_class_method :create_month_day

data/lib/zakuro/operation/month/type.rb

@@ -339,20 +339,20 @@ module Zakuro
     # Number 月
     #
     class Number
-      # @return [Integer] 計算
-      attr_reader :calc
-      # @return [Integer] 運用
-      attr_reader :actual
+      # @return [Integer] 移動もと
+      attr_reader :src
+      # @return [Integer] 移動先
+      attr_reader :dest
 
       #
       # 初期化
       #
-      # @param [Integer] calc 計算
-      # @param [Integer] actual 運用
+      # @param [Integer] src 移動元
+      # @param [Integer] dest 移動先
       #
-      def initialize(calc: -1, actual: -1)
-        @calc = calc
-        @actual = actual
+      def initialize(src: -1, dest: -1)
+        @src = src
+        @dest = dest
       end
 
       #
@@ -362,7 +362,7 @@ module Zakuro
       # @return [False] 有効
       #
       def invalid?
-        @calc == -1 || @actual == -1
+        @src == -1 || @dest == -1
       end
 
       #
@@ -381,7 +381,7 @@ module Zakuro
       # @return [Integer] 間隔
       #
       def interval
-        @calc - @actual
+        @src - @dest
       end
 
       #
@@ -428,22 +428,22 @@ module Zakuro
     # Leaped 閏有無
     #
     class Leaped
-      # @return [True, False] 計算
-      attr_reader :calc
-      # @return [True, False] 運用
-      attr_reader :actual
+      # @return [True, False] 移動元
+      attr_reader :src
+      # @return [True, False] 移動先
+      attr_reader :dest
 
       # :reek:BooleanParameter
 
       #
       # 初期化
       #
-      # @param [True, False] calc 計算
-      # @param [True, False] actual 運用
+      # @param [True, False] src 移動元
+      # @param [True, False] dest 移動先
       #
-      def initialize(calc: false, actual: false)
-        @calc = calc
-        @actual = actual
+      def initialize(src: false, dest: false)
+        @src = src
+        @dest = dest
       end
 
       #
@@ -453,7 +453,7 @@ module Zakuro
       # @return [False] 有効
       #
       def invalid?
-        !@calc && !@actual
+        !@src && !@dest
       end
     end
 
@@ -469,12 +469,12 @@ module Zakuro
       #
       # 初期化
       #
-      # @param [String] calc 計算
-      # @param [String] actual 運用
+      # @param [String] src 移動元
+      # @param [String] dest 移動先
       #
-      def initialize(calc: '小', actual: '小')
-        @calc = calc
-        @actual = actual
+      def initialize(src: '小', dest: '小')
+        @src = src
+        @dest = dest
       end
 
       #
@@ -483,8 +483,8 @@ module Zakuro
       # @return [True] 大
       # @return [False] 小
       #
-      def calc
-        @calc == BIG
+      def src
+        @src == BIG
       end
 
       #
@@ -493,8 +493,8 @@ module Zakuro
       # @return [True] 大
       # @return [False] 小
       #
-      def actual
-        @actual == BIG
+      def dest
+        @dest == BIG
       end
 
       #
@@ -504,7 +504,7 @@ module Zakuro
       # @return [False] 有効
       #
       def invalid?
-        @calc == @actual
+        @src == @dest
       end
     end
   end

data/lib/zakuro/operation/month/validator.rb

@@ -135,7 +135,7 @@ module Zakuro
         def self.western_date?(str: '')
           return Western::Calendar.new if str == EMPTY_STRING
 
-          Western::Calendar.valid_date_string(str: str)
+          Western::Calendar.valid_date_string(text: str)
         end
       end
 
@@ -461,14 +461,14 @@ module Zakuro
           #
           # @param [Integer] index 連番
           # @param [Hash<String, Object>] yaml_hash yaml
-          # @option yaml_hash [Hash] :calc 移動元
-          # @option yaml_hash [Hash] :actual 移動先
+          # @option yaml_hash [Hash] :src 移動元
+          # @option yaml_hash [Hash] :dest 移動先
           # @option yaml_hash [String] :days 中気差分
           #
           def initialize(index:, yaml_hash: {})
             @index = index
-            @source = Source.new(diff_index: index, yaml_hash: yaml_hash['calc'])
-            @destination = Destination.new(diff_index: index, yaml_hash: yaml_hash['actual'])
+            @source = Source.new(diff_index: index, yaml_hash: yaml_hash['src'])
+            @destination = Destination.new(diff_index: index, yaml_hash: yaml_hash['dest'])
             @days = yaml_hash['days']
           end
 
@@ -537,7 +537,7 @@ module Zakuro
           def validate
             failed = []
 
-            prefix = "[#{@diff_index}][solar_term.calc] invalid"
+            prefix = "[#{@diff_index}][solar_term.src] invalid"
 
             failed.push("#{prefix} 'index'. #{@index}") unless index?
 
@@ -600,7 +600,7 @@ module Zakuro
           def validate
             failed = []
 
-            prefix = "[#{@diff_index}][solar_term.actual] invalid"
+            prefix = "[#{@diff_index}][solar_term.dest] invalid"
 
             failed.push("#{prefix} 'index'. #{@index}") unless index?
 
@@ -633,23 +633,23 @@ module Zakuro
 
         # @return [Integer] 連番
         attr_reader :index
-        # @return [String] 計算
-        attr_reader :calc
-        # @return [String] 運用
-        attr_reader :actual
+        # @return [String] 移動元
+        attr_reader :src
+        # @return [String] 移動先
+        attr_reader :dest
 
         #
         # 初期化
         #
         # @param [Integer] index 連番
         # @param [Hash<String, String>] yaml_hash yaml
-        # @option yaml_hash [String] :calc 計算
-        # @option yaml_hash [String] :actual 運用
+        # @option yaml_hash [String] :src 移動元
+        # @option yaml_hash [String] :dest 移動先
         #
         def initialize(index:, yaml_hash: {})
           @index = index
-          @calc = yaml_hash['calc']
-          @actual = yaml_hash['actual']
+          @src = yaml_hash['src']
+          @dest = yaml_hash['dest']
         end
 
         #
@@ -662,19 +662,19 @@ module Zakuro
 
           prefix = "[#{@index}][#{NAME}] invalid"
 
-          failed.push("#{prefix} 'calc'. #{@calc}") unless calc?
+          failed.push("#{prefix} 'src'. #{@src}") unless src?
 
-          failed.push("#{prefix} 'actual'. #{@actual}") unless actual?
+          failed.push("#{prefix} 'dest'. #{@dest}") unless dest?
 
           failed
         end
 
-        def calc?
-          Types.positive?(str: @calc)
+        def src?
+          Types.positive?(str: @src)
         end
 
-        def actual?
-          Types.positive?(str: @actual)
+        def dest?
+          Types.positive?(str: @dest)
         end
       end
 
@@ -686,23 +686,23 @@ module Zakuro
 
         # @return [Integer] 連番
         attr_reader :index
-        # @return [String] 計算
-        attr_reader :calc
-        # @return [String] 運用
-        attr_reader :actual
+        # @return [String] 移動元
+        attr_reader :src
+        # @return [String] 移動先
+        attr_reader :dest
 
         #
         # 初期化
         #
         # @param [Integer] index 連番
         # @param [Hash<String, String>] yaml_hash yaml
-        # @option yaml_hash [String] :calc 計算
-        # @option yaml_hash [String] :actual 運用
+        # @option yaml_hash [String] :src 移動元
+        # @option yaml_hash [String] :dest 移動先
         #
         def initialize(index:, yaml_hash: {})
           @index = index
-          @calc = yaml_hash['calc']
-          @actual = yaml_hash['actual']
+          @src = yaml_hash['src']
+          @dest = yaml_hash['dest']
         end
 
         #
@@ -715,19 +715,19 @@ module Zakuro
 
           prefix = "[#{@index}][#{NAME}] invalid"
 
-          failed.push("#{prefix} 'calc'. #{@calc}") unless calc?
+          failed.push("#{prefix} 'src'. #{@src}") unless src?
 
-          failed.push("#{prefix} 'actual'. #{@actual}") unless actual?
+          failed.push("#{prefix} 'dest'. #{@dest}") unless dest?
 
           failed
         end
 
-        def calc?
-          Types.empiable_bool?(str: @calc)
+        def src?
+          Types.empiable_bool?(str: @src)
         end
 
-        def actual?
-          Types.empiable_bool?(str: @actual)
+        def dest?
+          Types.empiable_bool?(str: @dest)
         end
       end
 
@@ -739,23 +739,23 @@ module Zakuro
 
         # @return [Integer] 連番
         attr_reader :index
-        # @return [String] 計算
-        attr_reader :calc
-        # @return [String] 運用
-        attr_reader :actual
+        # @return [String] 移動元
+        attr_reader :src
+        # @return [String] 移動先
+        attr_reader :dest
 
         #
         # 初期化
         #
         # @param [Integer] index 連番
         # @param [Hash<String, String>] yaml_hash yaml
-        # @option yaml_hash [String] :calc 計算
-        # @option yaml_hash [String] :actual 運用
+        # @option yaml_hash [String] :src 移動元
+        # @option yaml_hash [String] :dest 移動先
         #
         def initialize(index:, yaml_hash: {})
           @index = index
-          @calc = yaml_hash['calc']
-          @actual = yaml_hash['actual']
+          @src = yaml_hash['src']
+          @dest = yaml_hash['dest']
         end
 
         #
@@ -768,19 +768,19 @@ module Zakuro
 
           prefix = "[#{@index}][#{NAME}] invalid"
 
-          failed.push("#{prefix} 'calc'. #{@calc}") unless calc?
+          failed.push("#{prefix} 'src'. #{@src}") unless src?
 
-          failed.push("#{prefix} 'actual'. #{@actual}") unless actual?
+          failed.push("#{prefix} 'dest'. #{@dest}") unless dest?
 
           failed
         end
 
-        def calc?
-          Types.month_days?(str: @calc)
+        def src?
+          Types.month_days?(str: @src)
         end
 
-        def actual?
-          Types.month_days?(str: @actual)
+        def dest?
+          Types.month_days?(str: @dest)
         end
       end