expressive 0.0.8 → 0.0.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    expressive (0.0.8)
+    expressive (0.0.9)
       awesome_print (~> 1.0.2)
       json
       polyglot (~> 0.3.3)

data/lib/expressive.rb

@@ -3,6 +3,8 @@ require 'treetop'
 require 'awesome_print'
 require 'rest_client'
 require File.join(File.dirname(__FILE__), 'scope')
+require File.join(File.dirname(__FILE__), 'extended_value')
+require File.join(File.dirname(__FILE__), 'webhook')
 
 Treetop.load File.join(File.dirname(__FILE__), 'expressive_grammar.treetop')
 
@@ -18,7 +20,7 @@ module Expressive
   end
 
   def self.all_symbols
-    %w(+ - * / = set sum post >= > < <= and or if date get put)
+    %w(+ - * / = set sum post >= > < <= and or if date get put lookup)
   end
 
   module Boolean

data/lib/expressive/version.rb

@@ -1,3 +1,3 @@
 module Expressive
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/extended_value.rb

@@ -0,0 +1,21 @@
+module Expressive
+  
+  class ExtendedValue
+    attr_accessor :setter, :adder
+    def initialize(property_name, scope)
+      @scope = scope
+      @property_name = property_name.to_s
+
+      @scope[@property_name] = self
+    end
+
+    def set(value)
+      setter.call value, @scope
+    end
+
+    def <<(value)
+      adder.call value, @scope
+    end
+  end
+
+end

data/lib/scope.rb

@@ -1,9 +1,25 @@
 module Expressive
   require 'json'
+
   class Scope
+    attr_reader :lookups
     def initialize(parent = {})
       @parent = parent
       @symbols = {}
+      @lookups = {}
+    end
+
+    def add_lookup_table(lookup_table_name, lookups)
+      @lookups[lookup_table_name] = {} unless @lookups.include?(lookup_table_name)
+      @lookups[lookup_table_name].merge!(lookups)
+    end
+
+    def add_lookup_function(lookup_function_name, passed_in_options, &func_proc)
+      @lookups[lookup_function_name] = [passed_in_options, func_proc]
+    end
+
+    def clear_lookup_tables
+      @lookups.clear
     end
 
     def [](name)
@@ -11,7 +27,20 @@ module Expressive
     end
 
     def []=(name, value)
-      @symbols[name] = value
+      if value 
+        if value.is_a?(ExtendedValue)
+          @symbols[name] = value unless @symbols.include?(name)
+        else
+          current_value = @symbols[name]
+          if current_value and current_value.is_a?(ExtendedValue)
+            current_value.set(value)
+          else
+            @symbols[name] = value
+          end
+        end
+      else 
+        @symbols[name] = value
+      end
     end
 
     def merge(scope)
@@ -36,36 +65,6 @@ module Expressive
     end
   end
 
-  class Webhook
-
-    def initialize(verb, url, params, headers)
-      @verb, @url, @params, @headers = verb, url, params, headers
-    end
-
-    def execute
-      self.send(@verb)
-    end
-
-    private
-
-      def post
-        headers = {:content_type => :json, :accept => :json}
-        headers = headers.merge(@headers) if @headers
-        RestClient.post(@url, @params.to_json, headers)
-      end
-
-      def get
-        headers = {:params => @params}
-        headers = headers.merge(@headers) if @headers
-        RestClient.get(@url, headers)
-      end
-
-      def put
-        RestClient.put(@url, @params)
-      end
-
-  end
-
   class TopLevel < Scope
 
     def initialize
@@ -75,6 +74,20 @@ module Expressive
         scope[cells.first.text_value] = cells[1].eval(scope)
       end
 
+      syntax('lookup') do |scope, cells|
+        lookup_result = scope.lookups[cells.first.text_value]
+        if lookup_result
+          key = cells[1].text_value[1..-2]
+          if lookup_result.is_a?(Hash)
+            lookup_result[key]
+          elsif lookup_result.is_a?(Array)
+            options = lookup_result.first
+            the_proc = lookup_result.last
+            the_proc.call(options, key)
+          end
+        end
+      end
+
       syntax('post') do |scope, cells|
         perform_webhook(:post, scope, cells)
       end

data/lib/webhook.rb

@@ -0,0 +1,29 @@
+module Expressive
+  class Webhook
+
+    def initialize(verb, url, params, headers)
+      @verb, @url, @params, @headers = verb, url, params, headers
+    end
+
+    def execute
+      self.send(@verb)
+    end
+
+    private
+    def post
+      headers = {:content_type => :json, :accept => :json}
+      headers = headers.merge(@headers) if @headers
+      RestClient.post(@url, @params.to_json, headers)
+    end
+
+    def get
+      headers = {:params => @params}
+      headers = headers.merge(@headers) if @headers
+      RestClient.get(@url, headers)
+    end
+
+    def put
+      RestClient.put(@url, @params)
+    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) }
+    it { Expressive.all_symbols.should =~ %w(+ - * / = set sum get put post >= > < <= and or if date lookup) }
   end
 
   describe "understands booleans" do
@@ -95,9 +95,10 @@ describe "Expressive" do
     end
 
     it "using multiple set commands" do
-      Expressive.run('(and (set vsi "vsi1234") (set vso "vso1234"))', @scope).should eql true
+      Expressive.run('(and (set vsi "vsi1234") (set vso "vso1234") (set vsbool true))', @scope).should eql true
       @scope['vsi'].should eql 'vsi1234'
       @scope['vso'].should eql 'vso1234'
+      @scope['vsbool'].should be_true
     end
   end
 
@@ -115,6 +116,40 @@ describe "Expressive" do
     end
   end
 
+  describe "understands using lookup tables" do
+    before(:each) do
+      @user1 = mock(:user, id:1, login: "user1", display_name: "User 1")
+      @user2 = mock(:user, id:2, login: "user2", display_name: "User 2")
+      @scope.add_lookup_table("users", @user1.login => @user1, @user2.login => @user2)
+      @scope.add_lookup_table("users", "x_current" => @user2)
+    end
+
+    it "will return a value from a lookup table" do
+      Expressive.run('(lookup users "x_current")', @scope).should eql @user2
+      Expressive.run('(lookup users "user1")', @scope).should eql @user1
+    end
+    it "will set multiple values based on results of a lookup" do
+      @owned_by_ext_value = Expressive::ExtendedValue.new(:x_owned_by, @scope)
+      @owned_by_ext_value.setter = Proc.new do |value, scope| 
+        scope["owned_by_id"] = value.id
+        scope["owned_by_type"] = value.class.to_s
+      end
+
+      Expressive.run('(set x_owned_by (lookup users "x_current"))', @scope)
+      @scope["owned_by_id"].should eql @user2.id
+      @scope["owned_by_type"].should eql "RSpec::Mocks::Mock"
+    end
+  end
+
+  describe "understands using lookup functions" do
+    it "should perform  the lookup function (add account and reverse login)" do
+      @scope.add_lookup_function("account_reverse_login", account: "ea") do |options, login|
+        "#{options[:account]}-#{login.reverse}"
+      end
+      Expressive.run('(lookup account_reverse_login "ijonas")', @scope).should eql "ea-sanoji"
+    end
+  end
+
   describe "understands web-hook statements" do
     context "put" do
       it_should_behave_like "a webhook", :put

data/spec/scope_spec.rb

@@ -1,12 +1,56 @@
 require "spec_helper"
 
-describe "TopLevel" do
+module Expressive 
+  describe TopLevel do
+
+    describe "#to_hash" do
+      it "return only the hash data" do
+        @scope = TopLevel.new
+        @scope["hello"] = "world"
+        @scope.to_hash.should eql({"hello" => "world"})
+      end
+    end
+
+  end
+
+  describe ExtendedValue do
+    it "sets the multiple values of a ExtendedValue" do
+      @scope = TopLevel.new
+
+      @owned_by_ext_value = ExtendedValue.new(:x_owned_by, @scope)
+      @owned_by_ext_value.setter = Proc.new do |value, scope| 
+        scope["owned_by_id"] = value.id
+        scope["owned_by_type"] = value.class.to_s
+      end
+
+      @scope["x_owned_by"] = mock(:current_user, id: 1)
+      @scope["owned_by_id"].should eql 1
+      @scope["owned_by_type"].should eql "RSpec::Mocks::Mock"
+
+
+      @current_state_ext_value = ExtendedValue.new(:x_current_state, @scope)
+      @current_state_ext_value.setter = Proc.new do |value, scope|
+        scope["current_state"] = value.state
+        scope["current_state_id"] = value.id
+      end
+
+      @scope["x_current_state"] = mock(:some_state, id: 1, state: "Pending")
+      @scope["current_state_id"].should eql 1
+      @scope["current_state"].should eql "Pending"
+    end
+    it "add values to a Set construct" do
+      @scope = TopLevel.new
+    
+      @participating_teams_ext_value = ExtendedValue.new(:x_participating_teams, @scope)
+      @participating_teams_ext_value.adder = Proc.new do |value, scope|
+        scope["participating_teams"] << value.id unless scope["participating_teams"].include?(value.id)  
+      end
+
+      @scope["participating_teams"] = [1]
+      @scope["x_participating_teams"] << mock(:some_team, id: 2, display_name: "The B-Team")
+      @scope["x_participating_teams"] << mock(:some_team, id: 2, display_name: "The B-Team")
+      @scope["participating_teams"].should =~ [1,2]
 
-  describe "to_hash" do
-    it "return only the hash data" do
-      @scope = Expressive::TopLevel.new
-      @scope["hello"] = "world"
-      @scope.to_hash.should eql({"hello" => "world"})
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressive
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
@@ -273,7 +273,9 @@ files:
 - lib/expressive.rb
 - lib/expressive/version.rb
 - lib/expressive_grammar.treetop
+- lib/extended_value.rb
 - lib/scope.rb
+- lib/webhook.rb
 - spec/expressive_spec.rb
 - spec/scope_spec.rb
 - spec/spec_helper.rb
@@ -292,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 871214623463249366
+      hash: 275595429222270530
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -301,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 871214623463249366
+      hash: 275595429222270530
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23