interrotron 0.0.4 → 0.0.5

data/README.md

@@ -35,7 +35,9 @@ compiled.call(:my_param => 'bar')
 # Since interrotron is meant for business rules, it handles dates as a 
 # native type as instances of ruby's DateTime class. You can use literals
 # for that like so:
-Interrotron.run('(> #dt{2010-09-04} start_date)', start_date: DateTime.parse('2012-12-12'))
+Interrotron.run('(> #t{2010-09-04} start_date)', start_date: DateTime.parse('2012-12-12').to_time)
+# => true
+Interrotron.run('(> (now) (ago (hours 12)))')
 # => true
 
 # You can, of course, create arbitarily complex exprs
@@ -64,12 +66,11 @@ The following functions and variables are built in to Interrotron (and more are
 (floor expr) ; equiv to num.floor
 (ceil expr) ; equiv to num.ceil
 (round expr) ; equiv to num.round
-(to_i expr) ; int conversion
-(to_f expr) ; float conversion
+(int expr) ; int conversion
+(float expr) ; float conversion
 (rand) ; returns a random float between 0 and 1
 (upcase str) ; uppercases a string
 (downcase) ; lowercases a string
-(now) ; returns the current DateTime
 (array e1, e2, ...) ; creates an array
 (max arr) ; returns the largest element of an array
 (min arr) ; returns the smallest element of an array
@@ -78,6 +79,14 @@ The following functions and variables are built in to Interrotron (and more are
 (last arr) ; get arr tail
 (nth pos arr) ; get array at index
 (member? val arr) ; check if the array has a member with value 'val'
+(now) ; returns the current DateTime
+(seconds n); n, for completeness
+(minutes n); n * secs_in_a_minute
+(hours n); n * secs_in_a_hour
+(months n) ; n * secs_in_a_month
+(ago n) ; yields a time in seconds from now
+(from-now n) ; yields a time in seconds from now
+(time 'str') ; parses a string to a Time
 ```
 
 ## Contributing

data/Rakefile

@@ -2,7 +2,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-Bundler::GemHelper.install_tasks
+# This seems to deplicate tasks
+#Bundler::GemHelper.install_tasks
 
 RSpec::Core::RakeTask.new('spec') do |t|
   t.rspec_opts = '--tag ~integration'
@@ -12,5 +13,4 @@ RSpec::Core::RakeTask.new('spec:integration') do |t|
   t.pattern = 'spec/integration/*_spec.rb'
 end
 
-task :default => :spec
-
+task :default => :spec

data/bin/interrotron

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'interrotron'
+
+puts Interrotron.run(ARGV[0]).inspect

data/interrotron.gemspec

@@ -9,7 +9,8 @@ Gem::Specification.new do |gem|
   gem.homepage      = ""
 
   gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables << 'interrotron'
+  #gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "interrotron"
   gem.require_paths = ["lib"]

data/lib/interrotron.rb

@@ -44,17 +44,17 @@ class Interrotron
   end
   
   TOKENS = [
-            [:lpar, /\(/],
-            [:rpar, /\)/],
-            [:fn, /fn/],
-            [:var, /[A-Za-z_><\+\>\<\!\=\*\/\%\-\?]+/],
-            [:num, /(\-?[0-9]+(\.[0-9]+)?)/, 
+            [:lpar, /\A\(/],
+            [:rpar, /\A\)/],
+            [:fn, /\Afn/],
+            [:var, /\A[A-Za-z_><\+\>\<\!\=\*\/\%\-\?]+/],
+            [:num, /\A(\-?[0-9]+(\.[0-9]+)?)/, 
              {cast: proc {|v| v =~ /\./ ? v.to_f : v.to_i }}],
-            [:datetime, /#dt\{([^\{]+)\}/,
-             {capture: 1, cast: proc {|v| DateTime.parse(v) }}],
-            [:spc, /\s+/, {discard: true}],
-            [:str, /"([^"\\]*(\\.[^"\\]*)*)"/, {capture: 1}],
-            [:str, /'([^'\\]*(\\.[^'\\]*)*)'/, {capture: 1}]
+            [:time, /\A#t\{([^\{]+)\}/,
+             {capture: 1, cast: proc {|v| DateTime.parse(v).to_time }}],
+            [:spc, /\A\s+/, {discard: true}],
+            [:str, /\A"([^"\\]*(\\.[^"\\]*)*)"/, {capture: 1}],
+            [:str, /\A'([^'\\]*(\\.[^'\\]*)*)'/, {capture: 1}]
            ]
 
   # Quote a ruby variable as a interrotron one
@@ -76,6 +76,7 @@ class Interrotron
     },
     'and' => Macro.new {|i,*args| args.all? {|a| i.iro_eval(a)} ? args.last : qvar('false')  },
     'or' => Macro.new {|i,*args| args.detect {|a| i.iro_eval(a) } || qvar('false') },
+    'apply' => proc {|fn,arr| fn.call(*arr) },
     'array' => proc {|*args| args},
     'identity' => proc {|a| a},
     'not' => proc {|a| !a},
@@ -104,13 +105,22 @@ class Interrotron
     'nth' => proc {|pos, arr| arr[pos]},
     'length' => proc {|arr| arr.length},
     'member?' => proc {|v,arr| arr.member? v},
-    'to_i' => proc {|a| a.to_i},
-    'to_f' => proc {|a| a.to_f},
-    'rand' => proc { rand },
+    'int' => proc {|a| a.to_i},
+    'float' => proc {|a| a.to_f},
+    'time' => proc {|s| DateTime.parse(s).to_time},
+    'rand' => proc {|n| rand n },
+    'str' => proc {|*args| args.reduce("") {|m,a| m + a.to_s}},
+    'strip' => proc {|s| s.strip},
     'upcase' => proc {|a| a.upcase},
     'downcase' => proc {|a| a.downcase},
-    'now' => proc { DateTime.now },
-    'str' => proc {|*args| args.reduce("") {|m,a| m + a.to_s}}
+    'now' => proc { Time.now },
+    'seconds' => proc {|n| n.to_i},
+    'minutes' => proc {|n| n.to_i * 60},
+    'hours' => proc {|n| n.to_i * 3600 },
+    'days' => proc {|n| n.to_i * 86400},
+    'months' => proc {|n| n.to_i * 2592000},
+    'ago' => proc {|t| Time.now - t},
+    'from-now' => proc {|t| Time.now + t}
   })
 
   def initialize(vars={},max_ops=nil)
@@ -131,7 +141,7 @@ class Interrotron
       matched_any = TOKENS.any? {|name,matcher,opts|
         opts ||= {}
         matches = matcher.match(str)
-        if !matches || !matches.pre_match.empty?
+        if !matches
           false
         else
           str = str[matches[0].length..-1]

data/lib/interrotron/version.rb

@@ -1,3 +1,3 @@
 class Interrotron
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/interrotron_spec.rb

@@ -59,9 +59,22 @@ describe "running" do
     end
   end
 
-  describe "date times" do
+  describe "times" do
     it "should parse and compare them properly" do
-      run('(> #dt{2010-09-04} start_date)', start_date: DateTime.parse('2012-12-12'))
+      run('(> #t{2010-09-04} start_date)', start_date: DateTime.parse('2012-12-12').to_time)
+    end
+    it "should understand days, minutes, seconds, and hours, as integers" do
+      run("(+ (days 1) (minutes 1) (hours 1) (seconds 1))").should == 90061
+    end
+
+    it "should add the time using from-now" do
+      n = Time.now
+      Time.should_receive(:now).twice().and_return(n)
+      run("(from-now (minutes 1))").to_i.should == (Time.now + 60).to_i
+    end
+
+    it "should compare times using convenience multipliers correctly" do
+      run('(> (now) (ago (hours 12)))').should be_true
     end
   end
 
@@ -171,4 +184,28 @@ describe "running" do
       run("").should be_nil
     end
   end
+  
+  describe "apply macro" do
+    it "should spat an array into another function" do
+      run("(apply + (array 1 2 3))").should == 6
+    end
+  end
+  
+  describe "conversions" do
+    it "should convert ints" do
+      res = run("(int '2')")
+      res.should == 2
+      res.should be_a(Fixnum)
+    end
+
+    it "should convert floats" do
+      res = run("(float '2.5')")
+      res.should == 2.5
+      res.should be_a(Float)
+    end
+
+    it "should parse dates and times" do
+      run("(time '2012-05-01')").should == DateTime.parse("2012-05-01").to_time
+    end
+  end
 end

metadata

@@ -1,31 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: interrotron
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  prerelease:
+  version: 0.0.5
 platform: ruby
 authors:
 - Andrew Cholakian
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000 Z
+date: 2012-05-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70187372115860 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2056 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
-  type: :development
+    none: false
+  requirement: *2056
   prerelease: false
-  version_requirements: *70187372115860
+  type: :development
 description: A tiny, embeddable, lisp VM
 email:
 - andrew@andrewvc.com
-executables: []
+executables:
+- interrotron
 extensions: []
 extra_rdoc_files: []
 files:
@@ -35,33 +36,35 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/interrotron
 - interrotron.gemspec
 - lib/interrotron.rb
 - lib/interrotron/version.rb
 - spec/interrotron_spec.rb
 homepage: ''
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.10
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.9
+signing_key:
 specification_version: 3
 summary: A lisp VM meant to run with guarantees on execution for business rules
 test_files:
 - spec/interrotron_spec.rb
+...