@@ -144,8 +144,9 @@ module InheritedResources self.scopes_configuration[scope][:as] = options[:as] || scope self.scopes_configuration[scope][:only] = Array(options[:only]) self.scopes_configuration[scope][:except] = Array(options[:except]) + [:if, :unless, :boolean, :default].each do |opt| - self.scopes_configuration[scope][opt] = options[opt] if options.key?(opt) + self.scopes_configuration[scope][opt] = options[opt] if options.key?(opt) end end end lib/inherited_resources/class_methods.rb @@ -57,20 +57,20 @@ module InheritedResources end end - # Evaluates the scope options :if or :unless - # Returns true if the proc, method, or string evals - # to the expected value + # Evaluates the scope options :if or :unless. Returns true if the proc + # method, or string evals to the expected value. # def applicable?(string_proc_or_symbol, expected) - return true unless string_proc_or_symbol - !!case string_proc_or_symbol - when String - eval string_proc_or_symbol - when Proc - string_proc_or_symbol.call - when Symbol - send string_proc_or_symbol - end == expected + case string_proc_or_symbol + when String + eval(string_proc_or_symbol) == expected + when Proc + string_proc_or_symbol.call(self) == expected + when Symbol + send(string_proc_or_symbol) == expected + else + true + end end # Returns the scopes used in this action. lib/inherited_resources/has_scope_helpers.rb @@ -1,10 +1,17 @@ require 'rubygems' -gem "test-unit" -require 'test/unit' + +begin + gem "test-unit" +rescue LoadError +end + begin + gem "ruby-debug" require 'ruby-debug' rescue LoadError end + +require 'test/unit' require 'mocha' ENV["RAILS_ENV"] = "test" test/test_helper.rb 6034256df0a15cd138594333edbf822ea279fd07 José Valim jose.valim@gmail.com http://github.com/josevalim/inherited_resources/commit/f8084fb130123f3c25f9aa93236f6f353734fd48 f8084fb130123f3c25f9aa93236f6f353734fd48 2009-09-30T06:47:35-07:00 2009-09-30T06:47:35-07:00 Tidying up some loose ends. 68092df6d9fa43aa0dd7b8a60728bed8519d4d10 José Valim jose.valim@gmail.com