expressive 0.0.13 → 0.0.14

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    expressive (0.0.13)
+    expressive (0.0.14)
       awesome_print (~> 1.0.2)
       json
       polyglot (~> 0.3.3)
@@ -28,7 +28,7 @@ GEM
       rb-fsevent (~> 0.9.1)
       rb-inotify (~> 0.8.8)
     method_source (0.8)
-    mime-types (1.19)
+    mime-types (1.21)
     polyglot (0.3.3)
     pry (0.9.10)
       coderay (~> 1.0.5)

data/lib/expressive/version.rb

@@ -1,3 +1,3 @@
 module Expressive
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/lib/expressive.rb

@@ -24,25 +24,25 @@ module Expressive
   end
 
   module Boolean
-    def eval(scope)
+    def eval(scope = nil)
      'true' == text_value
     end
   end
 
   module IntegerValue
-    def eval(scope)
+    def eval(scope = nil)
       text_value.to_i
     end
   end
 
   module FloatValue
-    def eval(scope)
+    def eval(scope = nil)
       text_value.to_f
     end
   end
 
   module StringValue
-    def eval(scope)
+    def eval(scope = nil)
       text_value.gsub('"', '')
     end
   end
@@ -61,8 +61,12 @@ module Expressive
     end
 
     def eval(scope)
-      function = statements.first.eval(scope)
-      function.call(scope, statements[1..-1])
+      first_elem = statements.first.eval(scope)
+      if first_elem.is_a? Function
+        first_elem.call(scope, statements[1..-1])
+      else
+        statements.map {|stat| stat.eval(scope) }
+      end
     end
   end
 

data/lib/scope.rb

@@ -14,7 +14,7 @@ module Expressive
       @lookups[lookup_table_name].merge!(lookups)
     end
 
-    def add_lookup_function(lookup_function_name, passed_in_options, &func_proc)
+    def add_lookup_function(lookup_function_name, passed_in_options = {}, &func_proc)
       @lookups[lookup_function_name] = [passed_in_options, func_proc]
     end
 
@@ -22,6 +22,10 @@ module Expressive
       @lookups.clear
     end
 
+    def include?(name)
+      @symbols.include?(name) or @lookups.include?(name)
+    end
+
     def [](name)
       @symbols[name] || @parent[name]
     end
@@ -83,7 +87,7 @@ module Expressive
           elsif lookup_result.is_a?(Array)
             options = lookup_result.first
             the_proc = lookup_result.last
-            the_proc.call(options, key)
+            the_proc.call(options, key, *cells[2..-1].map {|cell| cell.eval(scope)})
           end
         end
       end

data/spec/expressive_spec.rb

@@ -6,7 +6,7 @@ describe "Expressive" do
   end
 
   describe "all_symbols" do
-    it { Expressive.all_symbols.should =~ %w(+ - * / = set sum get put post >= > < <= and or if date lookup) }
+    it { Expressive.all_symbols.should =~ %w(+ - * / = set sum get put post >= > < <= and or if date lookup round) }
   end
 
   describe "understands booleans" do
@@ -151,6 +151,15 @@ describe "Expressive" do
       end
       Expressive.run('(lookup account_reverse_login "ijonas")', @scope).should eql "ea-sanoji"
     end
+
+    it "should support multiple parameters to a lookup function" do
+      @scope.add_lookup_function("related_count") do |options, related_type, query_specs, last|
+        [related_type, query_specs.length, last]
+      end
+
+      Expressive.run('(lookup related_count "matters" (1 2 3) 10)', @scope).should eql ['matters', 3, 10]
+    end
+
   end
 
   describe "understands web-hook statements" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressive
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
@@ -294,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3813765804844931706
+      hash: 1436366056289508828
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -303,10 +303,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3813765804844931706
+      hash: 1436366056289508828
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Scheme-like language for manipulating CaseBlocks cases