Unify internal helper method name: column_value_expression_builder

lib/groonga/expression-builder.rb

@@ -436,7 +436,7 @@ def [](name)
           "for table <#{@table.inspect}>"
         raise ArgumentError, message
       end
-      column_expression_builder(column, name)
+      column_value_expression_builder(column, name)
     end
 
     def id
@@ -482,7 +482,7 @@ def index(name)
         raise ArgumentError,
               "different index column: <#{name}>: #{object.inspect}"
       end
-      column_expression_builder(object, name)
+      column_value_expression_builder(object, name)
     end
 
     private
@@ -493,7 +493,7 @@ def build_match_target(&block)
       end
     end
 
-    def column_expression_builder(column, name)
+    def column_value_expression_builder(column, name)
       ColumnValueExpressionBuilder.new(column,
                                        :table => @table,
                                        :column_name => name)
@@ -535,55 +535,55 @@ def initialize(column, name, query, options={})
     end
 
     def ==(other)
-      column_value_builder == other
+      column_value_expression_builder == other
     end
 
     def =~(other)
-      column_value_builder =~ other
+      column_value_expression_builder =~ other
     end
 
     def <(other)
-      column_value_builder < other
+      column_value_expression_builder < other
     end
 
     def <=(other)
-      column_value_builder <= other
+      column_value_expression_builder <= other
     end
 
     def >(other)
-      column_value_builder > other
+      column_value_expression_builder > other
     end
 
     def >=(other)
-      column_value_builder >= other
+      column_value_expression_builder >= other
     end
 
     def +(other)
-      column_value_builder + other
+      column_value_expression_builder + other
     end
 
     def -(other)
-      column_value_builder - other
+      column_value_expression_builder - other
     end
 
     def *(other)
-      column_value_builder * other
+      column_value_expression_builder * other
     end
 
     def /(other)
-      column_value_builder / other
+      column_value_expression_builder / other
     end
 
     def %(other)
-      column_value_builder % other
+      column_value_expression_builder % other
     end
 
     def match(query, options={}, &block)
-      column_value_builder.match(query, options, &block)
+      column_value_expression_builder.match(query, options, &block)
     end
 
     private
-    def column_value_builder
+    def column_value_expression_builder
       ColumnValueExpressionBuilder.new(@default_column,
                                        :table => @table,
                                        :column_name => @column_name,
@@ -594,7 +594,7 @@ def method_missing(name, *args, &block)
       return super if block
       return super unless args.empty?
       if VALID_COLUMN_NAME_RE =~ name.to_s
-        column_value_builder.send(name)
+        column_value_expression_builder.send(name)
       else
         super
       end