rubyless 0.8.5 → 0.8.6

data/History.txt

@@ -1,4 +1,9 @@
-== 0.8.5
+== 0.8.6 2011-11-09
+
+* Minor enhancements
+  * Added support for 'nil'.
+
+== 0.8.5 2011-07-11
 
 * Minor enhancements
   * Added support for append_args and multiple prepend arguments.
@@ -145,4 +150,4 @@
 == 0.1.0 2009-06-02
 
 * 1 major enhancement:
-  * Initial alpha release.
+  * Initial alpha release.

data/lib/ruby_less/info.rb

@@ -1,3 +1,3 @@
 module RubyLess
-  VERSION = '0.8.5'
+  VERSION = '0.8.6'
 end

data/lib/ruby_less/processor.rb

@@ -64,6 +64,10 @@ module RubyLess
       t 'false', {:class => Boolean, :literal => false}
     end
 
+    def process_nil(*args)
+      t 'nil', {:class => NilClass, :literal => nil, :nil => true}
+    end
+
     def process_and(exp)
       t "(#{process(exp.shift)} and #{process(exp.shift)})", Boolean
     end
@@ -86,8 +90,18 @@ module RubyLess
       true_res  = process(exp.shift)
       false_res = process(exp.shift)
 
-      if true_res && false_res && true_res.klass != false_res.klass
-        raise RubyLess::SyntaxError.new("Error in conditional expression: '#{true_res}' and '#{false_res}' do not return results of same type (#{true_res.klass} != #{false_res.klass}).")
+      if true_res && false_res
+        if true_res.klass != false_res.klass
+          if true_res.klass == NilClass
+            # Change true_res to false_res class (could_be_nil? is true)
+            true_res.opts[:class] = false_res.klass
+          elsif false_res.klass == NilClass
+            # Change false_res to true_res class (could_be_nil? is true)
+            false_res.opts[:class] = true_res.klass
+          else
+            raise RubyLess::SyntaxError.new("Error in conditional expression: '#{true_res}' and '#{false_res}' do not return results of same type (#{true_res.klass} != #{false_res.klass}).")
+          end
+        end
       end
       raise RubyLess::SyntaxError.new("Error in conditional expression.") unless true_res || false_res
       opts = {}

data/rubyless.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyless}
-  s.version = "0.8.5"
+  s.version = "0.8.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2011-07-11}
+  s.date = %q{2011-11-09}
   s.description = %q{RubyLess is an interpreter for "safe ruby". The idea is to transform some "unsafe" ruby code into safe, type checked ruby, eventually rewriting some variables or methods.}
   s.email = %q{gaspard@teti.ch}
   s.extra_rdoc_files = [
@@ -54,20 +54,8 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://zenadmin.org/546}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{RubyLess is an interpreter for "safe ruby"}
-  s.test_files = [
-    "test/RubyLess_test.rb",
-    "test/mock/active_record_mock.rb",
-    "test/mock/dummy_class.rb",
-    "test/mock/dummy_module.rb",
-    "test/mock/property_column.rb",
-    "test/safe_class_test.rb",
-    "test/signature_hash_test.rb",
-    "test/test_helper.rb",
-    "test/typed_method_test.rb",
-    "test/typed_string_test.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/RubyLess/basic.yml

@@ -253,4 +253,13 @@ string_array:
 
 array_bad_method:
   src: "%w{foo bar}.plop(',')"
-  res: "unknown method 'plop(String)' for '[\"foo\",\"bar\"]' of type [String]."
+  res: "unknown method 'plop(String)' for '[\"foo\",\"bar\"]' of type [String]."
+
+nil:
+  src: 'nil'
+  tem: 'nil'
+
+nil_in_op:
+  src: '(dictionary[:foo] == "something" ? "foo" : nil)'
+  tem: '(get_dict[:foo]=="something") ? "foo" : nil'
+  res: ''

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyless
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 8
-  - 5
-  version: 0.8.5
+  - 6
+  version: 0.8.6
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 +02:00
+date: 2011-11-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,18 +154,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: RubyLess is an interpreter for "safe ruby"
-test_files: 
-- test/RubyLess_test.rb
-- test/mock/active_record_mock.rb
-- test/mock/dummy_class.rb
-- test/mock/dummy_module.rb
-- test/mock/property_column.rb
-- test/safe_class_test.rb
-- test/signature_hash_test.rb
-- test/test_helper.rb
-- test/typed_method_test.rb
-- test/typed_string_test.rb
+test_files: []
+