engineer_calculator 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c77106c45d3b8780498f59edf55b43c4497ee19de2ddd049d81d165d044e1a36
-  data.tar.gz: 4f33b68bd38c301b5d72064a75cec3e34968b42ef5bf72912af5006f5688be58
+  metadata.gz: e20b5435468fb2129335ff92e629c8dee115fa730552bf7b40c70e837f6943f1
+  data.tar.gz: ffdf69a3434ad682faf44df8aaa6d60444f747a904481c2a852311d8f59912c3
 SHA512:
-  metadata.gz: d97d53a8f058b81be2ca4b012bd38ed69651b256d91657de13994b153f4c8e5e7da1c999ee1c437b524ffebba5c0fffeb45ea14490fa897ecaba6f740ce3e969
-  data.tar.gz: ac3f643d9598a87772a6dcffa7c5604f6ee87b4cfd36af3eebbbc5c7c05da3045f5278dfebe2baf5349351c9e08655d05bbf423a07dc6b56d5cf1eaab12f1ca5
+  metadata.gz: cbcba9f27269255e2287c96439d7b5b14f1503d27f9b587bf7b988c6316602873fe57bf17cb53a84621aaa1703cf603afbf5ab7b42c8d119501af10744c0765b
+  data.tar.gz: b35f2493b81df625b145773ae831e13d1bf4dce1cf8da4d3be039fcac4ef1ee01ac0f5be44a2b66a3c55be2b45ade0edb40840ac430d05112ae3bc94deec8a7c

data/.ruby-version

@@ -1 +1 @@
-2.6.0
+2.6.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    engineer_calculator (0.1.0)
+    engineer_calculator (1.0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -19,4 +19,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.16.6
+   1.17.2

data/README.md

@@ -1,67 +1,5 @@
 # Engineer Calculator
 
-### a. 使い方
-calc = EngineeringCalculator.new("100kgg / 20mm2")  
-calc.result #=> ["5Mpa","100kgg/20mm2"]  
-calc.calc("10mpa + 20psi")  
-calc.result #=> ["30Mpa","10Mpa+20Mpa"]  
-calc.evaluate("100mpa +10m") #=> fail  
-
-### b. 実装計画
-#### 1) 数式を取り出す
-  1. (), \*, / を評価して配列に代入
-  ~~~
-  100kg / 20mm2 + 10psi #=> [100kg/20mm2,+,10psi,=]  
-
-  ex: (100kgg + 10pondg) / 20kg/mm2 + 10psi #=> [100kgg+ 10pondg,/,20mm2,+,10psi,=]  
-  ~~~
-  2.
-  2. 配列に変換
-  ~~~
-  [[数式,数値,単位]]
-  ~~~
-#### 2) Validate?メソッドで単位の並びを評価
-  1. 単位評価  
-  +, - で同じカテゴリーに属していない単位が選択されていたらFailを返して終了。  
-  ~~~
-  Mpa + psi => true  
-  Mpa * Mpa/s => true  
-  Mpa + m => fail  
-  Mpa + kg => fail  
-  ~~~
-
-  2. 計算式評価  
-  ()の数が間違っている。一番最後の)抜きはOK。  
-  ~~~
-  ((100kg/20m2 + 20psi) + 20 => true  
-  (20+10) * 100mpa) => fail  
-  ~~~
-  //, ** など計算式が連続している。  
-
-  3. 単位抜き  
-
-
-#### 3) 単位換算
-  1. メモ書き  
-  \*,/は単位無しの倍数とみなす。  
-  ~~~
-  100 * 20mpa #=> 20000Mpa  
-  ~~~
-  +,-並びに記載されているもので単位が一つしかない時は、その単位とする。  
-  ~~~
-  100 + 20psi => 100Mpa + 20psi  
-  ~~~
-  2. 単位換算表(yml形式)  
-
-
-#### 4) 数値計算
-  1. 数式だけを取り出す  
-  2. evalを使用して計算する  
-
-#### 5) 単位計算
-  1. 単位を計算するメソッドの用意
-
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -78,9 +16,49 @@ Or install it yourself as:
 
     $ gem install engineering_calculator
 
-## Usage
+For web site of calculator, please visit following link.
+https://eng.eastazy.work/calculator
+
+### How to use
+
+If your current directory is engineer_calcululator gem,
+please run "Rackup". Then access to http://localhost:9292/ , you can find web page.
+
+Add following into your code.
+```ruby
+require 'engineer_calculator'
+```
+
+Then make instance.
 
-TODO: Write usage instructions here
+```ruby
+eng_calc = Engineer::Calculator.new
+```
+
+After make instance you can get calculation reulst by "calc" method.
+Conversion always perform by SI base unit.
+```ruby
+eng_calc.calc("10cm+20m")
+=> {:value=>"20.1", :unit=>"m", :convert_formula=>"0.1(m)+ 20(m) "}
+```
+
+After calc method, you can get alter unit result by "alter" method.
+```ruby
+eng_calc.alter
+=> {:si_unit=>[["Length", nil]],
+  :variable=>[["Length",
+    [["Å", 201000000000.0],
+    ["mil", 791338.5826771759],
+    ["in", 791.3385826771759],
+    ["ft", 65.94488188976331],
+    ["yd", 21.98162729658777], ...]]]}
+```
+
+If conversion has any error, you can get error message by "error" method.
+```ruby
+eng_calc.error
+=> {}
+```
 
 ## Development
 

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "./lib/engineer_calculator/engineer_calculator"
+require "./lib/engineer_calculator"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/engineer_calculator.rb

@@ -1,4 +1,4 @@
-#require "engineering_calculator/version"
+require "engineer_calculator/version"
 require 'yaml'
 
 module Engineer
@@ -305,23 +305,23 @@ module Engineer
     end
 
     def si_base_unit
-      @si_base_unit ||= YAML.load_file(File.join(__dir__, 'si_base_unit.yml'))
+      @si_base_unit ||= YAML.load_file(File.join(__dir__, '/unit/si_base_unit.yml'))
     end
 
     def si_derived_unit
-      @si_derived_unit ||= YAML.load_file(File.join(__dir__, 'si_derived_unit.yml'))
+      @si_derived_unit ||= YAML.load_file(File.join(__dir__, 'unit/si_derived_unit.yml'))
     end
 
     def variable_unit
-      @variable_unit ||= YAML.load_file(File.join(__dir__, 'variable_unit.yml'))
+      @variable_unit ||= YAML.load_file(File.join(__dir__, 'unit/variable_unit.yml'))
     end
 
     def metric_prefix_unit
-      @metric_prefix ||= YAML.load_file(File.join(__dir__, 'metric_prefix.yml'))
+      @metric_prefix ||= YAML.load_file(File.join(__dir__, 'unit/metric_prefix.yml'))
     end
 
     def si_alter_unit
-      @si_alter_unit ||= YAML.load_file(File.join(__dir__, 'si_alter_unit.yml'))
+      @si_alter_unit ||= YAML.load_file(File.join(__dir__, 'unit/si_alter_unit.yml'))
     end
 
     def reg(kind_of_unit)

data/lib/engineer_calculator/version.rb

@@ -1,3 +1,3 @@
 module Engineer
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engineer_calculator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Azeroyear
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-23 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,14 +73,14 @@ files:
 - config.ru
 - engineering_calculator.gemspec
 - favicon.ico
-- lib/convert_to_japanese.yml
 - lib/engineer_calculator.rb
 - lib/engineer_calculator/version.rb
-- lib/metric_prefix.yml
-- lib/si_alter_unit.yml
-- lib/si_base_unit.yml
-- lib/si_derived_unit.yml
-- lib/variable_unit.yml
+- lib/unit/convert_to_japanese.yml
+- lib/unit/metric_prefix.yml
+- lib/unit/si_alter_unit.yml
+- lib/unit/si_base_unit.yml
+- lib/unit/si_derived_unit.yml
+- lib/unit/variable_unit.yml
 homepage: https://github.com/AZeroyear/engineering_calculator
 licenses:
 - MIT
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: This gem can calculate the calculation which included unit.