rubyless 0.8.2 → 0.8.3

data/History.txt

@@ -1,3 +1,14 @@
+== 0.8.3
+
+* Major enhancements
+  * Better support for literal Arrays.
+  * Support for Hash methods and Hash literals.
+
+* Minor enhancements
+  * Added some methods for basic types.
+  * Fixed a bug where evaluated string would be altered.
+  * Added support for true and false classes.
+
 == 0.8.2 2011-01-15
 
 * Minor enhancements

data/lib/ruby_less/basic_types.rb

@@ -18,7 +18,9 @@ RubyLess::SafeClass.safe_method_for( Number,
   [:==, Number] => Boolean, [:< , Number] => Boolean, [:> , Number] => Boolean,
   [:<=, Number] => Boolean, [:>=, Number] => Boolean, [:- , Number] => Number,
   [:+ , Number] => Number,  [:* , Number] => Number,  [:/ , Number] => Number,
-  [:% , Number] => Number,  [:"-@"]       => Number
+  [:% , Number] => Number,  [:"-@"]       => Number,
+  :to_f => Number,
+  :to_i => Number
 )
 
 RubyLess::SafeClass.safe_method_for( Time,
@@ -33,7 +35,9 @@ RubyLess::SafeClass.safe_method_for( String,
 
 RubyLess::SafeClass.safe_method_for( NilClass,
   [:==, String] => Boolean,
-  [:==, Number] => Boolean
+  [:==, Number] => Boolean,
+  :to_f => Number,
+  :to_i => Number
 )
 
 RubyLess::SafeClass.safe_method_for( Array,

data/lib/ruby_less/info.rb

@@ -1,3 +1,3 @@
 module RubyLess
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

data/lib/ruby_less/processor.rb

@@ -11,7 +11,11 @@ module RubyLess
 
     def self.translate(receiver, string)
       if sexp = RubyParser.new.parse(string)
-        self.new(receiver).process(sexp)
+        res = self.new(receiver).process(sexp)
+        if res.klass.kind_of?(Hash)
+          res.opts[:class] = Hash
+        end
+        res
       elsif string.size == 0
         ''
       else
@@ -52,6 +56,14 @@ module RubyLess
       end
     end
 
+    def process_true(*args)
+      t 'true', {:class => Boolean, :literal => true}
+    end
+
+    def process_false(*args)
+      t 'false', {:class => Boolean, :literal => false}
+    end
+
     def process_and(exp)
       t "(#{process(exp.shift)} and #{process(exp.shift)})", Boolean
     end
@@ -118,7 +130,7 @@ module RubyLess
         list << res
       end
 
-      res.opts[:class] = Array
+      res.opts[:class] = [content_class] # Array
       res.opts[:elem] = content_class
       t "[#{list * ','}]", res.opts.merge(:literal => nil)
     end
@@ -229,7 +241,18 @@ module RubyLess
           cond = []
         end
 
-        opts = get_method(receiver, signature)
+        if receiver && receiver.klass.kind_of?(Hash)
+          # resolve now
+          if signature.first == '[]' && klass = receiver.klass[args.literal]
+            return receiver.hash[args.literal]
+          else
+            # safe_method_type on Hash... ?
+            receiver = TypedString.new(receiver, Hash)
+            opts = get_method(receiver, signature)
+          end
+        else
+          opts = get_method(receiver, signature)
+        end
 
         # method type can rewrite receiver
         if opts[:receiver]
@@ -354,11 +377,15 @@ module RubyLess
       def get_method(receiver, signature)
         klass = receiver ? receiver.klass : @helper
 
-        type = klass.respond_to?(:safe_method_type) ? klass.safe_method_type(signature, receiver) : SafeClass.safe_method_type_for(klass, signature)
-
-        if type.nil?
-          # We try to match with the superclass of the arguments
+        if klass.respond_to?(:safe_method_type)
+          type = klass.safe_method_type(signature, receiver)
+        elsif klass.kind_of?(Array)
+          unless type = SafeClass.safe_method_type_for(Array, signature)
+            raise RubyLess::NoMethodError.new(receiver, "[#{klass}]", signature)
+          end
+        elsif type = SafeClass.safe_method_type_for(klass, signature)
         end
+
         raise RubyLess::NoMethodError.new(receiver, klass, signature) if !type || type[:class].kind_of?(Symbol) # we cannot send: no object.
 
         type[:class].kind_of?(Proc) ? type[:class].call(@helper, receiver ? receiver.klass : @helper, signature) : type

data/lib/ruby_less/safe_class.rb

@@ -13,32 +13,35 @@ module RubyLess
     # Return method type (options) if the given signature is a safe method for the class.
     def self.safe_method_type_for(klass, signature)
       if klass.kind_of?(Array)
-        return safe_method_type_for(Array, signature)
-      end
-
-      # Signature might be ['name', {:mode => String, :type => Number}].
-      # build signature arguments
-
-      # Replace all hashes in signature by Hash class and check for arguments
-      signature_args = []
-      signature = signature.map do |s|
-        if s.kind_of?(Hash)
-          signature_args << s
-          Hash
-        else
-          signature_args << nil
-          s
+        safe_method_type_for(Array, signature)
+      elsif klass.kind_of?(Hash)
+        nil # literal hash resolved in processor
+        klass = Hash
+      else
+        # Signature might be ['name', {:mode => String, :type => Number}].
+        # build signature arguments
+
+        # Replace all hashes in signature by Hash class and check for arguments
+        signature_args = []
+        signature = signature.map do |s|
+          if s.kind_of?(Hash)
+            signature_args << s
+            Hash
+          else
+            signature_args << nil
+            s
+          end
         end
-      end
 
-      # Find safe method in all ancestry
-      klass.ancestors.each do |ancestor|
-        # FIXME: find a way to optimize this search !
-        if type = safe_method_with_hash_args(ancestor, signature, signature_args)
-          return type
+        # Find safe method in all ancestry
+        klass.ancestors.each do |ancestor|
+          # FIXME: find a way to optimize this search !
+          if type = safe_method_with_hash_args(ancestor, signature, signature_args)
+            return type
+          end
         end
+        nil
       end
-      nil
     end
 
     def self.literal_class_for(klass)

data/rubyless.gemspec

@@ -1,78 +1,75 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rubyless}
-  s.version = "0.8.2"
+  s.version = "0.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2011-01-15}
+  s.date = %q{2011-06-15}
   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 = [
     "README.rdoc",
-     "TODO"
+    "TODO"
   ]
   s.files = [
-    ".gitignore",
-     "History.txt",
-     "README.rdoc",
-     "Rakefile",
-     "TODO",
-     "lib/ruby_less.rb",
-     "lib/ruby_less/basic_types.rb",
-     "lib/ruby_less/error.rb",
-     "lib/ruby_less/info.rb",
-     "lib/ruby_less/no_method_error.rb",
-     "lib/ruby_less/processor.rb",
-     "lib/ruby_less/safe_class.rb",
-     "lib/ruby_less/signature_hash.rb",
-     "lib/ruby_less/syntax_error.rb",
-     "lib/ruby_less/typed_method.rb",
-     "lib/ruby_less/typed_string.rb",
-     "lib/rubyless.rb",
-     "rails/init.rb",
-     "rubyless.gemspec",
-     "test/RubyLess/active_record.yml",
-     "test/RubyLess/basic.yml",
-     "test/RubyLess/errors.yml",
-     "test/RubyLess/hash.yml",
-     "test/RubyLess/string.yml",
-     "test/RubyLess/time.yml",
-     "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"
+    "History.txt",
+    "README.rdoc",
+    "Rakefile",
+    "TODO",
+    "lib/ruby_less.rb",
+    "lib/ruby_less/basic_types.rb",
+    "lib/ruby_less/error.rb",
+    "lib/ruby_less/info.rb",
+    "lib/ruby_less/no_method_error.rb",
+    "lib/ruby_less/processor.rb",
+    "lib/ruby_less/safe_class.rb",
+    "lib/ruby_less/signature_hash.rb",
+    "lib/ruby_less/syntax_error.rb",
+    "lib/ruby_less/typed_method.rb",
+    "lib/ruby_less/typed_string.rb",
+    "lib/rubyless.rb",
+    "rails/init.rb",
+    "rubyless.gemspec",
+    "test/RubyLess/active_record.yml",
+    "test/RubyLess/basic.yml",
+    "test/RubyLess/errors.yml",
+    "test/RubyLess/hash.yml",
+    "test/RubyLess/string.yml",
+    "test/RubyLess/time.yml",
+    "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"
   ]
   s.homepage = %q{http://zenadmin.org/546}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.1}
   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/RubyLess_test.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/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
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/RubyLess/basic.yml

@@ -164,10 +164,6 @@ accept_nil_in_no_nil:
   src: "no_nil(accept_nil(dictionary[:foo]))"
   tem: "no_nil(accept_nil(get_dict[:foo]))"
 
-parse_array:
-  src: "[3, 6]"
-  tem: '[3,6]'
-
 noop_method:
   src: 'no_op("hello")'
   tem: '("hello")'
@@ -222,4 +218,24 @@ map_allowed_method:
 
 map_forbidden_method:
   src: "%w{45 52}.map(:foo)"
-  tem: "unknown method 'map(:foo)' for '[\"45\",\"52\"]' of type Array."
+  tem: "unknown method 'map(:foo)' for '[\"45\",\"52\"]' of type [String]."
+
+eval_true:
+  src: "true"
+  tem: "true"
+
+eval_false:
+  src: "false"
+  tem: "false"
+
+number_array:
+  src: "[3, 6]"
+  tem: '[3,6]'
+
+string_array:
+  src: "%w{foo bar}.join(',')"
+  res: 'foo,bar'
+
+array_bad_method:
+  src: "%w{foo bar}.plop(',')"
+  res: "unknown method 'plop(String)' for '[\"foo\",\"bar\"]' of type [String]."

data/test/RubyLess/hash.yml

@@ -2,6 +2,14 @@ parse_hash:
   src: "{'one' => 1, 2 => 'two'}"
   tem: "{\"one\" => 1, 2 => \"two\"}"
 
+literal_on_hash:
+  src: "{'one' => 1, 2 => 'two'}['one'] + 2"
+  tem: "(1+2)"
+
+method_on_hash:
+  src: "{'one' => 1, 2 => 'two'}.to_param"
+  tem: "{\"one\" => 1, 2 => \"two\"}.to_param"
+  
 hash_access:
   src: "dictionary[:key]"
   tem: "get_dict[:key]"

data/test/RubyLess_test.rb

@@ -22,7 +22,7 @@ class RubyLessTest < Test::Unit::TestCase
           end
           res = RubyLess::TypedString.new(res, :class => [type[:class]])
         else
-          raise RubyLess::NoMethodError.new(receiver.raw, receiver.klass, ['map', method])
+          raise RubyLess::NoMethodError.new(receiver.raw, "[#{receiver.klass}]", ['map', method])
         end
       else
         # should never happen
@@ -55,6 +55,10 @@ class RubyLessTest < Test::Unit::TestCase
 
   safe_method_for Array, [:map, Symbol] => {:method => 'nil', :class => nil, :pre_processor => self.map_proc}
 
+  safe_method_for Array, [:join, String] => {:method => 'join', :class => String, :pre_processor => true}
+
+  safe_method_for Hash, :to_param => String
+
   safe_method_for String, :upcase => {:class => String, :pre_processor => true}
 
   safe_method_for Time, [:strftime, String] => String
@@ -169,6 +173,20 @@ class RubyLessTest < Test::Unit::TestCase
     assert_equal "marsupilami.says('Hello')", RubyLess.translate(typed_string, 'talk')
   end
 
+  def test_literal_hash_type
+    # Out of RubyLess::Processor, type is Hash, not {:foo => TypedString}.
+    typed_string = RubyLess.translate(self, %q{{:foo => 'bar'}})
+    assert_equal Hash, typed_string.klass
+  end
+
+  def test_should_not_alter_input_string
+    orig_str = 'contact where id #{params[:foo]} in site'
+    str = orig_str.dup
+    RubyLess.translate(self, str)
+  rescue RubyLess::Error => err
+    assert_equal orig_str, str
+  end
+
   def yt_do_test(file, test, context = yt_get('context',file,test))
     @@test_strings[file][test].keys.each do |key|
       next if ['src', 'context', 'str'].include?(key)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyless
 version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: false
+  hash: 57
+  prerelease: 
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 +01:00
+date: 2011-06-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,7 +90,6 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 files: 
-- .gitignore
 - History.txt
 - README.rdoc
 - Rakefile
@@ -130,8 +129,8 @@ homepage: http://zenadmin.org/546
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -155,16 +154,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 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/RubyLess_test.rb
 - test/safe_class_test.rb
 - test/signature_hash_test.rb
 - test/test_helper.rb

data/.gitignore

@@ -1,4 +0,0 @@
-pkg
-rdoc
-*.gem
-coverage