expressive 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    expressive (0.0.5)
+    expressive (0.0.6)
       awesome_print (~> 1.0.2)
+      json
       polyglot (~> 0.3.3)
       rest-client (~> 1.6.7)
       treetop (~> 1.4.10)

data/expressive.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency  "pry", "~> 0.9.10"
 
   gem.add_dependency "polyglot", "~> 0.3.3"
+  gem.add_dependency "json"
   gem.add_dependency "treetop", "~> 1.4.10"
   gem.add_dependency "awesome_print", "~> 1.0.2"
   gem.add_dependency "rest-client", "~> 1.6.7"

data/lib/expressive/version.rb

@@ -1,3 +1,3 @@
 module Expressive
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/scope.rb

@@ -1,4 +1,5 @@
 module Expressive
+  require 'json'
   class Scope
     def initialize(parent = {})
       @parent = parent
@@ -37,8 +38,8 @@ module Expressive
 
   class Webhook
 
-    def initialize(verb, url, params)
-      @verb, @url, @params = verb, url, params
+    def initialize(verb, url, params, headers)
+      @verb, @url, @params, @headers = verb, url, params, headers
     end
 
     def execute
@@ -48,11 +49,15 @@ module Expressive
     private
 
       def post
-        RestClient.post(@url, @params)
+        headers = {:content_type => :json, :accept => :json}
+        headers = headers.merge(@headers) if @headers
+        RestClient.post(@url, @params.to_json, headers)
       end
 
       def get
-        RestClient.get(@url, {params: @params})
+        headers = {:params => @params}
+        headers = headers.merge(@headers) if @headers
+        RestClient.get(@url, headers)
       end
 
       def put
@@ -104,14 +109,17 @@ module Expressive
 
     private
 
-    #(post "http://example.com" name age other)
-    #(get "http://example.com" "*")
+    #(post "http://example.com" "*" (headers "AUTH-TOKEN=13415") )
+    #(post "http://example.com" name email john smith (headers "AUTH-TOKEN=13415") )
 
     def perform_webhook(verb, scope, cells)
-      url = cells.shift.text_value.gsub('"', '')
-      params = create_webhook_parameters(scope, cells)
+      #convert cells to array so it can manipulated easily
+      cells_array = cells.map{|c| c.text_value.gsub('"', '')}
+      url = cells_array.shift
+      headers = create_webhook_headers(cells_array)
+      params = create_webhook_parameters(scope, cells_array)
       begin
-        response = Webhook.new(verb, url, params).execute
+        response = Webhook.new(verb, url, params, headers).execute
         scope = scope.merge(response) if response.is_a?(Hash)
       rescue RestClient::Exception => e
         scope['_errors'] = e.message
@@ -119,12 +127,25 @@ module Expressive
       scope
     end
 
+    def create_webhook_headers(cells)
+      header_position = cells.index("headers")
+      return if header_position.nil?
+      headers = cells[header_position + 1..-1]
+      cells.delete("headers")
+      headers.each{|h| cells.delete(h)}
+      headers.inject({}) do |header, h|
+        idx = h.index("=")
+        header[h[0..(idx-1)]] = h[(idx+1)..-1]
+        header
+      end
+    end
+
     def create_webhook_parameters(scope, cells)
-      if cells.first && cells.first.text_value.gsub('"', '') == '*'
+      if cells.first && cells.first == '*'
         scope.to_hash
       else
         cells.inject({}) do |params, key|
-          params[key.text_value] = scope[key.text_value]
+          params[key] = scope[key]
           params
         end
       end

data/spec/expressive_spec.rb

@@ -1,4 +1,3 @@
-
 require "spec_helper"
 
 describe "Expressive" do
@@ -127,6 +126,17 @@ describe "Expressive" do
         assert_requested(request)
         @scope['goodbye'].should eql 'srsly'
       end
+
+      it "should get with headers" do
+        @scope['ohai'] = "world"
+        @scope["monty"] = "python"
+        request = stub_request(:get, "www.example.com/?ohai=world&monty=python")
+          .with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'User-Agent'=>'Ruby', "AUTH-TOKEN" => "123456"})
+          .to_return(body: {'goodbye' => 'srsly'})
+        Expressive.run('(get "http://www.example.com" "*" headers "AUTH-TOKEN=123456")', @scope)
+        assert_requested(request)
+        @scope['goodbye'].should eql 'srsly'
+      end
     end
 
     context "post" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressive
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70261240748780 !ruby/object:Gem::Requirement
+  requirement: &70342459798500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *70261240748780
+  version_requirements: *70342459798500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70261240748260 !ruby/object:Gem::Requirement
+  requirement: &70342459798000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70261240748260
+  version_requirements: *70342459798000
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70261240747780 !ruby/object:Gem::Requirement
+  requirement: &70342459797500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70261240747780
+  version_requirements: *70342459797500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70261240747100 !ruby/object:Gem::Requirement
+  requirement: &70342459796940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70261240747100
+  version_requirements: *70342459796940
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70261240746320 !ruby/object:Gem::Requirement
+  requirement: &70342459796300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70261240746320
+  version_requirements: *70342459796300
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70261240745320 !ruby/object:Gem::Requirement
+  requirement: &70342459795840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *70261240745320
+  version_requirements: *70342459795840
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70261240744640 !ruby/object:Gem::Requirement
+  requirement: &70342459795380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.8.11
   type: :development
   prerelease: false
-  version_requirements: *70261240744640
+  version_requirements: *70342459795380
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70261240743580 !ruby/object:Gem::Requirement
+  requirement: &70342459794860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *70261240743580
+  version_requirements: *70342459794860
 - !ruby/object:Gem::Dependency
   name: polyglot
-  requirement: &70261240742840 !ruby/object:Gem::Requirement
+  requirement: &70342459794300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,21 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70261240742840
+  version_requirements: *70342459794300
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70342459793820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70342459793820
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &70261240543280 !ruby/object:Gem::Requirement
+  requirement: &70342459792980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +131,10 @@ dependencies:
         version: 1.4.10
   type: :runtime
   prerelease: false
-  version_requirements: *70261240543280
+  version_requirements: *70342459792980
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70261240541560 !ruby/object:Gem::Requirement
+  requirement: &70342459792000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +142,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70261240541560
+  version_requirements: *70342459792000
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70261240540720 !ruby/object:Gem::Requirement
+  requirement: &70342459791520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +153,7 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70261240540720
+  version_requirements: *70342459791520
 description: Scheme-like language for manipulating CaseBlocks cases
 email:
 - ijonas@emergeadapt.com
@@ -184,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3178828988294476295
+      hash: 1097799900527536520
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3178828988294476295
+      hash: 1097799900527536520
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15