expressive 0.0.25 → 0.0.26

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    expressive (0.0.25)
+    expressive (0.0.26)
       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 $sub post >= > < <= and or if date get put lookup $lookup $head $tail $reverse round $round $days_ago $hours_ago $minutes_ago $append $id)
+    %w(+ - * / = set sum $sub post >= > < <= and or if date datetime get put lookup $lookup $head $tail $reverse round $round $days_ago $hours_ago $minutes_ago $append $id $hash)
   end
 
   module Boolean

data/lib/expressive/version.rb

@@ -1,3 +1,3 @@
 module Expressive
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

data/lib/expressive_grammar.treetop

@@ -21,7 +21,7 @@ grammar Expressive
   end
 
   rule word
-    [a-zA-Z]+
+    [a-zA-Z0-9_]+
   end
 
   rule string

data/lib/scope.rb

@@ -88,6 +88,17 @@ module Expressive
         end
       end
 
+      syntax('$hash') do |scope, cells|
+        puts "$hash..."
+        hash = {}
+        cells.each do |cell|
+          key = cell.elements[1].elements[0].elements[1].text_value
+          value = cell.elements[1].elements[1].elements[1].instance_eval{eval(scope)}
+          puts value.class
+          hash[key] = value
+        end
+        hash
+      end
 
       syntax('$lookup') {|scope, cells| perform_lookup(scope, cells)}
       syntax('lookup') {|scope, cells| perform_lookup(scope, cells)}
@@ -113,6 +124,14 @@ module Expressive
           Date.new(values[0], values[1], values[2]).to_time.utc
         end
       end
+      syntax('datetime') do |scope, cells|
+        if cells.empty?
+          DateTime.now
+        else
+          date = cells.first.text_value.gsub(/[\)\(]/, '')
+          DateTime.parse(date)
+        end
+      end
 
       define('$id') {|*args| args.first.id }
       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 $sub get put post >= > < <= and or if date lookup round $round $days_ago $hours_ago $minutes_ago $append $id $head $lookup $reverse $tail) }
+    it { Expressive.all_symbols.should =~ %w(+ - * / = set sum $sub get put post >= > < <= and or if date datetime lookup round $round $days_ago $hours_ago $minutes_ago $append $id $head $lookup $reverse $tail $hash) }
   end
 
   describe "understands booleans" do
@@ -26,6 +26,15 @@ describe "Expressive" do
     it { Expressive.run('"hello world false"').should eql "hello world false" }
   end
 
+  describe "understands hash values" do
+    it { Expressive.run('($hash (test "value"))').should eql ({"test" => "value"})}
+    it { Expressive.run('($hash (test 5))').should eql ({"test" => 5})}
+    it { Expressive.run('($hash (test 5.3))').should eql ({"test" => 5.3})}
+    it { Expressive.run('($hash (test "value") (test2 64))').should eql ({"test" => "value", "test2" => 64})}
+    it { Expressive.run('($hash (test "value") (test2 (date)))').should eql ({"test" => "value", "test2" => Time.parse(Date.today.to_s).utc})}
+    it { Expressive.run('($hash (test "value") (test2 (date)) (key ($hash (within "a_hash"))))').should eql ({"test" => "value", "test2" => Time.parse(Date.today.to_s).utc, "key" => {"within" => "a_hash"}})}
+  end
+
   it "understands variables" do
     @scope["hello"] = "World"
     Expressive.run("hello", @scope).should eql "World"
@@ -179,6 +188,20 @@ EOH
     end
   end
 
+  describe "understands datetime parsing" do
+    it "will return the current date and time" do
+      Timecop.freeze(DateTime.now) do
+        now = DateTime.now
+        Expressive.run('(datetime)').should eql now
+      end
+    end
+
+    it "will return a date and time parsed from text" do
+      date = DateTime.parse("22nd November 2012 13:04")
+      Expressive.run('(datetime(22/11/2012 13:04:00))').should eql date
+    end
+  end
+
   describe "understands using lookup tables" do
     before(:each) do
       @user1 = mock(:user, id:1, login: "user1", display_name: "User 1")
@@ -215,8 +238,13 @@ EOH
       Expressive.run('($append participating_teams (1 2 3))', @scope)
       @scope['participating_teams'].should == [0, 1, 2, 3]
     end
+    it "add a hash to a list of values" do
+      @scope['documents'] = []
+      Expressive.run('($append documents ($hash (test "value") (another_test 53.2) (and_a_date (date))))', @scope)
+      @scope['documents'].should == [{"test" => "value", "another_test" => 53.2, "and_a_date" => Time.parse(Date.today.to_s).utc}]
+    end
   end
-
+  
   describe "understands retrieving the id of an object" do
     it do
       @scope["an_object"] = mock(:an_object, id: 5)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressive
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-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: -1947057546795348556
+      hash: 4009429271067879068
 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: -1947057546795348556
+      hash: 4009429271067879068
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24