rubyless 0.7.0 → 0.8.0

data/History.txt

@@ -1,3 +1,9 @@
+== 0.8.0 2010-11-15
+
+* Major enhancements
+  * Better resolution when receiving dynamic classes or proxy.
+  * Fixed a bug where anonymous classes would be memoized.
+
 == 0.7.0 2010-09-13
 
 * Major enhancements

data/lib/ruby_less/info.rb

@@ -1,3 +1,3 @@
 module RubyLess
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/lib/ruby_less/safe_class.rb

@@ -26,7 +26,7 @@ module RubyLess
           s
         end
       end
-
+      
       # Find safe method in all ancestry
       klass.ancestors.each do |ancestor|
         # FIXME: find a way to optimize this search !
@@ -267,6 +267,7 @@ module RubyLess
       end
 
       def self.safe_method_with_hash_args(klass, signature, hash_args)
+        
         if type = safe_methods_for(klass)[signature]
           unless allowed_args = type[:hash_args]
             # All arguments allowed

data/lib/ruby_less/signature_hash.rb

@@ -9,8 +9,17 @@ module RubyLess
         return type
       elsif signature.kind_of?(Array)
         size = signature.size
-        ancestors = signature.map {|k| k.kind_of?(Class) ? k.ancestors : [k]}
-
+        static_types = true
+        ancestors = signature.map do |k|
+          if k.kind_of?(Symbol)
+            [k]
+          elsif k.kind_of?(Class) && k.name != ''
+            k.ancestors
+          else
+            static_types = false
+            k.respond_to?(:ancestors) ? k.ancestors : [k]
+          end
+        end
         each do |key, type|
           next unless key.size == size
           ok = true
@@ -21,8 +30,8 @@ module RubyLess
             end
           end
           if ok
-            # insert in cache
-            self[signature] = type
+            # insert in cache if the signature does not contain dynamic types
+            self[signature] = type if static_types
             return type
           end
         end

data/rubyless.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyless}
-  s.version = "0.7.0"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-09-14}
+  s.date = %q{2010-11-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 = [
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://zenadmin.org/546}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{RubyLess is an interpreter for "safe ruby"}
   s.test_files = [
     "test/mock/active_record_mock.rb",
@@ -75,7 +75,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ruby_parser>, [">= 2.0.4"])
       s.add_runtime_dependency(%q<sexp_processor>, [">= 3.0.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])

data/test/RubyLess/basic.yml

@@ -202,3 +202,7 @@ class:
 class_map_as_string:
   src: "@foo.kind_of?(Document)"
   tem: "node.is_like?(\"DOC\")"
+
+proc_to_resolve_class:
+  src: "author"
+  tem: "node.author"

data/test/RubyLess/errors.yml

@@ -74,4 +74,8 @@ call_on_class:
 
 unknown_constant:
   src: "RubyLess"
-  tem: "Unknown constant 'RubyLess'."
+  tem: "Unknown constant 'RubyLess'."
+
+ternary_operator:
+  src: "@foo ? 'xx' : 15"
+  tem: "/Error in conditional expression.*String != Number/"

data/test/RubyLess_test.rb

@@ -65,7 +65,7 @@ class RubyLessTest < Test::Unit::TestCase
         res ={:class => Number, :prepend_args => RubyLess::TypedString.new('10', :class => Number), :method => 'add'}
       elsif context && res = context[:node_class].safe_method_type(signature)
         # try to execute method in the current var "var.method"
-        res = res.call(self, signature) if res.kind_of?(Proc)
+        res = res[:class].call(self, signature) if res[:class].kind_of?(Proc)
         res = res.merge(:method => "#{context[:node]}.#{res[:method] || signature[0]}")
       end
     end

data/test/mock/dummy_class.rb

@@ -18,7 +18,9 @@ class Dummy < RubyLess::ActiveRecordMock
                :foo                 => :bar,
                [:width, {:mode => String, :type => String, 'nice' => Boolean}] => String,
                [:kind_of?, Class]   => Boolean,
-               [:kind_of?, String]  => {:method => 'is_like?', :class  => Boolean}
+               [:kind_of?, String]  => {:method => 'is_like?', :class  => Boolean},
+               :author => (Proc.new do |h, s| {:method => 'author', :class => Dummy} end)
+               #:author => {:method => 'author', :class => Dummy}
 
   safe_context :spouse  => 'Dummy',
                :husband => {:class => 'Dummy', :context => {:clever => 'no'}}
@@ -81,6 +83,10 @@ class Dummy < RubyLess::ActiveRecordMock
   def zip
     10
   end
+
+  def author
+    Dummy.new('bob')
+  end
 end
 
 class SubDummy < Dummy

data/test/signature_hash_test.rb

@@ -40,5 +40,12 @@ class SignatureHashTest < Test::Unit::TestCase
       assert subject.keys.include?(key)
     end
 
+    should 'not cache key on anonymous class match' do
+      key = [:x, Class.new(String), String]
+      assert !subject.keys.include?(key)
+      assert_equal 'x_string_string', subject[key]
+      assert !subject.keys.include?(key)
+    end
+
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyless
 version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 +02:00
+date: 2010-11-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby_parser
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 0
@@ -35,9 +38,11 @@ dependencies:
   name: sexp_processor
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 3
         - 0
@@ -49,9 +54,11 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -61,9 +68,11 @@ dependencies:
   name: yamltest
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 6
@@ -126,23 +135,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: RubyLess is an interpreter for "safe ruby"