calculator7 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f59e3a0f339618c747adb971291fc0e1b9b9eda
-  data.tar.gz: 729569bbf4a649108746428a8a218fca14cac235
+  metadata.gz: 2c3679996d8e9ae4a6d90e3d365f3cc8d134813e
+  data.tar.gz: fedb9322e5b3da48fc084b3c1acbcb71ac250d94
 SHA512:
-  metadata.gz: 8383742eabff7d1d4d74d9cc8281878d92d8a6535e9efe8985e7e15df43728bc5c5780f08581e3695e9acb422c28b94aa5709f8b24b650575521e7ce4e76344b
-  data.tar.gz: 2f074299180a8ff35b81105b6a65afe170dccd78a09c9b0f5a70108d2caaef5f638bbd4a1f3c6772607cff81bff93225640b4ec9bb9ce9ad9cac2fe2e6e828e1
+  metadata.gz: 497cb83ae07a9af080536c9ebd594f8d57d5933df71fad0c0964d5e197fd497cc2cf0d90a0df684663f89d53d4798ef6b707bd4d7e0ee6b511f58a436775cb59
+  data.tar.gz: 273fe49badb04fdfa2258ab9e9cae9dc0e1ebb747242a6f17dc8cd5bda999284a2325b6899ef7814dfccc02fd14e6cfc23909e6b3a791a9c62822a4913a7ba15

data/lib/calculator7.rb

@@ -3,14 +3,14 @@ class Calculator7
   def self.compute(expression)
     enable = true
     expression.chars.each do |c|
-      if !"+-*/0123456789(). ".include?(c)
+      if !"+-*/0123456789(). !".include?(c)
         enable = false
         break
       end
     end
 
     return nil if !enable
-    expression = expression.chars.select { |c| "+-*/0123456789().".include?(c) }.join('')
+    expression = expression.chars.reject { |c| c == ' ' }.join('')
 
     compute_sub(expression)
   end
@@ -21,6 +21,19 @@ class Calculator7
     number = check_number(expression) 
     return number if number != nil
 
+    if expression[-1] == '!'
+      number = check_number expression[0..-2]
+
+      if number != nil
+        ret = 1
+        (1..number).each do |n|
+          ret = ret * n
+        end
+
+        return ret
+      end
+    end
+
     offset = 0
     value = 0
 
@@ -31,7 +44,7 @@ class Calculator7
 
       if offset == 0 and index > 0 and '+-'.include?(c)
         last_index = index
-     end
+      end
     end
     return nil if offset != 0
 
@@ -55,11 +68,12 @@ class Calculator7
         last_index = index
       end
     end
+
     if last_index > 0
       left = compute_sub(expression[0..last_index-1]) 
       right = compute_sub(expression[(last_index+1)..-1])
       c = expression[last_index]
-      return nil if right.to_f == 0
+      return nil if right.to_f == 0 and c == '/'
 
       if c == '*' 
         return left * right
@@ -80,7 +94,7 @@ class Calculator7
     return nil if count > 0
 
     count = expression.chars.select { |c| c == '+' or c == '-' }.count
-    return nil if count == 2 or (count == 1 and "0123456789".include?(expression[0]))
+    return nil if count >= 2 or (count == 1 and "0123456789".include?(expression[0]))
 
     count = expression.chars.select { |c| c == '.' }.count
     return nil if count > 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calculator7
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jianfeng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies: []
 description: A simple calculator
 email: tujf.cn@gmail.com