expressive 0.0.16 → 0.0.17

data/Gemfile.lock

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

data/lib/expressive.rb

@@ -20,7 +20,7 @@ module Expressive
   end
 
   def self.all_symbols
-    %w(+ - * / = set sum post >= > < <= and or if date get put lookup round $days_ago $hours_ago $minutes_ago)
+    %w(+ - * / = set sum post >= > < <= and or if date get put lookup round $days_ago $hours_ago $minutes_ago $append $id)
   end
 
   module Boolean

data/lib/expressive/version.rb

@@ -1,3 +1,3 @@
 module Expressive
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/lib/scope.rb

@@ -78,6 +78,16 @@ module Expressive
         scope[cells.first.text_value] = cells[1].eval(scope)
       end
 
+      syntax('$append') do |scope, cells|
+        scope[cells.first.text_value] = [] if scope[cells.first.text_value].nil?
+        addition = cells[1].eval(scope)
+        if addition.is_a?(Array)
+          scope[cells.first.text_value] = scope[cells.first.text_value] | addition
+        else
+          scope[cells.first.text_value] << addition
+        end
+      end
+
       syntax('lookup') do |scope, cells|
         lookup_result = scope.lookups[cells.first.text_value]
         if lookup_result
@@ -114,6 +124,7 @@ module Expressive
         end
       end
 
+      define('$id') {|*args| args.first.id }
       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 }

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 round $days_ago $hours_ago $minutes_ago) }
+    it { Expressive.all_symbols.should =~ %w(+ - * / = set sum get put post >= > < <= and or if date lookup round $days_ago $hours_ago $minutes_ago $append $id) }
   end
 
   describe "understands booleans" do
@@ -142,6 +142,26 @@ describe "Expressive" do
       @scope["owned_by_id"].should eql @user2.id
       @scope["owned_by_type"].should eql "RSpec::Mocks::Mock"
     end
+
+  end
+
+  describe "understands adding values to lists" do
+    it "add a single value to a list of values" do
+      Expressive.run('($append participating_teams 1)', @scope)
+      @scope['participating_teams'].should == [1]
+    end
+    it "append to a list values list of values" do
+      @scope['participating_teams'] = [0]
+      Expressive.run('($append participating_teams (1 2 3))', @scope)
+      @scope['participating_teams'].should == [0, 1, 2, 3]
+    end
+  end
+
+  describe "understands retrieving the id of an object" do
+    it do 
+      @scope["an_object"] = mock(:an_object, id: 5)
+      Expressive.run('($id an_object)', @scope).should == 5
+    end
   end
 
   describe "understands time ranges" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressive
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-26 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: 4308586797319105101
+      hash: -4421834201384334289
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -303,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4308586797319105101
+      hash: -4421834201384334289
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23