dentaku 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc04ff45c34b77ede3ebb41f6ed34a94413925ac
-  data.tar.gz: 19906fc893a540448be14ed1374cc1cb89b7c999
+  metadata.gz: 2786a55545e9a2472089d941fa6611aea6124991
+  data.tar.gz: 312eacef50b85dac484b9166c378a7ca359d305c
 SHA512:
-  metadata.gz: b8ef9498e64f6050bc7fd587b5c3cae3c0489bc050810601c70820d233a03bd586ed37567b186a423a397c1571e0cb02828ed17126627b1764e7c089abe36dfd
-  data.tar.gz: a5d0ee82db757582c697bfb721b27a9670cf46b790b17839967fd40fc52bdaf0e91a9839be73504da6bd026fbcb750edd7235c53d23f7930aec89da77b4f839a
+  metadata.gz: fdd35ea4a57f82c6f3c1f9e65ae28fa73d2862e7729225ce714b976466650a2e09473ea3a25c06a18fbaa76e8665294526fed8a3451649140855b79f38337a31
+  data.tar.gz: ea460a2b63b8318bb03a51ecb6c1370794da332395241357f2b486d2495e4079489894a7271b96d4464fac734c4af96caced5cdd3248505726e0841604a6f05c

data/dentaku.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Solomon White"]
   s.email       = ["rubysolo@gmail.com"]
   s.homepage    = "http://github.com/rubysolo/dentaku"
+  s.licenses    = %w(MIT)
   s.summary     = %q{A formula language parser and evaluator}
   s.description = <<-DESC
     Dentaku is a parser and evaluator for mathematical formulas

data/lib/dentaku/evaluator.rb

@@ -75,7 +75,11 @@ module Dentaku
     end
 
     def negate(_, token)
-      Token.new(token.category,token.value * -1)
+      Token.new(token.category, token.value * -1)
+    end
+
+    def percentage(token, _)
+      Token.new(token.category, token.value / 100.0)
     end
 
     def expand_range(left, oper1, middle, oper2, right)
@@ -83,7 +87,7 @@ module Dentaku
     end
 
     def if(*args)
-      _, open, condition, _, true_value, _, false_value, close = args
+      _if, _open, condition, _, true_value, _, false_value, _close = args
 
       if condition.value
         true_value

data/lib/dentaku/rules.rb

@@ -17,6 +17,7 @@ module Dentaku
         [ p(:math_mod),   :apply          ],
         [ p(:math_mul),   :apply          ],
         [ p(:math_add),   :apply          ],
+        [ p(:percentage), :percentage     ],
         [ p(:negation),   :negate         ],
         [ p(:range_asc),  :expand_range   ],
         [ p(:range_desc), :expand_range   ],
@@ -55,7 +56,12 @@ module Dentaku
     end
 
     def self.t(name)
-      @matchers ||= [
+      @matchers ||= generate_matchers
+      @matchers[name]
+    end
+
+    def self.generate_matchers
+      [
         :numeric, :string, :addsub, :subtract, :muldiv, :pow, :mod,
         :comparator, :comp_gt, :comp_lt,
         :open, :close, :comma,
@@ -65,8 +71,6 @@ module Dentaku
       ].each_with_object({}) do |name, matchers|
         matchers[name] = TokenMatcher.send(name)
       end
-
-      @matchers[name]
     end
 
     def self.p(name)
@@ -77,6 +81,7 @@ module Dentaku
         math_pow:   pattern(:numeric, :pow,            :numeric),
         math_mod:   pattern(:numeric, :mod,            :numeric),
         negation:   pattern(:subtract, :numeric),
+        percentage: pattern(:numeric, :mod),
         range_asc:  pattern(:numeric, :comp_lt,        :numeric,  :comp_lt, :numeric),
         range_desc: pattern(:numeric, :comp_gt,        :numeric,  :comp_gt, :numeric),
         num_comp:   pattern(:numeric, :comparator,     :numeric),

data/lib/dentaku/version.rb

@@ -1,3 +1,3 @@
 module Dentaku
-  VERSION = "0.2.13"
+  VERSION = "0.2.14"
 end

data/spec/evaluator_spec.rb

@@ -8,7 +8,7 @@ describe Dentaku::Evaluator do
     it 'should find a matching rule' do
       rule   = [Dentaku::TokenMatcher.new(:numeric, nil)]
       stream = [Dentaku::Token.new(:numeric, 1), Dentaku::Token.new(:operator, :add), Dentaku::Token.new(:numeric, 1)]
-      position, match = evaluator.find_rule_match(rule, stream)
+      position, _match = evaluator.find_rule_match(rule, stream)
       position.should eq(0)
     end
   end
@@ -46,6 +46,11 @@ describe Dentaku::Evaluator do
       evaluator.evaluate(token_stream(1, :subtract, :subtract, 1)).should eq(2)
     end
 
+    it 'supports unary percentage' do
+      evaluator.evaluate(token_stream(50, :mod)).should eq(0.5)
+      evaluator.evaluate(token_stream(50, :mod, :multiply, 100)).should eq(50)
+    end
+
     describe 'maths' do
       it 'should perform addition' do
         evaluator.evaluate(token_stream(1, :add, 1)).should eq(2)

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -46,8 +46,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -73,7 +73,8 @@ files:
 - spec/token_spec.rb
 - spec/tokenizer_spec.rb
 homepage: http://github.com/rubysolo/dentaku
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -81,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: dentaku
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A formula language parser and evaluator