expressive 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,15 +1,19 @@
 PATH
   remote: .
   specs:
-    expressive (0.0.2)
+    expressive (0.0.3)
       awesome_print (~> 1.0.2)
       polyglot (~> 0.3.3)
+      rest-client (~> 1.6.7)
       treetop (~> 1.4.10)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.2)
     awesome_print (1.0.2)
+    coderay (1.0.7)
+    crack (0.3.1)
     diff-lcs (1.1.3)
     ffi (1.1.5)
     guard (1.3.2)
@@ -22,7 +26,13 @@ GEM
       rb-fchange (~> 0.0.5)
       rb-fsevent (~> 0.9.1)
       rb-inotify (~> 0.8.8)
+    method_source (0.8)
+    mime-types (1.19)
     polyglot (0.3.3)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
     rb-fchange (0.0.5)
       ffi
     rb-fsevent (0.9.1)
@@ -30,6 +40,8 @@ GEM
       ffi (>= 0.5.0)
     rdoc (3.12)
       json (~> 1.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -39,10 +51,14 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.2)
     ruby_gntp (0.3.4)
+    slop (3.3.2)
     thor (0.16.0)
-    treetop (1.4.10)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
+    webmock (1.8.11)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
@@ -52,6 +68,8 @@ DEPENDENCIES
   expressive!
   guard (~> 1.3.2)
   guard-rspec (~> 1.2.1)
+  pry (~> 0.9.10)
   rdoc (~> 3.12)
   rspec (~> 2.11.0)
   ruby_gntp (~> 0.3.4)
+  webmock (~> 1.8.11)

data/Guardfile

@@ -1,30 +1,9 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'bundler' do
-  watch('Gemfile')
-  # Uncomment next line if Gemfile contain `gemspec' command
-  # watch(/^.+\.gemspec/)
-end
-
-guard 'rspec', :cli => "--color --format nested --fail-fast", :version => 2 do
+guard 'rspec', :cli => "--color --format nested --fail-fast", :version => 2, :notification => false do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-
-  # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-  
-  # Capybara request specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
-  
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+  watch('spec/spec_helper.rb')  { "rspec" }
 end
 

data/expressive.gemspec

@@ -22,8 +22,11 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency  "bundler", "~> 1.1.4"
   gem.add_development_dependency  "guard", "~> 1.3.2"
   gem.add_development_dependency  "guard-rspec", "~> 1.2.1"
+  gem.add_development_dependency  "webmock", "~> 1.8.11"
+  gem.add_development_dependency  "pry", "~> 0.9.10"
 
   gem.add_dependency "polyglot", "~> 0.3.3"
   gem.add_dependency "treetop", "~> 1.4.10"
   gem.add_dependency "awesome_print", "~> 1.0.2"
+  gem.add_dependency "rest-client", "~> 1.6.7"
 end

data/lib/expressive/version.rb

@@ -1,3 +1,3 @@
 module Expressive
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/expressive.rb

@@ -1,6 +1,7 @@
 require 'polyglot'
 require 'treetop'
 require 'awesome_print'
+require 'rest_client'
 require File.join(File.dirname(__FILE__), 'scope')
 
 Treetop.load File.join(File.dirname(__FILE__), 'expressive_grammar.treetop')
@@ -15,30 +16,39 @@ module Expressive
     @parser ||= ::ExpressiveParser.new
     @parser.parse(expressions)
   end
-end
 
+  def self.all_symbols
+    %w(+ - * / = set sum post >= > < <= and or if)
+  end
+end
 
-module Boolean 
+module Boolean
   def eval(scope)
-   'true' == text_value 
+   'true' == text_value
   end
 end
 
-module IntegerValue 
-  def eval(scope) 
+module IntegerValue
+  def eval(scope)
     text_value.to_i
   end
 end
 
-module FloatValue 
-  def eval(scope) 
-    text_value.to_f 
+module FloatValue
+  def eval(scope)
+    text_value.to_f
+  end
+end
+
+module StringValue
+  def eval(scope)
+    text_value.gsub('"', '')
   end
 end
 
 class Program < Treetop::Runtime::SyntaxNode
   def eval(scope)
-    elements.map {|e| 
+    elements.map {|e|
       e.eval(scope)
     }.last
   end
@@ -83,7 +93,7 @@ class Function
   end
 
   def call(scope, statements)
-    parameters = statements.map {|c| c.eval(scope)} 
+    parameters = statements.map {|c| c.eval(scope)}
     @block.call(*parameters)
   end
 end

data/lib/expressive_grammar.treetop

@@ -17,13 +17,17 @@ grammar Expressive
   end
 
   rule value
-    (boolean / number)
+    (string / boolean / number)
   end
 
   rule word
     [a-zA-Z]+
   end
 
+  rule string
+    '"' ([^"\\] / "\\" . )* '"' <StringValue>
+  end
+
   rule number
     ( float / integer )
   end

data/lib/scope.rb

@@ -25,14 +25,13 @@ class Scope
     @symbols
   end
 
-  def define(name, &block) 
-    self[name] =  Function.new(&block)    
+  def define(name, &block)
+    self[name] =  Function.new(&block)
   end
 
-  def syntax(name, &block) 
-    self[name] =  Syntax.new(&block)    
+  def syntax(name, &block)
+    self[name] =  Syntax.new(&block)
   end
-
 end
 
 class TopLevel < Scope
@@ -43,11 +42,33 @@ class TopLevel < Scope
       scope[cells.first.text_value] = cells[1].eval(scope)
     end
 
+    syntax('post') do |scope, cells|
+      uri = cells.shift.text_value.gsub('"', '')
+      payload = {}
+      cells.each do |key|
+        payload[key.text_value] = scope[key.text_value]
+      end
+      begin
+        response = RestClient.post uri, payload
+        scope = scope.merge(response) if response.is_a?(Hash)
+      rescue RestClient::Exception => e
+        scope['_errors'] = e.message
+      end
+      scope
+    end
+
     define('+') {|a,b| a.to_f + b.to_f }
     define('-') {|a,b| a.to_f - b.to_f }
     define('*') {|a,b| a.to_f * b.to_f }
     define('/') {|a,b| a.to_f / b.to_f }
     define('=') {|a,b| a == b }
-    define('sum') {|*args| args.flatten.map(&:to_f).reduce(:+) }
+    define('>') {|a,b| a.to_f > b.to_f }
+    define('<') {|a,b| a.to_f < b.to_f }
+    define('>=') {|a,b| a.to_f >= b.to_f }
+    define('<=') {|a,b| a.to_f <= b.to_f }
+    define('and') {|a,b| !!a && !!b }
+    define('or') {|a,b| !!a || !!b }
+    define('sum') { |*args| args.flatten.map(&:to_f).reduce(:+) }
+    define('if') { |*args| args.compact!; args[0] ? args[1] : args[2] }
   end
 end

data/spec/expressive_spec.rb

@@ -4,7 +4,11 @@ describe "Expressive" do
   before(:each) do
     @scope = TopLevel.new
   end
- 
+
+  describe "all_symbols" do
+    it { Expressive.all_symbols.should =~ %w(+ - * / = set sum post >= > < <= and or if) }
+  end
+
   describe "understands booleans" do
     it { Expressive.run("true").should eql true }
     it { Expressive.run("false").should eql false }
@@ -12,7 +16,14 @@ describe "Expressive" do
 
   describe "understands numbers" do
     it { Expressive.run("5").should eql 5 }
-    it { Expressive.run("5.5").should eql 5.5 } 
+    it { Expressive.run("5.5").should eql 5.5 }
+  end
+
+  describe "understands string literals" do
+    it { Expressive.run('"hello world "').should eql "hello world " }
+    it { Expressive.run('"hello world 2012"').should eql "hello world 2012" }
+    it { Expressive.run('"hello world 2.5"').should eql "hello world 2.5" }
+    it { Expressive.run('"hello world false"').should eql "hello world false" }
   end
 
   it "understands variables" do
@@ -20,16 +31,113 @@ describe "Expressive" do
     Expressive.run("hello", @scope).should eql "World"
   end
 
-  describe "understands arithmetic" do
+  describe "under stands arithmetic" do
     it { Expressive.run("(+ 4 2)").should eql 6.0 }
     it { Expressive.run("(- 4 2)").should eql 2.0 }
     it { Expressive.run("(* 4 2)").should eql 8.0 }
     it { Expressive.run("(/ 4 2)").should eql 2.0 }
-    it { Expressive.run("(sum 1 2 3)").should eql 6.0}
+    it { Expressive.run("(sum 1 2 3)").should eql 6.0 }
+  end
+
+  describe "understands comparisson" do
+    it { Expressive.run("(= 4 2)").should eql false }
+    it { Expressive.run("(= 4 4)").should eql true }
+    it { Expressive.run("(> 4 2)").should eql true }
+    it { Expressive.run("(> 2 4)").should eql false }
+    it { Expressive.run("(< 4 2)").should eql false }
+    it { Expressive.run("(< 2 4)").should eql true }
+    it { Expressive.run("(>= 4 4)").should eql true }
+    it { Expressive.run("(<= 4 4)").should eql true }
   end
 
   describe "understands compound statements" do
     it { Expressive.run("(= (+ 4 2) 6)").should eql true }
+    it { Expressive.run("(if (and (< 3 9) (> 2 1)), true, false)").should eql true }
+    it { Expressive.run("(if (and (< 10 9) (> 2 1)), true, false)").should eql false }
+  end
+
+  describe "understands conditional statements" do
+    it { Expressive.run('(if (> 5 4) "greater" "not so greater")').should eql "greater" }
+
+    context "it understands the need for commas (if you like that kind of thing" do
+      it { Expressive.run('(if (< 5 4), "greater", "not so greater")').should eql "not so greater" }
+    end
+
+    context "nil values" do
+      it { Expressive.run('(if (> nil_value 4) "greater" "not so greater")', @scope).should eql "not so greater" }
+      it { Expressive.run('(if (> 4 nil_value) "greater" "not so greater")', @scope).should eql "greater" }
+      it { Expressive.run('(if (> 4 nil_value) "greater" "not so greater")', @scope).should eql "greater" }
+      it { Expressive.run('(if (<= nil_value 4) "greater" "not so greater")', @scope).should eql "greater" }
+      it { Expressive.run('(if (>= 4 nil_value) "greater" "not so greater")', @scope).should eql "greater" }
+    end
+  end
+
+  describe "understands logical statements" do
+    it { Expressive.run('(and true true)').should eql true }
+    it { Expressive.run('(and true false)').should eql false }
+    it { Expressive.run('(or true true)').should eql true }
+    it { Expressive.run('(or true false)').should eql true }
+    it { Expressive.run('(or false false)').should eql false }
+
+    context "nil values" do
+      it { Expressive.run('(and true nil_value)', @scope).should eql false }
+      it { Expressive.run('(and nil_value true)', @scope).should eql false }
+      it { Expressive.run('(or nil_value true)', @scope).should eql true }
+      it { Expressive.run('(or nil_value false)', @scope).should eql false }
+    end
+  end
+
+  describe "understands web-hook statements" do
+    context "with a valid response" do
+      it "should post to the given uri" do
+        request = stub_request(:post, "www.example.com")
+        Expressive.run('(post "http://www.example.com")')
+        assert_requested(request)
+      end
+
+      it "should post the cope parameters if given" do
+        @scope['ohai'] = "world"
+        request = stub_request(:post, "www.example.com").with(body: {'ohai' => 'world'})
+        Expressive.run('(post "http://www.example.com" ohai)', @scope)
+        assert_requested(request)
+      end
+
+      it "should update the scope based on the response" do
+        @scope['ohai'] = "world"
+        request = stub_request(:post, "www.example.com").with(body: {'ohai' => 'world'}).to_return(body: {'goodbye' => 'srsly'})
+        Expressive.run('(post "http://www.example.com" ohai)', @scope)
+        @scope['goodbye'].should eql 'srsly'
+      end
+    end
+
+    context "when the response is invalid" do
+      context "sets error custom message" do
+        it "should add an entry in the errors element of the scope" do
+          message = 'Something went Pete Tong'
+          exception = RestClient::Exception.new
+          exception.message = message
+          stub_request(:post, 'www.example.com').to_raise(exception)
+          Expressive.run('(post "http://www.example.com")', @scope)
+          @scope['_errors'].should eql message
+        end
+      end
+
+      context "bad uri" do
+        it "should add an entry in the errors element of the scope" do
+          stub_request(:post, "badexample.com").to_raise(RestClient::ResourceNotFound.new)
+          Expressive.run('(post "badexample.com")', @scope)
+          @scope['_errors'].should eql 'Resource Not Found'
+        end
+      end
+
+      context "timeout" do
+        it "should add an entry in the errors element of the scope" do
+          stub_request(:post, 'www.example.com').to_timeout
+          Expressive.run('(post "http://www.example.com")', @scope)
+          @scope['_errors'].should eql 'Request Timeout'
+        end
+      end
+    end
   end
 
   context "looking up an id based on a value" do

data/spec/spec_helper.rb

@@ -8,7 +8,10 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'rspec'
+require 'webmock/rspec'
+require 'pry'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+
 require 'expressive'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressive
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
@@ -107,6 +107,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.11
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.10
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.10
 - !ruby/object:Gem::Dependency
   name: polyglot
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +187,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.7
 description: Scheme-like language for manipulating CaseBlocks cases
 email:
 - ijonas@emergeadapt.com
@@ -193,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3233629507963509909
+      hash: -977329044772272752
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3233629507963509909
+      hash: -977329044772272752
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23