lib/sakuramochi/predicate.rb in sakuramochi-0.5.5 vs lib/sakuramochi/predicate.rb in sakuramochi-0.5.6

@@ -1,7 +1,5 @@
-require 'sakuramochi/config'
-
 module Sakuramochi
   class Predicate
     attr_reader :name, :arel_predicate, :expand, :converter, :validator
 
     def initialize(options = {}) 
@@ -14,26 +12,22 @@
     end 
 
     def convert(value)
       return value unless @converter
       if @expand
-        Predicate.as_a(value).map { |v| @converter.call(v) }
+        Array(value).map { |v| @converter.call(v) }
       else
         @converter.call(value)
       end
     end 
 
     def validate(value)
       if @expand
-        Predicate.as_a(value).select { |v| @validator.call(v) }.any?
+        Array(value).select { |v| @validator.call(v) }.any?
       else
         @validator.call(value)
       end
     end 
-
-    def self.as_a(value)
-      value.is_a?(Enumerable) ? value.to_a : [value]
-    end
 
     def self.names
       Sakuramochi.config.predicates.keys
     end