xls_function 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78fe15af8eb4b5dafce02e10b89a8328b1e025d035e1349982faceebfe40aa43
-  data.tar.gz: 52223d13a8aae89a0998e08b349299d63968c178192c549d7b03ff7a8347cf91
+  metadata.gz: 061aed8566bf5bc16a1ddc0a7ea54237bdc8663971427dae4260373b815aca80
+  data.tar.gz: 8ad8571368b22fb3d6fc0207cb51cde4e94959e33a5d6020d535c3b16018e5eb
 SHA512:
-  metadata.gz: 1b05087ff9d7379fd8b4608f304162f8a1d69b623e5ced9b9e93f62b521c4b8fc5cfe91f526554e2c57416da7c626b5b76ecb90652a20b0d6af712fae4339f1a
-  data.tar.gz: 2a304ec0fcd97fc916833ea8be32f37fcd873e937638c68cc27527222c114842bb0a71b09bf2bbd3747b4c6c8a1cd92062ffec94089ce687007ac6a8dc72daf3
+  metadata.gz: d08ab1ac4bac791ff2a9af2d47eb3fc8914605ca77244d8c94a627d82dbefeec427dcfe04a6e9137530b8c778f1670e5cacfb588e5aefbab897876df9b4a383e
+  data.tar.gz: 630273a532af81bd5c9ab07ea1c2c1b67d057d3362c3e4e5c25b365aa499c279aeb9b1ceabae159bfde8b73d414d4fe55082ad2e7ecf1d3b38d5f5084257e8dc

data/.github/workflows/rspec.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1']
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
 
     steps:
     - uses: actions/checkout@v2

data/README.md

@@ -38,6 +38,8 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/moneyforward/xls_function. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](./CODE_OF_CONDUCT.md).
 
+- You can create a pull request to the main branch.
+- You should not change the version on your pull request.
 
 ## License
 

data/lib/xls_function/error.rb

@@ -34,12 +34,18 @@ module XlsFunction
       def na(error_info = '')
         new(ERROR_NA, error_info)
       end
+
+      # @return #DIV/0!
+      def div0!(error_info = '')
+        new(ERROR_DIV0, error_info)
+      end
     end
   end
 
   ERROR_VALUE = '#VALUE!'.freeze
   ERROR_NUM = '#NUM!'.freeze
   ERROR_NA = '#N/A'.freeze
+  ERROR_DIV0 = '#DIV/0!'.freeze
 
   ERRORS = [
     ERROR_VALUE,

data/lib/xls_function/evaluators/binary_operations/divide.rb

@@ -5,8 +5,17 @@ module XlsFunction
         operator_as '/'
 
         def eval
+          return ::XlsFunction::ErrorValue.div0!(divide_by_zero) if right.zero?
+
           left / right
         end
+
+        private
+
+        def divide_by_zero
+          message = error_message(:cannot_divide_by_zero)
+          class_info(message)
+        end
       end
     end
   end

data/lib/xls_function/locales/en.yml

@@ -64,4 +64,5 @@ en:
       cannot_convert_to_number: Cannot convert %{source} to number.
       cannot_convert_to_date: Cannot convert %{source} to date.
       cannot_convert_to_time: Cannot convert %{source} to time.
+      cannot_divide_by_zero: "Cannot divide by zero."
       invalid_value_for_function: Invalid value for formula or function.

data/lib/xls_function/locales/ja.yml

@@ -64,4 +64,5 @@ ja:
       cannot_convert_to_number: "%{source}は数値に変換できません。"
       cannot_convert_to_date: "%{source}は日付に変換できません。"
       cannot_convert_to_time: "%{source}は時刻に変換できません。"
+      cannot_divide_by_zero: "0除算が発生しました。"
       invalid_value_for_function: 値が数式または関数に対して無効です。

data/lib/xls_function/parse_rules/binary_operation.rb

@@ -7,7 +7,7 @@ module XlsFunction
           rule(:multiple_divide_operator) { match['*/'].as(:operator) >> space? }
           rule(:plus_minus_opeartor) { match['+-'].as(:operator) >> space? }
           rule(:concat_opeartor) { str('&').as(:operator) >> space? }
-          rule(:comparison_operator) { (str('>') | str('>=') | str('<') | str('<=') | str('=') | str('<>')).as(:operator) >> space? }
+          rule(:comparison_operator) { (str('<>') | str('>=') | str('<=') | str('>') | str('<') | str('=')).as(:operator) >> space? }
 
           rule(:binary_operation) do
             infix_expression(

data/lib/xls_function/version.rb

@@ -1,3 +1,3 @@
 module XlsFunction
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xls_function
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Nakakuki Shingo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n