calculate-bot 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a90de87ac5f71eee2614dae47a1c38651e827a83
-  data.tar.gz: 9ea98ef1e965f46a8e8711ce0e5d3f6ac0d588dc
+  metadata.gz: e59b83fa001831ec4e00441e1d4ffd96a63db444
+  data.tar.gz: 250f2e74d97ba8b66f3db2e031329ba9f7b5c8d8
 SHA512:
-  metadata.gz: 554298d0928d101330e1c41c798b1dab7b5f23005725c4dbd742bdb86b2ad80fcfc067c2f90cdead14646fc0fd489a0bb33f826ee8156729a9b6b6e0097130a4
-  data.tar.gz: d9a12f15c99fd5f9be3caa2d683ccb2031df7bb91a11e6197d683444ce3f9cf103cbea6c510e5af273eb231cab0e6e4d9c38dec0a5685f6a812b047082b5da47
+  metadata.gz: 0c52cd77ae07128d74297813d554e1479848c1b06c423797d2c5959cc396e9c2aacd6a522aeadc0b8e66a47696f3405ccd6c83bac4e8958faee857e9dede4c0f
+  data.tar.gz: 4e3138459df1a4246334d61a488bcb91674baff6ae84500ca60da40248a3a169a938d0bd37ae1e8d0210e3988532efd09fabd9835461c77fc025b78c256be7e6

data/lib/calculate-bot.rb

@@ -2,9 +2,10 @@ class CalculateBot
 
   def self.compute(expression)
     enable = true
+    expression.gsub!("！", "!")
     expression = expression.chars.reject { |c| c == ' ' }.join('')
     expression.chars.each do |c|
-      if !"+-*/0123456789(). !%^cgilnops".include?(c)
+      if !"+-*/0123456789(). !%^acdgilnoprst".include?(c)
         enable = false
         break
       end
@@ -14,6 +15,7 @@ class CalculateBot
 
     result = compute_sub(expression)
     return {:status => :no_result} if result == nil
+    return {:status => :too_big_result} if result == :too_big_result
 
     {:status => :normal, :result => result.to_s }
   end
@@ -27,13 +29,17 @@ class CalculateBot
     if expression[-1] == '!'
       number = check_number expression[0..-2]
 
-      if number != nil
-        ret = 1
-        (1..number).each do |n|
-          ret = ret * n
-        end
+      if number != nil 
+        if number > 200
+          return :too_big_result
+        else
+          ret = 1
+          (1..number).each do |n|
+            ret = ret * n
+          end
 
-        return ret
+          return ret
+        end
       end
     end
 
@@ -95,6 +101,44 @@ class CalculateBot
   def self.check_number(expression)
     if expression == 'pi'
       return 3.14159265359
+    elsif expression == 'rand'
+      r = Random.new
+      return r.rand(0..999) / 1000
+    elsif expression.index('log(') == 0 and expression.rindex(')') == expression.length - 1
+      inside = check_number(expression[4..-2])
+      if inside != nil
+        return Math.log10(inside)
+      else
+        return nil
+      end
+    elsif expression.index('ln(') == 0 and expression.rindex(')') == expression.length - 1
+      inside = check_number(expression[3..-2])
+      if inside != nil
+        return Math.log(inside)
+      else
+        return nil
+      end
+    elsif expression.index('sin(') == 0 and expression.rindex(')') == expression.length - 1
+      inside = check_number(expression[4..-2])
+      if inside != nil
+        return Math.sin(inside)
+      else
+        return nil
+      end
+    elsif expression.index('cos(') == 0 and expression.rindex(')') == expression.length - 1
+      inside = check_number(expression[4..-2])
+      if inside != nil
+        return Math.cos(inside)
+      else
+        return nil
+      end
+    elsif expression.index('tan(') == 0 and expression.rindex(')') == expression.length - 1
+      inside = check_number(expression[4..-2])
+      if inside != nil
+        return Math.tan(inside)
+      else
+        return nil
+      end
     end
 
     index = expression.rindex('^')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calculate-bot
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jianfeng Tu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies: []
 description: A calculator lib for computing result from string
 email: tujf.cn@gmail.com