From 7952a252faf86387f55beae91006b24847b3a22a Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 13 May 2010 20:33:01 +0000 Subject: [PATCH 001/139] Initial ideas for user segment system. --- app/controllers/content_controller.rb | 5 +- app/models/end_user_action_segment_field.rb | 16 + app/models/end_user_segment_field.rb | 19 + app/models/user_segment.rb | 27 + app/models/user_segment/core_type.rb | 74 + app/models/user_segment/field.rb | 110 ++ app/models/user_segment/field_handler.rb | 17 + app/models/user_segment/field_type.rb | 70 + app/models/user_segment/operation.rb | 41 + app/models/user_segment/operations.rb | 47 + app/models/user_segment/parser.rb | 4 + app/models/user_segment_cache.rb | 4 + app/models/user_segment_option_parser.rb | 1517 +++++++++++++++++ app/models/user_segment_option_parser.treetop | 140 ++ db/migrate/20100511165552_user_segments.rb | 39 + 15 files changed, 2129 insertions(+), 1 deletion(-) create mode 100644 app/models/end_user_action_segment_field.rb create mode 100644 app/models/end_user_segment_field.rb create mode 100644 app/models/user_segment.rb create mode 100644 app/models/user_segment/core_type.rb create mode 100644 app/models/user_segment/field.rb create mode 100644 app/models/user_segment/field_handler.rb create mode 100644 app/models/user_segment/field_type.rb create mode 100644 app/models/user_segment/operation.rb create mode 100644 app/models/user_segment/operations.rb create mode 100644 app/models/user_segment/parser.rb create mode 100644 app/models/user_segment_cache.rb create mode 100644 app/models/user_segment_option_parser.rb create mode 100644 app/models/user_segment_option_parser.treetop create mode 100644 db/migrate/20100511165552_user_segments.rb diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb index 2975d01a..653e46f0 100644 --- a/app/controllers/content_controller.rb +++ b/app/controllers/content_controller.rb @@ -25,7 +25,10 @@ class ContentController < ModuleController #:nodoc: all register_handler :content, :feature, "Content::CoreFeature::KeywordGenerator" register_handler :trigger, :actions, "Trigger::CoreTrigger" - + + register_handler :user_segment, :fields, 'EndUserSegmentField' + register_handler :user_segment, :fields, 'EndUserActionSegmentField' + def index @content_models,@content_actions = CmsController.get_content_models_and_actions diff --git a/app/models/end_user_action_segment_field.rb b/app/models/end_user_action_segment_field.rb new file mode 100644 index 00000000..b6ef5df7 --- /dev/null +++ b/app/models/end_user_action_segment_field.rb @@ -0,0 +1,16 @@ + +class EndUserActionSegmentField < UserSegment::FieldHandler + + def self.user_segment_fields_handler_info + { + :name => 'End User Action Segment Fields', + :domain_model_class => EndUserAction + } + end + + register_field :renderer, UserSegment::CoreType::StringType + register_field :action, UserSegment::CoreType::StringType + register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at + register_field :occurred, UserSegment::CoreType::DateTimeType, :field => :action_at + +end diff --git a/app/models/end_user_segment_field.rb b/app/models/end_user_segment_field.rb new file mode 100644 index 00000000..d4eb08ef --- /dev/null +++ b/app/models/end_user_segment_field.rb @@ -0,0 +1,19 @@ + +class EndUserSegmentField < UserSegment::FieldHandler + + def self.user_segment_fields_handler_info + { + :name => 'End User Segment Fields', + :domain_model_class => EndUser, + :end_user_field => :id + } + end + + register_field :email, UserSegment::CoreType::StringType + register_field :gender, UserSegment::CoreType::StringType + register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at + register_field :registered, UserSegment::CoreType::BooleanType + register_field :activated, UserSegment::CoreType::BooleanType + register_field :id, UserSegment::CoreType::NumberType + +end diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb new file mode 100644 index 00000000..13b6b85d --- /dev/null +++ b/app/models/user_segment.rb @@ -0,0 +1,27 @@ + +class UserSegment < DomainModel + + serialize :segment_options + serialize :fields + + def operations + return @operations if @operations + @operations = UserSegment::Operations.new + @operations.operations = self.segment_options if self.segment_options + @operations + end + + def operations=(text) + @operations = UserSegment::Operations.new + @operations.parse text + end + + def before_create + self.order_by = 'created_at DESC' unless self.order_by + end + + def before_save + self.segment_options = self.operations.to_a if self.operations && self.operations.valid? + end +end + diff --git a/app/models/user_segment/core_type.rb b/app/models/user_segment/core_type.rb new file mode 100644 index 00000000..5ab25e4f --- /dev/null +++ b/app/models/user_segment/core_type.rb @@ -0,0 +1,74 @@ + +class UserSegment::CoreType + + @@datetime_format_options = ['day', 'days', 'week', 'weeks', 'month', 'months', 'year', 'years'] + def self.datetime_format_options + @@datetime_format_options + end + + + class DateTimeType < UserSegment::FieldType + register_operation :before, [['Value', :integer], ['Format', :option, {:options => UserSegment::CoreType.datetime_format_options}]] + + def self.before(cls, field, value, format) + time = value.send(format).ago + cls.scoped(:conditions => ["#{field} <= ?", time]) + end + + register_operation :since, [['Value', :integer], ['Format', :option, {:options => UserSegment::CoreType.datetime_format_options}]] + + def self.since(cls, field, value, format) + time = value.send(format).ago + cls.scoped(:conditions => ["#{field} >= ?", time]) + end + + register_operation :between, [['From', :datetime], ['To', :datetime]] + + def self.between(cls, field, from, to) + cls.scoped(:conditions => ["#{field} between ? and ?", from, to]) + end + end + + + class NumberType < UserSegment::FieldType + register_operation :greater_than, [['Value', :integer]] + + def self.greater_than(cls, field, value) + cls.scoped(:conditions => ["#{field} > ?", value]) + end + + register_operation :less_than, [['Value', :integer]] + + def self.less_than(cls, field, value) + cls.scoped(:conditions => ["#{field} < ?", value]) + end + + register_operation :equals, [['Value', :integer]] + + def self.equals(cls, field, value) + cls.scoped(:conditions => ["#{field} = ?", value]) + end + end + + class StringType < UserSegment::FieldType + register_operation :like, [['String', :string]] + + def self.like(cls, field, string) + cls.scoped(:conditions => ["#{field} like ?", string]) + end + + register_operation :is, [['String', :string]] + + def self.is(cls, field, string) + cls.scoped(:conditions => ["#{field} = ?", string]) + end + end + + class BooleanType < UserSegment::FieldType + register_operation :is, [['Boolean', :boolean]] + + def self.is(cls, field, string) + cls.scoped(:conditions => ["#{field} = ?", string]) + end + end +end diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb new file mode 100644 index 00000000..c13685fb --- /dev/null +++ b/app/models/user_segment/field.rb @@ -0,0 +1,110 @@ + +class UserSegment::Field < HashModel + include HandlerActions + + attributes :field => nil, :operation => nil, :arguments => [], :child => nil + + validates_presence_of :field + validates_presence_of :operation + + def strict?; true; end + + def validate + unless self.field.blank? + self.errors.add(:field, 'invalid field') unless self.handler + end + + unless self.operation.blank? + self.errors.add(:operation, 'invalid operation') unless self.type_class && self.type_class.has_operation?(self.operation) + + if self.operation_info + self.errors.add(:arguments, 'are missing') if self.arguments.empty? && ! self.operation_arguments.empty? + + unless self.arguments.empty? + self.errors.add(:arguments, 'are incorrect') unless self.arguments.size == self.operation_arguments.size + self.errors.add(:arguments, 'are invalid') if self.arguments.size == self.operation_arguments.size && ! self.valid_arguments? + end + end + end + + self.errors.add(:child, 'is invalid') if self.child_field && ! self.child_field.valid? + end + + def count + @count ||= self.get_scope.count + end + + def end_user_ids(ids=nil) + return @end_user_ids if @end_user_ids + scope = self.get_scope + scope = scope.scoped(:conditions => {self.end_user_field => ids}) if ids + @end_user_ids = scope.find(:all, :select => self.end_user_field).collect &self.end_user_field + end + + def get_scope(scope=nil) + return @scope if @scope + scope ||= self.domain_model_class + @scope = self.type_class.send(self.operation, scope, self.model_field, *self.converted_arguments) + @scope = self.child_field.get_scope(@scope) if self.child_field + @scope + end + + def converted_arguments + @converted_arguments ||= UserSegment::FieldType.convert_arguments(self.arguments, self.operation_arguments, self.operation_argument_options) if self.operation_arguments + end + + def valid_arguments? + return false unless self.converted_arguments + self.converted_arguments.each { |arg| return false if arg.nil? } + true + end + + def operation_arguments + self.operation_info[:arguments] if self.operation_info + end + + def operation_argument_options + self.operation_info[:argument_options] if self.operation_info + end + + def operation_info + @operation_info ||= self.type_class.user_segment_field_type_operations[self.operation.to_sym] if self.type_class + end + + def type_class + @type_class ||= self.handler_class.user_segment_fields[self.field.to_sym][:type] if self.handler_class + end + + def model_field + self.handler_class.user_segment_fields[self.field.to_sym][:field] if self.handler_class + end + + def handler + @handler ||= self.get_handler_info(:user_segment, :fields).find { |info| info[:class].has_field?(self.field) } + end + + def handler=(handler) + @handler = handler + end + + def handler_class + self.handler[:class] if self.handler + end + + def domain_model_class + self.handler[:domain_model_class] if self.handler + end + + def end_user_field + (self.handler[:end_user_field] || :end_user_id) if self.handler + end + + def child_field + return @child_field if @child_field + return nil unless self.child + return nil unless self.handler + @child_field = UserSegment::Field.new self.child + @child_field.handler = self.handler + @child_field + end +end diff --git a/app/models/user_segment/field_handler.rb b/app/models/user_segment/field_handler.rb new file mode 100644 index 00000000..47b1bb30 --- /dev/null +++ b/app/models/user_segment/field_handler.rb @@ -0,0 +1,17 @@ + +class UserSegment::FieldHandler + + def self.user_segment_fields + @user_segment_fields ||= {} + end + + def self.has_field?(field) + self.user_segment_fields[field.to_sym] ? true : false + end + + def self.register_field(field, type, options={}) + self.user_segment_fields[field.to_sym] = options.merge(:type => type) + self.user_segment_fields[field.to_sym][:name] ||= field.to_s.humanize + self.user_segment_fields[field.to_sym][:field] ||= field.to_sym + end +end diff --git a/app/models/user_segment/field_type.rb b/app/models/user_segment/field_type.rb new file mode 100644 index 00000000..b82402bd --- /dev/null +++ b/app/models/user_segment/field_type.rb @@ -0,0 +1,70 @@ + +class UserSegment::FieldType + + def self.user_segment_field_type_operations + @user_segment_field_type_operations ||= {} + end + + def self.has_operation?(operation) + self.user_segment_field_type_operations[operation.to_sym] ? true : false + end + + def self.register_operation(operation, args=[], options={}) + arguments = [] + argument_names = [] + argument_options = [] + args.each do |arg| + if arg.is_a?(Array) + name = arg[0] + type = arg[1].to_sym + opts = arg[2] || {} + else + type = arg + name = type.to_s.humanize + opts = {} + end + + arguments << type.to_sym + argument_names << name + argument_options << opts + end + + name = options[:name] || operation.to_s.humanize + + self.user_segment_field_type_operations[operation.to_sym] = options.merge(:name => name, :arguments => arguments, :argument_names => argument_names, :argument_options => argument_options) + end + + # converts a string to the correct type + # supported types are :integer, :float, :double, :date, :datetime, :option, :boolean + def self.convert_to(value, type, opts={}) + case type + when :integer + return value.to_i if value.is_a?(Integer) || value =~ /^\d+$/ + when :float, :double + return value.to_f if value.is_a?(Numeric) || value =~ /^(\d+|\.\d+|\d+\.\d+)$/ + when :string + return value + when :date, :datetime + begin + return value if value.is_a?(::Time) + return Time.parse(value) + rescue + end + when :option + value = opts[:options].find { |o| o.downcase == value.downcase } + return value if value + when :boolean + return value if value.is_a?(TrueClass) || value.is_a?(FalseClass) + return true if value == '1' || value.downcase == 'true' + return false if value == '0' || value.downcase == 'false' + end + + nil + end + + def self.convert_arguments(arguments, types, options) + (0..arguments.length-1).collect do |idx| + self.convert_to(arguments[idx], types[idx], options[idx]) + end + end +end diff --git a/app/models/user_segment/operation.rb b/app/models/user_segment/operation.rb new file mode 100644 index 00000000..9727ef50 --- /dev/null +++ b/app/models/user_segment/operation.rb @@ -0,0 +1,41 @@ + +class UserSegment::Operation + + def initialize(operator, fields) + @operator = operator + @fields = fields + end + + def valid? + @fields.each { |fld| return false unless fld.valid? } + true + end + + def count + @fields.collect do |fld| + @operator == 'not' ? EndUser.count - fld.count : fld.count + end.inject(0) { |sum, num| sum + num } + end + + def end_user_ids(ids=nil) + return @end_user_ids if @end_user_ids + + @end_user_ids = [] + @fields.each { |fld| @end_user_ids = @end_user_ids + fld.end_user_ids(ids) } + @end_user_ids.uniq! + + if @operator == 'not' + if ids + @end_user_ids = ids - @end_user_ids + else + @end_user_ids = EndUser.find(:all, :select => 'id', :conditions => ['id not in(?)', @end_user_ids]).collect &:id + end + end + + @end_user_ids + end + + def to_a + [@operator] + @fields.collect { |fld| fld.to_h } + end +end diff --git a/app/models/user_segment/operations.rb b/app/models/user_segment/operations.rb new file mode 100644 index 00000000..b7ee7531 --- /dev/null +++ b/app/models/user_segment/operations.rb @@ -0,0 +1,47 @@ +require 'treetop' + +class UserSegment::Operations + + def end_user_ids + return @end_user_ids if @end_user_ids + return [] unless self.valid? + + self.operations.sort_by { |op| op.count }.each do |op| + @end_user_ids = op.end_user_ids(@end_user_ids) + return [] if @end_user_ids.empty? + end + + @end_user_ids + end + + def parser + @parser ||= UserSegmentOptionParser.new + end + + def parse(text) + if options = self.parser.parse(text) + self.operations = options.eval + end + end + + def valid? + return false unless self.operations + self.operations.each { |op| return false unless op.valid? } + true + end + + def operations + @operations + end + + def operations=(options) + @operations = options.collect do |line| + UserSegment::Operation.new line[0], line[1..-1].collect { |op| UserSegment::Field.new op } + end + end + + def to_a + return [] unless @operations + @operations.collect { |op| op.to_a } + end +end diff --git a/app/models/user_segment/parser.rb b/app/models/user_segment/parser.rb new file mode 100644 index 00000000..16a21179 --- /dev/null +++ b/app/models/user_segment/parser.rb @@ -0,0 +1,4 @@ + +class UserSegment::Parser + +end diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb new file mode 100644 index 00000000..6ed5c117 --- /dev/null +++ b/app/models/user_segment_cache.rb @@ -0,0 +1,4 @@ + +class UserSegmentCache < DomainModel + +end diff --git a/app/models/user_segment_option_parser.rb b/app/models/user_segment_option_parser.rb new file mode 100644 index 00000000..ca944e3b --- /dev/null +++ b/app/models/user_segment_option_parser.rb @@ -0,0 +1,1517 @@ +# Autogenerated from a Treetop grammar. Edits may be lost. + + + +module UserSegmentOption + include Treetop::Runtime + + def root + @root ||= :multiple_operations + end + + module MultipleOperations0 + def operations + elements[1] + end + end + + module MultipleOperations1 + def operations + elements[0] + end + + def more + elements[1] + end + + end + + module MultipleOperations2 + def eval(env={}) + [operations.eval(env)] + more.elements.collect { |e| e.operations.eval(env) } + end + end + + def _nt_multiple_operations + start_index = index + if node_cache[:multiple_operations].has_key?(index) + cached = node_cache[:multiple_operations][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_operations + s0 << r1 + if r1 + s2, i2 = [], index + loop do + i3, s3 = index, [] + s4, i4 = [], index + loop do + r5 = _nt_newline + if r5 + s4 << r5 + else + break + end + end + if s4.empty? + @index = i4 + r4 = nil + else + r4 = instantiate_node(SyntaxNode,input, i4...index, s4) + end + s3 << r4 + if r4 + r6 = _nt_operations + s3 << r6 + end + if s3.last + r3 = instantiate_node(SyntaxNode,input, i3...index, s3) + r3.extend(MultipleOperations0) + else + @index = i3 + r3 = nil + end + if r3 + s2 << r3 + else + break + end + end + r2 = instantiate_node(SyntaxNode,input, i2...index, s2) + s0 << r2 + if r2 + s7, i7 = [], index + loop do + r8 = _nt_newline + if r8 + s7 << r8 + else + break + end + end + r7 = instantiate_node(SyntaxNode,input, i7...index, s7) + s0 << r7 + end + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(MultipleOperations1) + r0.extend(MultipleOperations2) + else + @index = i0 + r0 = nil + end + + node_cache[:multiple_operations][start_index] = r0 + + r0 + end + + module Operations0 + def operation + elements[1] + end + end + + module Operations1 + def not_op + elements[0] + end + + def operation + elements[1] + end + + def more + elements[2] + end + end + + module Operations2 + def eval(env={}) + [not_op.eval(env), operation.eval(env)] + more.elements.collect { |e| e.operation.eval(env) } + end + end + + def _nt_operations + start_index = index + if node_cache[:operations].has_key?(index) + cached = node_cache[:operations][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_not + s0 << r1 + if r1 + r2 = _nt_operation + s0 << r2 + if r2 + s3, i3 = [], index + loop do + i4, s4 = index, [] + if has_terminal?('+', false, index) + r5 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('+') + r5 = nil + end + s4 << r5 + if r5 + r6 = _nt_operation + s4 << r6 + end + if s4.last + r4 = instantiate_node(SyntaxNode,input, i4...index, s4) + r4.extend(Operations0) + else + @index = i4 + r4 = nil + end + if r4 + s3 << r4 + else + break + end + end + r3 = instantiate_node(SyntaxNode,input, i3...index, s3) + s0 << r3 + end + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Operations1) + r0.extend(Operations2) + else + @index = i0 + r0 = nil + end + + node_cache[:operations][start_index] = r0 + + r0 + end + + module Operation0 + def space1 + elements[0] + end + + def field + elements[1] + end + + def operation + elements[3] + end + + def lparen + elements[4] + end + + def arguments + elements[5] + end + + def rparen + elements[6] + end + + def child + elements[7] + end + + def space2 + elements[8] + end + end + + module Operation1 + def eval(env={}) + {:field => field.eval(env), :operation => operation.eval(env), :arguments => arguments.eval(env), :child => child.eval(env)} + end + end + + def _nt_operation + start_index = index + if node_cache[:operation].has_key?(index) + cached = node_cache[:operation][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_space + s0 << r1 + if r1 + r2 = _nt_field + s0 << r2 + if r2 + if has_terminal?('.', false, index) + r3 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('.') + r3 = nil + end + s0 << r3 + if r3 + r4 = _nt_operation_name + s0 << r4 + if r4 + r5 = _nt_lparen + s0 << r5 + if r5 + r6 = _nt_arguments + s0 << r6 + if r6 + r7 = _nt_rparen + s0 << r7 + if r7 + r8 = _nt_sub_operations + s0 << r8 + if r8 + r9 = _nt_space + s0 << r9 + end + end + end + end + end + end + end + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Operation0) + r0.extend(Operation1) + else + @index = i0 + r0 = nil + end + + node_cache[:operation][start_index] = r0 + + r0 + end + + module SubOperations0 + def field + elements[1] + end + + def operation_name + elements[3] + end + + def lparen + elements[4] + end + + def arguments + elements[5] + end + + def rparen + elements[6] + end + end + + module SubOperations1 + def eval(env={}) + if empty? + nil + else + child = nil + elements.reverse.each do |e| + child = {:field => e.field.eval(env), :operation => e.operation_name.eval(env), :arguments => e.arguments.eval(env), :child => child} + end + child + end + end + end + + def _nt_sub_operations + start_index = index + if node_cache[:sub_operations].has_key?(index) + cached = node_cache[:sub_operations][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + s0, i0 = [], index + loop do + i1, s1 = index, [] + if has_terminal?('.', false, index) + r2 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('.') + r2 = nil + end + s1 << r2 + if r2 + r3 = _nt_field + s1 << r3 + if r3 + if has_terminal?('.', false, index) + r4 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('.') + r4 = nil + end + s1 << r4 + if r4 + r5 = _nt_operation_name + s1 << r5 + if r5 + r6 = _nt_lparen + s1 << r6 + if r6 + r7 = _nt_arguments + s1 << r7 + if r7 + r8 = _nt_rparen + s1 << r8 + end + end + end + end + end + end + if s1.last + r1 = instantiate_node(SyntaxNode,input, i1...index, s1) + r1.extend(SubOperations0) + else + @index = i1 + r1 = nil + end + if r1 + s0 << r1 + else + break + end + end + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(SubOperations1) + + node_cache[:sub_operations][start_index] = r0 + + r0 + end + + module Field0 + end + + module Field1 + def eval(env={}) + text_value + end + end + + def _nt_field + start_index = index + if node_cache[:field].has_key?(index) + cached = node_cache[:field][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + if has_terminal?('\G[a-zA-Z]', true, index) + r1 = true + @index += 1 + else + r1 = nil + end + s0 << r1 + if r1 + s2, i2 = [], index + loop do + if has_terminal?('\G[a-zA-Z0-9_]', true, index) + r3 = true + @index += 1 + else + r3 = nil + end + if r3 + s2 << r3 + else + break + end + end + r2 = instantiate_node(SyntaxNode,input, i2...index, s2) + s0 << r2 + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Field0) + r0.extend(Field1) + else + @index = i0 + r0 = nil + end + + node_cache[:field][start_index] = r0 + + r0 + end + + module OperationName0 + end + + module OperationName1 + def eval(env={}) + text_value + end + end + + def _nt_operation_name + start_index = index + if node_cache[:operation_name].has_key?(index) + cached = node_cache[:operation_name][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + if has_terminal?('\G[a-zA-Z]', true, index) + r1 = true + @index += 1 + else + r1 = nil + end + s0 << r1 + if r1 + s2, i2 = [], index + loop do + if has_terminal?('\G[a-zA-Z0-9_]', true, index) + r3 = true + @index += 1 + else + r3 = nil + end + if r3 + s2 << r3 + else + break + end + end + r2 = instantiate_node(SyntaxNode,input, i2...index, s2) + s0 << r2 + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(OperationName0) + r0.extend(OperationName1) + else + @index = i0 + r0 = nil + end + + node_cache[:operation_name][start_index] = r0 + + r0 + end + + module Arguments0 + def argument + elements[1] + end + end + + module Arguments1 + def arg + elements[0] + end + + def more + elements[1] + end + end + + module Arguments2 + def eval(env={}) + [arg.eval(env)] + more.elements.collect{ |e| e.argument.eval(env) } + end + end + + def _nt_arguments + start_index = index + if node_cache[:arguments].has_key?(index) + cached = node_cache[:arguments][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_argument + s0 << r1 + if r1 + s2, i2 = [], index + loop do + i3, s3 = index, [] + if has_terminal?(',', false, index) + r4 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure(',') + r4 = nil + end + s3 << r4 + if r4 + r5 = _nt_argument + s3 << r5 + end + if s3.last + r3 = instantiate_node(SyntaxNode,input, i3...index, s3) + r3.extend(Arguments0) + else + @index = i3 + r3 = nil + end + if r3 + s2 << r3 + else + break + end + end + r2 = instantiate_node(SyntaxNode,input, i2...index, s2) + s0 << r2 + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Arguments1) + r0.extend(Arguments2) + else + @index = i0 + r0 = nil + end + + node_cache[:arguments][start_index] = r0 + + r0 + end + + module Argument0 + def space1 + elements[0] + end + + def arg + elements[1] + end + + def space2 + elements[2] + end + end + + module Argument1 + def eval(env={}) + arg.eval(env) + end + end + + def _nt_argument + start_index = index + if node_cache[:argument].has_key?(index) + cached = node_cache[:argument][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_space + s0 << r1 + if r1 + i2 = index + r3 = _nt_string + if r3 + r2 = r3 + else + r4 = _nt_integer + if r4 + r2 = r4 + else + r5 = _nt_float + if r5 + r2 = r5 + else + r6 = _nt_boolean + if r6 + r2 = r6 + else + @index = i2 + r2 = nil + end + end + end + end + s0 << r2 + if r2 + r7 = _nt_space + s0 << r7 + end + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Argument0) + r0.extend(Argument1) + else + @index = i0 + r0 = nil + end + + node_cache[:argument][start_index] = r0 + + r0 + end + + module String0 + end + + module String1 + end + + module String2 + def eval(env={}) + text_value[1..-2] + end + end + + def _nt_string + start_index = index + if node_cache[:string].has_key?(index) + cached = node_cache[:string][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + if has_terminal?('"', false, index) + r1 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('"') + r1 = nil + end + s0 << r1 + if r1 + s2, i2 = [], index + loop do + i3 = index + i4, s4 = index, [] + i5 = index + if has_terminal?('"', false, index) + r6 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('"') + r6 = nil + end + if r6 + r5 = nil + else + @index = i5 + r5 = instantiate_node(SyntaxNode,input, index...index) + end + s4 << r5 + if r5 + if index < input_length + r7 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure("any character") + r7 = nil + end + s4 << r7 + end + if s4.last + r4 = instantiate_node(SyntaxNode,input, i4...index, s4) + r4.extend(String0) + else + @index = i4 + r4 = nil + end + if r4 + r3 = r4 + else + if has_terminal?('\"', false, index) + r8 = instantiate_node(SyntaxNode,input, index...(index + 2)) + @index += 2 + else + terminal_parse_failure('\"') + r8 = nil + end + if r8 + r3 = r8 + else + @index = i3 + r3 = nil + end + end + if r3 + s2 << r3 + else + break + end + end + r2 = instantiate_node(SyntaxNode,input, i2...index, s2) + s0 << r2 + if r2 + if has_terminal?('"', false, index) + r9 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('"') + r9 = nil + end + s0 << r9 + end + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(String1) + r0.extend(String2) + else + @index = i0 + r0 = nil + end + + node_cache[:string][start_index] = r0 + + r0 + end + + module Integer0 + end + + module Integer1 + def eval(env={}) + text_value.to_i + end + end + + def _nt_integer + start_index = index + if node_cache[:integer].has_key?(index) + cached = node_cache[:integer][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0 = index + i1, s1 = index, [] + if has_terminal?('\G[1-9]', true, index) + r2 = true + @index += 1 + else + r2 = nil + end + s1 << r2 + if r2 + s3, i3 = [], index + loop do + if has_terminal?('\G[0-9]', true, index) + r4 = true + @index += 1 + else + r4 = nil + end + if r4 + s3 << r4 + else + break + end + end + r3 = instantiate_node(SyntaxNode,input, i3...index, s3) + s1 << r3 + end + if s1.last + r1 = instantiate_node(SyntaxNode,input, i1...index, s1) + r1.extend(Integer0) + else + @index = i1 + r1 = nil + end + if r1 + r0 = r1 + r0.extend(Integer1) + else + if has_terminal?('0', false, index) + r5 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('0') + r5 = nil + end + if r5 + r0 = r5 + r0.extend(Integer1) + else + @index = i0 + r0 = nil + end + end + + node_cache[:integer][start_index] = r0 + + r0 + end + + module Boolean0 + def eval(env={}) + if text_value.downcase == 'true' + true + else + false + end + end + end + + def _nt_boolean + start_index = index + if node_cache[:boolean].has_key?(index) + cached = node_cache[:boolean][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0 = index + if has_terminal?('true', false, index) + r1 = instantiate_node(SyntaxNode,input, index...(index + 4)) + @index += 4 + else + terminal_parse_failure('true') + r1 = nil + end + if r1 + r0 = r1 + r0.extend(Boolean0) + else + if has_terminal?('TRUE', false, index) + r2 = instantiate_node(SyntaxNode,input, index...(index + 4)) + @index += 4 + else + terminal_parse_failure('TRUE') + r2 = nil + end + if r2 + r0 = r2 + r0.extend(Boolean0) + else + if has_terminal?('True', false, index) + r3 = instantiate_node(SyntaxNode,input, index...(index + 4)) + @index += 4 + else + terminal_parse_failure('True') + r3 = nil + end + if r3 + r0 = r3 + r0.extend(Boolean0) + else + if has_terminal?('false', false, index) + r4 = instantiate_node(SyntaxNode,input, index...(index + 5)) + @index += 5 + else + terminal_parse_failure('false') + r4 = nil + end + if r4 + r0 = r4 + r0.extend(Boolean0) + else + if has_terminal?('FALSE', false, index) + r5 = instantiate_node(SyntaxNode,input, index...(index + 5)) + @index += 5 + else + terminal_parse_failure('FALSE') + r5 = nil + end + if r5 + r0 = r5 + r0.extend(Boolean0) + else + if has_terminal?('False', false, index) + r6 = instantiate_node(SyntaxNode,input, index...(index + 5)) + @index += 5 + else + terminal_parse_failure('False') + r6 = nil + end + if r6 + r0 = r6 + r0.extend(Boolean0) + else + @index = i0 + r0 = nil + end + end + end + end + end + end + + node_cache[:boolean][start_index] = r0 + + r0 + end + + module Float0 + end + + module Float1 + end + + module Float2 + end + + module Float3 + def eval(env={}) + text_value.to_f + end + end + + def _nt_float + start_index = index + if node_cache[:float].has_key?(index) + cached = node_cache[:float][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0 = index + i1, s1 = index, [] + if has_terminal?('\G[1-9]', true, index) + r2 = true + @index += 1 + else + r2 = nil + end + s1 << r2 + if r2 + s3, i3 = [], index + loop do + if has_terminal?('\G[0-9]', true, index) + r4 = true + @index += 1 + else + r4 = nil + end + if r4 + s3 << r4 + else + break + end + end + r3 = instantiate_node(SyntaxNode,input, i3...index, s3) + s1 << r3 + end + if s1.last + r1 = instantiate_node(SyntaxNode,input, i1...index, s1) + r1.extend(Float0) + else + @index = i1 + r1 = nil + end + if r1 + r0 = r1 + else + i5, s5 = index, [] + if has_terminal?('.', false, index) + r6 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('.') + r6 = nil + end + s5 << r6 + if r6 + s7, i7 = [], index + loop do + if has_terminal?('\G[0-9]', true, index) + r8 = true + @index += 1 + else + r8 = nil + end + if r8 + s7 << r8 + else + break + end + end + if s7.empty? + @index = i7 + r7 = nil + else + r7 = instantiate_node(SyntaxNode,input, i7...index, s7) + end + s5 << r7 + end + if s5.last + r5 = instantiate_node(SyntaxNode,input, i5...index, s5) + r5.extend(Float1) + else + @index = i5 + r5 = nil + end + if r5 + r0 = r5 + else + i9, s9 = index, [] + s10, i10 = [], index + loop do + if has_terminal?('\G[0-9]', true, index) + r11 = true + @index += 1 + else + r11 = nil + end + if r11 + s10 << r11 + else + break + end + end + if s10.empty? + @index = i10 + r10 = nil + else + r10 = instantiate_node(SyntaxNode,input, i10...index, s10) + end + s9 << r10 + if r10 + if has_terminal?('.', false, index) + r12 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('.') + r12 = nil + end + s9 << r12 + if r12 + if has_terminal?('\G[0-9]', true, index) + r13 = true + @index += 1 + else + r13 = nil + end + s9 << r13 + end + end + if s9.last + r9 = instantiate_node(SyntaxNode,input, i9...index, s9) + r9.extend(Float2) + r9.extend(Float3) + else + @index = i9 + r9 = nil + end + if r9 + r0 = r9 + else + @index = i0 + r0 = nil + end + end + end + + node_cache[:float][start_index] = r0 + + r0 + end + + module Lparen0 + def space1 + elements[0] + end + + def space2 + elements[2] + end + end + + def _nt_lparen + start_index = index + if node_cache[:lparen].has_key?(index) + cached = node_cache[:lparen][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_space + s0 << r1 + if r1 + if has_terminal?('(', false, index) + r2 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('(') + r2 = nil + end + s0 << r2 + if r2 + r3 = _nt_space + s0 << r3 + end + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Lparen0) + else + @index = i0 + r0 = nil + end + + node_cache[:lparen][start_index] = r0 + + r0 + end + + module Rparen0 + def space1 + elements[0] + end + + def space2 + elements[2] + end + end + + def _nt_rparen + start_index = index + if node_cache[:rparen].has_key?(index) + cached = node_cache[:rparen][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_space + s0 << r1 + if r1 + if has_terminal?(')', false, index) + r2 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure(')') + r2 = nil + end + s0 << r2 + if r2 + r3 = _nt_space + s0 << r3 + end + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Rparen0) + else + @index = i0 + r0 = nil + end + + node_cache[:rparen][start_index] = r0 + + r0 + end + + module NonSpaceChar0 + end + + def _nt_non_space_char + start_index = index + if node_cache[:non_space_char].has_key?(index) + cached = node_cache[:non_space_char][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + i1 = index + if has_terminal?('\G[ ]', true, index) + r2 = true + @index += 1 + else + r2 = nil + end + if r2 + r1 = nil + else + @index = i1 + r1 = instantiate_node(SyntaxNode,input, index...index) + end + s0 << r1 + if r1 + if index < input_length + r3 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure("any character") + r3 = nil + end + s0 << r3 + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(NonSpaceChar0) + else + @index = i0 + r0 = nil + end + + node_cache[:non_space_char][start_index] = r0 + + r0 + end + + module Not0 + end + + module Not1 + def space + elements[1] + end + end + + module Not2 + def eval(env={}) + empty? ? nil : 'not' + end + end + + def _nt_not + start_index = index + if node_cache[:not].has_key?(index) + cached = node_cache[:not][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + i2 = index + i3, s3 = index, [] + if has_terminal?('\G[nN]', true, index) + r4 = true + @index += 1 + else + r4 = nil + end + s3 << r4 + if r4 + if has_terminal?('\G[oO]', true, index) + r5 = true + @index += 1 + else + r5 = nil + end + s3 << r5 + if r5 + if has_terminal?('\G[tT]', true, index) + r6 = true + @index += 1 + else + r6 = nil + end + s3 << r6 + if r6 + if has_terminal?(' ', false, index) + r7 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure(' ') + r7 = nil + end + s3 << r7 + end + end + end + if s3.last + r3 = instantiate_node(SyntaxNode,input, i3...index, s3) + r3.extend(Not0) + else + @index = i3 + r3 = nil + end + if r3 + r2 = r3 + else + if has_terminal?('!', false, index) + r8 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('!') + r8 = nil + end + if r8 + r2 = r8 + else + @index = i2 + r2 = nil + end + end + if r2 + r1 = r2 + else + r1 = instantiate_node(SyntaxNode,input, index...index) + end + s0 << r1 + if r1 + r9 = _nt_space + s0 << r9 + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Not1) + r0.extend(Not2) + else + @index = i0 + r0 = nil + end + + node_cache[:not][start_index] = r0 + + r0 + end + + module Newline0 + def space + elements[0] + end + + end + + def _nt_newline + start_index = index + if node_cache[:newline].has_key?(index) + cached = node_cache[:newline][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_space + s0 << r1 + if r1 + if has_terminal?("\n", false, index) + r2 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure("\n") + r2 = nil + end + s0 << r2 + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Newline0) + else + @index = i0 + r0 = nil + end + + node_cache[:newline][start_index] = r0 + + r0 + end + + def _nt_space + start_index = index + if node_cache[:space].has_key?(index) + cached = node_cache[:space][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + s0, i0 = [], index + loop do + if has_terminal?('\G[ ]', true, index) + r1 = true + @index += 1 + else + r1 = nil + end + if r1 + s0 << r1 + else + break + end + end + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + + node_cache[:space][start_index] = r0 + + r0 + end + +end + +class UserSegmentOptionParser < Treetop::Runtime::CompiledParser + include UserSegmentOption +end + + diff --git a/app/models/user_segment_option_parser.treetop b/app/models/user_segment_option_parser.treetop new file mode 100644 index 00000000..d4e4b9e3 --- /dev/null +++ b/app/models/user_segment_option_parser.treetop @@ -0,0 +1,140 @@ + +grammar UserSegmentOption + + rule multiple_operations + operations:operations more:(newline+ operations)* newline* { + def eval(env={}) + [operations.eval(env)] + more.elements.collect { |e| e.operations.eval(env) } + end + } + end + + rule operations + not_op:not operation:operation more:('+' operation)* { + def eval(env={}) + [not_op.eval(env), operation.eval(env)] + more.elements.collect { |e| e.operation.eval(env) } + end + } + end + + rule operation + space field:field '.' operation:operation_name lparen arguments:arguments rparen child:sub_operations space { + def eval(env={}) + {:field => field.eval(env), :operation => operation.eval(env), :arguments => arguments.eval(env), :child => child.eval(env)} + end + } + end + + rule sub_operations + ('.' field '.' operation_name lparen arguments rparen)* { + def eval(env={}) + if empty? + nil + else + child = nil + elements.reverse.each do |e| + child = {:field => e.field.eval(env), :operation => e.operation_name.eval(env), :arguments => e.arguments.eval(env), :child => child} + end + child + end + end + } + end + + rule field + [a-zA-Z] [a-zA-Z0-9_]* { + def eval(env={}) + text_value + end + } + end + + rule operation_name + [a-zA-Z] [a-zA-Z0-9_]* { + def eval(env={}) + text_value + end + } + end + + rule arguments + arg:argument more:(',' argument)* { + def eval(env={}) + [arg.eval(env)] + more.elements.collect{ |e| e.argument.eval(env) } + end + } + end + + rule argument + space arg:(string / integer / float / boolean) space { + def eval(env={}) + arg.eval(env) + end + } + end + + rule string + '"' (!'"' . / '\"')* '"' { + def eval(env={}) + text_value[1..-2] + end + } + end + + rule integer + ([1-9] [0-9]* / '0') { + def eval(env={}) + text_value.to_i + end + } + end + + rule boolean + ('true' / 'TRUE' / 'True' / 'false' / 'FALSE' / 'False') { + def eval(env={}) + if text_value.downcase == 'true' + true + else + false + end + end + } + end + + rule float + [1-9] [0-9]* / '.' [0-9]+ / [0-9]+ '.' [0-9] { + def eval(env={}) + text_value.to_f + end + } + end + + rule lparen + space '(' space + end + + rule rparen + space ')' space + end + + rule non_space_char + ![ ] . + end + + rule not + ([nN] [oO] [tT] ' ' / '!')? space { + def eval(env={}) + empty? ? nil : 'not' + end + } + end + + rule newline + space "\n" + end + + rule space + [ ]* + end +end + diff --git a/db/migrate/20100511165552_user_segments.rb b/db/migrate/20100511165552_user_segments.rb new file mode 100644 index 00000000..b6657ccd --- /dev/null +++ b/db/migrate/20100511165552_user_segments.rb @@ -0,0 +1,39 @@ +class UserSegments < ActiveRecord::Migration + def self.up + create_table :user_segments, :force => true do |t| + t.string :name + t.text :description + t.string :type + t.boolean :main_page + t.datetime :last_ran_at + t.integer :last_count + t.text :fields + t.text :segment_options + t.text :segment_options_text + t.string :order_by + t.timestamps + end + + create_table :user_segment_caches, :force => true do |t| + t.integer :user_segment_id + t.text :id_list + t.datetime :created_at + end + + create_table :user_segment_analytics, :force => true do |t| + t.integer :user_segment_id + t.text :fields + t.text :results + t.datetime :start_date + t.datetime :end_date + t.string :step + t.timestamps + end + end + + def self.down + drop_table :user_segments + drop_table :user_segment_caches + drop_table :user_segment_analytics + end +end From 185ce247234c103c21b5bb4abd11c6a557890f02 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 13 May 2010 23:52:43 +0000 Subject: [PATCH 002/139] Fixes for user segment types. Added specs for most basic parts of user segments. --- app/models/user_segment/core_type.rb | 20 +++- app/models/user_segment/field_handler.rb | 17 ++- app/models/user_segment/field_type.rb | 24 ++-- app/models/user_segment/parser.rb | 4 - spec/models/user_segment/core_type_spec.rb | 111 ++++++++++++++++++ .../models/user_segment/field_handler_spec.rb | 18 +++ spec/models/user_segment/field_spec.rb | 62 ++++++++++ spec/models/user_segment/field_type_spec.rb | 90 ++++++++++++++ spec/models/user_segment/operation_spec.rb | 47 ++++++++ 9 files changed, 373 insertions(+), 20 deletions(-) delete mode 100644 app/models/user_segment/parser.rb create mode 100644 spec/models/user_segment/core_type_spec.rb create mode 100644 spec/models/user_segment/field_handler_spec.rb create mode 100644 spec/models/user_segment/field_spec.rb create mode 100644 spec/models/user_segment/field_type_spec.rb create mode 100644 spec/models/user_segment/operation_spec.rb diff --git a/app/models/user_segment/core_type.rb b/app/models/user_segment/core_type.rb index 5ab25e4f..28b83e60 100644 --- a/app/models/user_segment/core_type.rb +++ b/app/models/user_segment/core_type.rb @@ -1,7 +1,7 @@ class UserSegment::CoreType - @@datetime_format_options = ['day', 'days', 'week', 'weeks', 'month', 'months', 'year', 'years'] + @@datetime_format_options = ['second', 'seconds', 'minute', 'minutes', 'hour', 'hours', 'day', 'days', 'week', 'weeks', 'month', 'months', 'year', 'years'] def self.datetime_format_options @@datetime_format_options end @@ -37,17 +37,35 @@ def self.greater_than(cls, field, value) cls.scoped(:conditions => ["#{field} > ?", value]) end + register_operation :greater_than_or_equal_to, [['Value', :integer]] + + def self.greater_than_or_equal_to(cls, field, value) + cls.scoped(:conditions => ["#{field} >= ?", value]) + end + register_operation :less_than, [['Value', :integer]] def self.less_than(cls, field, value) cls.scoped(:conditions => ["#{field} < ?", value]) end + register_operation :less_than_or_equal_to, [['Value', :integer]] + + def self.less_than_or_equal_to(cls, field, value) + cls.scoped(:conditions => ["#{field} <= ?", value]) + end + register_operation :equals, [['Value', :integer]] def self.equals(cls, field, value) cls.scoped(:conditions => ["#{field} = ?", value]) end + + register_operation :is, [['Value', :integer]] + + def self.is(cls, field, value) + self.equals(cls, field, value) + end end class StringType < UserSegment::FieldType diff --git a/app/models/user_segment/field_handler.rb b/app/models/user_segment/field_handler.rb index 47b1bb30..f8e7d126 100644 --- a/app/models/user_segment/field_handler.rb +++ b/app/models/user_segment/field_handler.rb @@ -1,17 +1,22 @@ class UserSegment::FieldHandler - def self.user_segment_fields - @user_segment_fields ||= {} - end + def self.user_segment_fields; {}; end def self.has_field?(field) self.user_segment_fields[field.to_sym] ? true : false end def self.register_field(field, type, options={}) - self.user_segment_fields[field.to_sym] = options.merge(:type => type) - self.user_segment_fields[field.to_sym][:name] ||= field.to_s.humanize - self.user_segment_fields[field.to_sym][:field] ||= field.to_sym + fields = self.user_segment_fields + + fields[field.to_sym] = options.merge(:type => type) + fields[field.to_sym][:name] ||= field.to_s.humanize + fields[field.to_sym][:field] ||= field.to_sym + + sing = class << self; self; end + sing.send :define_method, :user_segment_fields do + fields + end end end diff --git a/app/models/user_segment/field_type.rb b/app/models/user_segment/field_type.rb index b82402bd..bd722608 100644 --- a/app/models/user_segment/field_type.rb +++ b/app/models/user_segment/field_type.rb @@ -1,15 +1,15 @@ class UserSegment::FieldType - def self.user_segment_field_type_operations - @user_segment_field_type_operations ||= {} - end + def self.user_segment_field_type_operations; {}; end def self.has_operation?(operation) self.user_segment_field_type_operations[operation.to_sym] ? true : false end def self.register_operation(operation, args=[], options={}) + operations = self.user_segment_field_type_operations + arguments = [] argument_names = [] argument_options = [] @@ -29,9 +29,14 @@ def self.register_operation(operation, args=[], options={}) argument_options << opts end - name = options[:name] || operation.to_s.humanize + + operations[operation.to_sym] = options.merge(:arguments => arguments, :argument_names => argument_names, :argument_options => argument_options) + operations[operation.to_sym][:name] ||= operation.to_s.humanize - self.user_segment_field_type_operations[operation.to_sym] = options.merge(:name => name, :arguments => arguments, :argument_names => argument_names, :argument_options => argument_options) + sing = class << self; self; end + sing.send :define_method, :user_segment_field_type_operations do + operations + end end # converts a string to the correct type @@ -43,10 +48,10 @@ def self.convert_to(value, type, opts={}) when :float, :double return value.to_f if value.is_a?(Numeric) || value =~ /^(\d+|\.\d+|\d+\.\d+)$/ when :string - return value + return value if value.is_a?(String) when :date, :datetime begin - return value if value.is_a?(::Time) + return value if value.is_a?(Time) return Time.parse(value) rescue end @@ -55,8 +60,9 @@ def self.convert_to(value, type, opts={}) return value if value when :boolean return value if value.is_a?(TrueClass) || value.is_a?(FalseClass) - return true if value == '1' || value.downcase == 'true' - return false if value == '0' || value.downcase == 'false' + value = value.downcase if value.is_a?(String) + return true if value == 1 || value == '1' || value == 'true' + return false if value == 0 || value == '0' || value == 'false' end nil diff --git a/app/models/user_segment/parser.rb b/app/models/user_segment/parser.rb deleted file mode 100644 index 16a21179..00000000 --- a/app/models/user_segment/parser.rb +++ /dev/null @@ -1,4 +0,0 @@ - -class UserSegment::Parser - -end diff --git a/spec/models/user_segment/core_type_spec.rb b/spec/models/user_segment/core_type_spec.rb new file mode 100644 index 00000000..4c645e69 --- /dev/null +++ b/spec/models/user_segment/core_type_spec.rb @@ -0,0 +1,111 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +describe UserSegment::CoreType do + + reset_domain_tables :end_users + + describe "DateTimeType" do + before(:each) do + EndUser.push_target('test1@test.dev', :created_at => 2.days.ago) + EndUser.push_target('test2@test.dev', :created_at => 5.days.ago) + EndUser.push_target('test3@test.dev') + + @type = UserSegment::CoreType::DateTimeType + end + + it "should return users using before" do + @type.before(EndUser, :created_at, 1, 'day').count.should == 2 + @type.before(EndUser, :created_at, 3, 'days').count.should == 1 + @type.before(EndUser, :created_at, 6, 'days').count.should == 0 + end + + it "should return users using since" do + @type.since(EndUser, :created_at, 1, 'day').count.should == 1 + @type.since(EndUser, :created_at, 3, 'days').count.should == 2 + @type.since(EndUser, :created_at, 6, 'days').count.should == 3 + end + + it "should return users using between" do + @type.between(EndUser, :created_at, 1.day.ago, Time.now).count.should == 1 + @type.between(EndUser, :created_at, 3.day.ago, Time.now).count.should == 2 + @type.between(EndUser, :created_at, 6.day.ago, Time.now).count.should == 3 + end + end + + describe "NumberType" do + before(:each) do + EndUser.push_target('test1@test.dev', :user_level => 1) + EndUser.push_target('test2@test.dev', :user_level => 2) + EndUser.push_target('test3@test.dev', :user_level => 3) + EndUser.push_target('test4@test.dev', :user_level => 3) + + @type = UserSegment::CoreType::NumberType + end + + it "should return users using greater_than" do + @type.greater_than(EndUser, :user_level, 2).count.should == 2 + @type.greater_than(EndUser, :user_level, 3).count.should == 0 + end + + it "should return users using greater_than_or_equal_to" do + @type.greater_than_or_equal_to(EndUser, :user_level, 1).count.should == 4 + @type.greater_than_or_equal_to(EndUser, :user_level, 2).count.should == 3 + @type.greater_than_or_equal_to(EndUser, :user_level, 4).count.should == 0 + end + + it "should return users using less_than" do + @type.less_than(EndUser, :user_level, 1).count.should == 0 + @type.less_than(EndUser, :user_level, 2).count.should == 1 + @type.less_than(EndUser, :user_level, 4).count.should == 4 + end + + it "should return users using less_than_or_equal_to" do + @type.less_than_or_equal_to(EndUser, :user_level, 1).count.should == 1 + @type.less_than_or_equal_to(EndUser, :user_level, 2).count.should == 2 + @type.less_than_or_equal_to(EndUser, :user_level, 3).count.should == 4 + @type.less_than_or_equal_to(EndUser, :user_level, 4).count.should == 4 + end + + it "should return users using equals" do + @type.equals(EndUser, :user_level, 1).count.should == 1 + @type.equals(EndUser, :user_level, 2).count.should == 1 + @type.equals(EndUser, :user_level, 3).count.should == 2 + @type.is(EndUser, :user_level, 3).count.should == 2 + end + end + + describe "StringType" do + before(:each) do + EndUser.push_target('test1@test.dev') + EndUser.push_target('test2@test.dev') + EndUser.push_target('test3@test.dev') + EndUser.push_target('test4@test.dev') + + @type = UserSegment::CoreType::StringType + end + + it "should return users using like" do + @type.like(EndUser, :email, 'test%@test.dev').count.should == 4 + end + + it "should return users using is" do + @type.is(EndUser, :email, 'test1@test.dev').count.should == 1 + end + end + + describe "BooleanType" do + before(:each) do + EndUser.push_target('test1@test.dev', :activated => true) + EndUser.push_target('test2@test.dev', :activated => true) + EndUser.push_target('test3@test.dev', :activated => true) + EndUser.push_target('test4@test.dev', :activated => false) + + @type = UserSegment::CoreType::BooleanType + end + + it "should return users using is" do + @type.is(EndUser, :activated, true).count.should == 3 + @type.is(EndUser, :activated, false).count.should == 1 + end + end +end diff --git a/spec/models/user_segment/field_handler_spec.rb b/spec/models/user_segment/field_handler_spec.rb new file mode 100644 index 00000000..bcd1682f --- /dev/null +++ b/spec/models/user_segment/field_handler_spec.rb @@ -0,0 +1,18 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +describe UserSegment::FieldHandler do + + it "should be able to register a field" do + UserSegment::FieldHandler.register_field(:created, UserSegment::CoreType::DateTimeType, :field => :created_at) + UserSegment::FieldHandler.has_field?(:created).should be_true + UserSegment::FieldHandler.user_segment_fields[:created][:field].should == :created_at + UserSegment::FieldHandler.user_segment_fields[:created][:type].should == UserSegment::CoreType::DateTimeType + UserSegment::FieldHandler.user_segment_fields[:created][:name].should == 'Created' + + UserSegment::FieldHandler.register_field(:created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'EndUser.created') + UserSegment::FieldHandler.has_field?(:created).should be_true + UserSegment::FieldHandler.user_segment_fields[:created][:field].should == :created_at + UserSegment::FieldHandler.user_segment_fields[:created][:type].should == UserSegment::CoreType::DateTimeType + UserSegment::FieldHandler.user_segment_fields[:created][:name].should == 'EndUser.created' + end +end diff --git a/spec/models/user_segment/field_spec.rb b/spec/models/user_segment/field_spec.rb new file mode 100644 index 00000000..85ea21bb --- /dev/null +++ b/spec/models/user_segment/field_spec.rb @@ -0,0 +1,62 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +describe UserSegment::Field do + + reset_domain_tables :end_users + + @handler = EndUserSegmentField.user_segment_fields_handler_info + + before(:each) do + EndUser.push_target('test1@test.dev', :created_at => 2.days.ago, :activated => true) + EndUser.push_target('test2@test.dev', :created_at => 5.days.ago, :activated => false) + EndUser.push_target('test3@test.dev', :activated => false) + end + + it "should be able to use handler" do + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] + @field.handler = @handler + + @field.handler_class.should == EndUserSegmentField + @field.domain_model_class.should == EndUser + @field.end_user_field.should == :id + @field.model_field.should == :created_at + @field.type_class.should == UserSegment::CoreType::DateTimeType + @field.operation_arguments.should == [:integer, :option] + @field.valid_arguments?.should == true + @field.valid?.should == true + end + + it "should return the count" do + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] + @field.handler = @handler + @field.valid?.should == true + @field.count.should == 2 + @field.end_user_ids.length.should == 2 + + @field = UserSegment::Field.new :field => 'created', :operation => 'since', :arguments => [1, 'days'] + @field.handler = @handler + @field.valid?.should == true + @field.count.should == 1 + @field.end_user_ids.length.should == 1 + end + + it "should work with children" do + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'], :child => {:field => 'activated', :operation => 'is', :arguments => [true]} + @field.handler = @handler + @field.valid?.should == true + @field.count.should == 1 + @field.end_user_ids.length.should == 1 + + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'], :child => {:field => 'activated', :operation => 'is', :arguments => [true], :child => {:field => 'email', :operation => 'like', :arguments => ['test%@test.dev']}} + @field.handler = @handler + @field.valid?.should == true + @field.count.should == 1 + @field.end_user_ids.length.should == 1 + + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'], :child => {:field => 'activated', :operation => 'is', :arguments => [false], :child => {:field => 'email', :operation => 'like', :arguments => ['test%@test.dev']}} + @field.handler = @handler + @field.valid?.should == true + @field.count.should == 1 + @field.end_user_ids.length.should == 1 + end +end diff --git a/spec/models/user_segment/field_type_spec.rb b/spec/models/user_segment/field_type_spec.rb new file mode 100644 index 00000000..54c9898a --- /dev/null +++ b/spec/models/user_segment/field_type_spec.rb @@ -0,0 +1,90 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +describe UserSegment::FieldType do + + it "should convert value to integer" do + UserSegment::FieldType.convert_to("0", :integer).should == 0 + UserSegment::FieldType.convert_to(0, :integer).should == 0 + UserSegment::FieldType.convert_to("1", :integer).should == 1 + UserSegment::FieldType.convert_to(99, :integer).should == 99 + UserSegment::FieldType.convert_to(99.0, :integer).should be_nil + UserSegment::FieldType.convert_to("99", :integer).should == 99 + UserSegment::FieldType.convert_to("1n", :integer).should be_nil + end + + it "should convert value to float" do + UserSegment::FieldType.convert_to("0", :float).should == 0.0 + UserSegment::FieldType.convert_to(0, :float).should == 0.0 + UserSegment::FieldType.convert_to("1", :float).should == 1.0 + UserSegment::FieldType.convert_to(99, :float).should == 99.0 + UserSegment::FieldType.convert_to(99.0, :float).should == 99.0 + UserSegment::FieldType.convert_to("99", :float).should == 99.0 + UserSegment::FieldType.convert_to("3.54", :float).should == 3.54 + UserSegment::FieldType.convert_to(3.54, :float).should == 3.54 + UserSegment::FieldType.convert_to("1n", :float).should be_nil + end + + it "should only return string values" do + UserSegment::FieldType.convert_to("hello world", :string).should == "hello world" + UserSegment::FieldType.convert_to(1, :string).should be_nil + UserSegment::FieldType.convert_to(true, :string).should be_nil + UserSegment::FieldType.convert_to(false, :string).should be_nil + UserSegment::FieldType.convert_to(nil, :string).should be_nil + UserSegment::FieldType.convert_to(0.1, :string).should be_nil + UserSegment::FieldType.convert_to(Time.now, :string).should be_nil + end + + it "should convert value to time" do + time = Time.parse "1/1/1990" + UserSegment::FieldType.convert_to(time.strftime("1/1/1990"), :datetime).should == time + time = Time.now + UserSegment::FieldType.convert_to(time, :datetime).should == time + end + + it "should convert value to boolean" do + UserSegment::FieldType.convert_to(true, :boolean).should == true + UserSegment::FieldType.convert_to('true', :boolean).should == true + UserSegment::FieldType.convert_to('TRUE', :boolean).should == true + UserSegment::FieldType.convert_to(1, :boolean).should == true + UserSegment::FieldType.convert_to('1', :boolean).should == true + UserSegment::FieldType.convert_to(false, :boolean).should == false + UserSegment::FieldType.convert_to('false', :boolean).should == false + UserSegment::FieldType.convert_to('FALSE', :boolean).should == false + UserSegment::FieldType.convert_to(0, :boolean).should == false + UserSegment::FieldType.convert_to('0', :boolean).should == false + end + + it "should convert value to option" do + UserSegment::FieldType.convert_to('day', :option, :options => ['day', 'days', 'week', 'weeks']).should == 'day' + UserSegment::FieldType.convert_to('Day', :option, :options => ['day', 'days', 'week', 'weeks']).should == 'day' + UserSegment::FieldType.convert_to('DAY', :option, :options => ['day', 'days', 'week', 'weeks']).should == 'day' + UserSegment::FieldType.convert_to('weeks', :option, :options => ['day', 'days', 'week', 'weeks']).should == 'weeks' + UserSegment::FieldType.convert_to('WeeKs', :option, :options => ['day', 'days', 'week', 'weeks']).should == 'weeks' + UserSegment::FieldType.convert_to('WeEk', :option, :options => ['day', 'days', 'week', 'weeks']).should == 'week' + UserSegment::FieldType.convert_to('now', :option, :options => ['day', 'days', 'week', 'weeks']).should be_nil + UserSegment::FieldType.convert_to('dayss', :option, :options => ['day', 'days', 'week', 'weeks']).should be_nil + end + + it "should covert all the arguments" do + arguments = ['1', 'test', 'true', '1/1/1990', 'Days', '1day'] + types = [:integer, :string, :boolean, :datetime, :option, :integer] + options = [{}, {}, {}, {}, {:options => ['day', 'days', 'week', 'weeks']}] + + converted = UserSegment::FieldType.convert_arguments(arguments, types, options) + converted[0].should == 1 + converted[1].should == 'test' + converted[2].should == true + converted[3].should == Time.parse('1/1/1990') + converted[4].should == 'days' + converted[5].should be_nil + end + + it "should be able to register and operation" do + UserSegment::FieldType.register_operation(:from, [['Value', :integer], ['Option', :option, {:options => ['day', 'days']}]]) + UserSegment::FieldType.has_operation?('from').should be_true + operation = UserSegment::FieldType.user_segment_field_type_operations[:from] + converted = UserSegment::FieldType.convert_arguments([1, 'Day'], operation[:arguments], operation[:argument_options]) + converted[0].should == 1 + converted[1].should == 'day' + end +end diff --git a/spec/models/user_segment/operation_spec.rb b/spec/models/user_segment/operation_spec.rb new file mode 100644 index 00000000..19ca163b --- /dev/null +++ b/spec/models/user_segment/operation_spec.rb @@ -0,0 +1,47 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +describe UserSegment::Operation do + + reset_domain_tables :end_users + + @handler = EndUserSegmentField.user_segment_fields_handler_info + + before(:each) do + EndUser.push_target('test1@test.dev', :created_at => 2.days.ago, :activated => true) + EndUser.push_target('test2@test.dev', :created_at => 5.days.ago, :activated => false) + EndUser.push_target('test3@test.dev', :activated => false) + end + + it "should be able to get the count" do + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] + @field.handler = @handler + + @operation = UserSegment::Operation.new nil, [@field] + @operation.valid?.should be_true + @operation.count.should == 2 + @operation.end_user_ids.length.should == 2 + + @operation = UserSegment::Operation.new 'not', [@field] + @operation.valid?.should be_true + @operation.count.should == 1 + @operation.end_user_ids.length.should == 1 + end + + it "should be able to concat fields" do + @field1 = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] + @field1.handler = @handler + + @field2 = UserSegment::Field.new :field => 'activated', :operation => 'is', :arguments => [false] + @field2.handler = @handler + + @operation = UserSegment::Operation.new nil, [@field1, @field2] + @operation.valid?.should be_true + @operation.count.should == 4 + @operation.end_user_ids.length.should == 3 + + @operation = UserSegment::Operation.new 'not', [@field1, @field2] + @operation.valid?.should be_true + @operation.count.should == 2 + @operation.end_user_ids.length.should == 0 + end +end From d2fecdd2576f30e9505a7d25074612eee741ef5a Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 14 May 2010 14:07:07 +0000 Subject: [PATCH 003/139] Fixed the not condition in the parser. Add test for Operations. Added method in Field Handler called handlers. Makes sure end user fields are returned first. --- app/models/end_user_segment_field.rb | 1 + app/models/user_segment/field.rb | 2 +- app/models/user_segment/field_handler.rb | 7 ++ app/models/user_segment/operations.rb | 3 + app/models/user_segment_option_parser.rb | 112 ++++++++++-------- app/models/user_segment_option_parser.treetop | 6 +- .../models/user_segment/field_handler_spec.rb | 4 + spec/models/user_segment/field_spec.rb | 9 +- spec/models/user_segment/operation_spec.rb | 30 ++--- spec/models/user_segment/operations_spec.rb | 108 +++++++++++++++++ 10 files changed, 206 insertions(+), 76 deletions(-) create mode 100644 spec/models/user_segment/operations_spec.rb diff --git a/app/models/end_user_segment_field.rb b/app/models/end_user_segment_field.rb index d4eb08ef..b5442962 100644 --- a/app/models/end_user_segment_field.rb +++ b/app/models/end_user_segment_field.rb @@ -15,5 +15,6 @@ def self.user_segment_fields_handler_info register_field :registered, UserSegment::CoreType::BooleanType register_field :activated, UserSegment::CoreType::BooleanType register_field :id, UserSegment::CoreType::NumberType + register_field :user_level, UserSegment::CoreType::NumberType end diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index c13685fb..37d69904 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -80,7 +80,7 @@ def model_field end def handler - @handler ||= self.get_handler_info(:user_segment, :fields).find { |info| info[:class].has_field?(self.field) } + @handler ||= UserSegment::FieldHandler.handlers.find { |info| info[:class].has_field?(self.field) } end def handler=(handler) diff --git a/app/models/user_segment/field_handler.rb b/app/models/user_segment/field_handler.rb index f8e7d126..4d112600 100644 --- a/app/models/user_segment/field_handler.rb +++ b/app/models/user_segment/field_handler.rb @@ -1,5 +1,6 @@ class UserSegment::FieldHandler + include HandlerActions def self.user_segment_fields; {}; end @@ -19,4 +20,10 @@ def self.register_field(field, type, options={}) fields end end + + def self.handlers + ([ self.get_handler_info(:user_segment, :fields, 'end_user_segment_field'), + self.get_handler_info(:user_segment, :fields, 'end_user_action_segment_field')] + + self.get_handler_info(:user_segment, :fields)).uniq + end end diff --git a/app/models/user_segment/operations.rb b/app/models/user_segment/operations.rb index b7ee7531..e23561a4 100644 --- a/app/models/user_segment/operations.rb +++ b/app/models/user_segment/operations.rb @@ -21,6 +21,9 @@ def parser def parse(text) if options = self.parser.parse(text) self.operations = options.eval + true + else + false end end diff --git a/app/models/user_segment_option_parser.rb b/app/models/user_segment_option_parser.rb index ca944e3b..0c419dc0 100644 --- a/app/models/user_segment_option_parser.rb +++ b/app/models/user_segment_option_parser.rb @@ -1324,14 +1324,20 @@ module Not0 end module Not1 - def space - elements[1] + def space1 + elements[0] + end + + def space2 + elements[2] end end module Not2 def eval(env={}) - empty? ? nil : 'not' + return nil if empty? + return 'not' if text_value.strip.downcase == 'not' || text_value.strip.downcase == '!' + nil end end @@ -1347,76 +1353,80 @@ def _nt_not end i0, s0 = index, [] - i2 = index - i3, s3 = index, [] - if has_terminal?('\G[nN]', true, index) - r4 = true - @index += 1 - else - r4 = nil - end - s3 << r4 - if r4 - if has_terminal?('\G[oO]', true, index) + r1 = _nt_space + s0 << r1 + if r1 + i3 = index + i4, s4 = index, [] + if has_terminal?('\G[nN]', true, index) r5 = true @index += 1 else r5 = nil end - s3 << r5 + s4 << r5 if r5 - if has_terminal?('\G[tT]', true, index) + if has_terminal?('\G[oO]', true, index) r6 = true @index += 1 else r6 = nil end - s3 << r6 + s4 << r6 if r6 - if has_terminal?(' ', false, index) - r7 = instantiate_node(SyntaxNode,input, index...(index + 1)) + if has_terminal?('\G[tT]', true, index) + r7 = true @index += 1 else - terminal_parse_failure(' ') r7 = nil end - s3 << r7 + s4 << r7 + if r7 + if has_terminal?(' ', false, index) + r8 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure(' ') + r8 = nil + end + s4 << r8 + end end end - end - if s3.last - r3 = instantiate_node(SyntaxNode,input, i3...index, s3) - r3.extend(Not0) - else - @index = i3 - r3 = nil - end - if r3 - r2 = r3 - else - if has_terminal?('!', false, index) - r8 = instantiate_node(SyntaxNode,input, index...(index + 1)) - @index += 1 + if s4.last + r4 = instantiate_node(SyntaxNode,input, i4...index, s4) + r4.extend(Not0) else - terminal_parse_failure('!') - r8 = nil + @index = i4 + r4 = nil end - if r8 - r2 = r8 + if r4 + r3 = r4 else - @index = i2 - r2 = nil + if has_terminal?('!', false, index) + r9 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('!') + r9 = nil + end + if r9 + r3 = r9 + else + @index = i3 + r3 = nil + end + end + if r3 + r2 = r3 + else + r2 = instantiate_node(SyntaxNode,input, index...index) + end + s0 << r2 + if r2 + r10 = _nt_space + s0 << r10 end - end - if r2 - r1 = r2 - else - r1 = instantiate_node(SyntaxNode,input, index...index) - end - s0 << r1 - if r1 - r9 = _nt_space - s0 << r9 end if s0.last r0 = instantiate_node(SyntaxNode,input, i0...index, s0) diff --git a/app/models/user_segment_option_parser.treetop b/app/models/user_segment_option_parser.treetop index d4e4b9e3..3d83bb8d 100644 --- a/app/models/user_segment_option_parser.treetop +++ b/app/models/user_segment_option_parser.treetop @@ -122,9 +122,11 @@ grammar UserSegmentOption end rule not - ([nN] [oO] [tT] ' ' / '!')? space { + space ([nN] [oO] [tT] ' ' / '!')? space { def eval(env={}) - empty? ? nil : 'not' + return nil if empty? + return 'not' if text_value.strip.downcase == 'not' || text_value.strip.downcase == '!' + nil end } end diff --git a/spec/models/user_segment/field_handler_spec.rb b/spec/models/user_segment/field_handler_spec.rb index bcd1682f..fd82ab29 100644 --- a/spec/models/user_segment/field_handler_spec.rb +++ b/spec/models/user_segment/field_handler_spec.rb @@ -15,4 +15,8 @@ UserSegment::FieldHandler.user_segment_fields[:created][:type].should == UserSegment::CoreType::DateTimeType UserSegment::FieldHandler.user_segment_fields[:created][:name].should == 'EndUser.created' end + + it "should always return the EndUserSegmentField as the first handler" do + UserSegment::FieldHandler.handlers[0][:class] == EndUserSegmentField + end end diff --git a/spec/models/user_segment/field_spec.rb b/spec/models/user_segment/field_spec.rb index 85ea21bb..81264a01 100644 --- a/spec/models/user_segment/field_spec.rb +++ b/spec/models/user_segment/field_spec.rb @@ -4,8 +4,6 @@ reset_domain_tables :end_users - @handler = EndUserSegmentField.user_segment_fields_handler_info - before(:each) do EndUser.push_target('test1@test.dev', :created_at => 2.days.ago, :activated => true) EndUser.push_target('test2@test.dev', :created_at => 5.days.ago, :activated => false) @@ -14,7 +12,6 @@ it "should be able to use handler" do @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] - @field.handler = @handler @field.handler_class.should == EndUserSegmentField @field.domain_model_class.should == EndUser @@ -28,13 +25,12 @@ it "should return the count" do @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] - @field.handler = @handler + @field.valid?.should == true @field.count.should == 2 @field.end_user_ids.length.should == 2 @field = UserSegment::Field.new :field => 'created', :operation => 'since', :arguments => [1, 'days'] - @field.handler = @handler @field.valid?.should == true @field.count.should == 1 @field.end_user_ids.length.should == 1 @@ -42,19 +38,16 @@ it "should work with children" do @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'], :child => {:field => 'activated', :operation => 'is', :arguments => [true]} - @field.handler = @handler @field.valid?.should == true @field.count.should == 1 @field.end_user_ids.length.should == 1 @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'], :child => {:field => 'activated', :operation => 'is', :arguments => [true], :child => {:field => 'email', :operation => 'like', :arguments => ['test%@test.dev']}} - @field.handler = @handler @field.valid?.should == true @field.count.should == 1 @field.end_user_ids.length.should == 1 @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'], :child => {:field => 'activated', :operation => 'is', :arguments => [false], :child => {:field => 'email', :operation => 'like', :arguments => ['test%@test.dev']}} - @field.handler = @handler @field.valid?.should == true @field.count.should == 1 @field.end_user_ids.length.should == 1 diff --git a/spec/models/user_segment/operation_spec.rb b/spec/models/user_segment/operation_spec.rb index 19ca163b..3690aac1 100644 --- a/spec/models/user_segment/operation_spec.rb +++ b/spec/models/user_segment/operation_spec.rb @@ -4,44 +4,46 @@ reset_domain_tables :end_users - @handler = EndUserSegmentField.user_segment_fields_handler_info - before(:each) do EndUser.push_target('test1@test.dev', :created_at => 2.days.ago, :activated => true) EndUser.push_target('test2@test.dev', :created_at => 5.days.ago, :activated => false) EndUser.push_target('test3@test.dev', :activated => false) + EndUser.push_target('test4@test.dev', :activated => true) + EndUser.push_target('test5@test.dev', :activated => false) + EndUser.push_target('test6@test.dev', :created_at => 10.days.ago, :activated => true) + EndUser.push_target('test7@test.dev', :activated => false) end it "should be able to get the count" do @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] - @field.handler = @handler @operation = UserSegment::Operation.new nil, [@field] @operation.valid?.should be_true - @operation.count.should == 2 - @operation.end_user_ids.length.should == 2 + @operation.count.should == 3 + @operation.end_user_ids.length.should == 3 + @operation.to_a.should == [nil, @field.to_h] @operation = UserSegment::Operation.new 'not', [@field] @operation.valid?.should be_true - @operation.count.should == 1 - @operation.end_user_ids.length.should == 1 + @operation.count.should == 4 + @operation.end_user_ids.length.should == 4 + @operation.to_a.should == ['not', @field.to_h] end it "should be able to concat fields" do @field1 = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] - @field1.handler = @handler - @field2 = UserSegment::Field.new :field => 'activated', :operation => 'is', :arguments => [false] - @field2.handler = @handler @operation = UserSegment::Operation.new nil, [@field1, @field2] @operation.valid?.should be_true - @operation.count.should == 4 - @operation.end_user_ids.length.should == 3 + @operation.count.should == 7 + @operation.end_user_ids.length.should == 6 + @operation.to_a.should == [nil, @field1.to_h, @field2.to_h] @operation = UserSegment::Operation.new 'not', [@field1, @field2] @operation.valid?.should be_true - @operation.count.should == 2 - @operation.end_user_ids.length.should == 0 + @operation.count.should == 7 + @operation.end_user_ids.length.should == 1 + @operation.to_a.should == ['not', @field1.to_h, @field2.to_h] end end diff --git a/spec/models/user_segment/operations_spec.rb b/spec/models/user_segment/operations_spec.rb new file mode 100644 index 00000000..ce27e177 --- /dev/null +++ b/spec/models/user_segment/operations_spec.rb @@ -0,0 +1,108 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +describe UserSegment::Operations do + + reset_domain_tables :end_users + + before(:each) do + @user1 = EndUser.push_target('test1@test.dev', :created_at => 2.days.ago, :activated => true, :user_level => 1) + @user2 = EndUser.push_target('test2@test.dev', :created_at => 5.days.ago, :activated => false, :user_level => 2) + @user3 = EndUser.push_target('test3@test.dev', :activated => false, :user_level => 3) + @user4 = EndUser.push_target('test4@test.dev', :activated => true, :user_level => 1) + @user5 = EndUser.push_target('test5@test.dev', :activated => false, :user_level => 2) + @user6 = EndUser.push_target('test6@test.dev', :created_at => 10.days.ago, :activated => true, :user_level => 3) + @user7 = EndUser.push_target('test7@test.dev', :activated => false, :user_level => 1) + end + + it "should return the end user ids from a given set of options" do + @operations = UserSegment::Operations.new + options = [[nil, {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}]] + @operations.operations = options + @operations.valid?.should == true + @operations.to_a.should == options + @operations.end_user_ids.length.should == 5 + end + + it "should be able to refine end user ids based on multiple operations" do + @operations = UserSegment::Operations.new + options = [ + [nil, {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}], + [nil, {:field => 'activated', :operation => 'is', :arguments => [true], :child => nil}] + ] + @operations.operations = options + @operations.valid?.should == true + @operations.to_a.should == options + @operations.end_user_ids.length.should == 2 + end + + it "should return the end user ids from a given set operations syntax" do + @operations = UserSegment::Operations.new + options = [[nil, {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}]] + code = <<-CODE + created.since(3, "days") + CODE + @operations.parse(code).should be_true + @operations.valid?.should == true + @operations.to_a.should == options + @operations.end_user_ids.length.should == 5 + + @operations = UserSegment::Operations.new + options = [['not', {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}]] + code = <<-CODE + not created.since(3, "days") + CODE + @operations.parse(code).should be_true + @operations.valid?.should == true + @operations.to_a.should == options + @operations.end_user_ids.length.should == 2 + end + + it "should be able to refine end user ids with multiple operations" do + @operations = UserSegment::Operations.new + options = [ + [nil, {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}], + [nil, {:field => 'activated', :operation => 'is', :arguments => [true], :child => nil}] + ] + code = <<-CODE + created.since(3, "days") + activated.is(true) + CODE + @operations.parse(code).should be_true + @operations.valid?.should == true + @operations.to_a.should == options + @operations.end_user_ids.length.should == 2 + @operations.end_user_ids.include?(@user1.id).should be_true + @operations.end_user_ids.include?(@user4.id).should be_true + + @operations = UserSegment::Operations.new + options = [ + ['not', {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}], + [nil, {:field => 'activated', :operation => 'is', :arguments => [true], :child => nil}] + ] + code = <<-CODE + not created.since(3, "days") + activated.is(true) + CODE + @operations.parse(code).should be_true + @operations.valid?.should == true + @operations.to_a.should == options + @operations.end_user_ids.length.should == 1 + @operations.end_user_ids.include?(@user6.id).should be_true + + @operations = UserSegment::Operations.new + options = [ + ['not', {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}, {:field => 'user_level', :operation => 'is', :arguments => [1], :child => nil}], + [nil, {:field => 'activated', :operation => 'is', :arguments => [true], :child => nil}] + ] + code = <<-CODE + not created.since(3, "days") + user_level.is(1) + activated.is(true) + CODE + @operations.parse(code).should be_true + @operations.valid?.should == true + @operations.to_a.should == options + @operations.end_user_ids.length.should == 1 + @operations.end_user_ids.include?(@user6.id).should be_true + end + +end From d3d80e4bd2fb5ce37d901a17478f335225c48419 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 14 May 2010 16:26:49 +0000 Subject: [PATCH 004/139] Fix for strings. Test the parser --- app/models/user_segment_option_parser.rb | 340 ++++++++++-------- app/models/user_segment_option_parser.treetop | 8 +- .../models/user_segment_option_parser_spec.rb | 92 +++++ 3 files changed, 277 insertions(+), 163 deletions(-) create mode 100644 spec/models/user_segment_option_parser_spec.rb diff --git a/app/models/user_segment_option_parser.rb b/app/models/user_segment_option_parser.rb index 0c419dc0..e6cbb866 100644 --- a/app/models/user_segment_option_parser.rb +++ b/app/models/user_segment_option_parser.rb @@ -660,11 +660,11 @@ def _nt_argument if r3 r2 = r3 else - r4 = _nt_integer + r4 = _nt_float if r4 r2 = r4 else - r5 = _nt_float + r5 = _nt_integer if r5 r2 = r5 else @@ -706,7 +706,7 @@ module String1 module String2 def eval(env={}) - text_value[1..-2] + text_value[1..-2].gsub('\"', '"').gsub('\\\'', "'") end end @@ -721,95 +721,142 @@ def _nt_string return cached end - i0, s0 = index, [] + i0 = index + i1, s1 = index, [] if has_terminal?('"', false, index) - r1 = instantiate_node(SyntaxNode,input, index...(index + 1)) + r2 = instantiate_node(SyntaxNode,input, index...(index + 1)) @index += 1 else terminal_parse_failure('"') - r1 = nil + r2 = nil end - s0 << r1 - if r1 - s2, i2 = [], index + s1 << r2 + if r2 + s3, i3 = [], index loop do - i3 = index - i4, s4 = index, [] - i5 = index - if has_terminal?('"', false, index) - r6 = instantiate_node(SyntaxNode,input, index...(index + 1)) - @index += 1 + i4 = index + if has_terminal?('\"', false, index) + r5 = instantiate_node(SyntaxNode,input, index...(index + 2)) + @index += 2 else - terminal_parse_failure('"') - r6 = nil - end - if r6 + terminal_parse_failure('\"') r5 = nil - else - @index = i5 - r5 = instantiate_node(SyntaxNode,input, index...index) end - s4 << r5 if r5 - if index < input_length - r7 = instantiate_node(SyntaxNode,input, index...(index + 1)) - @index += 1 - else - terminal_parse_failure("any character") - r7 = nil - end - s4 << r7 - end - if s4.last - r4 = instantiate_node(SyntaxNode,input, i4...index, s4) - r4.extend(String0) - else - @index = i4 - r4 = nil - end - if r4 - r3 = r4 + r4 = r5 else - if has_terminal?('\"', false, index) - r8 = instantiate_node(SyntaxNode,input, index...(index + 2)) - @index += 2 + if has_terminal?('\G[^"]', true, index) + r6 = true + @index += 1 else - terminal_parse_failure('\"') - r8 = nil + r6 = nil end - if r8 - r3 = r8 + if r6 + r4 = r6 else - @index = i3 - r3 = nil + @index = i4 + r4 = nil end end - if r3 - s2 << r3 + if r4 + s3 << r4 else break end end - r2 = instantiate_node(SyntaxNode,input, i2...index, s2) - s0 << r2 - if r2 + r3 = instantiate_node(SyntaxNode,input, i3...index, s3) + s1 << r3 + if r3 if has_terminal?('"', false, index) - r9 = instantiate_node(SyntaxNode,input, index...(index + 1)) + r7 = instantiate_node(SyntaxNode,input, index...(index + 1)) @index += 1 else terminal_parse_failure('"') - r9 = nil + r7 = nil end - s0 << r9 + s1 << r7 end end - if s0.last - r0 = instantiate_node(SyntaxNode,input, i0...index, s0) - r0.extend(String1) + if s1.last + r1 = instantiate_node(SyntaxNode,input, i1...index, s1) + r1.extend(String0) + else + @index = i1 + r1 = nil + end + if r1 + r0 = r1 r0.extend(String2) else - @index = i0 - r0 = nil + i8, s8 = index, [] + if has_terminal?("'", false, index) + r9 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure("'") + r9 = nil + end + s8 << r9 + if r9 + s10, i10 = [], index + loop do + i11 = index + if has_terminal?("\\'", false, index) + r12 = instantiate_node(SyntaxNode,input, index...(index + 2)) + @index += 2 + else + terminal_parse_failure("\\'") + r12 = nil + end + if r12 + r11 = r12 + else + if has_terminal?('\G[^\']', true, index) + r13 = true + @index += 1 + else + r13 = nil + end + if r13 + r11 = r13 + else + @index = i11 + r11 = nil + end + end + if r11 + s10 << r11 + else + break + end + end + r10 = instantiate_node(SyntaxNode,input, i10...index, s10) + s8 << r10 + if r10 + if has_terminal?("'", false, index) + r14 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure("'") + r14 = nil + end + s8 << r14 + end + end + if s8.last + r8 = instantiate_node(SyntaxNode,input, i8...index, s8) + r8.extend(String1) + else + @index = i8 + r8 = nil + end + if r8 + r0 = r8 + r0.extend(String2) + else + @index = i0 + r0 = nil + end end node_cache[:string][start_index] = r0 @@ -1005,9 +1052,6 @@ module Float1 end module Float2 - end - - module Float3 def eval(env={}) text_value.to_f end @@ -1026,30 +1070,59 @@ def _nt_float i0 = index i1, s1 = index, [] - if has_terminal?('\G[1-9]', true, index) - r2 = true - @index += 1 - else + s2, i2 = [], index + loop do + if has_terminal?('\G[0-9]', true, index) + r3 = true + @index += 1 + else + r3 = nil + end + if r3 + s2 << r3 + else + break + end + end + if s2.empty? + @index = i2 r2 = nil + else + r2 = instantiate_node(SyntaxNode,input, i2...index, s2) end s1 << r2 if r2 - s3, i3 = [], index - loop do - if has_terminal?('\G[0-9]', true, index) - r4 = true - @index += 1 - else - r4 = nil + if has_terminal?('.', false, index) + r4 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('.') + r4 = nil + end + s1 << r4 + if r4 + s5, i5 = [], index + loop do + if has_terminal?('\G[0-9]', true, index) + r6 = true + @index += 1 + else + r6 = nil + end + if r6 + s5 << r6 + else + break + end end - if r4 - s3 << r4 + if s5.empty? + @index = i5 + r5 = nil else - break + r5 = instantiate_node(SyntaxNode,input, i5...index, s5) end + s1 << r5 end - r3 = instantiate_node(SyntaxNode,input, i3...index, s3) - s1 << r3 end if s1.last r1 = instantiate_node(SyntaxNode,input, i1...index, s1) @@ -1060,104 +1133,53 @@ def _nt_float end if r1 r0 = r1 + r0.extend(Float2) else - i5, s5 = index, [] + i7, s7 = index, [] if has_terminal?('.', false, index) - r6 = instantiate_node(SyntaxNode,input, index...(index + 1)) + r8 = instantiate_node(SyntaxNode,input, index...(index + 1)) @index += 1 else terminal_parse_failure('.') - r6 = nil + r8 = nil end - s5 << r6 - if r6 - s7, i7 = [], index + s7 << r8 + if r8 + s9, i9 = [], index loop do if has_terminal?('\G[0-9]', true, index) - r8 = true + r10 = true @index += 1 else - r8 = nil + r10 = nil end - if r8 - s7 << r8 + if r10 + s9 << r10 else break end end - if s7.empty? - @index = i7 - r7 = nil + if s9.empty? + @index = i9 + r9 = nil else - r7 = instantiate_node(SyntaxNode,input, i7...index, s7) + r9 = instantiate_node(SyntaxNode,input, i9...index, s9) end - s5 << r7 + s7 << r9 end - if s5.last - r5 = instantiate_node(SyntaxNode,input, i5...index, s5) - r5.extend(Float1) + if s7.last + r7 = instantiate_node(SyntaxNode,input, i7...index, s7) + r7.extend(Float1) else - @index = i5 - r5 = nil + @index = i7 + r7 = nil end - if r5 - r0 = r5 + if r7 + r0 = r7 + r0.extend(Float2) else - i9, s9 = index, [] - s10, i10 = [], index - loop do - if has_terminal?('\G[0-9]', true, index) - r11 = true - @index += 1 - else - r11 = nil - end - if r11 - s10 << r11 - else - break - end - end - if s10.empty? - @index = i10 - r10 = nil - else - r10 = instantiate_node(SyntaxNode,input, i10...index, s10) - end - s9 << r10 - if r10 - if has_terminal?('.', false, index) - r12 = instantiate_node(SyntaxNode,input, index...(index + 1)) - @index += 1 - else - terminal_parse_failure('.') - r12 = nil - end - s9 << r12 - if r12 - if has_terminal?('\G[0-9]', true, index) - r13 = true - @index += 1 - else - r13 = nil - end - s9 << r13 - end - end - if s9.last - r9 = instantiate_node(SyntaxNode,input, i9...index, s9) - r9.extend(Float2) - r9.extend(Float3) - else - @index = i9 - r9 = nil - end - if r9 - r0 = r9 - else - @index = i0 - r0 = nil - end + @index = i0 + r0 = nil end end diff --git a/app/models/user_segment_option_parser.treetop b/app/models/user_segment_option_parser.treetop index 3d83bb8d..db139bec 100644 --- a/app/models/user_segment_option_parser.treetop +++ b/app/models/user_segment_option_parser.treetop @@ -66,7 +66,7 @@ grammar UserSegmentOption end rule argument - space arg:(string / integer / float / boolean) space { + space arg:(string / float / integer / boolean) space { def eval(env={}) arg.eval(env) end @@ -74,9 +74,9 @@ grammar UserSegmentOption end rule string - '"' (!'"' . / '\"')* '"' { + ('"' ('\"' / [^"])* '"' / "'" ("\\'" / [^'])* "'") { def eval(env={}) - text_value[1..-2] + text_value[1..-2].gsub('\"', '"').gsub('\\\'', "'") end } end @@ -102,7 +102,7 @@ grammar UserSegmentOption end rule float - [1-9] [0-9]* / '.' [0-9]+ / [0-9]+ '.' [0-9] { + ([0-9]+ '.' [0-9]+ / '.' [0-9]+) { def eval(env={}) text_value.to_f end diff --git a/spec/models/user_segment_option_parser_spec.rb b/spec/models/user_segment_option_parser_spec.rb new file mode 100644 index 00000000..43d541c3 --- /dev/null +++ b/spec/models/user_segment_option_parser_spec.rb @@ -0,0 +1,92 @@ +require File.dirname(__FILE__) + "/../spec_helper" +require 'treetop' + +describe UserSegmentOptionParser do + + def parse(text) + parser = UserSegmentOptionParser.new + if data = parser.parse(text) + data.eval + else + raise parser.inspect + nil + end + end + + it "should be able to parse operations to and array" do + code = <<-CODE + created.since(1, "days") + CODE + parse(code).should == [[nil, {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => nil}]] + + code = <<-CODE + created_at.since_ago(1, "days") + CODE + parse(code).should == [[nil, {:field => 'created_at', :operation => 'since_ago', :arguments => [1, "days"], :child => nil}]] + + code = <<-CODE + created_at2.since_ago8(1, "days") + CODE + parse(code).should == [[nil, {:field => 'created_at2', :operation => 'since_ago8', :arguments => [1, "days"], :child => nil}]] + + code = <<-CODE + test.contains("") + CODE + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => [''], :child => nil}]] + + code = <<-CODE + test.contains(true, false) + CODE + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => [true, false], :child => nil}]] + + code = 'test.contains("days\"", 1)' + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => ['days"', 1], :child => nil}]] + + code = <<-CODE + test.contains('1.1') + CODE + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => ['1.1'], :child => nil}]] + + code = "test.contains('1.1\\'')" + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => ["1.1'"], :child => nil}]] + + code = <<-CODE + test.contains(1.1) + CODE + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => [1.1], :child => nil}]] + + code = <<-CODE + test.contains(1.0) + CODE + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => [1.0], :child => nil}]] + + code = <<-CODE + test.contains(.1) + CODE + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => [0.1], :child => nil}]] + end + + it "should be able to not an operation" do + code = <<-CODE + Not created.since(1, "days") + CODE + parse(code).should == [['not', {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => nil}]] + end + + it "should be able to chain operations" do + code = <<-CODE + created.since(1, "days").registered.is(true) + CODE + parse(code).should == [[nil, {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => {:field => 'registered', :operation => 'is', :arguments => [true], :child => nil}}]] + + code = <<-CODE + created.since(1, "days").registered.is(true).logged_in.is(false) + CODE + parse(code).should == [[nil, {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => {:field => 'registered', :operation => 'is', :arguments => [true], :child => {:field => 'logged_in', :operation => 'is', :arguments => [false], :child => nil}}}]] + + code = <<-CODE + NOT created.since(1, "days").registered.is(true).logged_in.is(false) + CODE + parse(code).should == [['not', {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => {:field => 'registered', :operation => 'is', :arguments => [true], :child => {:field => 'logged_in', :operation => 'is', :arguments => [false], :child => nil}}}]] + end +end From a47d5d6f4943526aec4f0496c14473272127243c Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 14 May 2010 17:41:30 +0000 Subject: [PATCH 005/139] Testing and/or coditions for option parser. --- .../models/user_segment_option_parser_spec.rb | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/spec/models/user_segment_option_parser_spec.rb b/spec/models/user_segment_option_parser_spec.rb index 43d541c3..9b76782e 100644 --- a/spec/models/user_segment_option_parser_spec.rb +++ b/spec/models/user_segment_option_parser_spec.rb @@ -89,4 +89,27 @@ def parse(text) CODE parse(code).should == [['not', {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => {:field => 'registered', :operation => 'is', :arguments => [true], :child => {:field => 'logged_in', :operation => 'is', :arguments => [false], :child => nil}}}]] end + + it "should be able to or operations" do + code = <<-CODE + created.since(1, "days") + registered.is(true) + CODE + parse(code).should == [[nil, {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => nil}, {:field => 'registered', :operation => 'is', :arguments => [true], :child => nil}]] + + code = <<-CODE + created.since(1, "days") + registered.is(true) + test.is('good') + CODE + parse(code).should == [[nil, {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => nil}, {:field => 'registered', :operation => 'is', :arguments => [true], :child => nil}, {:field => 'test', :operation => 'is', :arguments => ['good'], :child => nil}]] + end + + it "should be able to and operations" do + code = <<-CODE + created.since(1, "days") + registered.is(true) + CODE + parse(code).should == [ + [nil, {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => nil}], + [nil, {:field => 'registered', :operation => 'is', :arguments => [true], :child => nil}] + ] + end end From 5de548e270ca9430f70d00680657d75b04cdb441 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 14 May 2010 17:49:28 +0000 Subject: [PATCH 006/139] Added a test to parse a complicated set of operations. --- spec/models/user_segment_option_parser_spec.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/spec/models/user_segment_option_parser_spec.rb b/spec/models/user_segment_option_parser_spec.rb index 9b76782e..2376782f 100644 --- a/spec/models/user_segment_option_parser_spec.rb +++ b/spec/models/user_segment_option_parser_spec.rb @@ -112,4 +112,17 @@ def parse(text) [nil, {:field => 'registered', :operation => 'is', :arguments => [true], :child => nil}] ] end + + it "should parse a complaticated set of operations" do + code = <<-CODE + created.since(1 , "days").born.before('yesterday')+ registered.is( true ) + registered.is( true ) + not test.is( false ) + product.purchased( 'computer' ).created.since( 1, 'day' ) + CODE + parse(code).should == [ + [nil, {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => {:field => 'born', :operation => 'before', :arguments => ['yesterday'], :child => nil}}, {:field => 'registered', :operation => 'is', :arguments => [true], :child => nil}], + [nil, {:field => 'registered', :operation => 'is', :arguments => [true], :child => nil}], + ['not', {:field => 'test', :operation => 'is', :arguments => [false], :child => nil}, {:field => 'product', :operation => 'purchased', :arguments => ['computer'], :child => {:field => 'created', :operation => 'since', :arguments => [1, 'day'], :child => nil}}] + ] + end end From 97dfafbefe8cdf3e7ed2bced6de2302bf4df5048 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 14 May 2010 19:38:58 +0000 Subject: [PATCH 007/139] Added each, each_with_index and find to perform actions with segments. --- app/models/user_segment.rb | 54 ++++++++++++++++++++-- app/models/user_segment_cache.rb | 25 ++++++++++ db/migrate/20100511165552_user_segments.rb | 4 ++ 3 files changed, 79 insertions(+), 4 deletions(-) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 13b6b85d..23a1726c 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -1,9 +1,12 @@ class UserSegment < DomainModel + has_many :user_segment_caches, :order => 'created_at, id', :dependent => :destroy, :class_name => 'UserSegmentCache' serialize :segment_options serialize :fields + validates_presence_of :name + def operations return @operations if @operations @operations = UserSegment::Operations.new @@ -11,17 +14,60 @@ def operations @operations end - def operations=(text) + def segment_options_text=(text) + self.write_attribute :segment_options_text, text @operations = UserSegment::Operations.new @operations.parse text + self.segment_options = @operations.valid? ? self.operations.to_a : nil + text end - def before_create + def cache_ids + self.user_segment_caches.delete_all + self.order_by = 'created_at DESC' unless self.order_by + ids = EndUser.find(:all, :select => 'id', :conditions => {:id => self.operations.end_user_ids}, :order => self.order_by) + + num_segements = (self.operations.end_user_ids.length / 1000) + num_segements = num_segements + 1 if (self.operations.end_user_ids.length % 1000) > 0 + + (0..num_segements-1).each do |idx| + start = idx * 1000 + self.user_segment_caches.create :id_list => ids[start..start+999] + end + + self.last_ran_at = Time.now + self.last_count = ids.length + self.save + end + + def end_user_ids + return @end_user_ids if @end_user_ids + @end_user_ids = [] + self.user_segment_caches.each do |segement| + @end_user_ids = @end_user_ids + segement.id_list + end + @end_user_ids + end + + def each(&block) + self.user_segment_caches.each do |segement| + segement.each &block + end + end + + def each_with_index(&block) + idx = 0 + self.user_segment_caches.each do |segement| + idx = segement.each_with_index idx, &block + end end - def before_save - self.segment_options = self.operations.to_a if self.operations && self.operations.valid? + def find(&block) + self.user_segment_caches.each do |segement| + user = segement.find &block + return user if user + end end end diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb index 6ed5c117..9edd9629 100644 --- a/app/models/user_segment_cache.rb +++ b/app/models/user_segment_cache.rb @@ -1,4 +1,29 @@ class UserSegmentCache < DomainModel + belongs_to :user_segment + serialize :id_list + + validates_presence_of :user_segment_id + + def before_create + self.created_at = Time.now unless self.created_at + end + + def end_users + @end_users ||= EndUser.find(:all, :conditions => {:id => self.id_list}) + end + + def each + self.end_users.each { |user| yield user } + end + + def each_with_index(idx=0) + self.end_users.each { |user| yield user, idx; idx = idx.succ } + idx + end + + def find + self.end_users.find { |user| yield user } + end end diff --git a/db/migrate/20100511165552_user_segments.rb b/db/migrate/20100511165552_user_segments.rb index b6657ccd..dfcec4b3 100644 --- a/db/migrate/20100511165552_user_segments.rb +++ b/db/migrate/20100511165552_user_segments.rb @@ -20,6 +20,8 @@ def self.up t.datetime :created_at end + add_index :user_segment_caches, [:user_segment_id], :name => 'user_segment_cache_segment_idx' + create_table :user_segment_analytics, :force => true do |t| t.integer :user_segment_id t.text :fields @@ -29,6 +31,8 @@ def self.up t.string :step t.timestamps end + + add_index :user_segment_analytics, [:user_segment_id], :name => 'user_segment_analytics_segment_idx' end def self.down From afa05c5f95ac8de2207be3928ac0c8087db9723d Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 14 May 2010 19:58:56 +0000 Subject: [PATCH 008/139] Can pass options to enumerable methods. --- app/models/user_segment.rb | 12 ++++++------ app/models/user_segment_cache.rb | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 23a1726c..1a532ab1 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -50,22 +50,22 @@ def end_user_ids @end_user_ids end - def each(&block) + def each(opts={}, &block) self.user_segment_caches.each do |segement| - segement.each &block + segement.each opts, &block end end - def each_with_index(&block) + def each_with_index(opts={}, &block) idx = 0 self.user_segment_caches.each do |segement| - idx = segement.each_with_index idx, &block + idx = segement.each_with_index idx, opts, &block end end - def find(&block) + def find(opts={}, &block) self.user_segment_caches.each do |segement| - user = segement.find &block + user = segement.find opts, &block return user if user end end diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb index 9edd9629..73f917ee 100644 --- a/app/models/user_segment_cache.rb +++ b/app/models/user_segment_cache.rb @@ -10,20 +10,22 @@ def before_create self.created_at = Time.now unless self.created_at end - def end_users - @end_users ||= EndUser.find(:all, :conditions => {:id => self.id_list}) + def end_users(opts={}) + return @end_users if @end_users + users_by_id = EndUser.find(:all, :conditions => {:id => self.id_list}).index_by(&:id) + @end_users = self.id_list.map { |id| users_by_id[id] }.compact end - def each - self.end_users.each { |user| yield user } + def each(opts={}) + self.end_users(opts).each { |user| yield user } end - def each_with_index(idx=0) - self.end_users.each { |user| yield user, idx; idx = idx.succ } + def each_with_index(idx=0, opts={}) + self.end_users(opts).each { |user| yield user, idx; idx = idx.succ } idx end - def find - self.end_users.find { |user| yield user } + def find(opts={}) + self.end_users(opts).find { |user| yield user } end end From 8558a233397d555daea8f22680128fe5a3fd1327 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 17 May 2010 14:31:56 +0000 Subject: [PATCH 009/139] Don't store user objects in user segment cache. Batch fetch users. --- app/models/user_segment.rb | 50 +++++++++++++++++++--- app/models/user_segment_cache.rb | 39 ++++++++++++++--- db/migrate/20100511165552_user_segments.rb | 3 +- 3 files changed, 78 insertions(+), 14 deletions(-) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 1a532ab1..2a399416 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -1,7 +1,7 @@ class UserSegment < DomainModel - has_many :user_segment_caches, :order => 'created_at, id', :dependent => :destroy, :class_name => 'UserSegmentCache' + has_many :user_segment_caches, :order => 'position', :dependent => :destroy, :class_name => 'UserSegmentCache' serialize :segment_options serialize :fields @@ -26,14 +26,14 @@ def cache_ids self.user_segment_caches.delete_all self.order_by = 'created_at DESC' unless self.order_by - ids = EndUser.find(:all, :select => 'id', :conditions => {:id => self.operations.end_user_ids}, :order => self.order_by) + ids = EndUser.find(:all, :select => 'id', :conditions => {:id => self.operations.end_user_ids}, :order => self.order_by).collect &:id - num_segements = (self.operations.end_user_ids.length / 1000) - num_segements = num_segements + 1 if (self.operations.end_user_ids.length % 1000) > 0 + num_segements = (self.operations.end_user_ids.length / UserSegmentCache::SIZE) + num_segements = num_segements + 1 if (self.operations.end_user_ids.length % UserSegmentCache::SIZE) > 0 (0..num_segements-1).each do |idx| - start = idx * 1000 - self.user_segment_caches.create :id_list => ids[start..start+999] + start = idx * UserSegmentCache::SIZE + self.user_segment_caches.create :id_list => ids[start..start+UserSegmentCache::SIZE-1], :position => idx end self.last_ran_at = Time.now @@ -56,6 +56,14 @@ def each(opts={}, &block) end end + def collect(opts={}, &block) + data = [] + self.user_segment_caches.each do |segement| + data = data + segement.collect(opts, &block) + end + data + end + def each_with_index(opts={}, &block) idx = 0 self.user_segment_caches.each do |segement| @@ -69,5 +77,35 @@ def find(opts={}, &block) return user if user end end + + def paginate(page,args = {}) + args = args.clone.symbolize_keys! + window_size =args.delete(:window) || 2 + + page_size = args.delete(:per_page).to_i + page_size = 20 if page_size <= 0 + + total_count = self.last_count + pages = (total_count.to_f / (page_size || 10)).ceil + pages = 1 if pages < 1 + page = (page ? page.to_i : 1).clamp(1,pages) + + offset = (page-1) * page_size + + position = (offset / UserSegmentCache::SIZE).to_i + + cache = self.user_segment_caches.find_by_position(position) + items = cache ? cache.fetch_users(:offset => (offset % UserSegmentCache::SIZE), :limit => page_size) : [] + + [ { :pages => pages, + :page => page, + :window_size => window_size, + :total => total_count, + :per_page => page_size, + :first => offset+1, + :last => offset + items.length, + :count => items.length + }, items ] + end end diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb index 73f917ee..d207a807 100644 --- a/app/models/user_segment_cache.rb +++ b/app/models/user_segment_cache.rb @@ -1,5 +1,8 @@ class UserSegmentCache < DomainModel + SIZE = 25000 + DEFAULT_BATCH_SIZE = 1000 + belongs_to :user_segment serialize :id_list @@ -10,22 +13,44 @@ def before_create self.created_at = Time.now unless self.created_at end - def end_users(opts={}) - return @end_users if @end_users - users_by_id = EndUser.find(:all, :conditions => {:id => self.id_list}).index_by(&:id) - @end_users = self.id_list.map { |id| users_by_id[id] }.compact + def fetch_users(opts={}) + ids = opts[:offset] && opts[:limit] ? self.id_list[opts[:offset]..opts[:offset]+opts[:limit]-1] : self.id_list + users_by_id = EndUser.find(:all, :conditions => {:id => ids}).index_by(&:id) + ids.map { |id| users_by_id[id] }.compact + end + + def find_in_batches(opts={}) + limit = opts[:batch_size] || DEFAULT_BATCH_SIZE + offset = 0 + num_chunks = (self.id_list.size / limit).to_i + num_chunks = num_chunks.succ if (self.id_list.length % limit) > 0 + (1..num_chunks).each do |chunk| + users = self.fetch_users(:offset => offset, :limit => limit) + offset = offset + limit + yield users + end end def each(opts={}) - self.end_users(opts).each { |user| yield user } + self.find_in_batches(opts) { |users| users.each { |user| yield user } } + end + + def collect(opts={}) + data = [] + self.find_in_batches(opts) { |users| data = data + users.collect { |user| yield user } } + data end def each_with_index(idx=0, opts={}) - self.end_users(opts).each { |user| yield user, idx; idx = idx.succ } + self.find_in_batches(opts) { |users| users.each { |user| yield user, idx; idx = idx.succ } } idx end def find(opts={}) - self.end_users(opts).find { |user| yield user } + self.find_in_batches(opts) do |users| + user = users.find { |user| yield user } + return user if user + end + nil end end diff --git a/db/migrate/20100511165552_user_segments.rb b/db/migrate/20100511165552_user_segments.rb index dfcec4b3..88655354 100644 --- a/db/migrate/20100511165552_user_segments.rb +++ b/db/migrate/20100511165552_user_segments.rb @@ -16,7 +16,8 @@ def self.up create_table :user_segment_caches, :force => true do |t| t.integer :user_segment_id - t.text :id_list + t.integer :position + t.text :id_list, :limit => 16777215 t.datetime :created_at end From d12fa762397b5691a466271d775f20d6030f2b46 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 17 May 2010 19:18:03 +0000 Subject: [PATCH 010/139] Can search through a segment. --- app/models/user_segment.rb | 24 ++++++++++++++++++++++++ app/models/user_segment_cache.rb | 27 +++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 2a399416..1e4a5dca 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -107,5 +107,29 @@ def paginate(page,args = {}) :count => items.length }, items ] end + + def search(offset=0, args={}) + args = args.clone.symbolize_keys! + + page_size = args.delete(:per_page).to_i + page_size = 20 if page_size <= 0 + + cache_offset = offset % UserSegmentCache::SIZE + + ids = [] + ((offset / UserSegmentCache::SIZE).to_i..self.user_segment_caches.length-1).each do |position| + cache = self.user_segment_caches.find_by_position(position) + cache_offset, cache_ids = cache.search(cache_offset, args.merge(:limit => page_size-ids.length)) + ids = ids + cache_ids + offset = UserSegmentCache::SIZE * position + cache_offset + cache_offset = 0 + break if ids.length >= page_size + end + + args.delete(:conditions) + args.delete(:joins) + users = EndUser.find(:all, args.merge(:conditions => {:id => ids})) + return [offset, users] + end end diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb index d207a807..4a8e594e 100644 --- a/app/models/user_segment_cache.rb +++ b/app/models/user_segment_cache.rb @@ -19,6 +19,33 @@ def fetch_users(opts={}) ids.map { |id| users_by_id[id] }.compact end + def search(offset=0, opts={}) + opts = opts.clone.symbolize_keys! + opts.delete(:offset) + opts.delete(:include) + limit = opts.delete(:limit) || 20 + batch_size = opts.delete(:batch_size) || DEFAULT_BATCH_SIZE + num_chunks = (self.id_list.size / batch_size).to_i + num_chunks = num_chunks.succ if (self.id_list.length % batch_size) > 0 + + base_scope = EndUser.scoped(opts) + + ids = [] + ((offset/batch_size).to_i..num_chunks-1).each do |chunk| + sub_list = self.id_list[offset..(offset+batch_size-1)] + scope = base_scope.scoped(:select => 'id', :conditions => {:id => sub_list}) + users_by_id = scope.find(:all).index_by(&:id) + ids = ids + sub_list.map { |id| users_by_id[id] ? id : nil }.compact unless users_by_id.empty? + offset = offset + batch_size + break if ids.length > limit + end + + has_more = ids.length > limit + ids = ids[0..limit-1] if has_more + offset = ids.size > 0 ? self.id_list.index(ids[-1]) : 0 + [offset, ids] + end + def find_in_batches(opts={}) limit = opts[:batch_size] || DEFAULT_BATCH_SIZE offset = 0 From 4f8b85b84ed398bb6bbaf61b778d306228d86a05 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 17 May 2010 20:15:50 +0000 Subject: [PATCH 011/139] Added a end user caches table. Used to store a full text index on all the end user fields. --- app/models/end_user.rb | 7 +++++- app/models/end_user_cache.rb | 25 ++++++++++++++++++++++ db/migrate/20100511165552_user_segments.rb | 9 ++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 app/models/end_user_cache.rb diff --git a/app/models/end_user.rb b/app/models/end_user.rb index 4b49bd76..196b85f8 100644 --- a/app/models/end_user.rb +++ b/app/models/end_user.rb @@ -74,7 +74,8 @@ class EndUser < DomainModel has_many :addresses, :class_name => 'EndUserAddress', :dependent => :destroy has_one :tag_cache, :dependent => :destroy - + has_one :end_user_cache, :dependent => :destroy, :class_name => 'EndUserCache' + has_many :end_user_cookies, :dependent => :delete_all, :class_name => 'EndUserCookie' has_many :end_user_actions, :dependent => :delete_all @@ -128,6 +129,10 @@ def after_create #:nodoc: end end + def after_save #:nodoc: + self.end_user_cache ? self.end_user_cache.save : EndUserCache.create(:end_user_id => self.id) + end + ## Validation Fucntions diff --git a/app/models/end_user_cache.rb b/app/models/end_user_cache.rb new file mode 100644 index 00000000..6810b5b9 --- /dev/null +++ b/app/models/end_user_cache.rb @@ -0,0 +1,25 @@ + +class EndUserCache < DomainModel + belongs_to :end_user + validates_presence_of :end_user_id + + def before_save + self.data = self.get_end_user_data.delete_if { |v| v.blank? }.join(' ') + end + + def get_end_user_data + data = [ + self.end_user.email, + self.end_user.name, + self.end_user.user_class.name, + self.end_user.source, + self.end_user.registered? ? 'registered' : nil + ] + end + + def self.reindex + EndUser.find_in_batches do |users| + users.each { |user| user.save } + end + end +end diff --git a/db/migrate/20100511165552_user_segments.rb b/db/migrate/20100511165552_user_segments.rb index 88655354..3174b94b 100644 --- a/db/migrate/20100511165552_user_segments.rb +++ b/db/migrate/20100511165552_user_segments.rb @@ -34,11 +34,20 @@ def self.up end add_index :user_segment_analytics, [:user_segment_id], :name => 'user_segment_analytics_segment_idx' + + create_table :end_user_caches, :force => true, :options => "ENGINE=MyISAM" do |t| + t.integer :end_user_id + t.text :data + end + + add_index :end_user_caches, [:end_user_id], :name => 'end_user_caches_idx', :unique => true + execute "CREATE FULLTEXT INDEX end_user_caches_data_index ON end_user_caches (data)" end def self.down drop_table :user_segments drop_table :user_segment_caches drop_table :user_segment_analytics + drop_table :end_user_caches end end From 5edc34f991917b1d29c88a18059b83ff7c1f5d4b Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 17 May 2010 20:58:11 +0000 Subject: [PATCH 012/139] can use a scope to search for end user ids within end user segments. --- app/models/end_user_cache.rb | 3 ++- app/models/user_segment.rb | 20 +++++++++++++------- app/models/user_segment_cache.rb | 7 ++++--- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/app/models/end_user_cache.rb b/app/models/end_user_cache.rb index 6810b5b9..d984e4ed 100644 --- a/app/models/end_user_cache.rb +++ b/app/models/end_user_cache.rb @@ -13,7 +13,8 @@ def get_end_user_data self.end_user.name, self.end_user.user_class.name, self.end_user.source, - self.end_user.registered? ? 'registered' : nil + self.end_user.registered? ? 'registered' : nil, + self.end_user.tag_names.join(" ") ] end diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 1e4a5dca..4d41489c 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -108,26 +108,32 @@ def paginate(page,args = {}) }, items ] end - def search(offset=0, args={}) + def search(args={}) args = args.clone.symbolize_keys! - page_size = args.delete(:per_page).to_i - page_size = 20 if page_size <= 0 + offset = args.delete(:offset).to_i + limit = args.delete(:limit).to_i + limit = 20 if limit <= 0 cache_offset = offset % UserSegmentCache::SIZE + if args[:scope].nil? + args[:scope] = EndUser.scoped(:conditions => args.delete(:conditions), :joins => args.delete(:joins)) + args[:end_user_field] = :id + end + ids = [] ((offset / UserSegmentCache::SIZE).to_i..self.user_segment_caches.length-1).each do |position| cache = self.user_segment_caches.find_by_position(position) - cache_offset, cache_ids = cache.search(cache_offset, args.merge(:limit => page_size-ids.length)) + cache_offset, cache_ids = cache.search(cache_offset, args.merge(:limit => limit-ids.length)) ids = ids + cache_ids offset = UserSegmentCache::SIZE * position + cache_offset cache_offset = 0 - break if ids.length >= page_size + break if ids.length >= limit end - args.delete(:conditions) - args.delete(:joins) + args.delete(:scope) + args.delete(:end_user_field) users = EndUser.find(:all, args.merge(:conditions => {:id => ids})) return [offset, users] end diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb index 4a8e594e..ba53782e 100644 --- a/app/models/user_segment_cache.rb +++ b/app/models/user_segment_cache.rb @@ -28,13 +28,14 @@ def search(offset=0, opts={}) num_chunks = (self.id_list.size / batch_size).to_i num_chunks = num_chunks.succ if (self.id_list.length % batch_size) > 0 - base_scope = EndUser.scoped(opts) + base_scope = opts.delete(:scope) || EndUser + end_user_field = opts.delete(:end_user_field) || :end_user_id ids = [] ((offset/batch_size).to_i..num_chunks-1).each do |chunk| sub_list = self.id_list[offset..(offset+batch_size-1)] - scope = base_scope.scoped(:select => 'id', :conditions => {:id => sub_list}) - users_by_id = scope.find(:all).index_by(&:id) + scope = base_scope.scoped(:select => end_user_field.to_s, :conditions => {end_user_field.to_sym => sub_list}) + users_by_id = scope.find(:all).index_by(&end_user_field.to_sym) ids = ids + sub_list.map { |id| users_by_id[id] ? id : nil }.compact unless users_by_id.empty? offset = offset + batch_size break if ids.length > limit From 143a62379d510df50de61715990cd6a9bc7134dc Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 18 May 2010 18:17:03 +0000 Subject: [PATCH 013/139] Added a search box to members page. Can set the text for active next and previous links. Added EndUserSearch to handle search through EndUserCache with and without user segments. --- app/controllers/members_controller.rb | 139 +++++++++---------------- app/helpers/cms_helper.rb | 7 +- app/models/end_user_cache.rb | 2 + app/models/end_user_search.rb | 22 ++++ app/models/user_segment.rb | 4 +- app/views/members/_targets_table.rhtml | 44 +++----- app/views/members/index.rhtml | 20 ++-- lib/active_table.rb | 7 +- 8 files changed, 103 insertions(+), 142 deletions(-) create mode 100644 app/models/end_user_search.rb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 486bab33..82a2f712 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -14,18 +14,15 @@ class MembersController < CmsController # :nodoc: all include ActiveTable::Controller active_table :email_targets_table, EndUser, - [ hdr(:icon, 'check'), - hdr(:static, 'edit', :width => '16'), - hdr(:option, 'user_level',:options => EndUser.user_level_select_options,:label => 'Lvl', :width=> 40), - hdr(:string, 'email'), - hdr(:string, 'first_name',:label => 'First'), - hdr(:string, 'last_name',:label => 'Last'), - hdr(:date_range, 'created_at',:label => 'Created'), - hdr(:date_range, 'registered_at',:label => 'Reg.'), - hdr(:option, 'user_class_id',:label=> 'Profile',:options => :get_user_classes), - hdr(:option, 'source',:options => EndUser.source_select_options,:label => 'Src. Type',:width=>90), - hdr(:string, 'lead_source',:label => 'Src.' ), - 'tags' + [ hdr(:icon, 'check', :width => '16'), + hdr(:static, 'Profile', :width => '70'), + hdr(:static, 'Image', :width => '70'), + 'Name', + 'Email', + hdr(:static, 'Src. Type', :label => 'Src. Type'), + hdr(:static, 'Src.', :label => 'Src.'), + hdr(:static, 'Created', :width => '120'), + hdr(:static, 'Reg.', :label => 'Reg.', :width => '120') ], :count_callback => 'count_end_users', :find_callback => 'find_end_users' @@ -35,47 +32,56 @@ class MembersController < CmsController # :nodoc: all def segmentations - @segment= session[:et] - @segmentations = MarketSegment.find(:all,:conditions => 'segment_type = "members" AND market_campaign_id IS NULL',:order => :name).collect { |seg| - [ seg.name, seg.id ] - } - - @loaded_segment_id = session[:et_segment] - @loaded_segment_name = session[:et_segment_name] + @segmentations ||= UserSegment.find(:all, :conditions => {:main_page => true}, :order => 'name') + end + def segment + @segment ||= UserSegment.find_by_id params[:path][0] end def count_end_users(opts) - - @seg = MarketSegment.new(:segment_type => 'members',:options => { :tags => @segment[:tags], :tags_select => @segment[:tags_select], - :conditions => opts[:conditions], :order => opts[:order], - :search => session[:active_table][:email_targets_table] }) - @seg.target_count + if self.search_results + pages, users = self.search_results + if self.search.user_segment + self.search.offsets.length * self.search.per_page - (self.search.per_page - users.length) + else + pages[:total] + end + elsif self.segment + self.segment.last_count + else + EndUser.count :conditions => 'client_user_id IS NULL' + end end def find_end_users(opts) + if self.search_results + pages, users = self.search_results + users + elsif self.segment + pages, users = self.segment.paginate self.search.page, :per_page => 25 + users + else + EndUser.find(:all, :conditions => 'client_user_id IS NULL', :include => [:user_class, :domain_file], :offset => opts[:offset], :limit => opts[:limit], :order => opts[:order]) + end + end + + def search + return @search if @search + + @search = EndUserSearch.new + @search.terms = params[:terms] + @search.per_page = 25 + @search.offset = (params[:offset] || 0).to_i + @search.offsets = (params[:offsets] || [0]).collect { |n| n.to_i } + @search.user_segment = self.segment + @search.page = (params[:page] || 1).to_i + @search.offset = @search.offsets[@search.page-1] if @search.user_segment && @search.offsets.length >= @search.page + @search + end - # (set in handle_table_actions) - if we are saving this segment, find one with the same name, - # or create a new one - if @save_segment - @seg = MarketSegment.find_by_name(@save_segment,:conditions => 'segment_type="members"') || - MarketSegment.new(:segment_type => 'members', :name => @save_segment) - else - @seg = MarketSegment.new(:segment_type => 'members') - end - - @seg.options = { :tags => @segment[:tags], :tags_select => @segment[:tags_select], - :conditions => opts[:conditions], :order => opts[:order], - :search => session[:active_table][:email_targets_table] } - - session[:members_table_segment] = @seg.options.clone - if @save_segment - @seg.save - session[:et_segment] = @seg.id - session[:et_segment_name] = @seg.name - end - - @seg.target_find(:offset => opts[:offset], :limit => opts[:limit], :order => opts[:order]) + def search_results + @search_results ||= self.search.search if self.search.terms end def get_user_classes @@ -104,30 +110,6 @@ def handle_table_actions end end end - elsif request.post? && params[:save_segment] - @save_segment = params[:save_segment] - @update_segments = true - elsif request.post? && params[:load_segment] - load_segment = MarketSegment.find_by_id(params[:load_segment].to_i) - - if load_segment - params.delete(:email_targets_table) - session[:active_table][:email_targets_table] = load_segment.options[:search] - session[:et] = { :tags => load_segment.options[:tags], :tags_select => load_segment.options[:tags_select] } - session[:et_segment] = load_segment.id - session[:et_segment_name] = load_segment.name - else - session[:et_segment] = nil - session[:et_segment_name] = nil - end - @update_segments = true - elsif request.post? && params[:delete_segment] - load_segment = MarketSegment.find_by_id(params[:delete_segment].to_i) - load_segment.destroy - session[:et_segment] = nil - session[:et_segment_name] = nil - @update_segments = true - end end @@ -162,25 +144,6 @@ def display_targets_table(display = true) if params[:table_action] || params[:segment_action] handle_table_actions end - - default_options = { :tags => [], - :tags_select => 'any' - } - - session[:et] ||= default_options.clone - session[:et_segment] ||= nil - - if(params[:tag]) - session[:et][:tags] << params[:tag] - session[:et][:tags].uniq! - elsif params[:remove_tag] - session[:et][:tags].delete(params[:remove_tag]) - elsif params[:tags_select] - session[:et][:tags_select] = params[:tags_select] - elsif params[:clear_tag] - session[:et][:tags] = [] - end - @segment= session[:et] @active_table_output = email_targets_table_generate params, :per_page => 25, :include => :tag_cache, :conditions => 'client_user_id IS NULL', :order => 'created_at DESC' diff --git a/app/helpers/cms_helper.rb b/app/helpers/cms_helper.rb index 8fa220aa..c000a4c5 100644 --- a/app/helpers/cms_helper.rb +++ b/app/helpers/cms_helper.rb @@ -520,6 +520,9 @@ def active_table_for(name,active_table_output,options={},&block) table_actions = options.delete(:actions) more_actions = options.delete(:more_actions) + next_link_text = options.delete(:next) || '>' + previous_link_text = options.delete(:previous) || '<' + options[:class] ||= "active_table" form_elements = options.delete(:form_elements) @@ -694,7 +697,7 @@ def active_table_for(name,active_table_output,options={},&block) initial = true if(pagination[:page] > 1) initial = false - concat( "
  • <
    • ") + concat( "
  • #{previous_link_text}
    • ") end concat(pagination[:pages].collect { |number| first = true if initial @@ -709,7 +712,7 @@ def active_table_for(name,active_table_output,options={},&block) }.to_s ) if(pagination[:page] < pagination[:pages_count]) - concat( "
  • >
    • ") + concat( "
  • #{next_link_text}
    • ") end concat('') end diff --git a/app/models/end_user_cache.rb b/app/models/end_user_cache.rb index d984e4ed..5f8eefc6 100644 --- a/app/models/end_user_cache.rb +++ b/app/models/end_user_cache.rb @@ -3,6 +3,8 @@ class EndUserCache < DomainModel belongs_to :end_user validates_presence_of :end_user_id + named_scope :search, lambda { |query| {:conditions => ['MATCH (data) AGAINST (?)', query], :order => "MATCH (data) AGAINST (#{self.quote_value(query)}) DESC"} } + def before_save self.data = self.get_end_user_data.delete_if { |v| v.blank? }.join(' ') end diff --git a/app/models/end_user_search.rb b/app/models/end_user_search.rb new file mode 100644 index 00000000..18bdb624 --- /dev/null +++ b/app/models/end_user_search.rb @@ -0,0 +1,22 @@ + +class EndUserSearch + attr_accessor :terms, :offset, :page, :per_page, :user_segment, :offsets + + def search(opts={}) + scope = EndUserCache.search self.terms + if self.user_segment + self.offsets << self.offset unless self.offsets.include?(self.offset) + new_offset, users = self.user_segment.search opts.merge(:scope => scope, :offset => self.offset, :limit => self.per_page) + if users.length >= self.per_page + self.offsets << (new_offset+1) unless self.offsets.include?(new_offset+1) + end + [new_offset, users] + else + pages, ids = scope.paginate(self.page, :select => 'end_user_id') + ids = ids.collect { |cache| cache[:end_user_id] } + users_by_id = EndUser.find(:all, opts.merge(:conditions => {:id => ids})).index_by(&:id) + users = ids.map { |id| users_by_id[id] } + [pages, users] + end + end +end diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 4d41489c..f95afec0 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -26,7 +26,7 @@ def cache_ids self.user_segment_caches.delete_all self.order_by = 'created_at DESC' unless self.order_by - ids = EndUser.find(:all, :select => 'id', :conditions => {:id => self.operations.end_user_ids}, :order => self.order_by).collect &:id + ids = EndUser.find(:all, :select => 'id', :conditions => {:id => self.operations.end_user_ids, :client_user_id => nil}, :order => self.order_by).collect &:id num_segements = (self.operations.end_user_ids.length / UserSegmentCache::SIZE) num_segements = num_segements + 1 if (self.operations.end_user_ids.length % UserSegmentCache::SIZE) > 0 @@ -78,7 +78,7 @@ def find(opts={}, &block) end end - def paginate(page,args = {}) + def paginate(page=1, args={}) args = args.clone.symbolize_keys! window_size =args.delete(:window) || 2 diff --git a/app/views/members/_targets_table.rhtml b/app/views/members/_targets_table.rhtml index bc8f43ea..5e13d9a9 100644 --- a/app/views/members/_targets_table.rhtml +++ b/app/views/members/_targets_table.rhtml @@ -1,15 +1,3 @@ -<% if @update_tags -%> - -<% end -%> - -<% if @update_segments -%> - -<% end -%> - <% @user_classes = [] @user_level_options = EndUser.user_level_select_options @source_options = EndUser.source_options_hash @@ -21,9 +9,10 @@ @user_class_objs.each { |cls| @user_classes[cls.id] = h(cls.name.t) } %> <% active_table_for :email_targets_table, @active_table_output, - :refresh_url => url_for(:action => 'display_targets_table'), + :refresh_url => url_for(:action => 'display_targets_table', :path => @segment ? @segment.id : nil, :terms => @search.terms, :offsets => @search.offsets.empty? ? nil : @search.offsets), :class => 'active_table', :width => '100%', + :next => @search.user_segment && @search.terms ? 'more' : '>', :actions => [ ['Add Tags','js','MemberEditor.addTags();'], ['Remove Tags','js','MemberEditor.removeTags();'] ], @@ -33,33 +22,28 @@ <%= entry_checkbox 'user',t.id %> + <%= t.user_class ? t.user_class.name : '-' %> - <% unless @user_class_index[t.user_class_id].editor? %> - <%= theme_image_tag 'icons/table_actions/edit.gif' %> - <% end -%> + <%= image = t.image ? t.image.image_tag(:thumb) : 'No Image'.t + t.editor? ? image : content_tag(:a, image, {:href => url_for(:action => 'edit', :path => t.id)}) + %> - <%= t.user_level %> - <%= h t.email.blank? ? 'No Email'.t : t.email %> - <%= h(truncate(t.first_name,:length => 30)) %> + <%= t.editor? ? h(t.name) : content_tag(:a, t.name, {:href => url_for(:action => 'edit', :path => t.id)}) %> - <%= h(truncate(t.last_name ,:llength => 30)) %> + <%= email = t.email.blank? ? 'No Email'.t : t.email + t.editor? ? h(email) : content_tag(:a, email, {:href => url_for(:action => 'edit', :path => t.id)}) + %> - + <%= h @source_options[t.source] %> + <%= h t.lead_source.blank? ? '-' : t.lead_source %> + <%= t.created_at ? t.created_at.strftime(DEFAULT_DATE_FORMAT.t) : '-' %> - + <%= t.registered_at ? t.registered_at.strftime(DEFAULT_DATE_FORMAT.t) : '-' %> - - <%= @user_classes[t.user_class_id] if t.user_class_id %> - <%= h @source_options[t.source] %> - <%= h t.lead_source.blank? ? '-' : t.lead_source %> - <% user_tags = t.tag_cache_tags.to_s.split(",") %> - <%= user_tags[0..5].collect {|tag| "#{tag}" }.join(", ") %> - <%= "+(#{user_tags.length-6})" if user_tags.length > 6 %> - <% end -%> diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index 96999d39..9b582418 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -106,22 +106,14 @@
    -
    -<% ajax_tabs [ 'Tags','Segmentations'], 'Tags' do |t| %> - <% t.tab do -%> -
    - <%= render :partial => 'tags' %> -
    - <% end -%> - <% t.tab do -%> -
    - <%= render :partial => 'segmentations' %> -
    - <% end -%> -<% end -%> +
    +<%= form_tag %> +<%= text_field_tag :terms, @search.terms %> +<%= submit_tag 'Search' %> + +
    -
    @@ -102,18 +105,34 @@ <%= p.link "Download Visible Targets",:icon => 'download.gif', :controller => :member_export %> <%= p.link "Tag List", :icon => 'show.gif', :action => 'tags' %> <%= p.link "Access Tokens", :icon => 'access.gif', :controller => '/access_token' if myself.has_role?('editor_access_tokens') %> + <%= p.link "Segments", :icon => 'access.gif', :action => 'segments' %> <% end -%>
    -
    +
    <%= form_tag %> -<%= text_field_tag :terms, @search.terms %> -<%= submit_tag 'Search' %> +<% if @segment && @segment.last_ran_at -%> + Edit | Refresh +<% end -%> +<%= select_tag :user_segment_id, options_for_select([['Everyone', nil]] + @segmentations.collect { |seg| [seg.name, seg.id] }, (@segment ? @segment.id : nil)), :onchange => 'MemberEditor.changeSegments();', :id => 'user_segments_user_segment_id', :style => 'width:200px;' %> +
    +<% if @segment && @segment.last_ran_at -%> +<%= 'updated on %s' / @segment.last_ran_at.strftime(DEFAULT_DATETIME_FORMAT.t) %> +
    +<% end -%> +Create a Segment +
    +
    +<%= form_tag %> +<%= text_field_tag :terms, @search.terms, :id => 'members_search_terms' %> +<%= submit_tag 'Search'.t %> +
    -
    + +
    diff --git a/app/views/members/segments.html.erb b/app/views/members/segments.html.erb new file mode 100644 index 00000000..7add174d --- /dev/null +++ b/app/views/members/segments.html.erb @@ -0,0 +1,9 @@ + + +
    + +
    + <%= render :partial => 'user_segments_table' %> +
    From 385b7dab4643add1242efc5ef4eb9985ec5bf400 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 18 May 2010 21:24:47 +0000 Subject: [PATCH 015/139] Added status to user segment to keep track of where in the process of calculating end user ids it is. Added edit segment and refresh segement to members controller. --- app/controllers/members_controller.rb | 35 +++++++++++++++---- app/models/user_segment.rb | 33 +++++++++++++++-- .../members/_user_segments_table.html.erb | 17 +++++++-- app/views/members/edit_segment.html.erb | 9 +++++ app/views/members/index.rhtml | 2 +- db/migrate/20100511165552_user_segments.rb | 2 +- 6 files changed, 86 insertions(+), 12 deletions(-) create mode 100644 app/views/members/edit_segment.html.erb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index f0c6c5de..6c26d8c5 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -7,7 +7,8 @@ class MembersController < CmsController # :nodoc: all layout 'manage' cms_admin_paths "people", - "People" => { :controller => '/members' } + "People" => { :controller => '/members' }, + "Segments" => { :action => 'segments' } # need to include @@ -29,7 +30,7 @@ class MembersController < CmsController # :nodoc: all def segmentations return @segmentations if @segmentations - @segmentations = UserSegment.find(:all, :conditions => {:main_page => true}, :order => 'name') + @segmentations = UserSegment.find(:all, :conditions => {:main_page => true, :status => 'finished'}, :order => 'name') @segmentations << self.segment if self.segment && ! @segmentations.find { |seg| seg.id == self.segment.id } @segmentations end @@ -167,16 +168,19 @@ def index active_table :user_segments_table, UserSegment, [ hdr(:icon, 'check', :width => '16'), + hdr(:icon, '', :width => '32'), :main_page, :name, :description, + :status, :last_count, :last_ran_at, - :created_at + :created_at, + :updated_at ] def user_segments_table(display=true) - @active_table_output = user_segments_table_generate params, :order => 'created_at DESC' + @active_table_output = user_segments_table_generate params, :order => 'updated_at DESC' render :partial => 'user_segments_table' if display end @@ -186,19 +190,38 @@ def segments end def create_segment - cms_page_path ['People'], 'Create a Segment' + cms_page_path ['People', 'Segments'], 'Create a Segment' @segment = UserSegment.new params[:segment] if request.post? && params[:segment] @segment.save if @segment.id - @segment.cache_ids + @segment.refresh redirect_to :action => 'segments' end end end + def edit_segment + @segment = UserSegment.find params[:path][0] + + cms_page_path ['People', 'Segments'], '%s Segment' / @segment.name + + if request.post? && params[:segment] + if @segment.update_attributes params[:segment] + @segment.refresh + redirect_to :action => 'segments' + end + end + end + + def refresh_segment + @segment = UserSegment.find params[:path][0] + @segment.refresh + redirect_to :action => 'segments' + end + def create cms_page_path ['People'],'Create Contact' diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index f95afec0..8414b3d9 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -1,11 +1,18 @@ class UserSegment < DomainModel - has_many :user_segment_caches, :order => 'position', :dependent => :destroy, :class_name => 'UserSegmentCache' + has_many :user_segment_caches, :order => 'position', :dependent => :delete_all, :class_name => 'UserSegmentCache' serialize :segment_options serialize :fields validates_presence_of :name + validates_presence_of :segment_options + + def ready?; self.status == 'finished'; end + + def validate + self.errors.add(:segment_options_text, 'is invalid') if self.segment_options_text && self.segment_options.nil? + end def operations return @operations if @operations @@ -15,6 +22,7 @@ def operations end def segment_options_text=(text) + text = text.gsub("\r", '').strip self.write_attribute :segment_options_text, text @operations = UserSegment::Operations.new @operations.parse text @@ -22,7 +30,23 @@ def segment_options_text=(text) text end - def cache_ids + def refresh + if self.status == 'new' || self.ready? + self.status = 'refreshing' + self.save + + if EndUser.count < 50000 + self.cache_ids + else + self.run_worker(:cache_ids) + end + end + end + + def cache_ids(opts={}) + self.status = 'calculating' + self.save + self.user_segment_caches.delete_all self.order_by = 'created_at DESC' unless self.order_by @@ -36,6 +60,7 @@ def cache_ids self.user_segment_caches.create :id_list => ids[start..start+UserSegmentCache::SIZE-1], :position => idx end + self.status = 'finished' self.last_ran_at = Time.now self.last_count = ids.length self.save @@ -137,5 +162,9 @@ def search(args={}) users = EndUser.find(:all, args.merge(:conditions => {:id => ids})) return [offset, users] end + + def before_create + self.status = 'new' + end end diff --git a/app/views/members/_user_segments_table.html.erb b/app/views/members/_user_segments_table.html.erb index 599be6cd..faeca2c7 100644 --- a/app/views/members/_user_segments_table.html.erb +++ b/app/views/members/_user_segments_table.html.erb @@ -5,11 +5,24 @@ :update => 'user_segments_table' do |t| %> > <%= entry_checkbox 'user',t.id %> + + <% if t.ready? -%> + <%= theme_image_tag('icons/actions/edit.gif') %> + <% end -%> + <%= t.main_page ? 'Yes'.t : 'No'.t %> - <%= h t.name %> + + <% if t.ready? -%> + <%= h t.name %> + <% else -%> + <%= t.name %> + <% end -%> + <%= h(t.description ? t.description : '') %> + <%= t.status %> <%= t.last_count %> - <%= t.last_ran_at.strftime(DEFAULT_DATETIME_FORMAT.t) %> + <%= t.last_ran_at.strftime(DEFAULT_DATETIME_FORMAT.t) if t.last_ran_at %> <%= t.created_at.strftime(DEFAULT_DATETIME_FORMAT.t) %> + <%= t.updated_at.strftime(DEFAULT_DATETIME_FORMAT.t) %> <% end -%> diff --git a/app/views/members/edit_segment.html.erb b/app/views/members/edit_segment.html.erb new file mode 100644 index 00000000..9b317c67 --- /dev/null +++ b/app/views/members/edit_segment.html.erb @@ -0,0 +1,9 @@ + +<% admin_form_for :segment, @segment do |f| -%> +<%= f.text_field :name %> +<%= f.text_area :description, :rows => 3 %> +<%= f.check_boxes :main_page, [['display on people page', true]], :single => true %> +<%= f.text_area :segment_options_text, :rows => 8, :label => 'Operations' %> +<%= f.spacer %> +<%= f.cancel_submit_buttons 'Cancel', 'Save' %> +<% end -%> diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index de54a274..cafc1b9b 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -113,7 +113,7 @@
    <%= form_tag %> <% if @segment && @segment.last_ran_at -%> - Edit | Refresh + Edit | Refresh <% end -%> <%= select_tag :user_segment_id, options_for_select([['Everyone', nil]] + @segmentations.collect { |seg| [seg.name, seg.id] }, (@segment ? @segment.id : nil)), :onchange => 'MemberEditor.changeSegments();', :id => 'user_segments_user_segment_id', :style => 'width:200px;' %>
    diff --git a/db/migrate/20100511165552_user_segments.rb b/db/migrate/20100511165552_user_segments.rb index 3174b94b..7cbe448f 100644 --- a/db/migrate/20100511165552_user_segments.rb +++ b/db/migrate/20100511165552_user_segments.rb @@ -3,7 +3,7 @@ def self.up create_table :user_segments, :force => true do |t| t.string :name t.text :description - t.string :type + t.string :status t.boolean :main_page t.datetime :last_ran_at t.integer :last_count From 5f90d19ccf039b064a112de7c594f5b928711e9a Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 18 May 2010 21:35:08 +0000 Subject: [PATCH 016/139] Added a create segment link on segments page. --- app/controllers/members_controller.rb | 5 ++--- app/views/members/segments.html.erb | 8 ++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 6c26d8c5..9a4e2a64 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -192,11 +192,10 @@ def segments def create_segment cms_page_path ['People', 'Segments'], 'Create a Segment' - @segment = UserSegment.new params[:segment] + @segment = UserSegment.new :main_page => true if request.post? && params[:segment] - @segment.save - if @segment.id + if @segment.update_attributes params[:segment] @segment.refresh redirect_to :action => 'segments' end diff --git a/app/views/members/segments.html.erb b/app/views/members/segments.html.erb index 7add174d..1860c61d 100644 --- a/app/views/members/segments.html.erb +++ b/app/views/members/segments.html.erb @@ -1,9 +1,13 @@ +<% action_panel :handler => 'members' do |p| -%> + <%= p.link "Create a Segment",:icon => 'add.gif', :action => 'create_segment' %> +<% end -%> + +
    + -
    -
    <%= render :partial => 'user_segments_table' %>
    From 74a1d609e3b9bf2a13c634b2ce87a830020ac691 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 19 May 2010 14:48:50 +0000 Subject: [PATCH 017/139] Can add and remove segments from the main page. --- app/controllers/members_controller.rb | 15 ++++++++++----- app/views/members/_user_segments_table.html.erb | 12 ++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 9a4e2a64..8bf4eaea 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -155,11 +155,6 @@ def display_targets_table(display = true) def index cms_page_path [], "People" - #unless params[:refresh] - #session[:et] = nil - #session[:et_segment] = nil - #end - segmentations display_targets_table(false) @@ -180,6 +175,16 @@ def index ] def user_segments_table(display=true) + active_table_action 'user_segments' do |act,ids| + case act + when 'delete': UserSegment.destroy(ids) + when 'add' + UserSegment.update_all('main_page = 1', :id => ids) + when 'remove' + UserSegment.update_all('main_page = 0', :id => ids) + end + end + @active_table_output = user_segments_table_generate params, :order => 'updated_at DESC' render :partial => 'user_segments_table' if display end diff --git a/app/views/members/_user_segments_table.html.erb b/app/views/members/_user_segments_table.html.erb index faeca2c7..cab71e2f 100644 --- a/app/views/members/_user_segments_table.html.erb +++ b/app/views/members/_user_segments_table.html.erb @@ -1,10 +1,10 @@ <% active_table_for :user_segments_table, @active_table_output, - :class => 'active_table', - :width => '100%', - :more_actions => [ ['Delete Segments','delete','Delete the selected segments?'] ], - :update => 'user_segments_table' do |t| %> - > - <%= entry_checkbox 'user',t.id %> + :refresh_url => url_for(:action => 'user_segments_table'), + :style => 'width:100%', + :actions => [['Add to Main Page', 'add'], ['Remove from Main Page', 'remove']], + :more_actions => [['Delete Segments','delete','Delete the selected segments?']] do |t| %> + > + <%= entry_checkbox 'user_segments',t.id %> <% if t.ready? -%> <%= theme_image_tag('icons/actions/edit.gif') %> From fcab142af6e94f7727bd6ce74fe7dbd960762bb8 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 19 May 2010 17:00:56 +0000 Subject: [PATCH 018/139] Created 1 form for updating and creating segments. --- app/models/user_segment.rb | 13 +++++++++++++ app/views/members/_segment_form.html.erb | 11 +++++++++++ app/views/members/create_segment.html.erb | 10 +--------- app/views/members/edit_segment.html.erb | 10 +--------- 4 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 app/views/members/_segment_form.html.erb diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 8414b3d9..f7ce208b 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -8,6 +8,11 @@ class UserSegment < DomainModel validates_presence_of :name validates_presence_of :segment_options + def initialize(opts={}) + super + self.fields = [] unless self.fields + end + def ready?; self.status == 'finished'; end def validate @@ -166,5 +171,13 @@ def search(args={}) def before_create self.status = 'new' end + + def self.fields_options + [['Source', 'source'], ['Date of Birth', 'dob'], ['Gender', 'gender'], ['Created', 'created_at'], ['Registered', 'registered_at']] + end + + def self.order_by_options + [['Created Desc', 'created_at DESC'], ['Created Asc', 'created_at'], ['Email', 'email']] + end end diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb new file mode 100644 index 00000000..49d96b0a --- /dev/null +++ b/app/views/members/_segment_form.html.erb @@ -0,0 +1,11 @@ + +<% admin_form_for :segment, @segment do |f| -%> +<%= f.text_field :name %> +<%= f.text_area :description, :rows => 3 %> +<%= f.select :order_by, UserSegment.order_by_options %> +<%= f.check_boxes :main_page, [['display on people page', true]], :single => true %> +<%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> +<%= f.text_area :segment_options_text, :rows => 8, :label => 'Operations' %> +<%= f.spacer %> +<%= f.cancel_submit_buttons 'Cancel', (@segment.id ? 'Save' : 'Create') %> +<% end -%> diff --git a/app/views/members/create_segment.html.erb b/app/views/members/create_segment.html.erb index 3f034e01..a5919db3 100644 --- a/app/views/members/create_segment.html.erb +++ b/app/views/members/create_segment.html.erb @@ -1,9 +1 @@ - -<% admin_form_for :segment, @segment do |f| -%> -<%= f.text_field :name %> -<%= f.text_area :description, :rows => 3 %> -<%= f.check_boxes :main_page, [['display on people page', true]], :single => true %> -<%= f.text_area :segment_options_text, :rows => 8, :label => 'Operations' %> -<%= f.spacer %> -<%= f.cancel_submit_buttons 'Cancel', 'Create' %> -<% end -%> +<%= render :partial => 'segment_form' %> diff --git a/app/views/members/edit_segment.html.erb b/app/views/members/edit_segment.html.erb index 9b317c67..a5919db3 100644 --- a/app/views/members/edit_segment.html.erb +++ b/app/views/members/edit_segment.html.erb @@ -1,9 +1 @@ - -<% admin_form_for :segment, @segment do |f| -%> -<%= f.text_field :name %> -<%= f.text_area :description, :rows => 3 %> -<%= f.check_boxes :main_page, [['display on people page', true]], :single => true %> -<%= f.text_area :segment_options_text, :rows => 8, :label => 'Operations' %> -<%= f.spacer %> -<%= f.cancel_submit_buttons 'Cancel', 'Save' %> -<% end -%> +<%= render :partial => 'segment_form' %> From 6d7528f52576977b40d406dd3edd07a67b01c07c Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 19 May 2010 18:19:32 +0000 Subject: [PATCH 019/139] Can copy a segment. Dynamically display user fields based on segmentation. --- app/controllers/members_controller.rb | 54 ++++++++++++++++++------- app/models/user_segment.rb | 7 +++- app/views/members/_targets_table.rhtml | 33 +++++++++------ app/views/members/copy_segment.html.erb | 1 + 4 files changed, 66 insertions(+), 29 deletions(-) create mode 100644 app/views/members/copy_segment.html.erb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 8bf4eaea..8a295345 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -12,21 +12,9 @@ class MembersController < CmsController # :nodoc: all # need to include - include ActiveTable::Controller - active_table :email_targets_table, - EndUser, - [ hdr(:icon, 'check', :width => '16'), - hdr(:static, 'Profile', :width => '70'), - hdr(:static, 'Image', :width => '70'), - 'Name', - 'Email' - ], - :count_callback => 'count_end_users', - :find_callback => 'find_end_users' - + include ActiveTable::Controller protected - def segmentations return @segmentations if @segmentations @@ -107,6 +95,25 @@ def handle_table_actions end end + def email_targets_table_generate(opts,*find_options) + @generated_active_table_columns = [ + ActiveTable::IconHeader.new('check', :width => '16'), + ActiveTable::StaticHeader.new('Profile', :width => '70'), + ActiveTable::StaticHeader.new('Image', :width => '70'), + ActiveTable::StaticHeader.new('Name'), + ActiveTable::StaticHeader.new('Email') + ] + + if self.segment && self.segment.fields + self.segment.fields.each do |field| + option = UserSegment.fields_options.rassoc(field) + @generated_active_table_columns << ActiveTable::StaticHeader.new(option[1], :label => option[0]) if option + end + end + + active_table_generate('end_users', EndUser, @generated_active_table_columns, {:count_callback => 'count_end_users', :find_callback => 'find_end_users'}, opts, *find_options) + end + public def lookup_autocomplete @@ -132,7 +139,6 @@ def lookup_autocomplete render :partial => 'lookup_autocomplete' end - def display_targets_table(display = true) if params[:table_action] || params[:segment_action] @@ -154,7 +160,9 @@ def display_targets_table(display = true) # Members editing def index cms_page_path [], "People" - + + return redirect_to(:action => 'segments') if self.segment && ! self.segment.ready? + segmentations display_targets_table(false) @@ -212,6 +220,22 @@ def edit_segment cms_page_path ['People', 'Segments'], '%s Segment' / @segment.name + if request.post? && params[:segment] + if @segment.update_attributes params[:segment] + @segment.refresh if @segment.should_refresh? + redirect_to :action => 'segments' + end + end + end + + def copy_segment + segment_to_copy = UserSegment.find params[:path][0] + + cms_page_path ['People', 'Segments'], 'Copy %s Segment' / segment_to_copy.name + + @segment = UserSegment.new segment_to_copy.attributes.symbolize_keys.slice(:name, :description, :fields, :main_page, :segment_options_text, :order_by) + @segment.name += ' (Copy)' unless request.post? + if request.post? && params[:segment] if @segment.update_attributes params[:segment] @segment.refresh diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index f7ce208b..04ae783e 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -28,6 +28,7 @@ def operations def segment_options_text=(text) text = text.gsub("\r", '').strip + @should_refresh = self.segment_options_text != text self.write_attribute :segment_options_text, text @operations = UserSegment::Operations.new @operations.parse text @@ -35,6 +36,10 @@ def segment_options_text=(text) text end + def should_refresh? + @should_refresh + end + def refresh if self.status == 'new' || self.ready? self.status = 'refreshing' @@ -173,7 +178,7 @@ def before_create end def self.fields_options - [['Source', 'source'], ['Date of Birth', 'dob'], ['Gender', 'gender'], ['Created', 'created_at'], ['Registered', 'registered_at']] + [['Source', 'source'], ['Date of Birth', 'dob'], ['Gender', 'gender'], ['Created', 'created_at'], ['Registered', 'registered_at'], ['User Class', 'user_class']] end def self.order_by_options diff --git a/app/views/members/_targets_table.rhtml b/app/views/members/_targets_table.rhtml index 91556828..c351e0d1 100644 --- a/app/views/members/_targets_table.rhtml +++ b/app/views/members/_targets_table.rhtml @@ -1,22 +1,12 @@ -<% @user_classes = [] - @user_level_options = EndUser.user_level_select_options - @source_options = EndUser.source_options_hash - @view = "View".t - @edit = "Edit".t - @delete = "Delete".t - @user_class_objs = UserClass.find(:all) - @user_class_index = @user_class_objs.index_by(&:id) - @user_class_objs.each { |cls| @user_classes[cls.id] = h(cls.name.t) } %> - <% active_table_for :email_targets_table, @active_table_output, :refresh_url => url_for(:action => 'display_targets_table', :path => @segment ? @segment.id : nil, :terms => @search.terms, :offsets => @search.offsets.empty? ? nil : @search.offsets), :class => 'active_table', :width => '100%', :next => @search.user_segment && @search.terms ? 'more' : '>', - :actions => [ ['Add Tags','js','MemberEditor.addTags();'], - ['Remove Tags','js','MemberEditor.removeTags();'] + :actions => [['Add Tags','js','MemberEditor.addTags();'], + ['Remove Tags','js','MemberEditor.removeTags();'] ], - :more_actions => [ ['Delete Targets','delete','Delete the selected users?'] ], + :more_actions => [['Delete Targets','delete','Delete the selected users?']], :update => 'targets_table' do |t| %> > @@ -36,6 +26,23 @@ t.editor? ? h(email) : content_tag(:a, email, {:href => url_for(:action => 'edit', :path => t.id)}) %> + + <% if @segment && @segment.fields -%> + <% @segment.fields.each do |field| -%> + <%= + value = t.send(field) + if value.is_a?(DomainModel) + "#{value.name}" + elsif value.is_a?(Time) + "#{value.strftime(DEFAULT_DATETIME_FORMAT.t)}" + elsif value.nil? + "-" + else + "#{value}" + end + %> + <% end -%> + <% end -%> <% end -%> diff --git a/app/views/members/copy_segment.html.erb b/app/views/members/copy_segment.html.erb new file mode 100644 index 00000000..a5919db3 --- /dev/null +++ b/app/views/members/copy_segment.html.erb @@ -0,0 +1 @@ +<%= render :partial => 'segment_form' %> From 108b0b0998f477b41bdf2d14a4bcd569159d2b0b Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 19 May 2010 18:42:18 +0000 Subject: [PATCH 020/139] Added module level options for fields to display and ordering of the everyone view. --- app/controllers/members_controller.rb | 54 ++++++++++++++++++++++---- app/models/user_segment.rb | 6 +++ app/views/members/_targets_table.rhtml | 4 +- app/views/members/index.rhtml | 2 + app/views/members/options.html.erb | 7 ++++ 5 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 app/views/members/options.html.erb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 8a295345..5f39bfed 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -104,11 +104,16 @@ def email_targets_table_generate(opts,*find_options) ActiveTable::StaticHeader.new('Email') ] + @fields = [] if self.segment && self.segment.fields - self.segment.fields.each do |field| - option = UserSegment.fields_options.rassoc(field) - @generated_active_table_columns << ActiveTable::StaticHeader.new(option[1], :label => option[0]) if option - end + @fields = self.segment.fields + else self.class.module_options && self.class.module_options.fields + @fields = self.class.module_options.fields + end + + @fields.each do |field| + option = UserSegment.fields_options.rassoc(field) + @generated_active_table_columns << ActiveTable::StaticHeader.new(option[1], :label => option[0]) if option end active_table_generate('end_users', EndUser, @generated_active_table_columns, {:count_callback => 'count_end_users', :find_callback => 'find_end_users'}, opts, *find_options) @@ -145,7 +150,7 @@ def display_targets_table(display = true) handle_table_actions end - @active_table_output = email_targets_table_generate params, :per_page => 25, :include => :tag_cache, :conditions => 'client_user_id IS NULL', :order => 'created_at DESC' + @active_table_output = email_targets_table_generate params, :per_page => 25, :include => :tag_cache, :conditions => 'client_user_id IS NULL', :order => self.class.module_options.order_by if display @update_tags = true @@ -197,6 +202,37 @@ def user_segments_table(display=true) render :partial => 'user_segments_table' if display end + def options + cms_page_path ['People'], "Everyone Options" + + @options = self.class.module_options(params[:options]) + + if request.post? && @options.valid? + Configuration.set_config_model(@options) + flash[:notice] = "Updated Everyone options".t + redirect_to :action => 'index' + return + end + end + + def self.module_options(vals=nil) + Configuration.get_config_model(Options,vals) + end + + class Options < HashModel + attributes :fields => [], :order_by => 'created_at DESC' + + def validate + if self.fields + self.errors.add(:fields, 'is invalid') if self.fields.find { |f| UserSegment.fields_options.rassoc(f).nil? } + end + + if self.order_by + self.errors.add(:order_by, 'is invalid') unless UserSegment.order_by_options.rassoc(self.order_by) + end + end + end + def segments cms_page_path ['People'], 'Segments' user_segments_table(false) @@ -222,8 +258,12 @@ def edit_segment if request.post? && params[:segment] if @segment.update_attributes params[:segment] - @segment.refresh if @segment.should_refresh? - redirect_to :action => 'segments' + if @segment.should_refresh? + @segment.refresh + redirect_to :action => 'segments' + else + redirect_to :action => 'index', :path => @segment.id + end end end end diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 04ae783e..779f7fcf 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -36,6 +36,12 @@ def segment_options_text=(text) text end + def order_by=(order) + @should_refresh = self.order_by != order + self.write_attribute :order_by, order + order + end + def should_refresh? @should_refresh end diff --git a/app/views/members/_targets_table.rhtml b/app/views/members/_targets_table.rhtml index c351e0d1..996f021b 100644 --- a/app/views/members/_targets_table.rhtml +++ b/app/views/members/_targets_table.rhtml @@ -27,8 +27,8 @@ %> - <% if @segment && @segment.fields -%> - <% @segment.fields.each do |field| -%> + <% if @fields -%> + <% @fields.each do |field| -%> <%= value = t.send(field) if value.is_a?(DomainModel) diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index cafc1b9b..594a90de 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -114,6 +114,8 @@ <%= form_tag %> <% if @segment && @segment.last_ran_at -%> Edit | Refresh +<% else -%> + Edit <% end -%> <%= select_tag :user_segment_id, options_for_select([['Everyone', nil]] + @segmentations.collect { |seg| [seg.name, seg.id] }, (@segment ? @segment.id : nil)), :onchange => 'MemberEditor.changeSegments();', :id => 'user_segments_user_segment_id', :style => 'width:200px;' %>
    diff --git a/app/views/members/options.html.erb b/app/views/members/options.html.erb new file mode 100644 index 00000000..8673c11d --- /dev/null +++ b/app/views/members/options.html.erb @@ -0,0 +1,7 @@ + +<% admin_form_for :options, @options do |f| -%> +<%= f.select :order_by, UserSegment.order_by_options %> +<%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> +<%= f.spacer %> +<%= f.cancel_submit_buttons 'Cancel', 'Save' %> +<% end -%> From fa693f3656771e6c35b702d6c5be6e441cfc2ea0 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 19 May 2010 19:16:27 +0000 Subject: [PATCH 021/139] Added to_expr to generate the text value of the operations. --- app/models/user_segment.rb | 4 ++++ app/models/user_segment/field.rb | 6 ++++++ app/models/user_segment/operation.rb | 6 ++++++ app/models/user_segment/operations.rb | 5 +++++ 4 files changed, 21 insertions(+) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 779f7fcf..bd88ffe0 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -190,5 +190,9 @@ def self.fields_options def self.order_by_options [['Created Desc', 'created_at DESC'], ['Created Asc', 'created_at'], ['Email', 'email']] end + + def to_expr + self.operations.to_expr + end end diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index 37d69904..70b03153 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -107,4 +107,10 @@ def child_field @child_field.handler = self.handler @child_field end + + def to_expr + output = "#{field}.#{operation}(" + self.arguments.collect { |arg| arg.is_a?(String) || arg.is_a?(Time) ? "\"#{arg}\"" : arg.to_s }.join(', ') + ")" + output += self.child.to_s if self.child + output + end end diff --git a/app/models/user_segment/operation.rb b/app/models/user_segment/operation.rb index 9727ef50..720426b8 100644 --- a/app/models/user_segment/operation.rb +++ b/app/models/user_segment/operation.rb @@ -38,4 +38,10 @@ def end_user_ids(ids=nil) def to_a [@operator] + @fields.collect { |fld| fld.to_h } end + + def to_expr + output = @operator == 'not' ? 'not ' : '' + output = @fields.collect { |fld| fld.to_expr }.join(' + ') + output + end end diff --git a/app/models/user_segment/operations.rb b/app/models/user_segment/operations.rb index e23561a4..6f793965 100644 --- a/app/models/user_segment/operations.rb +++ b/app/models/user_segment/operations.rb @@ -47,4 +47,9 @@ def to_a return [] unless @operations @operations.collect { |op| op.to_a } end + + def to_expr + return '' unless @operations + @operations.collect { |op| op.to_expr }.join("\n") + end end From 79a1867c3549f417b47d4d74678177f2ef907369 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 19 May 2010 21:35:20 +0000 Subject: [PATCH 022/139] Started working on a operation syntax builder. --- app/controllers/members_controller.rb | 28 ++++++- app/models/end_user_segment_field.rb | 13 ++- app/models/user_segment/field.rb | 6 +- app/models/user_segment/operation.rb | 2 +- app/models/user_segment/operation_builder.rb | 87 ++++++++++++++++++++ app/views/members/_operation_form.html.erb | 30 +++++++ app/views/members/_segment_form.html.erb | 1 + app/views/members/builder.html.erb | 3 + 8 files changed, 158 insertions(+), 12 deletions(-) create mode 100644 app/models/user_segment/operation_builder.rb create mode 100644 app/views/members/_operation_form.html.erb create mode 100644 app/views/members/builder.html.erb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 5f39bfed..14293d44 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -208,8 +208,10 @@ def options @options = self.class.module_options(params[:options]) if request.post? && @options.valid? - Configuration.set_config_model(@options) - flash[:notice] = "Updated Everyone options".t + if params[:commit] + Configuration.set_config_model(@options) + flash[:notice] = "Updated Everyone options".t + end redirect_to :action => 'index' return end @@ -241,9 +243,13 @@ def segments def create_segment cms_page_path ['People', 'Segments'], 'Create a Segment' + @builder = UserSegment::OperationBuilder.new nil + @segment = UserSegment.new :main_page => true if request.post? && params[:segment] + return redirect_to :action => 'index' unless params[:commit] + if @segment.update_attributes params[:segment] @segment.refresh redirect_to :action => 'segments' @@ -256,7 +262,11 @@ def edit_segment cms_page_path ['People', 'Segments'], '%s Segment' / @segment.name + @builder = UserSegment::OperationBuilder.new nil + if request.post? && params[:segment] + return redirect_to :action => 'index', :path => @segment.id unless params[:commit] + if @segment.update_attributes params[:segment] if @segment.should_refresh? @segment.refresh @@ -273,10 +283,14 @@ def copy_segment cms_page_path ['People', 'Segments'], 'Copy %s Segment' / segment_to_copy.name + @builder = UserSegment::OperationBuilder.new nil + @segment = UserSegment.new segment_to_copy.attributes.symbolize_keys.slice(:name, :description, :fields, :main_page, :segment_options_text, :order_by) @segment.name += ' (Copy)' unless request.post? if request.post? && params[:segment] + return redirect_to :action => 'index', :path => segment_to_copy.id unless params[:commit] + if @segment.update_attributes params[:segment] @segment.refresh redirect_to :action => 'segments' @@ -290,6 +304,16 @@ def refresh_segment redirect_to :action => 'segments' end + def builder + cms_page_path ['People'], 'Operation Builder' + + @builder = UserSegment::OperationBuilder.new nil + + if request.post? && params[:builder] + @builder.build(params[:builder]) + end + end + def create cms_page_path ['People'],'Create Contact' diff --git a/app/models/end_user_segment_field.rb b/app/models/end_user_segment_field.rb index b5442962..8efd6e93 100644 --- a/app/models/end_user_segment_field.rb +++ b/app/models/end_user_segment_field.rb @@ -9,12 +9,11 @@ def self.user_segment_fields_handler_info } end - register_field :email, UserSegment::CoreType::StringType - register_field :gender, UserSegment::CoreType::StringType - register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at - register_field :registered, UserSegment::CoreType::BooleanType - register_field :activated, UserSegment::CoreType::BooleanType - register_field :id, UserSegment::CoreType::NumberType - register_field :user_level, UserSegment::CoreType::NumberType + register_field :email, UserSegment::CoreType::StringType, :name => 'User: Email' + register_field :gender, UserSegment::CoreType::StringType, :name => 'User: Gender' + register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'User: Created' + register_field :registered, UserSegment::CoreType::BooleanType, :name => 'User: Registered' + register_field :activated, UserSegment::CoreType::BooleanType, :name => 'User: Activated' + register_field :user_level, UserSegment::CoreType::NumberType, :name => 'User: User Level' end diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index 70b03153..d8aebf93 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -1,7 +1,5 @@ class UserSegment::Field < HashModel - include HandlerActions - attributes :field => nil, :operation => nil, :arguments => [], :child => nil validates_presence_of :field @@ -67,6 +65,10 @@ def operation_argument_options self.operation_info[:argument_options] if self.operation_info end + def operation_argument_names + self.operation_info[:argument_names] if self.operation_info + end + def operation_info @operation_info ||= self.type_class.user_segment_field_type_operations[self.operation.to_sym] if self.type_class end diff --git a/app/models/user_segment/operation.rb b/app/models/user_segment/operation.rb index 720426b8..de6eebf4 100644 --- a/app/models/user_segment/operation.rb +++ b/app/models/user_segment/operation.rb @@ -41,7 +41,7 @@ def to_a def to_expr output = @operator == 'not' ? 'not ' : '' - output = @fields.collect { |fld| fld.to_expr }.join(' + ') + output += @fields.collect { |fld| fld.to_expr }.join(' + ') output end end diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb new file mode 100644 index 00000000..02885376 --- /dev/null +++ b/app/models/user_segment/operation_builder.rb @@ -0,0 +1,87 @@ + +class UserSegment::OperationBuilder < HashModel + attributes :operator => nil, :field => 'created', :operation => 'since', :arguments => [] + + def operator_options + [['Not', 'not'], ['', nil]] + end + + def build(opts={}) + self.operator = opts[:operator] + self.field = opts[:field] + self.operation = opts[:operation] + unless self.operation_options.rassoc(self.operation) + self.operation = self.operation_options[0][1] + @user_segment_field = nil + end + + self.operation_arguments.each_with_index do |type, idx| + arg = "argument#{idx}" + self.send("#{arg}=", opts[arg.to_sym]) if opts[arg.to_sym] + end + end + + def field_options + return @field_options if @field_options + @field_options = [] + UserSegment::FieldHandler.handlers.each do |handler| + handler[:class].user_segment_fields.each do |field, values| + @field_options << [values[:name], field.to_s] unless @field_options.rassoc(field.to_s) + end + end + @field_options.sort! { |a, b| a[0] <=> b[0] } + end + + def user_segment_field + return @user_segment_field if @user_segment_field + @user_segment_field = UserSegment::Field.new :field => self.field, :operation => self.operation, :arguments => self.arguments + @user_segment_field + end + + def operation_options + return @operation_options if @operation_options + @operation_options = [] + + if self.user_segment_field.type_class + @operation_options = self.user_segment_field.type_class.user_segment_field_type_operations.collect do |operation, values| + [values[:name], operation.to_s] + end + end + + @operation_options.sort! { |a, b| a[0] <=> b[0] } + end + + def operation_arguments + self.user_segment_field.operation_arguments || [] + end + + def operation_argument_names + self.user_segment_field.operation_argument_names + end + + def operation_argument_options + self.user_segment_field.operation_argument_options + end + + def convert_to(value, idx) + UserSegment::FieldType.convert_to(value, self.operation_arguments[idx], self.operation_argument_options[idx]) + end + + def method_missing(arg, *args) + arg = arg.to_s + if arg =~ /^argument(\d+)$/ + self.arguments[$1.to_i] + elsif arg =~ /^argument(\d+)=$/ + self.arguments[$1.to_i] = self.convert_to(args[0], $1.to_i) if $1.to_i < self.operation_arguments.length + else + super + end + end + + def to_expr + return '' unless self.user_segment_field.valid? + output = self.operator == 'not' ? 'not ' : '' + output += self.user_segment_field.to_expr + output + end +end diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb new file mode 100644 index 00000000..ed19bd63 --- /dev/null +++ b/app/views/members/_operation_form.html.erb @@ -0,0 +1,30 @@ + +
    +<% admin_form_for :builder, @builder do |f| -%> +<%= f.check_boxes :operator, [['not', 'not']], :single => true, :label => 'I am' %> +<%= f.select :field, @builder.field_options, :label => 'looking for' %> +<%= f.select :operation, @builder.operation_options %> + + <% @builder.operation_arguments.each_with_index do |arg, idx| -%> + <% arg_options = @builder.operation_argument_options[idx] + label = @builder.operation_argument_names[idx] + if arg_options[:options] -%> + <%= f.select "argument#{idx}", arg_options[:options], :label => label %> + <% else -%> + <%= f.text_field "argument#{idx}", :label => label %> + <% end -%> + <% end -%> + +<%= f.submit 'Build' %> +<% end -%> + +
    +Expression:
    + +
    + +
    + + diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb index 49d96b0a..7c757e98 100644 --- a/app/views/members/_segment_form.html.erb +++ b/app/views/members/_segment_form.html.erb @@ -9,3 +9,4 @@ <%= f.spacer %> <%= f.cancel_submit_buttons 'Cancel', (@segment.id ? 'Save' : 'Create') %> <% end -%> + diff --git a/app/views/members/builder.html.erb b/app/views/members/builder.html.erb new file mode 100644 index 00000000..49c6cf10 --- /dev/null +++ b/app/views/members/builder.html.erb @@ -0,0 +1,3 @@ + +<%= render :partial => 'operation_form' %> + From f49f00aa7dd993a7b979f47964812529aaadfd20 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 20 May 2010 17:06:30 +0000 Subject: [PATCH 023/139] Added expr to options form --- app/views/members/_operation_form.html.erb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb index ed19bd63..cccf078c 100644 --- a/app/views/members/_operation_form.html.erb +++ b/app/views/members/_operation_form.html.erb @@ -14,17 +14,11 @@ <%= f.text_field "argument#{idx}", :label => label %> <% end -%> <% end -%> - -<%= f.submit 'Build' %> +<%= f.submit_tag 'Build' %> +<%= f.spacer %> +<%= f.text_area :to_expr, :style => 'width:400px; height: 50px;', :readonly => true, :label => 'Expression' %> <% end -%> -
    -Expression:
    - -
    -
    From c42f6c7b5fdafc2057b27a54af457a152a01fbba Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 20 May 2010 19:42:04 +0000 Subject: [PATCH 024/139] Using ajax to update form elements. --- app/controllers/members_controller.rb | 10 +++ app/views/members/_operation_form.html.erb | 63 +++++++++++++------ .../_operation_form_arguments.html.erb | 17 +++++ .../_operation_form_expression.html.erb | 4 ++ .../_operation_form_operation.html.erb | 11 ++++ 5 files changed, 86 insertions(+), 19 deletions(-) create mode 100644 app/views/members/_operation_form_arguments.html.erb create mode 100644 app/views/members/_operation_form_expression.html.erb create mode 100644 app/views/members/_operation_form_operation.html.erb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 14293d44..c433d3a1 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -311,9 +311,19 @@ def builder if request.post? && params[:builder] @builder.build(params[:builder]) + render :inline => @builder.to_expr end end + def update_builder + @builder = UserSegment::OperationBuilder.new nil + @builder.build(params[:builder]) + return render :partial => 'operation_form_arguments' if params[:arguments] + return render :partial => 'operation_form_operation' if params[:operation] + return render :partial => 'operation_form_expression' if params[:expression] + return :nothing => true + end + def create cms_page_path ['People'],'Create Contact' diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb index cccf078c..c61c8bb6 100644 --- a/app/views/members/_operation_form.html.erb +++ b/app/views/members/_operation_form.html.erb @@ -1,24 +1,49 @@ -
    -<% admin_form_for :builder, @builder do |f| -%> -<%= f.check_boxes :operator, [['not', 'not']], :single => true, :label => 'I am' %> -<%= f.select :field, @builder.field_options, :label => 'looking for' %> -<%= f.select :operation, @builder.operation_options %> - - <% @builder.operation_arguments.each_with_index do |arg, idx| -%> - <% arg_options = @builder.operation_argument_options[idx] - label = @builder.operation_argument_names[idx] - if arg_options[:options] -%> - <%= f.select "argument#{idx}", arg_options[:options], :label => label %> - <% else -%> - <%= f.text_field "argument#{idx}", :label => label %> - <% end -%> - <% end -%> -<%= f.submit_tag 'Build' %> -<%= f.spacer %> -<%= f.text_area :to_expr, :style => 'width:400px; height: 50px;', :readonly => true, :label => 'Expression' %> -<% end -%> + + +
    +User Segment Syntax Helper +<% cms_unstyled_form_for :builder, @builder, :html => {:id => 'builder', :onsubmit => 'OperationBuilder.updateExpression(); return false;'} do |f| -%> +
      +
    • +<%= 'I am'.t %> +<%= f.check_boxes :operator, [['not', 'not']], :single => true %> +
      • +
    • + + <%= f.select :field, @builder.field_options, {}, :onchange => 'OperationBuilder.updateOperations();' %> +
      • +
      +<%= render :partial => 'operation_form_operation' %>
      +
    • +<%= f.submit_tag 'Build' %> +
      • + +
    • +<%= render :partial => 'operation_form_expression' %> +
      • + +<% end -%> + +
    +<%= observe_form 'builder', :frequency => 1, :function => 'OperationBuilder.updateExpression();' %> diff --git a/app/views/members/_operation_form_arguments.html.erb b/app/views/members/_operation_form_arguments.html.erb new file mode 100644 index 00000000..49471334 --- /dev/null +++ b/app/views/members/_operation_form_arguments.html.erb @@ -0,0 +1,17 @@ + +<% cms_unstyled_fields_for :builder, @builder do |f| %> +
      + <% @builder.operation_arguments.each_with_index do |arg, idx| -%> +
    • + + <% arg_options = @builder.operation_argument_options[idx] + label = @builder.operation_argument_names[idx] + if arg_options[:options] -%> + <%= f.select "argument#{idx}", arg_options[:options], :label => label %> + <% else -%> + <%= f.text_field "argument#{idx}", :label => label %> + <% end -%> +
      • + <% end -%> +
    +<% end %> diff --git a/app/views/members/_operation_form_expression.html.erb b/app/views/members/_operation_form_expression.html.erb new file mode 100644 index 00000000..301293fb --- /dev/null +++ b/app/views/members/_operation_form_expression.html.erb @@ -0,0 +1,4 @@ + +<% cms_unstyled_fields_for :builder, @builder do |f| -%> +<%= f.text_area_tag :expr, @builder.to_expr, :style => 'width:400px; height: 50px;', :readonly => true %> +<% end -%> diff --git a/app/views/members/_operation_form_operation.html.erb b/app/views/members/_operation_form_operation.html.erb new file mode 100644 index 00000000..3e091048 --- /dev/null +++ b/app/views/members/_operation_form_operation.html.erb @@ -0,0 +1,11 @@ + +<% cms_unstyled_fields_for :builder, @builder do |f| %> +
  • +<%= f.select :operation, @builder.operation_options, {}, :onchange => 'OperationBuilder.updateArguments();' %> +
    • + +
  • +<%= render :partial => 'operation_form_arguments' %> +
    • + +<% end %> From eef623978bf886fb5a74414efc01d1dd80c6d0c5 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 20 May 2010 20:59:34 +0000 Subject: [PATCH 025/139] Fix fields in user segment. Display the arguments name. --- app/controllers/members_controller.rb | 3 ++- app/models/user_segment.rb | 9 +++---- app/models/user_segment/operation_builder.rb | 2 +- app/views/members/_operation_form.html.erb | 25 ++++++++++--------- .../_operation_form_arguments.html.erb | 17 +++++++------ .../_operation_form_operation.html.erb | 4 +-- 6 files changed, 31 insertions(+), 29 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index c433d3a1..77317760 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -311,8 +311,9 @@ def builder if request.post? && params[:builder] @builder.build(params[:builder]) - render :inline => @builder.to_expr end + + render :action => 'builder', :layout => 'manage_window' end def update_builder diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index bd88ffe0..04885cdb 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -8,13 +8,12 @@ class UserSegment < DomainModel validates_presence_of :name validates_presence_of :segment_options - def initialize(opts={}) - super - self.fields = [] unless self.fields - end - def ready?; self.status == 'finished'; end + def fields + self.read_attribute(:fields) || [] + end + def validate self.errors.add(:segment_options_text, 'is invalid') if self.segment_options_text && self.segment_options.nil? end diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb index 02885376..03a62d60 100644 --- a/app/models/user_segment/operation_builder.rb +++ b/app/models/user_segment/operation_builder.rb @@ -1,6 +1,6 @@ class UserSegment::OperationBuilder < HashModel - attributes :operator => nil, :field => 'created', :operation => 'since', :arguments => [] + attributes :operator => nil, :field => 'created', :operation => 'since', :arguments => [], :child => nil def operator_options [['Not', 'not'], ['', nil]] diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb index c61c8bb6..633eddb0 100644 --- a/app/views/members/_operation_form.html.erb +++ b/app/views/members/_operation_form.html.erb @@ -17,31 +17,32 @@ OperationBuilder = { } -
    +
    User Segment Syntax Helper <% cms_unstyled_form_for :builder, @builder, :html => {:id => 'builder', :onsubmit => 'OperationBuilder.updateExpression(); return false;'} do |f| -%> -
      -
    • -<%= 'I am'.t %> -<%= f.check_boxes :operator, [['not', 'not']], :single => true %> +
        +
      • +<%= 'I am'.t %> +(<%= f.check_boxes :operator, [['not', 'not']], :single => true, :separator => '' %>)
        • -
      • - + +
      • +<%= 'looking for'.t %> <%= f.select :field, @builder.field_options, {}, :onchange => 'OperationBuilder.updateOperations();' %>
        • -
        +
        <%= render :partial => 'operation_form_operation' %>
        -
      • -<%= f.submit_tag 'Build' %> -
        • -
      • <%= render :partial => 'operation_form_expression' %>
        • +
      • +<%= f.submit_tag 'Build' %> +
        • + <% end -%>
    diff --git a/app/views/members/_operation_form_arguments.html.erb b/app/views/members/_operation_form_arguments.html.erb index 49471334..154c8f4d 100644 --- a/app/views/members/_operation_form_arguments.html.erb +++ b/app/views/members/_operation_form_arguments.html.erb @@ -1,17 +1,18 @@ <% cms_unstyled_fields_for :builder, @builder do |f| %> -
      + <% @builder.operation_arguments.each_with_index do |arg, idx| -%> -
    • - +
      • + + + <% end -%> - +
      <%= @builder.operation_argument_names[idx] %> <% arg_options = @builder.operation_argument_options[idx] - label = @builder.operation_argument_names[idx] if arg_options[:options] -%> - <%= f.select "argument#{idx}", arg_options[:options], :label => label %> + <%= f.select "argument#{idx}", arg_options[:options] %> <% else -%> - <%= f.text_field "argument#{idx}", :label => label %> + <%= f.text_field "argument#{idx}" %> <% end -%> - +
      <% end %> diff --git a/app/views/members/_operation_form_operation.html.erb b/app/views/members/_operation_form_operation.html.erb index 3e091048..c0035f92 100644 --- a/app/views/members/_operation_form_operation.html.erb +++ b/app/views/members/_operation_form_operation.html.erb @@ -1,7 +1,7 @@ <% cms_unstyled_fields_for :builder, @builder do |f| %> -
    • -<%= f.select :operation, @builder.operation_options, {}, :onchange => 'OperationBuilder.updateArguments();' %> +
    • +<%= f.select :operation, @builder.operation_options, {}, :onchange => 'OperationBuilder.updateArguments();', :style => 'width:250px;' %>
    • From aee3dec307d8abc745e8c98da81ab274526f8944 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 20 May 2010 22:01:21 +0000 Subject: [PATCH 026/139] Display the builder in a popup window. --- app/views/members/_segment_form.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb index 7c757e98..6dbe64b8 100644 --- a/app/views/members/_segment_form.html.erb +++ b/app/views/members/_segment_form.html.erb @@ -1,10 +1,12 @@ - <% admin_form_for :segment, @segment do |f| -%> <%= f.text_field :name %> <%= f.text_area :description, :rows => 3 %> <%= f.select :order_by, UserSegment.order_by_options %> <%= f.check_boxes :main_page, [['display on people page', true]], :single => true %> <%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> +<% f.custom_field '' do %> +Builder +<% end %> <%= f.text_area :segment_options_text, :rows => 8, :label => 'Operations' %> <%= f.spacer %> <%= f.cancel_submit_buttons 'Cancel', (@segment.id ? 'Save' : 'Create') %> From c3112f809e3917f86b326892f8513e591c505db6 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 21 May 2010 15:51:33 +0000 Subject: [PATCH 027/139] Can append operation to user segment options text. --- app/controllers/members_controller.rb | 13 +++++----- app/models/end_user_segment_field.rb | 12 +++++----- app/models/user_segment/core_type.rb | 6 ++--- app/models/user_segment/operation_builder.rb | 2 +- app/views/members/_operation_form.html.erb | 24 ++++++++++++------- .../_operation_form_arguments.html.erb | 8 +++++-- .../_operation_form_expression.html.erb | 1 + .../_operation_form_operation.html.erb | 12 +++++++--- app/views/members/_segment_form.html.erb | 13 +++++++++- app/views/members/update_builder.rjs | 2 ++ 10 files changed, 63 insertions(+), 30 deletions(-) create mode 100644 app/views/members/update_builder.rjs diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 77317760..2dffcaaf 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -8,7 +8,7 @@ class MembersController < CmsController # :nodoc: all cms_admin_paths "people", "People" => { :controller => '/members' }, - "Segments" => { :action => 'segments' } + "List" => { :action => 'segments' } # need to include @@ -236,12 +236,12 @@ def validate end def segments - cms_page_path ['People'], 'Segments' + cms_page_path ['People'], 'List' user_segments_table(false) end def create_segment - cms_page_path ['People', 'Segments'], 'Create a Segment' + cms_page_path ['People', 'List'], 'Create a List' @builder = UserSegment::OperationBuilder.new nil @@ -260,7 +260,7 @@ def create_segment def edit_segment @segment = UserSegment.find params[:path][0] - cms_page_path ['People', 'Segments'], '%s Segment' / @segment.name + cms_page_path ['People', 'List'], '%s List' / @segment.name @builder = UserSegment::OperationBuilder.new nil @@ -281,7 +281,7 @@ def edit_segment def copy_segment segment_to_copy = UserSegment.find params[:path][0] - cms_page_path ['People', 'Segments'], 'Copy %s Segment' / segment_to_copy.name + cms_page_path ['People', 'List'], 'Copy %s List' / segment_to_copy.name @builder = UserSegment::OperationBuilder.new nil @@ -308,6 +308,7 @@ def builder cms_page_path ['People'], 'Operation Builder' @builder = UserSegment::OperationBuilder.new nil + @builder.build(:field => 'created', :operation => 'since', :argument0 => 2, :argument1 => 'days') if request.post? && params[:builder] @builder.build(params[:builder]) @@ -322,7 +323,7 @@ def update_builder return render :partial => 'operation_form_arguments' if params[:arguments] return render :partial => 'operation_form_operation' if params[:operation] return render :partial => 'operation_form_expression' if params[:expression] - return :nothing => true + return render :nothing => true unless params[:commit] end def create diff --git a/app/models/end_user_segment_field.rb b/app/models/end_user_segment_field.rb index 8efd6e93..841f92d9 100644 --- a/app/models/end_user_segment_field.rb +++ b/app/models/end_user_segment_field.rb @@ -9,11 +9,11 @@ def self.user_segment_fields_handler_info } end - register_field :email, UserSegment::CoreType::StringType, :name => 'User: Email' - register_field :gender, UserSegment::CoreType::StringType, :name => 'User: Gender' - register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'User: Created' - register_field :registered, UserSegment::CoreType::BooleanType, :name => 'User: Registered' - register_field :activated, UserSegment::CoreType::BooleanType, :name => 'User: Activated' - register_field :user_level, UserSegment::CoreType::NumberType, :name => 'User: User Level' + register_field :email, UserSegment::CoreType::StringType, :name => 'Users: Email' + register_field :gender, UserSegment::CoreType::StringType, :name => 'Users: Gender' + register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'Users: Created' + register_field :registered, UserSegment::CoreType::BooleanType, :name => 'Users: Registered' + register_field :activated, UserSegment::CoreType::BooleanType, :name => 'Users: Activated' + register_field :user_level, UserSegment::CoreType::NumberType, :name => 'Users: User Level' end diff --git a/app/models/user_segment/core_type.rb b/app/models/user_segment/core_type.rb index 28b83e60..0f50c01d 100644 --- a/app/models/user_segment/core_type.rb +++ b/app/models/user_segment/core_type.rb @@ -8,14 +8,14 @@ def self.datetime_format_options class DateTimeType < UserSegment::FieldType - register_operation :before, [['Value', :integer], ['Format', :option, {:options => UserSegment::CoreType.datetime_format_options}]] + register_operation :before, [['Value', :integer], ['Format', :option, {:options => UserSegment::CoreType.datetime_format_options, :description => 'ago'}]] def self.before(cls, field, value, format) time = value.send(format).ago cls.scoped(:conditions => ["#{field} <= ?", time]) end - register_operation :since, [['Value', :integer], ['Format', :option, {:options => UserSegment::CoreType.datetime_format_options}]] + register_operation :since, [['Value', :integer], ['Format', :option, {:options => UserSegment::CoreType.datetime_format_options, :description => 'ago'}]] def self.since(cls, field, value, format) time = value.send(format).ago @@ -83,7 +83,7 @@ def self.is(cls, field, string) end class BooleanType < UserSegment::FieldType - register_operation :is, [['Boolean', :boolean]] + register_operation :is, [['', :boolean]] def self.is(cls, field, string) cls.scoped(:conditions => ["#{field} = ?", string]) diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb index 03a62d60..08e67641 100644 --- a/app/models/user_segment/operation_builder.rb +++ b/app/models/user_segment/operation_builder.rb @@ -1,6 +1,6 @@ class UserSegment::OperationBuilder < HashModel - attributes :operator => nil, :field => 'created', :operation => 'since', :arguments => [], :child => nil + attributes :operator => nil, :field => nil, :operation => nil, :arguments => [], :child => nil def operator_options [['Not', 'not'], ['', nil]] diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb index 633eddb0..1e45d9ad 100644 --- a/app/views/members/_operation_form.html.erb +++ b/app/views/members/_operation_form.html.erb @@ -13,14 +13,22 @@ OperationBuilder = { updateExpression: function() { <%= remote_function :url => url_for(:action => 'update_builder', :expression => 1), :submit => 'builder', :update => 'expression' %>; + }, + + appendExpression: function() { + <%= remote_function :url => url_for(:action => 'update_builder', :commit => 1), :submit => 'builder' %>; + }, + + appendOptionsText: function(expr) { + with(window.opener) { setTimeout(function(){UserSegment.appendOptionsText(expr);}, 1); } } } -
      -User Segment Syntax Helper -<% cms_unstyled_form_for :builder, @builder, :html => {:id => 'builder', :onsubmit => 'OperationBuilder.updateExpression(); return false;'} do |f| -%> -
        +
        +User List Syntax Builder +<% cms_unstyled_form_for :builder, @builder, :html => {:id => 'builder', :onsubmit => 'OperationBuilder.appendExpression(); return false;', :class => "admin_form"} do |f| -%> +
        • <%= 'I am'.t %> (<%= f.check_boxes :operator, [['not', 'not']], :single => true, :separator => '' %>) @@ -28,10 +36,10 @@ OperationBuilder = {
        • <%= 'looking for'.t %> - <%= f.select :field, @builder.field_options, {}, :onchange => 'OperationBuilder.updateOperations();' %> + <%= f.select :field, @builder.field_options, {}, :onchange => 'OperationBuilder.updateOperations();', :style => 'width:200px;' %>
          • -
          +
          <%= render :partial => 'operation_form_operation' %>
          @@ -39,8 +47,8 @@ OperationBuilder = { <%= render :partial => 'operation_form_expression' %> -
        • -<%= f.submit_tag 'Build' %> +
        • +<%= f.cancel_submit_buttons 'Close', 'Add to Operations', {:onclick => 'window.close();'} %>
          • <% end -%> diff --git a/app/views/members/_operation_form_arguments.html.erb b/app/views/members/_operation_form_arguments.html.erb index 154c8f4d..b4146cbf 100644 --- a/app/views/members/_operation_form_arguments.html.erb +++ b/app/views/members/_operation_form_arguments.html.erb @@ -3,16 +3,20 @@ <% @builder.operation_arguments.each_with_index do |arg, idx| -%> - - + + <%= "" if description %> <% end -%>
          <%= @builder.operation_argument_names[idx] %> + <%= @builder.operation_argument_names[idx] %> <% arg_options = @builder.operation_argument_options[idx] + description = arg_options[:description] if arg_options[:options] -%> <%= f.select "argument#{idx}", arg_options[:options] %> + <% elsif @builder.operation_arguments[idx] == :boolean -%> + <%= f.yes_no "argument#{idx}" %> <% else -%> <%= f.text_field "argument#{idx}" %> <% end -%>
           #{description}
          <% end %> diff --git a/app/views/members/_operation_form_expression.html.erb b/app/views/members/_operation_form_expression.html.erb index 301293fb..76d09eca 100644 --- a/app/views/members/_operation_form_expression.html.erb +++ b/app/views/members/_operation_form_expression.html.erb @@ -1,4 +1,5 @@ <% cms_unstyled_fields_for :builder, @builder do |f| -%> +
          Snippet
          <%= f.text_area_tag :expr, @builder.to_expr, :style => 'width:400px; height: 50px;', :readonly => true %> <% end -%> diff --git a/app/views/members/_operation_form_operation.html.erb b/app/views/members/_operation_form_operation.html.erb index c0035f92..e2df7520 100644 --- a/app/views/members/_operation_form_operation.html.erb +++ b/app/views/members/_operation_form_operation.html.erb @@ -1,8 +1,14 @@ <% cms_unstyled_fields_for :builder, @builder do |f| %> -
        • -<%= f.select :operation, @builder.operation_options, {}, :onchange => 'OperationBuilder.updateArguments();', :style => 'width:250px;' %> -
          • + +<% if @builder.operation_options.length == 1 -%> + <%= f.hidden_field :operation %> +<% else -%> +
        • + <%= f.select :operation, @builder.operation_options, {}, :onchange => 'OperationBuilder.updateArguments();', :style => 'width:140px;' %> + function +
          • +<% end -%>
        • <%= render :partial => 'operation_form_arguments' %> diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb index 6dbe64b8..8d6aa47c 100644 --- a/app/views/members/_segment_form.html.erb +++ b/app/views/members/_segment_form.html.erb @@ -1,3 +1,14 @@ + + <% admin_form_for :segment, @segment do |f| -%> <%= f.text_field :name %> <%= f.text_area :description, :rows => 3 %> @@ -5,7 +16,7 @@ <%= f.check_boxes :main_page, [['display on people page', true]], :single => true %> <%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> <% f.custom_field '' do %> -Builder +Builder <% end %> <%= f.text_area :segment_options_text, :rows => 8, :label => 'Operations' %> <%= f.spacer %> diff --git a/app/views/members/update_builder.rjs b/app/views/members/update_builder.rjs new file mode 100644 index 00000000..5c67fb14 --- /dev/null +++ b/app/views/members/update_builder.rjs @@ -0,0 +1,2 @@ + +page.call 'OperationBuilder.appendOptionsText', @builder.to_expr From ff70675ab8fcc0b042f06b66221e2aa548f9a534 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 21 May 2010 20:01:13 +0000 Subject: [PATCH 028/139] Can build expressions with conditions and or or --- app/controllers/members_controller.rb | 3 +- app/models/user_segment/field.rb | 12 +++--- app/models/user_segment/operation_builder.rb | 39 ++++++++++++++++--- app/views/members/_operation_form.html.erb | 7 +--- .../_operation_form_arguments.html.erb | 10 ++--- .../members/_operation_form_child.html.erb | 11 ++++++ .../_operation_form_operation.html.erb | 20 +++++++--- 7 files changed, 72 insertions(+), 30 deletions(-) create mode 100644 app/views/members/_operation_form_child.html.erb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 2dffcaaf..6269f8bb 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -320,8 +320,7 @@ def builder def update_builder @builder = UserSegment::OperationBuilder.new nil @builder.build(params[:builder]) - return render :partial => 'operation_form_arguments' if params[:arguments] - return render :partial => 'operation_form_operation' if params[:operation] + return render :partial => 'operation_form_operation', :locals => {:builder => @builder, :form_id => 'builder'} if params[:operation] return render :partial => 'operation_form_expression' if params[:expression] return render :nothing => true unless params[:commit] end diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index d8aebf93..493a3895 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -13,7 +13,7 @@ def validate end unless self.operation.blank? - self.errors.add(:operation, 'invalid operation') unless self.type_class && self.type_class.has_operation?(self.operation) + self.errors.add(:operation, 'invalid operation') if ! self.type_class || ! self.type_class.has_operation?(self.operation) if self.operation_info self.errors.add(:arguments, 'are missing') if self.arguments.empty? && ! self.operation_arguments.empty? @@ -25,7 +25,7 @@ def validate end end - self.errors.add(:child, 'is invalid') if self.child_field && ! self.child_field.valid? + self.errors.add(:child, 'is invalid') if self.child && self.child_field && ! self.child_field.valid? end def count @@ -74,7 +74,7 @@ def operation_info end def type_class - @type_class ||= self.handler_class.user_segment_fields[self.field.to_sym][:type] if self.handler_class + @type_class ||= self.handler_class.user_segment_fields[self.field.to_sym][:type] if self.handler_class && self.handler_class.user_segment_fields && self.handler_class.user_segment_fields[self.field.to_sym] end def model_field @@ -82,7 +82,7 @@ def model_field end def handler - @handler ||= UserSegment::FieldHandler.handlers.find { |info| info[:class].has_field?(self.field) } + @handler ||= UserSegment::FieldHandler.handlers.find { |info| info[:class].has_field?(self.field) } unless self.field.blank? end def handler=(handler) @@ -110,9 +110,9 @@ def child_field @child_field end - def to_expr + def to_expr(opts={}) output = "#{field}.#{operation}(" + self.arguments.collect { |arg| arg.is_a?(String) || arg.is_a?(Time) ? "\"#{arg}\"" : arg.to_s }.join(', ') + ")" - output += self.child.to_s if self.child + output += '.' + self.child_field.to_expr if self.child && self.child_field && opts[:nochild].nil? output end end diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb index 08e67641..6a3eed12 100644 --- a/app/models/user_segment/operation_builder.rb +++ b/app/models/user_segment/operation_builder.rb @@ -1,24 +1,44 @@ class UserSegment::OperationBuilder < HashModel - attributes :operator => nil, :field => nil, :operation => nil, :arguments => [], :child => nil + attributes :operator => nil, :field => nil, :operation => nil, :arguments => nil, :condition => nil + + def strict?; true; end + def arguments; @arguments ||= []; end def operator_options [['Not', 'not'], ['', nil]] end + def condition_options + [['', nil], ['And', 'and'], ['Or', 'or']] + end + + def validate + self.errors.add(:field, 'is invalid') unless self.user_segment_field.valid? + self.errors.add(:condition, 'is invalid') if ! self.condition.blank? && ! self.child_field.valid? + end + def build(opts={}) self.operator = opts[:operator] self.field = opts[:field] self.operation = opts[:operation] - unless self.operation_options.rassoc(self.operation) - self.operation = self.operation_options[0][1] - @user_segment_field = nil + self.condition = opts[:condition] + unless self.field.blank? + unless self.operation_options.rassoc(self.operation) + self.operation = self.operation_options[0][1] + @user_segment_field = nil + end end self.operation_arguments.each_with_index do |type, idx| arg = "argument#{idx}" self.send("#{arg}=", opts[arg.to_sym]) if opts[arg.to_sym] end + + if opts[:child] + self.child_field.build(opts[:child]) + self.user_segment_field.child = self.child_field.user_segment_field.to_h if self.condition == 'and' + end end def field_options @@ -30,6 +50,7 @@ def field_options end end @field_options.sort! { |a, b| a[0] <=> b[0] } + @field_options end def user_segment_field @@ -79,9 +100,15 @@ def method_missing(arg, *args) end def to_expr - return '' unless self.user_segment_field.valid? + return '' unless self.valid? output = self.operator == 'not' ? 'not ' : '' - output += self.user_segment_field.to_expr + output += self.user_segment_field.to_expr(:nochild => 1) + output += '.' + self.child_field.to_expr if self.condition == 'and' + output += ' + ' + self.child_field.to_expr if self.condition == 'or' output end + + def child_field + @child_field ||= UserSegment::OperationBuilder.new nil + end end diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb index 1e45d9ad..c1818ac7 100644 --- a/app/views/members/_operation_form.html.erb +++ b/app/views/members/_operation_form.html.erb @@ -6,11 +6,6 @@ OperationBuilder = { OperationBuilder.updateExpression(); }, - updateArguments: function() { - <%= remote_function :url => url_for(:action => 'update_builder', :arguments => 1), :submit => 'builder', :update => 'arguments' %>; - OperationBuilder.updateExpression(); - }, - updateExpression: function() { <%= remote_function :url => url_for(:action => 'update_builder', :expression => 1), :submit => 'builder', :update => 'expression' %>; }, @@ -40,7 +35,7 @@ OperationBuilder = {
          • -<%= render :partial => 'operation_form_operation' %> +<%= render :partial => 'operation_form_operation', :locals => {:builder => @builder, :form_id => 'builder'} %>
        • diff --git a/app/views/members/_operation_form_arguments.html.erb b/app/views/members/_operation_form_arguments.html.erb index b4146cbf..9f7d1e8e 100644 --- a/app/views/members/_operation_form_arguments.html.erb +++ b/app/views/members/_operation_form_arguments.html.erb @@ -1,15 +1,15 @@ -<% cms_unstyled_fields_for :builder, @builder do |f| %> +<% cms_unstyled_fields_for form_id, builder do |f| %> - <% @builder.operation_arguments.each_with_index do |arg, idx| -%> + <% builder.operation_arguments.each_with_index do |arg, idx| -%> - + + - - - + + - - - - - - <% end -%> diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index 96999d39..9b582418 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -106,22 +106,14 @@
          -
          -<% ajax_tabs [ 'Tags','Segmentations'], 'Tags' do |t| %> - <% t.tab do -%> -
          - <%= render :partial => 'tags' %> -
          - <% end -%> - <% t.tab do -%> -
          - <%= render :partial => 'segmentations' %> -
          - <% end -%> -<% end -%> +
          +<%= form_tag %> +<%= text_field_tag :terms, @search.terms %> +<%= submit_tag 'Search' %> + +
          -
          @@ -102,18 +105,34 @@ <%= p.link "Download Visible Targets",:icon => 'download.gif', :controller => :member_export %> <%= p.link "Tag List", :icon => 'show.gif', :action => 'tags' %> <%= p.link "Access Tokens", :icon => 'access.gif', :controller => '/access_token' if myself.has_role?('editor_access_tokens') %> + <%= p.link "Segments", :icon => 'access.gif', :action => 'segments' %> <% end -%>
          -
          +
          <%= form_tag %> -<%= text_field_tag :terms, @search.terms %> -<%= submit_tag 'Search' %> +<% if @segment && @segment.last_ran_at -%> + Edit | Refresh +<% end -%> +<%= select_tag :user_segment_id, options_for_select([['Everyone', nil]] + @segmentations.collect { |seg| [seg.name, seg.id] }, (@segment ? @segment.id : nil)), :onchange => 'MemberEditor.changeSegments();', :id => 'user_segments_user_segment_id', :style => 'width:200px;' %> +
          +<% if @segment && @segment.last_ran_at -%> +<%= 'updated on %s' / @segment.last_ran_at.strftime(DEFAULT_DATETIME_FORMAT.t) %> +
          +<% end -%> +Create a Segment +
          +
          +<%= form_tag %> +<%= text_field_tag :terms, @search.terms, :id => 'members_search_terms' %> +<%= submit_tag 'Search'.t %> +
          -
          + +
          diff --git a/app/views/members/segments.html.erb b/app/views/members/segments.html.erb new file mode 100644 index 00000000..7add174d --- /dev/null +++ b/app/views/members/segments.html.erb @@ -0,0 +1,9 @@ + + +
          + +
          + <%= render :partial => 'user_segments_table' %> +
          From b452ae060a1d600bd56df9d7ad773af48b35dbbc Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 18 May 2010 21:24:47 +0000 Subject: [PATCH 044/139] Added status to user segment to keep track of where in the process of calculating end user ids it is. Added edit segment and refresh segement to members controller. --- app/controllers/members_controller.rb | 35 +++++++++++++++---- app/models/user_segment.rb | 33 +++++++++++++++-- .../members/_user_segments_table.html.erb | 17 +++++++-- app/views/members/edit_segment.html.erb | 9 +++++ app/views/members/index.rhtml | 2 +- db/migrate/20100511165552_user_segments.rb | 2 +- 6 files changed, 86 insertions(+), 12 deletions(-) create mode 100644 app/views/members/edit_segment.html.erb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index f0c6c5de..6c26d8c5 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -7,7 +7,8 @@ class MembersController < CmsController # :nodoc: all layout 'manage' cms_admin_paths "people", - "People" => { :controller => '/members' } + "People" => { :controller => '/members' }, + "Segments" => { :action => 'segments' } # need to include @@ -29,7 +30,7 @@ class MembersController < CmsController # :nodoc: all def segmentations return @segmentations if @segmentations - @segmentations = UserSegment.find(:all, :conditions => {:main_page => true}, :order => 'name') + @segmentations = UserSegment.find(:all, :conditions => {:main_page => true, :status => 'finished'}, :order => 'name') @segmentations << self.segment if self.segment && ! @segmentations.find { |seg| seg.id == self.segment.id } @segmentations end @@ -167,16 +168,19 @@ def index active_table :user_segments_table, UserSegment, [ hdr(:icon, 'check', :width => '16'), + hdr(:icon, '', :width => '32'), :main_page, :name, :description, + :status, :last_count, :last_ran_at, - :created_at + :created_at, + :updated_at ] def user_segments_table(display=true) - @active_table_output = user_segments_table_generate params, :order => 'created_at DESC' + @active_table_output = user_segments_table_generate params, :order => 'updated_at DESC' render :partial => 'user_segments_table' if display end @@ -186,19 +190,38 @@ def segments end def create_segment - cms_page_path ['People'], 'Create a Segment' + cms_page_path ['People', 'Segments'], 'Create a Segment' @segment = UserSegment.new params[:segment] if request.post? && params[:segment] @segment.save if @segment.id - @segment.cache_ids + @segment.refresh redirect_to :action => 'segments' end end end + def edit_segment + @segment = UserSegment.find params[:path][0] + + cms_page_path ['People', 'Segments'], '%s Segment' / @segment.name + + if request.post? && params[:segment] + if @segment.update_attributes params[:segment] + @segment.refresh + redirect_to :action => 'segments' + end + end + end + + def refresh_segment + @segment = UserSegment.find params[:path][0] + @segment.refresh + redirect_to :action => 'segments' + end + def create cms_page_path ['People'],'Create Contact' diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index f95afec0..8414b3d9 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -1,11 +1,18 @@ class UserSegment < DomainModel - has_many :user_segment_caches, :order => 'position', :dependent => :destroy, :class_name => 'UserSegmentCache' + has_many :user_segment_caches, :order => 'position', :dependent => :delete_all, :class_name => 'UserSegmentCache' serialize :segment_options serialize :fields validates_presence_of :name + validates_presence_of :segment_options + + def ready?; self.status == 'finished'; end + + def validate + self.errors.add(:segment_options_text, 'is invalid') if self.segment_options_text && self.segment_options.nil? + end def operations return @operations if @operations @@ -15,6 +22,7 @@ def operations end def segment_options_text=(text) + text = text.gsub("\r", '').strip self.write_attribute :segment_options_text, text @operations = UserSegment::Operations.new @operations.parse text @@ -22,7 +30,23 @@ def segment_options_text=(text) text end - def cache_ids + def refresh + if self.status == 'new' || self.ready? + self.status = 'refreshing' + self.save + + if EndUser.count < 50000 + self.cache_ids + else + self.run_worker(:cache_ids) + end + end + end + + def cache_ids(opts={}) + self.status = 'calculating' + self.save + self.user_segment_caches.delete_all self.order_by = 'created_at DESC' unless self.order_by @@ -36,6 +60,7 @@ def cache_ids self.user_segment_caches.create :id_list => ids[start..start+UserSegmentCache::SIZE-1], :position => idx end + self.status = 'finished' self.last_ran_at = Time.now self.last_count = ids.length self.save @@ -137,5 +162,9 @@ def search(args={}) users = EndUser.find(:all, args.merge(:conditions => {:id => ids})) return [offset, users] end + + def before_create + self.status = 'new' + end end diff --git a/app/views/members/_user_segments_table.html.erb b/app/views/members/_user_segments_table.html.erb index 599be6cd..faeca2c7 100644 --- a/app/views/members/_user_segments_table.html.erb +++ b/app/views/members/_user_segments_table.html.erb @@ -5,11 +5,24 @@ :update => 'user_segments_table' do |t| %>
          > + - + + - + + <% end -%> diff --git a/app/views/members/edit_segment.html.erb b/app/views/members/edit_segment.html.erb new file mode 100644 index 00000000..9b317c67 --- /dev/null +++ b/app/views/members/edit_segment.html.erb @@ -0,0 +1,9 @@ + +<% admin_form_for :segment, @segment do |f| -%> +<%= f.text_field :name %> +<%= f.text_area :description, :rows => 3 %> +<%= f.check_boxes :main_page, [['display on people page', true]], :single => true %> +<%= f.text_area :segment_options_text, :rows => 8, :label => 'Operations' %> +<%= f.spacer %> +<%= f.cancel_submit_buttons 'Cancel', 'Save' %> +<% end -%> diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index de54a274..cafc1b9b 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -113,7 +113,7 @@
          <%= form_tag %> <% if @segment && @segment.last_ran_at -%> - Edit | Refresh + Edit | Refresh <% end -%> <%= select_tag :user_segment_id, options_for_select([['Everyone', nil]] + @segmentations.collect { |seg| [seg.name, seg.id] }, (@segment ? @segment.id : nil)), :onchange => 'MemberEditor.changeSegments();', :id => 'user_segments_user_segment_id', :style => 'width:200px;' %>
          diff --git a/db/migrate/20100511165552_user_segments.rb b/db/migrate/20100511165552_user_segments.rb index 3174b94b..7cbe448f 100644 --- a/db/migrate/20100511165552_user_segments.rb +++ b/db/migrate/20100511165552_user_segments.rb @@ -3,7 +3,7 @@ def self.up create_table :user_segments, :force => true do |t| t.string :name t.text :description - t.string :type + t.string :status t.boolean :main_page t.datetime :last_ran_at t.integer :last_count From b227b2d4f9c9fe68b1995d7fe362133d7e1996ef Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 18 May 2010 21:35:08 +0000 Subject: [PATCH 045/139] Added a create segment link on segments page. --- app/controllers/members_controller.rb | 5 ++--- app/views/members/segments.html.erb | 8 ++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 6c26d8c5..9a4e2a64 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -192,11 +192,10 @@ def segments def create_segment cms_page_path ['People', 'Segments'], 'Create a Segment' - @segment = UserSegment.new params[:segment] + @segment = UserSegment.new :main_page => true if request.post? && params[:segment] - @segment.save - if @segment.id + if @segment.update_attributes params[:segment] @segment.refresh redirect_to :action => 'segments' end diff --git a/app/views/members/segments.html.erb b/app/views/members/segments.html.erb index 7add174d..1860c61d 100644 --- a/app/views/members/segments.html.erb +++ b/app/views/members/segments.html.erb @@ -1,9 +1,13 @@ +<% action_panel :handler => 'members' do |p| -%> + <%= p.link "Create a Segment",:icon => 'add.gif', :action => 'create_segment' %> +<% end -%> + +
          + -
          -
          <%= render :partial => 'user_segments_table' %>
          From 859b4f17f006634e552d5122f64cb4d88ea28173 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 19 May 2010 14:48:50 +0000 Subject: [PATCH 046/139] Can add and remove segments from the main page. --- app/controllers/members_controller.rb | 15 ++++++++++----- app/views/members/_user_segments_table.html.erb | 12 ++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 9a4e2a64..8bf4eaea 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -155,11 +155,6 @@ def display_targets_table(display = true) def index cms_page_path [], "People" - #unless params[:refresh] - #session[:et] = nil - #session[:et_segment] = nil - #end - segmentations display_targets_table(false) @@ -180,6 +175,16 @@ def index ] def user_segments_table(display=true) + active_table_action 'user_segments' do |act,ids| + case act + when 'delete': UserSegment.destroy(ids) + when 'add' + UserSegment.update_all('main_page = 1', :id => ids) + when 'remove' + UserSegment.update_all('main_page = 0', :id => ids) + end + end + @active_table_output = user_segments_table_generate params, :order => 'updated_at DESC' render :partial => 'user_segments_table' if display end diff --git a/app/views/members/_user_segments_table.html.erb b/app/views/members/_user_segments_table.html.erb index faeca2c7..cab71e2f 100644 --- a/app/views/members/_user_segments_table.html.erb +++ b/app/views/members/_user_segments_table.html.erb @@ -1,10 +1,10 @@ <% active_table_for :user_segments_table, @active_table_output, - :class => 'active_table', - :width => '100%', - :more_actions => [ ['Delete Segments','delete','Delete the selected segments?'] ], - :update => 'user_segments_table' do |t| %> -
          > - + :refresh_url => url_for(:action => 'user_segments_table'), + :style => 'width:100%', + :actions => [['Add to Main Page', 'add'], ['Remove from Main Page', 'remove']], + :more_actions => [['Delete Segments','delete','Delete the selected segments?']] do |t| %> + > + > + + <% if @segment && @segment.fields -%> + <% @segment.fields.each do |field| -%> + <%= + value = t.send(field) + if value.is_a?(DomainModel) + "" + elsif value.is_a?(Time) + "" + elsif value.nil? + "" + else + "" + end + %> + <% end -%> + <% end -%> <% end -%> diff --git a/app/views/members/copy_segment.html.erb b/app/views/members/copy_segment.html.erb new file mode 100644 index 00000000..a5919db3 --- /dev/null +++ b/app/views/members/copy_segment.html.erb @@ -0,0 +1 @@ +<%= render :partial => 'segment_form' %> From f18dc08aebfda31d4c758c5dff9ff9a57d61514f Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 19 May 2010 18:42:18 +0000 Subject: [PATCH 049/139] Added module level options for fields to display and ordering of the everyone view. --- app/controllers/members_controller.rb | 54 ++++++++++++++++++++++---- app/models/user_segment.rb | 6 +++ app/views/members/_targets_table.rhtml | 4 +- app/views/members/index.rhtml | 2 + app/views/members/options.html.erb | 7 ++++ 5 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 app/views/members/options.html.erb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 8a295345..5f39bfed 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -104,11 +104,16 @@ def email_targets_table_generate(opts,*find_options) ActiveTable::StaticHeader.new('Email') ] + @fields = [] if self.segment && self.segment.fields - self.segment.fields.each do |field| - option = UserSegment.fields_options.rassoc(field) - @generated_active_table_columns << ActiveTable::StaticHeader.new(option[1], :label => option[0]) if option - end + @fields = self.segment.fields + else self.class.module_options && self.class.module_options.fields + @fields = self.class.module_options.fields + end + + @fields.each do |field| + option = UserSegment.fields_options.rassoc(field) + @generated_active_table_columns << ActiveTable::StaticHeader.new(option[1], :label => option[0]) if option end active_table_generate('end_users', EndUser, @generated_active_table_columns, {:count_callback => 'count_end_users', :find_callback => 'find_end_users'}, opts, *find_options) @@ -145,7 +150,7 @@ def display_targets_table(display = true) handle_table_actions end - @active_table_output = email_targets_table_generate params, :per_page => 25, :include => :tag_cache, :conditions => 'client_user_id IS NULL', :order => 'created_at DESC' + @active_table_output = email_targets_table_generate params, :per_page => 25, :include => :tag_cache, :conditions => 'client_user_id IS NULL', :order => self.class.module_options.order_by if display @update_tags = true @@ -197,6 +202,37 @@ def user_segments_table(display=true) render :partial => 'user_segments_table' if display end + def options + cms_page_path ['People'], "Everyone Options" + + @options = self.class.module_options(params[:options]) + + if request.post? && @options.valid? + Configuration.set_config_model(@options) + flash[:notice] = "Updated Everyone options".t + redirect_to :action => 'index' + return + end + end + + def self.module_options(vals=nil) + Configuration.get_config_model(Options,vals) + end + + class Options < HashModel + attributes :fields => [], :order_by => 'created_at DESC' + + def validate + if self.fields + self.errors.add(:fields, 'is invalid') if self.fields.find { |f| UserSegment.fields_options.rassoc(f).nil? } + end + + if self.order_by + self.errors.add(:order_by, 'is invalid') unless UserSegment.order_by_options.rassoc(self.order_by) + end + end + end + def segments cms_page_path ['People'], 'Segments' user_segments_table(false) @@ -222,8 +258,12 @@ def edit_segment if request.post? && params[:segment] if @segment.update_attributes params[:segment] - @segment.refresh if @segment.should_refresh? - redirect_to :action => 'segments' + if @segment.should_refresh? + @segment.refresh + redirect_to :action => 'segments' + else + redirect_to :action => 'index', :path => @segment.id + end end end end diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 04ae783e..779f7fcf 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -36,6 +36,12 @@ def segment_options_text=(text) text end + def order_by=(order) + @should_refresh = self.order_by != order + self.write_attribute :order_by, order + order + end + def should_refresh? @should_refresh end diff --git a/app/views/members/_targets_table.rhtml b/app/views/members/_targets_table.rhtml index c351e0d1..996f021b 100644 --- a/app/views/members/_targets_table.rhtml +++ b/app/views/members/_targets_table.rhtml @@ -27,8 +27,8 @@ %> - <% if @segment && @segment.fields -%> - <% @segment.fields.each do |field| -%> + <% if @fields -%> + <% @fields.each do |field| -%> <%= value = t.send(field) if value.is_a?(DomainModel) diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index cafc1b9b..594a90de 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -114,6 +114,8 @@ <%= form_tag %> <% if @segment && @segment.last_ran_at -%> Edit | Refresh +<% else -%> + Edit <% end -%> <%= select_tag :user_segment_id, options_for_select([['Everyone', nil]] + @segmentations.collect { |seg| [seg.name, seg.id] }, (@segment ? @segment.id : nil)), :onchange => 'MemberEditor.changeSegments();', :id => 'user_segments_user_segment_id', :style => 'width:200px;' %>
          diff --git a/app/views/members/options.html.erb b/app/views/members/options.html.erb new file mode 100644 index 00000000..8673c11d --- /dev/null +++ b/app/views/members/options.html.erb @@ -0,0 +1,7 @@ + +<% admin_form_for :options, @options do |f| -%> +<%= f.select :order_by, UserSegment.order_by_options %> +<%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> +<%= f.spacer %> +<%= f.cancel_submit_buttons 'Cancel', 'Save' %> +<% end -%> From 5bca63972c08de3c447b162b9f9e357238424008 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 19 May 2010 19:16:27 +0000 Subject: [PATCH 050/139] Added to_expr to generate the text value of the operations. --- app/models/user_segment.rb | 4 ++++ app/models/user_segment/field.rb | 6 ++++++ app/models/user_segment/operation.rb | 6 ++++++ app/models/user_segment/operations.rb | 5 +++++ 4 files changed, 21 insertions(+) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 779f7fcf..bd88ffe0 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -190,5 +190,9 @@ def self.fields_options def self.order_by_options [['Created Desc', 'created_at DESC'], ['Created Asc', 'created_at'], ['Email', 'email']] end + + def to_expr + self.operations.to_expr + end end diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index 37d69904..70b03153 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -107,4 +107,10 @@ def child_field @child_field.handler = self.handler @child_field end + + def to_expr + output = "#{field}.#{operation}(" + self.arguments.collect { |arg| arg.is_a?(String) || arg.is_a?(Time) ? "\"#{arg}\"" : arg.to_s }.join(', ') + ")" + output += self.child.to_s if self.child + output + end end diff --git a/app/models/user_segment/operation.rb b/app/models/user_segment/operation.rb index 9727ef50..720426b8 100644 --- a/app/models/user_segment/operation.rb +++ b/app/models/user_segment/operation.rb @@ -38,4 +38,10 @@ def end_user_ids(ids=nil) def to_a [@operator] + @fields.collect { |fld| fld.to_h } end + + def to_expr + output = @operator == 'not' ? 'not ' : '' + output = @fields.collect { |fld| fld.to_expr }.join(' + ') + output + end end diff --git a/app/models/user_segment/operations.rb b/app/models/user_segment/operations.rb index e23561a4..6f793965 100644 --- a/app/models/user_segment/operations.rb +++ b/app/models/user_segment/operations.rb @@ -47,4 +47,9 @@ def to_a return [] unless @operations @operations.collect { |op| op.to_a } end + + def to_expr + return '' unless @operations + @operations.collect { |op| op.to_expr }.join("\n") + end end From 51eae04c8497670a0b1866a8b47778a71cec4b9f Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 19 May 2010 21:35:20 +0000 Subject: [PATCH 051/139] Started working on a operation syntax builder. --- app/controllers/members_controller.rb | 28 ++++++- app/models/end_user_segment_field.rb | 13 ++- app/models/user_segment/field.rb | 6 +- app/models/user_segment/operation.rb | 2 +- app/models/user_segment/operation_builder.rb | 87 ++++++++++++++++++++ app/views/members/_operation_form.html.erb | 30 +++++++ app/views/members/_segment_form.html.erb | 1 + app/views/members/builder.html.erb | 3 + 8 files changed, 158 insertions(+), 12 deletions(-) create mode 100644 app/models/user_segment/operation_builder.rb create mode 100644 app/views/members/_operation_form.html.erb create mode 100644 app/views/members/builder.html.erb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 5f39bfed..14293d44 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -208,8 +208,10 @@ def options @options = self.class.module_options(params[:options]) if request.post? && @options.valid? - Configuration.set_config_model(@options) - flash[:notice] = "Updated Everyone options".t + if params[:commit] + Configuration.set_config_model(@options) + flash[:notice] = "Updated Everyone options".t + end redirect_to :action => 'index' return end @@ -241,9 +243,13 @@ def segments def create_segment cms_page_path ['People', 'Segments'], 'Create a Segment' + @builder = UserSegment::OperationBuilder.new nil + @segment = UserSegment.new :main_page => true if request.post? && params[:segment] + return redirect_to :action => 'index' unless params[:commit] + if @segment.update_attributes params[:segment] @segment.refresh redirect_to :action => 'segments' @@ -256,7 +262,11 @@ def edit_segment cms_page_path ['People', 'Segments'], '%s Segment' / @segment.name + @builder = UserSegment::OperationBuilder.new nil + if request.post? && params[:segment] + return redirect_to :action => 'index', :path => @segment.id unless params[:commit] + if @segment.update_attributes params[:segment] if @segment.should_refresh? @segment.refresh @@ -273,10 +283,14 @@ def copy_segment cms_page_path ['People', 'Segments'], 'Copy %s Segment' / segment_to_copy.name + @builder = UserSegment::OperationBuilder.new nil + @segment = UserSegment.new segment_to_copy.attributes.symbolize_keys.slice(:name, :description, :fields, :main_page, :segment_options_text, :order_by) @segment.name += ' (Copy)' unless request.post? if request.post? && params[:segment] + return redirect_to :action => 'index', :path => segment_to_copy.id unless params[:commit] + if @segment.update_attributes params[:segment] @segment.refresh redirect_to :action => 'segments' @@ -290,6 +304,16 @@ def refresh_segment redirect_to :action => 'segments' end + def builder + cms_page_path ['People'], 'Operation Builder' + + @builder = UserSegment::OperationBuilder.new nil + + if request.post? && params[:builder] + @builder.build(params[:builder]) + end + end + def create cms_page_path ['People'],'Create Contact' diff --git a/app/models/end_user_segment_field.rb b/app/models/end_user_segment_field.rb index b5442962..8efd6e93 100644 --- a/app/models/end_user_segment_field.rb +++ b/app/models/end_user_segment_field.rb @@ -9,12 +9,11 @@ def self.user_segment_fields_handler_info } end - register_field :email, UserSegment::CoreType::StringType - register_field :gender, UserSegment::CoreType::StringType - register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at - register_field :registered, UserSegment::CoreType::BooleanType - register_field :activated, UserSegment::CoreType::BooleanType - register_field :id, UserSegment::CoreType::NumberType - register_field :user_level, UserSegment::CoreType::NumberType + register_field :email, UserSegment::CoreType::StringType, :name => 'User: Email' + register_field :gender, UserSegment::CoreType::StringType, :name => 'User: Gender' + register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'User: Created' + register_field :registered, UserSegment::CoreType::BooleanType, :name => 'User: Registered' + register_field :activated, UserSegment::CoreType::BooleanType, :name => 'User: Activated' + register_field :user_level, UserSegment::CoreType::NumberType, :name => 'User: User Level' end diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index 70b03153..d8aebf93 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -1,7 +1,5 @@ class UserSegment::Field < HashModel - include HandlerActions - attributes :field => nil, :operation => nil, :arguments => [], :child => nil validates_presence_of :field @@ -67,6 +65,10 @@ def operation_argument_options self.operation_info[:argument_options] if self.operation_info end + def operation_argument_names + self.operation_info[:argument_names] if self.operation_info + end + def operation_info @operation_info ||= self.type_class.user_segment_field_type_operations[self.operation.to_sym] if self.type_class end diff --git a/app/models/user_segment/operation.rb b/app/models/user_segment/operation.rb index 720426b8..de6eebf4 100644 --- a/app/models/user_segment/operation.rb +++ b/app/models/user_segment/operation.rb @@ -41,7 +41,7 @@ def to_a def to_expr output = @operator == 'not' ? 'not ' : '' - output = @fields.collect { |fld| fld.to_expr }.join(' + ') + output += @fields.collect { |fld| fld.to_expr }.join(' + ') output end end diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb new file mode 100644 index 00000000..02885376 --- /dev/null +++ b/app/models/user_segment/operation_builder.rb @@ -0,0 +1,87 @@ + +class UserSegment::OperationBuilder < HashModel + attributes :operator => nil, :field => 'created', :operation => 'since', :arguments => [] + + def operator_options + [['Not', 'not'], ['', nil]] + end + + def build(opts={}) + self.operator = opts[:operator] + self.field = opts[:field] + self.operation = opts[:operation] + unless self.operation_options.rassoc(self.operation) + self.operation = self.operation_options[0][1] + @user_segment_field = nil + end + + self.operation_arguments.each_with_index do |type, idx| + arg = "argument#{idx}" + self.send("#{arg}=", opts[arg.to_sym]) if opts[arg.to_sym] + end + end + + def field_options + return @field_options if @field_options + @field_options = [] + UserSegment::FieldHandler.handlers.each do |handler| + handler[:class].user_segment_fields.each do |field, values| + @field_options << [values[:name], field.to_s] unless @field_options.rassoc(field.to_s) + end + end + @field_options.sort! { |a, b| a[0] <=> b[0] } + end + + def user_segment_field + return @user_segment_field if @user_segment_field + @user_segment_field = UserSegment::Field.new :field => self.field, :operation => self.operation, :arguments => self.arguments + @user_segment_field + end + + def operation_options + return @operation_options if @operation_options + @operation_options = [] + + if self.user_segment_field.type_class + @operation_options = self.user_segment_field.type_class.user_segment_field_type_operations.collect do |operation, values| + [values[:name], operation.to_s] + end + end + + @operation_options.sort! { |a, b| a[0] <=> b[0] } + end + + def operation_arguments + self.user_segment_field.operation_arguments || [] + end + + def operation_argument_names + self.user_segment_field.operation_argument_names + end + + def operation_argument_options + self.user_segment_field.operation_argument_options + end + + def convert_to(value, idx) + UserSegment::FieldType.convert_to(value, self.operation_arguments[idx], self.operation_argument_options[idx]) + end + + def method_missing(arg, *args) + arg = arg.to_s + if arg =~ /^argument(\d+)$/ + self.arguments[$1.to_i] + elsif arg =~ /^argument(\d+)=$/ + self.arguments[$1.to_i] = self.convert_to(args[0], $1.to_i) if $1.to_i < self.operation_arguments.length + else + super + end + end + + def to_expr + return '' unless self.user_segment_field.valid? + output = self.operator == 'not' ? 'not ' : '' + output += self.user_segment_field.to_expr + output + end +end diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb new file mode 100644 index 00000000..ed19bd63 --- /dev/null +++ b/app/views/members/_operation_form.html.erb @@ -0,0 +1,30 @@ + +
          +<% admin_form_for :builder, @builder do |f| -%> +<%= f.check_boxes :operator, [['not', 'not']], :single => true, :label => 'I am' %> +<%= f.select :field, @builder.field_options, :label => 'looking for' %> +<%= f.select :operation, @builder.operation_options %> + + <% @builder.operation_arguments.each_with_index do |arg, idx| -%> + <% arg_options = @builder.operation_argument_options[idx] + label = @builder.operation_argument_names[idx] + if arg_options[:options] -%> + <%= f.select "argument#{idx}", arg_options[:options], :label => label %> + <% else -%> + <%= f.text_field "argument#{idx}", :label => label %> + <% end -%> + <% end -%> + +<%= f.submit 'Build' %> +<% end -%> + +
          +Expression:
          + +
          + +
          + + diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb index 49d96b0a..7c757e98 100644 --- a/app/views/members/_segment_form.html.erb +++ b/app/views/members/_segment_form.html.erb @@ -9,3 +9,4 @@ <%= f.spacer %> <%= f.cancel_submit_buttons 'Cancel', (@segment.id ? 'Save' : 'Create') %> <% end -%> + diff --git a/app/views/members/builder.html.erb b/app/views/members/builder.html.erb new file mode 100644 index 00000000..49c6cf10 --- /dev/null +++ b/app/views/members/builder.html.erb @@ -0,0 +1,3 @@ + +<%= render :partial => 'operation_form' %> + From 407195c647988f1bb852471bc5220d92deb34937 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 20 May 2010 17:06:30 +0000 Subject: [PATCH 052/139] Added expr to options form --- app/views/members/_operation_form.html.erb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb index ed19bd63..cccf078c 100644 --- a/app/views/members/_operation_form.html.erb +++ b/app/views/members/_operation_form.html.erb @@ -14,17 +14,11 @@ <%= f.text_field "argument#{idx}", :label => label %> <% end -%> <% end -%> - -<%= f.submit 'Build' %> +<%= f.submit_tag 'Build' %> +<%= f.spacer %> +<%= f.text_area :to_expr, :style => 'width:400px; height: 50px;', :readonly => true, :label => 'Expression' %> <% end -%> -
          -Expression:
          - -
          - From 5b5ade50a6205f8fddabaf5328816327d0c2c2eb Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 20 May 2010 19:42:04 +0000 Subject: [PATCH 053/139] Using ajax to update form elements. --- app/controllers/members_controller.rb | 10 +++ app/views/members/_operation_form.html.erb | 63 +++++++++++++------ .../_operation_form_arguments.html.erb | 17 +++++ .../_operation_form_expression.html.erb | 4 ++ .../_operation_form_operation.html.erb | 11 ++++ 5 files changed, 86 insertions(+), 19 deletions(-) create mode 100644 app/views/members/_operation_form_arguments.html.erb create mode 100644 app/views/members/_operation_form_expression.html.erb create mode 100644 app/views/members/_operation_form_operation.html.erb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 14293d44..c433d3a1 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -311,9 +311,19 @@ def builder if request.post? && params[:builder] @builder.build(params[:builder]) + render :inline => @builder.to_expr end end + def update_builder + @builder = UserSegment::OperationBuilder.new nil + @builder.build(params[:builder]) + return render :partial => 'operation_form_arguments' if params[:arguments] + return render :partial => 'operation_form_operation' if params[:operation] + return render :partial => 'operation_form_expression' if params[:expression] + return :nothing => true + end + def create cms_page_path ['People'],'Create Contact' diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb index cccf078c..c61c8bb6 100644 --- a/app/views/members/_operation_form.html.erb +++ b/app/views/members/_operation_form.html.erb @@ -1,24 +1,49 @@ -
          -<% admin_form_for :builder, @builder do |f| -%> -<%= f.check_boxes :operator, [['not', 'not']], :single => true, :label => 'I am' %> -<%= f.select :field, @builder.field_options, :label => 'looking for' %> -<%= f.select :operation, @builder.operation_options %> - - <% @builder.operation_arguments.each_with_index do |arg, idx| -%> - <% arg_options = @builder.operation_argument_options[idx] - label = @builder.operation_argument_names[idx] - if arg_options[:options] -%> - <%= f.select "argument#{idx}", arg_options[:options], :label => label %> - <% else -%> - <%= f.text_field "argument#{idx}", :label => label %> - <% end -%> - <% end -%> -<%= f.submit_tag 'Build' %> -<%= f.spacer %> -<%= f.text_area :to_expr, :style => 'width:400px; height: 50px;', :readonly => true, :label => 'Expression' %> -<% end -%> + + +
          +User Segment Syntax Helper +<% cms_unstyled_form_for :builder, @builder, :html => {:id => 'builder', :onsubmit => 'OperationBuilder.updateExpression(); return false;'} do |f| -%> +
            +
          • +<%= 'I am'.t %> +<%= f.check_boxes :operator, [['not', 'not']], :single => true %> +
            • +
          • + + <%= f.select :field, @builder.field_options, {}, :onchange => 'OperationBuilder.updateOperations();' %> +
            • +
            +<%= render :partial => 'operation_form_operation' %>
            +
          • +<%= f.submit_tag 'Build' %> +
            • + +
          • +<%= render :partial => 'operation_form_expression' %> +
            • + +<% end -%> + +
          +<%= observe_form 'builder', :frequency => 1, :function => 'OperationBuilder.updateExpression();' %> diff --git a/app/views/members/_operation_form_arguments.html.erb b/app/views/members/_operation_form_arguments.html.erb new file mode 100644 index 00000000..49471334 --- /dev/null +++ b/app/views/members/_operation_form_arguments.html.erb @@ -0,0 +1,17 @@ + +<% cms_unstyled_fields_for :builder, @builder do |f| %> +
            + <% @builder.operation_arguments.each_with_index do |arg, idx| -%> +
          • + + <% arg_options = @builder.operation_argument_options[idx] + label = @builder.operation_argument_names[idx] + if arg_options[:options] -%> + <%= f.select "argument#{idx}", arg_options[:options], :label => label %> + <% else -%> + <%= f.text_field "argument#{idx}", :label => label %> + <% end -%> +
            • + <% end -%> +
          +<% end %> diff --git a/app/views/members/_operation_form_expression.html.erb b/app/views/members/_operation_form_expression.html.erb new file mode 100644 index 00000000..301293fb --- /dev/null +++ b/app/views/members/_operation_form_expression.html.erb @@ -0,0 +1,4 @@ + +<% cms_unstyled_fields_for :builder, @builder do |f| -%> +<%= f.text_area_tag :expr, @builder.to_expr, :style => 'width:400px; height: 50px;', :readonly => true %> +<% end -%> diff --git a/app/views/members/_operation_form_operation.html.erb b/app/views/members/_operation_form_operation.html.erb new file mode 100644 index 00000000..3e091048 --- /dev/null +++ b/app/views/members/_operation_form_operation.html.erb @@ -0,0 +1,11 @@ + +<% cms_unstyled_fields_for :builder, @builder do |f| %> +
        • +<%= f.select :operation, @builder.operation_options, {}, :onchange => 'OperationBuilder.updateArguments();' %> +
          • + +
        • +<%= render :partial => 'operation_form_arguments' %> +
          • + +<% end %> From a02eb0cb248bd23f5d0e3149c529305788d21edb Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 20 May 2010 20:59:34 +0000 Subject: [PATCH 054/139] Fix fields in user segment. Display the arguments name. --- app/controllers/members_controller.rb | 3 ++- app/models/user_segment.rb | 9 +++---- app/models/user_segment/operation_builder.rb | 2 +- app/views/members/_operation_form.html.erb | 25 ++++++++++--------- .../_operation_form_arguments.html.erb | 17 +++++++------ .../_operation_form_operation.html.erb | 4 +-- 6 files changed, 31 insertions(+), 29 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index c433d3a1..77317760 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -311,8 +311,9 @@ def builder if request.post? && params[:builder] @builder.build(params[:builder]) - render :inline => @builder.to_expr end + + render :action => 'builder', :layout => 'manage_window' end def update_builder diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index bd88ffe0..04885cdb 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -8,13 +8,12 @@ class UserSegment < DomainModel validates_presence_of :name validates_presence_of :segment_options - def initialize(opts={}) - super - self.fields = [] unless self.fields - end - def ready?; self.status == 'finished'; end + def fields + self.read_attribute(:fields) || [] + end + def validate self.errors.add(:segment_options_text, 'is invalid') if self.segment_options_text && self.segment_options.nil? end diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb index 02885376..03a62d60 100644 --- a/app/models/user_segment/operation_builder.rb +++ b/app/models/user_segment/operation_builder.rb @@ -1,6 +1,6 @@ class UserSegment::OperationBuilder < HashModel - attributes :operator => nil, :field => 'created', :operation => 'since', :arguments => [] + attributes :operator => nil, :field => 'created', :operation => 'since', :arguments => [], :child => nil def operator_options [['Not', 'not'], ['', nil]] diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb index c61c8bb6..633eddb0 100644 --- a/app/views/members/_operation_form.html.erb +++ b/app/views/members/_operation_form.html.erb @@ -17,31 +17,32 @@ OperationBuilder = { } -
          +
          User Segment Syntax Helper <% cms_unstyled_form_for :builder, @builder, :html => {:id => 'builder', :onsubmit => 'OperationBuilder.updateExpression(); return false;'} do |f| -%> -
            -
          • -<%= 'I am'.t %> -<%= f.check_boxes :operator, [['not', 'not']], :single => true %> +
              +
            • +<%= 'I am'.t %> +(<%= f.check_boxes :operator, [['not', 'not']], :single => true, :separator => '' %>)
              • -
            • - + +
            • +<%= 'looking for'.t %> <%= f.select :field, @builder.field_options, {}, :onchange => 'OperationBuilder.updateOperations();' %>
              • -
              +
              <%= render :partial => 'operation_form_operation' %>
              -
            • -<%= f.submit_tag 'Build' %> -
              • -
            • <%= render :partial => 'operation_form_expression' %>
              • +
            • +<%= f.submit_tag 'Build' %> +
              • + <% end -%>
          diff --git a/app/views/members/_operation_form_arguments.html.erb b/app/views/members/_operation_form_arguments.html.erb index 49471334..154c8f4d 100644 --- a/app/views/members/_operation_form_arguments.html.erb +++ b/app/views/members/_operation_form_arguments.html.erb @@ -1,17 +1,18 @@ <% cms_unstyled_fields_for :builder, @builder do |f| %> -
            +
          <%= @builder.operation_argument_names[idx] %><%= builder.operation_argument_names[idx] %> - <% arg_options = @builder.operation_argument_options[idx] + <% arg_options = builder.operation_argument_options[idx] description = arg_options[:description] if arg_options[:options] -%> <%= f.select "argument#{idx}", arg_options[:options] %> - <% elsif @builder.operation_arguments[idx] == :boolean -%> + <% elsif builder.operation_arguments[idx] == :boolean -%> <%= f.yes_no "argument#{idx}" %> <% else -%> <%= f.text_field "argument#{idx}" %> diff --git a/app/views/members/_operation_form_child.html.erb b/app/views/members/_operation_form_child.html.erb new file mode 100644 index 00000000..b8ddddec --- /dev/null +++ b/app/views/members/_operation_form_child.html.erb @@ -0,0 +1,11 @@ + +<% cms_unstyled_fields_for form_id, builder do |f| -%> +
        • + <%= f.select :field, builder.field_options, {}, :onchange => 'OperationBuilder.updateOperations();', :style => 'width:200px;' %> +
          • + +
          +<%= render :partial => 'operation_form_operation', :locals => {:builder => builder, :form_id => form_id} %> +
          + +<% end -%> diff --git a/app/views/members/_operation_form_operation.html.erb b/app/views/members/_operation_form_operation.html.erb index e2df7520..089e3737 100644 --- a/app/views/members/_operation_form_operation.html.erb +++ b/app/views/members/_operation_form_operation.html.erb @@ -1,17 +1,27 @@ -<% cms_unstyled_fields_for :builder, @builder do |f| %> +<% cms_unstyled_fields_for form_id, builder do |f| %> -<% if @builder.operation_options.length == 1 -%> +<% if builder.operation_options.length == 1 -%> <%= f.hidden_field :operation %> <% else -%>
        • - <%= f.select :operation, @builder.operation_options, {}, :onchange => 'OperationBuilder.updateArguments();', :style => 'width:140px;' %> + <%= f.select :operation, builder.operation_options, {}, :onchange => 'OperationBuilder.updateOperations();', :style => 'width:140px;' %> function
          • <% end -%> -
        • -<%= render :partial => 'operation_form_arguments' %> +
        • +<%= render :partial => 'operation_form_arguments', :locals => {:form_id => form_id, :builder => builder} %>
          • +
        • +<%= f.select :condition, builder.condition_options, {}, :onchange => 'OperationBuilder.updateOperations();' %> +
          • + +<% unless builder.condition.blank? -%> +
          +<%= render :partial => 'operation_form_child', :locals => {:builder => builder.child_field, :form_id => "#{form_id}[child]"} %> +
          +<% end -%> + <% end %> From 87f0703c2e278b7e38102e66e573208dc9819872 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 21 May 2010 21:18:22 +0000 Subject: [PATCH 029/139] Added end user action field types --- app/controllers/module_controller.rb | 1 + app/models/end_user_action_segment_field.rb | 2 +- app/models/end_user_action_segment_type.rb | 17 +++++++++++++++++ app/models/handler_actions.rb | 13 ++++++++----- app/models/user_segment/field_type.rb | 12 +++++++++++- 5 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 app/models/end_user_action_segment_type.rb diff --git a/app/controllers/module_controller.rb b/app/controllers/module_controller.rb index 202be008..a6eb0a04 100644 --- a/app/controllers/module_controller.rb +++ b/app/controllers/module_controller.rb @@ -78,6 +78,7 @@ def self.get_module_handlers def self.register_handler(component,handler,class_name,options={}) component = component.to_sym; handler = handler.to_sym + options[:handler] = handler handlers = self.get_module_handlers handlers[component] ||= {} handlers[component][handler] ||= [] diff --git a/app/models/end_user_action_segment_field.rb b/app/models/end_user_action_segment_field.rb index b6ef5df7..754fd96e 100644 --- a/app/models/end_user_action_segment_field.rb +++ b/app/models/end_user_action_segment_field.rb @@ -9,7 +9,7 @@ def self.user_segment_fields_handler_info end register_field :renderer, UserSegment::CoreType::StringType - register_field :action, UserSegment::CoreType::StringType + register_field :action, EndUserActionSegmentType::ActionType register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at register_field :occurred, UserSegment::CoreType::DateTimeType, :field => :action_at diff --git a/app/models/end_user_action_segment_type.rb b/app/models/end_user_action_segment_type.rb new file mode 100644 index 00000000..c1327bb0 --- /dev/null +++ b/app/models/end_user_action_segment_type.rb @@ -0,0 +1,17 @@ + +class EndUserActionSegmentType + + class ActionType < UserSegment::FieldType + include HandlerActions + + def self.action_options + self.get_handlers(:action).collect { |handler| [handler[1][:description], handler[1][:handler].to_s] } + end + + register_operation :is, [['Action', :option, {:options => EndUserActionSegmentType::ActionType.action_options}]] + + def self.is(cls, field, action) + cls.scoped(:conditions => ["#{field} = ?", action]) + end + end +end diff --git a/app/models/handler_actions.rb b/app/models/handler_actions.rb index ad73e01b..f1860c12 100644 --- a/app/models/handler_actions.rb +++ b/app/models/handler_actions.rb @@ -7,7 +7,7 @@ def self.append_features(base) #:nodoc: base.extend(ClassMethods) end - def get_handlers(component,handler,initialized=false) + def get_handlers(component,handler=nil,initialized=false) self.class.get_handlers(component,handler,initialized) end @@ -40,8 +40,7 @@ def get_handler_instance(component,handler_name,identifier,*initialize_args) module ClassMethods - def get_handlers(component,handler,initialized = false) - component = component.to_sym; handler = handler.to_sym + def get_handlers(component,handler=nil,initialized = false) handlers = DataCache.get_cached_container("Handlers","Active") unless initialized || RAILS_ENV != 'production' unless handlers mods = initialized ? SiteModule.initialized_modules_info : SiteModule.enabled_modules_info @@ -68,10 +67,14 @@ def get_handlers(component,handler,initialized = false) end DataCache.put_container("Handlers","Active",handlers) unless initialized || RAILS_ENV == 'development' end - return (handlers[component]||{})[handler] || [] + if handler + (handlers[component.to_sym]||{})[handler.to_sym] || [] + else + (handlers[component.to_sym] || {}).values.inject([]) { |a,b| a.concat(b) } + end end - + def get_handler_options(component,handler_name,initialized=false) handlers = get_handlers(component,handler_name,initialized) handlers.collect do |handler| diff --git a/app/models/user_segment/field_type.rb b/app/models/user_segment/field_type.rb index bd722608..b70b3e43 100644 --- a/app/models/user_segment/field_type.rb +++ b/app/models/user_segment/field_type.rb @@ -42,6 +42,8 @@ def self.register_operation(operation, args=[], options={}) # converts a string to the correct type # supported types are :integer, :float, :double, :date, :datetime, :option, :boolean def self.convert_to(value, type, opts={}) + return value if value.nil? + case type when :integer return value.to_i if value.is_a?(Integer) || value =~ /^\d+$/ @@ -56,7 +58,15 @@ def self.convert_to(value, type, opts={}) rescue end when :option - value = opts[:options].find { |o| o.downcase == value.downcase } + value = opts[:options].find do |o| + if o.is_a?(Array) + o[1].downcase == value.downcase + else + o.downcase == value.downcase + end + end + + return value[1] if value.is_a?(Array) return value if value when :boolean return value if value.is_a?(TrueClass) || value.is_a?(FalseClass) From 8fb9fe76208f8516a69ad6e185a5ae749c512f06 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 13 May 2010 20:33:01 +0000 Subject: [PATCH 030/139] Initial ideas for user segment system. --- app/controllers/content_controller.rb | 5 +- app/models/end_user_action_segment_field.rb | 16 + app/models/end_user_segment_field.rb | 19 + app/models/user_segment.rb | 27 + app/models/user_segment/core_type.rb | 74 + app/models/user_segment/field.rb | 110 ++ app/models/user_segment/field_handler.rb | 17 + app/models/user_segment/field_type.rb | 70 + app/models/user_segment/operation.rb | 41 + app/models/user_segment/operations.rb | 47 + app/models/user_segment/parser.rb | 4 + app/models/user_segment_cache.rb | 4 + app/models/user_segment_option_parser.rb | 1517 +++++++++++++++++ app/models/user_segment_option_parser.treetop | 140 ++ db/migrate/20100511165552_user_segments.rb | 39 + 15 files changed, 2129 insertions(+), 1 deletion(-) create mode 100644 app/models/end_user_action_segment_field.rb create mode 100644 app/models/end_user_segment_field.rb create mode 100644 app/models/user_segment.rb create mode 100644 app/models/user_segment/core_type.rb create mode 100644 app/models/user_segment/field.rb create mode 100644 app/models/user_segment/field_handler.rb create mode 100644 app/models/user_segment/field_type.rb create mode 100644 app/models/user_segment/operation.rb create mode 100644 app/models/user_segment/operations.rb create mode 100644 app/models/user_segment/parser.rb create mode 100644 app/models/user_segment_cache.rb create mode 100644 app/models/user_segment_option_parser.rb create mode 100644 app/models/user_segment_option_parser.treetop create mode 100644 db/migrate/20100511165552_user_segments.rb diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb index 2975d01a..653e46f0 100644 --- a/app/controllers/content_controller.rb +++ b/app/controllers/content_controller.rb @@ -25,7 +25,10 @@ class ContentController < ModuleController #:nodoc: all register_handler :content, :feature, "Content::CoreFeature::KeywordGenerator" register_handler :trigger, :actions, "Trigger::CoreTrigger" - + + register_handler :user_segment, :fields, 'EndUserSegmentField' + register_handler :user_segment, :fields, 'EndUserActionSegmentField' + def index @content_models,@content_actions = CmsController.get_content_models_and_actions diff --git a/app/models/end_user_action_segment_field.rb b/app/models/end_user_action_segment_field.rb new file mode 100644 index 00000000..b6ef5df7 --- /dev/null +++ b/app/models/end_user_action_segment_field.rb @@ -0,0 +1,16 @@ + +class EndUserActionSegmentField < UserSegment::FieldHandler + + def self.user_segment_fields_handler_info + { + :name => 'End User Action Segment Fields', + :domain_model_class => EndUserAction + } + end + + register_field :renderer, UserSegment::CoreType::StringType + register_field :action, UserSegment::CoreType::StringType + register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at + register_field :occurred, UserSegment::CoreType::DateTimeType, :field => :action_at + +end diff --git a/app/models/end_user_segment_field.rb b/app/models/end_user_segment_field.rb new file mode 100644 index 00000000..d4eb08ef --- /dev/null +++ b/app/models/end_user_segment_field.rb @@ -0,0 +1,19 @@ + +class EndUserSegmentField < UserSegment::FieldHandler + + def self.user_segment_fields_handler_info + { + :name => 'End User Segment Fields', + :domain_model_class => EndUser, + :end_user_field => :id + } + end + + register_field :email, UserSegment::CoreType::StringType + register_field :gender, UserSegment::CoreType::StringType + register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at + register_field :registered, UserSegment::CoreType::BooleanType + register_field :activated, UserSegment::CoreType::BooleanType + register_field :id, UserSegment::CoreType::NumberType + +end diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb new file mode 100644 index 00000000..13b6b85d --- /dev/null +++ b/app/models/user_segment.rb @@ -0,0 +1,27 @@ + +class UserSegment < DomainModel + + serialize :segment_options + serialize :fields + + def operations + return @operations if @operations + @operations = UserSegment::Operations.new + @operations.operations = self.segment_options if self.segment_options + @operations + end + + def operations=(text) + @operations = UserSegment::Operations.new + @operations.parse text + end + + def before_create + self.order_by = 'created_at DESC' unless self.order_by + end + + def before_save + self.segment_options = self.operations.to_a if self.operations && self.operations.valid? + end +end + diff --git a/app/models/user_segment/core_type.rb b/app/models/user_segment/core_type.rb new file mode 100644 index 00000000..5ab25e4f --- /dev/null +++ b/app/models/user_segment/core_type.rb @@ -0,0 +1,74 @@ + +class UserSegment::CoreType + + @@datetime_format_options = ['day', 'days', 'week', 'weeks', 'month', 'months', 'year', 'years'] + def self.datetime_format_options + @@datetime_format_options + end + + + class DateTimeType < UserSegment::FieldType + register_operation :before, [['Value', :integer], ['Format', :option, {:options => UserSegment::CoreType.datetime_format_options}]] + + def self.before(cls, field, value, format) + time = value.send(format).ago + cls.scoped(:conditions => ["#{field} <= ?", time]) + end + + register_operation :since, [['Value', :integer], ['Format', :option, {:options => UserSegment::CoreType.datetime_format_options}]] + + def self.since(cls, field, value, format) + time = value.send(format).ago + cls.scoped(:conditions => ["#{field} >= ?", time]) + end + + register_operation :between, [['From', :datetime], ['To', :datetime]] + + def self.between(cls, field, from, to) + cls.scoped(:conditions => ["#{field} between ? and ?", from, to]) + end + end + + + class NumberType < UserSegment::FieldType + register_operation :greater_than, [['Value', :integer]] + + def self.greater_than(cls, field, value) + cls.scoped(:conditions => ["#{field} > ?", value]) + end + + register_operation :less_than, [['Value', :integer]] + + def self.less_than(cls, field, value) + cls.scoped(:conditions => ["#{field} < ?", value]) + end + + register_operation :equals, [['Value', :integer]] + + def self.equals(cls, field, value) + cls.scoped(:conditions => ["#{field} = ?", value]) + end + end + + class StringType < UserSegment::FieldType + register_operation :like, [['String', :string]] + + def self.like(cls, field, string) + cls.scoped(:conditions => ["#{field} like ?", string]) + end + + register_operation :is, [['String', :string]] + + def self.is(cls, field, string) + cls.scoped(:conditions => ["#{field} = ?", string]) + end + end + + class BooleanType < UserSegment::FieldType + register_operation :is, [['Boolean', :boolean]] + + def self.is(cls, field, string) + cls.scoped(:conditions => ["#{field} = ?", string]) + end + end +end diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb new file mode 100644 index 00000000..c13685fb --- /dev/null +++ b/app/models/user_segment/field.rb @@ -0,0 +1,110 @@ + +class UserSegment::Field < HashModel + include HandlerActions + + attributes :field => nil, :operation => nil, :arguments => [], :child => nil + + validates_presence_of :field + validates_presence_of :operation + + def strict?; true; end + + def validate + unless self.field.blank? + self.errors.add(:field, 'invalid field') unless self.handler + end + + unless self.operation.blank? + self.errors.add(:operation, 'invalid operation') unless self.type_class && self.type_class.has_operation?(self.operation) + + if self.operation_info + self.errors.add(:arguments, 'are missing') if self.arguments.empty? && ! self.operation_arguments.empty? + + unless self.arguments.empty? + self.errors.add(:arguments, 'are incorrect') unless self.arguments.size == self.operation_arguments.size + self.errors.add(:arguments, 'are invalid') if self.arguments.size == self.operation_arguments.size && ! self.valid_arguments? + end + end + end + + self.errors.add(:child, 'is invalid') if self.child_field && ! self.child_field.valid? + end + + def count + @count ||= self.get_scope.count + end + + def end_user_ids(ids=nil) + return @end_user_ids if @end_user_ids + scope = self.get_scope + scope = scope.scoped(:conditions => {self.end_user_field => ids}) if ids + @end_user_ids = scope.find(:all, :select => self.end_user_field).collect &self.end_user_field + end + + def get_scope(scope=nil) + return @scope if @scope + scope ||= self.domain_model_class + @scope = self.type_class.send(self.operation, scope, self.model_field, *self.converted_arguments) + @scope = self.child_field.get_scope(@scope) if self.child_field + @scope + end + + def converted_arguments + @converted_arguments ||= UserSegment::FieldType.convert_arguments(self.arguments, self.operation_arguments, self.operation_argument_options) if self.operation_arguments + end + + def valid_arguments? + return false unless self.converted_arguments + self.converted_arguments.each { |arg| return false if arg.nil? } + true + end + + def operation_arguments + self.operation_info[:arguments] if self.operation_info + end + + def operation_argument_options + self.operation_info[:argument_options] if self.operation_info + end + + def operation_info + @operation_info ||= self.type_class.user_segment_field_type_operations[self.operation.to_sym] if self.type_class + end + + def type_class + @type_class ||= self.handler_class.user_segment_fields[self.field.to_sym][:type] if self.handler_class + end + + def model_field + self.handler_class.user_segment_fields[self.field.to_sym][:field] if self.handler_class + end + + def handler + @handler ||= self.get_handler_info(:user_segment, :fields).find { |info| info[:class].has_field?(self.field) } + end + + def handler=(handler) + @handler = handler + end + + def handler_class + self.handler[:class] if self.handler + end + + def domain_model_class + self.handler[:domain_model_class] if self.handler + end + + def end_user_field + (self.handler[:end_user_field] || :end_user_id) if self.handler + end + + def child_field + return @child_field if @child_field + return nil unless self.child + return nil unless self.handler + @child_field = UserSegment::Field.new self.child + @child_field.handler = self.handler + @child_field + end +end diff --git a/app/models/user_segment/field_handler.rb b/app/models/user_segment/field_handler.rb new file mode 100644 index 00000000..47b1bb30 --- /dev/null +++ b/app/models/user_segment/field_handler.rb @@ -0,0 +1,17 @@ + +class UserSegment::FieldHandler + + def self.user_segment_fields + @user_segment_fields ||= {} + end + + def self.has_field?(field) + self.user_segment_fields[field.to_sym] ? true : false + end + + def self.register_field(field, type, options={}) + self.user_segment_fields[field.to_sym] = options.merge(:type => type) + self.user_segment_fields[field.to_sym][:name] ||= field.to_s.humanize + self.user_segment_fields[field.to_sym][:field] ||= field.to_sym + end +end diff --git a/app/models/user_segment/field_type.rb b/app/models/user_segment/field_type.rb new file mode 100644 index 00000000..b82402bd --- /dev/null +++ b/app/models/user_segment/field_type.rb @@ -0,0 +1,70 @@ + +class UserSegment::FieldType + + def self.user_segment_field_type_operations + @user_segment_field_type_operations ||= {} + end + + def self.has_operation?(operation) + self.user_segment_field_type_operations[operation.to_sym] ? true : false + end + + def self.register_operation(operation, args=[], options={}) + arguments = [] + argument_names = [] + argument_options = [] + args.each do |arg| + if arg.is_a?(Array) + name = arg[0] + type = arg[1].to_sym + opts = arg[2] || {} + else + type = arg + name = type.to_s.humanize + opts = {} + end + + arguments << type.to_sym + argument_names << name + argument_options << opts + end + + name = options[:name] || operation.to_s.humanize + + self.user_segment_field_type_operations[operation.to_sym] = options.merge(:name => name, :arguments => arguments, :argument_names => argument_names, :argument_options => argument_options) + end + + # converts a string to the correct type + # supported types are :integer, :float, :double, :date, :datetime, :option, :boolean + def self.convert_to(value, type, opts={}) + case type + when :integer + return value.to_i if value.is_a?(Integer) || value =~ /^\d+$/ + when :float, :double + return value.to_f if value.is_a?(Numeric) || value =~ /^(\d+|\.\d+|\d+\.\d+)$/ + when :string + return value + when :date, :datetime + begin + return value if value.is_a?(::Time) + return Time.parse(value) + rescue + end + when :option + value = opts[:options].find { |o| o.downcase == value.downcase } + return value if value + when :boolean + return value if value.is_a?(TrueClass) || value.is_a?(FalseClass) + return true if value == '1' || value.downcase == 'true' + return false if value == '0' || value.downcase == 'false' + end + + nil + end + + def self.convert_arguments(arguments, types, options) + (0..arguments.length-1).collect do |idx| + self.convert_to(arguments[idx], types[idx], options[idx]) + end + end +end diff --git a/app/models/user_segment/operation.rb b/app/models/user_segment/operation.rb new file mode 100644 index 00000000..9727ef50 --- /dev/null +++ b/app/models/user_segment/operation.rb @@ -0,0 +1,41 @@ + +class UserSegment::Operation + + def initialize(operator, fields) + @operator = operator + @fields = fields + end + + def valid? + @fields.each { |fld| return false unless fld.valid? } + true + end + + def count + @fields.collect do |fld| + @operator == 'not' ? EndUser.count - fld.count : fld.count + end.inject(0) { |sum, num| sum + num } + end + + def end_user_ids(ids=nil) + return @end_user_ids if @end_user_ids + + @end_user_ids = [] + @fields.each { |fld| @end_user_ids = @end_user_ids + fld.end_user_ids(ids) } + @end_user_ids.uniq! + + if @operator == 'not' + if ids + @end_user_ids = ids - @end_user_ids + else + @end_user_ids = EndUser.find(:all, :select => 'id', :conditions => ['id not in(?)', @end_user_ids]).collect &:id + end + end + + @end_user_ids + end + + def to_a + [@operator] + @fields.collect { |fld| fld.to_h } + end +end diff --git a/app/models/user_segment/operations.rb b/app/models/user_segment/operations.rb new file mode 100644 index 00000000..b7ee7531 --- /dev/null +++ b/app/models/user_segment/operations.rb @@ -0,0 +1,47 @@ +require 'treetop' + +class UserSegment::Operations + + def end_user_ids + return @end_user_ids if @end_user_ids + return [] unless self.valid? + + self.operations.sort_by { |op| op.count }.each do |op| + @end_user_ids = op.end_user_ids(@end_user_ids) + return [] if @end_user_ids.empty? + end + + @end_user_ids + end + + def parser + @parser ||= UserSegmentOptionParser.new + end + + def parse(text) + if options = self.parser.parse(text) + self.operations = options.eval + end + end + + def valid? + return false unless self.operations + self.operations.each { |op| return false unless op.valid? } + true + end + + def operations + @operations + end + + def operations=(options) + @operations = options.collect do |line| + UserSegment::Operation.new line[0], line[1..-1].collect { |op| UserSegment::Field.new op } + end + end + + def to_a + return [] unless @operations + @operations.collect { |op| op.to_a } + end +end diff --git a/app/models/user_segment/parser.rb b/app/models/user_segment/parser.rb new file mode 100644 index 00000000..16a21179 --- /dev/null +++ b/app/models/user_segment/parser.rb @@ -0,0 +1,4 @@ + +class UserSegment::Parser + +end diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb new file mode 100644 index 00000000..6ed5c117 --- /dev/null +++ b/app/models/user_segment_cache.rb @@ -0,0 +1,4 @@ + +class UserSegmentCache < DomainModel + +end diff --git a/app/models/user_segment_option_parser.rb b/app/models/user_segment_option_parser.rb new file mode 100644 index 00000000..ca944e3b --- /dev/null +++ b/app/models/user_segment_option_parser.rb @@ -0,0 +1,1517 @@ +# Autogenerated from a Treetop grammar. Edits may be lost. + + + +module UserSegmentOption + include Treetop::Runtime + + def root + @root ||= :multiple_operations + end + + module MultipleOperations0 + def operations + elements[1] + end + end + + module MultipleOperations1 + def operations + elements[0] + end + + def more + elements[1] + end + + end + + module MultipleOperations2 + def eval(env={}) + [operations.eval(env)] + more.elements.collect { |e| e.operations.eval(env) } + end + end + + def _nt_multiple_operations + start_index = index + if node_cache[:multiple_operations].has_key?(index) + cached = node_cache[:multiple_operations][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_operations + s0 << r1 + if r1 + s2, i2 = [], index + loop do + i3, s3 = index, [] + s4, i4 = [], index + loop do + r5 = _nt_newline + if r5 + s4 << r5 + else + break + end + end + if s4.empty? + @index = i4 + r4 = nil + else + r4 = instantiate_node(SyntaxNode,input, i4...index, s4) + end + s3 << r4 + if r4 + r6 = _nt_operations + s3 << r6 + end + if s3.last + r3 = instantiate_node(SyntaxNode,input, i3...index, s3) + r3.extend(MultipleOperations0) + else + @index = i3 + r3 = nil + end + if r3 + s2 << r3 + else + break + end + end + r2 = instantiate_node(SyntaxNode,input, i2...index, s2) + s0 << r2 + if r2 + s7, i7 = [], index + loop do + r8 = _nt_newline + if r8 + s7 << r8 + else + break + end + end + r7 = instantiate_node(SyntaxNode,input, i7...index, s7) + s0 << r7 + end + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(MultipleOperations1) + r0.extend(MultipleOperations2) + else + @index = i0 + r0 = nil + end + + node_cache[:multiple_operations][start_index] = r0 + + r0 + end + + module Operations0 + def operation + elements[1] + end + end + + module Operations1 + def not_op + elements[0] + end + + def operation + elements[1] + end + + def more + elements[2] + end + end + + module Operations2 + def eval(env={}) + [not_op.eval(env), operation.eval(env)] + more.elements.collect { |e| e.operation.eval(env) } + end + end + + def _nt_operations + start_index = index + if node_cache[:operations].has_key?(index) + cached = node_cache[:operations][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_not + s0 << r1 + if r1 + r2 = _nt_operation + s0 << r2 + if r2 + s3, i3 = [], index + loop do + i4, s4 = index, [] + if has_terminal?('+', false, index) + r5 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('+') + r5 = nil + end + s4 << r5 + if r5 + r6 = _nt_operation + s4 << r6 + end + if s4.last + r4 = instantiate_node(SyntaxNode,input, i4...index, s4) + r4.extend(Operations0) + else + @index = i4 + r4 = nil + end + if r4 + s3 << r4 + else + break + end + end + r3 = instantiate_node(SyntaxNode,input, i3...index, s3) + s0 << r3 + end + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Operations1) + r0.extend(Operations2) + else + @index = i0 + r0 = nil + end + + node_cache[:operations][start_index] = r0 + + r0 + end + + module Operation0 + def space1 + elements[0] + end + + def field + elements[1] + end + + def operation + elements[3] + end + + def lparen + elements[4] + end + + def arguments + elements[5] + end + + def rparen + elements[6] + end + + def child + elements[7] + end + + def space2 + elements[8] + end + end + + module Operation1 + def eval(env={}) + {:field => field.eval(env), :operation => operation.eval(env), :arguments => arguments.eval(env), :child => child.eval(env)} + end + end + + def _nt_operation + start_index = index + if node_cache[:operation].has_key?(index) + cached = node_cache[:operation][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_space + s0 << r1 + if r1 + r2 = _nt_field + s0 << r2 + if r2 + if has_terminal?('.', false, index) + r3 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('.') + r3 = nil + end + s0 << r3 + if r3 + r4 = _nt_operation_name + s0 << r4 + if r4 + r5 = _nt_lparen + s0 << r5 + if r5 + r6 = _nt_arguments + s0 << r6 + if r6 + r7 = _nt_rparen + s0 << r7 + if r7 + r8 = _nt_sub_operations + s0 << r8 + if r8 + r9 = _nt_space + s0 << r9 + end + end + end + end + end + end + end + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Operation0) + r0.extend(Operation1) + else + @index = i0 + r0 = nil + end + + node_cache[:operation][start_index] = r0 + + r0 + end + + module SubOperations0 + def field + elements[1] + end + + def operation_name + elements[3] + end + + def lparen + elements[4] + end + + def arguments + elements[5] + end + + def rparen + elements[6] + end + end + + module SubOperations1 + def eval(env={}) + if empty? + nil + else + child = nil + elements.reverse.each do |e| + child = {:field => e.field.eval(env), :operation => e.operation_name.eval(env), :arguments => e.arguments.eval(env), :child => child} + end + child + end + end + end + + def _nt_sub_operations + start_index = index + if node_cache[:sub_operations].has_key?(index) + cached = node_cache[:sub_operations][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + s0, i0 = [], index + loop do + i1, s1 = index, [] + if has_terminal?('.', false, index) + r2 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('.') + r2 = nil + end + s1 << r2 + if r2 + r3 = _nt_field + s1 << r3 + if r3 + if has_terminal?('.', false, index) + r4 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('.') + r4 = nil + end + s1 << r4 + if r4 + r5 = _nt_operation_name + s1 << r5 + if r5 + r6 = _nt_lparen + s1 << r6 + if r6 + r7 = _nt_arguments + s1 << r7 + if r7 + r8 = _nt_rparen + s1 << r8 + end + end + end + end + end + end + if s1.last + r1 = instantiate_node(SyntaxNode,input, i1...index, s1) + r1.extend(SubOperations0) + else + @index = i1 + r1 = nil + end + if r1 + s0 << r1 + else + break + end + end + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(SubOperations1) + + node_cache[:sub_operations][start_index] = r0 + + r0 + end + + module Field0 + end + + module Field1 + def eval(env={}) + text_value + end + end + + def _nt_field + start_index = index + if node_cache[:field].has_key?(index) + cached = node_cache[:field][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + if has_terminal?('\G[a-zA-Z]', true, index) + r1 = true + @index += 1 + else + r1 = nil + end + s0 << r1 + if r1 + s2, i2 = [], index + loop do + if has_terminal?('\G[a-zA-Z0-9_]', true, index) + r3 = true + @index += 1 + else + r3 = nil + end + if r3 + s2 << r3 + else + break + end + end + r2 = instantiate_node(SyntaxNode,input, i2...index, s2) + s0 << r2 + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Field0) + r0.extend(Field1) + else + @index = i0 + r0 = nil + end + + node_cache[:field][start_index] = r0 + + r0 + end + + module OperationName0 + end + + module OperationName1 + def eval(env={}) + text_value + end + end + + def _nt_operation_name + start_index = index + if node_cache[:operation_name].has_key?(index) + cached = node_cache[:operation_name][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + if has_terminal?('\G[a-zA-Z]', true, index) + r1 = true + @index += 1 + else + r1 = nil + end + s0 << r1 + if r1 + s2, i2 = [], index + loop do + if has_terminal?('\G[a-zA-Z0-9_]', true, index) + r3 = true + @index += 1 + else + r3 = nil + end + if r3 + s2 << r3 + else + break + end + end + r2 = instantiate_node(SyntaxNode,input, i2...index, s2) + s0 << r2 + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(OperationName0) + r0.extend(OperationName1) + else + @index = i0 + r0 = nil + end + + node_cache[:operation_name][start_index] = r0 + + r0 + end + + module Arguments0 + def argument + elements[1] + end + end + + module Arguments1 + def arg + elements[0] + end + + def more + elements[1] + end + end + + module Arguments2 + def eval(env={}) + [arg.eval(env)] + more.elements.collect{ |e| e.argument.eval(env) } + end + end + + def _nt_arguments + start_index = index + if node_cache[:arguments].has_key?(index) + cached = node_cache[:arguments][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_argument + s0 << r1 + if r1 + s2, i2 = [], index + loop do + i3, s3 = index, [] + if has_terminal?(',', false, index) + r4 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure(',') + r4 = nil + end + s3 << r4 + if r4 + r5 = _nt_argument + s3 << r5 + end + if s3.last + r3 = instantiate_node(SyntaxNode,input, i3...index, s3) + r3.extend(Arguments0) + else + @index = i3 + r3 = nil + end + if r3 + s2 << r3 + else + break + end + end + r2 = instantiate_node(SyntaxNode,input, i2...index, s2) + s0 << r2 + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Arguments1) + r0.extend(Arguments2) + else + @index = i0 + r0 = nil + end + + node_cache[:arguments][start_index] = r0 + + r0 + end + + module Argument0 + def space1 + elements[0] + end + + def arg + elements[1] + end + + def space2 + elements[2] + end + end + + module Argument1 + def eval(env={}) + arg.eval(env) + end + end + + def _nt_argument + start_index = index + if node_cache[:argument].has_key?(index) + cached = node_cache[:argument][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_space + s0 << r1 + if r1 + i2 = index + r3 = _nt_string + if r3 + r2 = r3 + else + r4 = _nt_integer + if r4 + r2 = r4 + else + r5 = _nt_float + if r5 + r2 = r5 + else + r6 = _nt_boolean + if r6 + r2 = r6 + else + @index = i2 + r2 = nil + end + end + end + end + s0 << r2 + if r2 + r7 = _nt_space + s0 << r7 + end + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Argument0) + r0.extend(Argument1) + else + @index = i0 + r0 = nil + end + + node_cache[:argument][start_index] = r0 + + r0 + end + + module String0 + end + + module String1 + end + + module String2 + def eval(env={}) + text_value[1..-2] + end + end + + def _nt_string + start_index = index + if node_cache[:string].has_key?(index) + cached = node_cache[:string][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + if has_terminal?('"', false, index) + r1 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('"') + r1 = nil + end + s0 << r1 + if r1 + s2, i2 = [], index + loop do + i3 = index + i4, s4 = index, [] + i5 = index + if has_terminal?('"', false, index) + r6 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('"') + r6 = nil + end + if r6 + r5 = nil + else + @index = i5 + r5 = instantiate_node(SyntaxNode,input, index...index) + end + s4 << r5 + if r5 + if index < input_length + r7 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure("any character") + r7 = nil + end + s4 << r7 + end + if s4.last + r4 = instantiate_node(SyntaxNode,input, i4...index, s4) + r4.extend(String0) + else + @index = i4 + r4 = nil + end + if r4 + r3 = r4 + else + if has_terminal?('\"', false, index) + r8 = instantiate_node(SyntaxNode,input, index...(index + 2)) + @index += 2 + else + terminal_parse_failure('\"') + r8 = nil + end + if r8 + r3 = r8 + else + @index = i3 + r3 = nil + end + end + if r3 + s2 << r3 + else + break + end + end + r2 = instantiate_node(SyntaxNode,input, i2...index, s2) + s0 << r2 + if r2 + if has_terminal?('"', false, index) + r9 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('"') + r9 = nil + end + s0 << r9 + end + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(String1) + r0.extend(String2) + else + @index = i0 + r0 = nil + end + + node_cache[:string][start_index] = r0 + + r0 + end + + module Integer0 + end + + module Integer1 + def eval(env={}) + text_value.to_i + end + end + + def _nt_integer + start_index = index + if node_cache[:integer].has_key?(index) + cached = node_cache[:integer][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0 = index + i1, s1 = index, [] + if has_terminal?('\G[1-9]', true, index) + r2 = true + @index += 1 + else + r2 = nil + end + s1 << r2 + if r2 + s3, i3 = [], index + loop do + if has_terminal?('\G[0-9]', true, index) + r4 = true + @index += 1 + else + r4 = nil + end + if r4 + s3 << r4 + else + break + end + end + r3 = instantiate_node(SyntaxNode,input, i3...index, s3) + s1 << r3 + end + if s1.last + r1 = instantiate_node(SyntaxNode,input, i1...index, s1) + r1.extend(Integer0) + else + @index = i1 + r1 = nil + end + if r1 + r0 = r1 + r0.extend(Integer1) + else + if has_terminal?('0', false, index) + r5 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('0') + r5 = nil + end + if r5 + r0 = r5 + r0.extend(Integer1) + else + @index = i0 + r0 = nil + end + end + + node_cache[:integer][start_index] = r0 + + r0 + end + + module Boolean0 + def eval(env={}) + if text_value.downcase == 'true' + true + else + false + end + end + end + + def _nt_boolean + start_index = index + if node_cache[:boolean].has_key?(index) + cached = node_cache[:boolean][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0 = index + if has_terminal?('true', false, index) + r1 = instantiate_node(SyntaxNode,input, index...(index + 4)) + @index += 4 + else + terminal_parse_failure('true') + r1 = nil + end + if r1 + r0 = r1 + r0.extend(Boolean0) + else + if has_terminal?('TRUE', false, index) + r2 = instantiate_node(SyntaxNode,input, index...(index + 4)) + @index += 4 + else + terminal_parse_failure('TRUE') + r2 = nil + end + if r2 + r0 = r2 + r0.extend(Boolean0) + else + if has_terminal?('True', false, index) + r3 = instantiate_node(SyntaxNode,input, index...(index + 4)) + @index += 4 + else + terminal_parse_failure('True') + r3 = nil + end + if r3 + r0 = r3 + r0.extend(Boolean0) + else + if has_terminal?('false', false, index) + r4 = instantiate_node(SyntaxNode,input, index...(index + 5)) + @index += 5 + else + terminal_parse_failure('false') + r4 = nil + end + if r4 + r0 = r4 + r0.extend(Boolean0) + else + if has_terminal?('FALSE', false, index) + r5 = instantiate_node(SyntaxNode,input, index...(index + 5)) + @index += 5 + else + terminal_parse_failure('FALSE') + r5 = nil + end + if r5 + r0 = r5 + r0.extend(Boolean0) + else + if has_terminal?('False', false, index) + r6 = instantiate_node(SyntaxNode,input, index...(index + 5)) + @index += 5 + else + terminal_parse_failure('False') + r6 = nil + end + if r6 + r0 = r6 + r0.extend(Boolean0) + else + @index = i0 + r0 = nil + end + end + end + end + end + end + + node_cache[:boolean][start_index] = r0 + + r0 + end + + module Float0 + end + + module Float1 + end + + module Float2 + end + + module Float3 + def eval(env={}) + text_value.to_f + end + end + + def _nt_float + start_index = index + if node_cache[:float].has_key?(index) + cached = node_cache[:float][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0 = index + i1, s1 = index, [] + if has_terminal?('\G[1-9]', true, index) + r2 = true + @index += 1 + else + r2 = nil + end + s1 << r2 + if r2 + s3, i3 = [], index + loop do + if has_terminal?('\G[0-9]', true, index) + r4 = true + @index += 1 + else + r4 = nil + end + if r4 + s3 << r4 + else + break + end + end + r3 = instantiate_node(SyntaxNode,input, i3...index, s3) + s1 << r3 + end + if s1.last + r1 = instantiate_node(SyntaxNode,input, i1...index, s1) + r1.extend(Float0) + else + @index = i1 + r1 = nil + end + if r1 + r0 = r1 + else + i5, s5 = index, [] + if has_terminal?('.', false, index) + r6 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('.') + r6 = nil + end + s5 << r6 + if r6 + s7, i7 = [], index + loop do + if has_terminal?('\G[0-9]', true, index) + r8 = true + @index += 1 + else + r8 = nil + end + if r8 + s7 << r8 + else + break + end + end + if s7.empty? + @index = i7 + r7 = nil + else + r7 = instantiate_node(SyntaxNode,input, i7...index, s7) + end + s5 << r7 + end + if s5.last + r5 = instantiate_node(SyntaxNode,input, i5...index, s5) + r5.extend(Float1) + else + @index = i5 + r5 = nil + end + if r5 + r0 = r5 + else + i9, s9 = index, [] + s10, i10 = [], index + loop do + if has_terminal?('\G[0-9]', true, index) + r11 = true + @index += 1 + else + r11 = nil + end + if r11 + s10 << r11 + else + break + end + end + if s10.empty? + @index = i10 + r10 = nil + else + r10 = instantiate_node(SyntaxNode,input, i10...index, s10) + end + s9 << r10 + if r10 + if has_terminal?('.', false, index) + r12 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('.') + r12 = nil + end + s9 << r12 + if r12 + if has_terminal?('\G[0-9]', true, index) + r13 = true + @index += 1 + else + r13 = nil + end + s9 << r13 + end + end + if s9.last + r9 = instantiate_node(SyntaxNode,input, i9...index, s9) + r9.extend(Float2) + r9.extend(Float3) + else + @index = i9 + r9 = nil + end + if r9 + r0 = r9 + else + @index = i0 + r0 = nil + end + end + end + + node_cache[:float][start_index] = r0 + + r0 + end + + module Lparen0 + def space1 + elements[0] + end + + def space2 + elements[2] + end + end + + def _nt_lparen + start_index = index + if node_cache[:lparen].has_key?(index) + cached = node_cache[:lparen][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_space + s0 << r1 + if r1 + if has_terminal?('(', false, index) + r2 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('(') + r2 = nil + end + s0 << r2 + if r2 + r3 = _nt_space + s0 << r3 + end + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Lparen0) + else + @index = i0 + r0 = nil + end + + node_cache[:lparen][start_index] = r0 + + r0 + end + + module Rparen0 + def space1 + elements[0] + end + + def space2 + elements[2] + end + end + + def _nt_rparen + start_index = index + if node_cache[:rparen].has_key?(index) + cached = node_cache[:rparen][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_space + s0 << r1 + if r1 + if has_terminal?(')', false, index) + r2 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure(')') + r2 = nil + end + s0 << r2 + if r2 + r3 = _nt_space + s0 << r3 + end + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Rparen0) + else + @index = i0 + r0 = nil + end + + node_cache[:rparen][start_index] = r0 + + r0 + end + + module NonSpaceChar0 + end + + def _nt_non_space_char + start_index = index + if node_cache[:non_space_char].has_key?(index) + cached = node_cache[:non_space_char][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + i1 = index + if has_terminal?('\G[ ]', true, index) + r2 = true + @index += 1 + else + r2 = nil + end + if r2 + r1 = nil + else + @index = i1 + r1 = instantiate_node(SyntaxNode,input, index...index) + end + s0 << r1 + if r1 + if index < input_length + r3 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure("any character") + r3 = nil + end + s0 << r3 + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(NonSpaceChar0) + else + @index = i0 + r0 = nil + end + + node_cache[:non_space_char][start_index] = r0 + + r0 + end + + module Not0 + end + + module Not1 + def space + elements[1] + end + end + + module Not2 + def eval(env={}) + empty? ? nil : 'not' + end + end + + def _nt_not + start_index = index + if node_cache[:not].has_key?(index) + cached = node_cache[:not][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + i2 = index + i3, s3 = index, [] + if has_terminal?('\G[nN]', true, index) + r4 = true + @index += 1 + else + r4 = nil + end + s3 << r4 + if r4 + if has_terminal?('\G[oO]', true, index) + r5 = true + @index += 1 + else + r5 = nil + end + s3 << r5 + if r5 + if has_terminal?('\G[tT]', true, index) + r6 = true + @index += 1 + else + r6 = nil + end + s3 << r6 + if r6 + if has_terminal?(' ', false, index) + r7 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure(' ') + r7 = nil + end + s3 << r7 + end + end + end + if s3.last + r3 = instantiate_node(SyntaxNode,input, i3...index, s3) + r3.extend(Not0) + else + @index = i3 + r3 = nil + end + if r3 + r2 = r3 + else + if has_terminal?('!', false, index) + r8 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('!') + r8 = nil + end + if r8 + r2 = r8 + else + @index = i2 + r2 = nil + end + end + if r2 + r1 = r2 + else + r1 = instantiate_node(SyntaxNode,input, index...index) + end + s0 << r1 + if r1 + r9 = _nt_space + s0 << r9 + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Not1) + r0.extend(Not2) + else + @index = i0 + r0 = nil + end + + node_cache[:not][start_index] = r0 + + r0 + end + + module Newline0 + def space + elements[0] + end + + end + + def _nt_newline + start_index = index + if node_cache[:newline].has_key?(index) + cached = node_cache[:newline][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + i0, s0 = index, [] + r1 = _nt_space + s0 << r1 + if r1 + if has_terminal?("\n", false, index) + r2 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure("\n") + r2 = nil + end + s0 << r2 + end + if s0.last + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + r0.extend(Newline0) + else + @index = i0 + r0 = nil + end + + node_cache[:newline][start_index] = r0 + + r0 + end + + def _nt_space + start_index = index + if node_cache[:space].has_key?(index) + cached = node_cache[:space][index] + if cached + cached = SyntaxNode.new(input, index...(index + 1)) if cached == true + @index = cached.interval.end + end + return cached + end + + s0, i0 = [], index + loop do + if has_terminal?('\G[ ]', true, index) + r1 = true + @index += 1 + else + r1 = nil + end + if r1 + s0 << r1 + else + break + end + end + r0 = instantiate_node(SyntaxNode,input, i0...index, s0) + + node_cache[:space][start_index] = r0 + + r0 + end + +end + +class UserSegmentOptionParser < Treetop::Runtime::CompiledParser + include UserSegmentOption +end + + diff --git a/app/models/user_segment_option_parser.treetop b/app/models/user_segment_option_parser.treetop new file mode 100644 index 00000000..d4e4b9e3 --- /dev/null +++ b/app/models/user_segment_option_parser.treetop @@ -0,0 +1,140 @@ + +grammar UserSegmentOption + + rule multiple_operations + operations:operations more:(newline+ operations)* newline* { + def eval(env={}) + [operations.eval(env)] + more.elements.collect { |e| e.operations.eval(env) } + end + } + end + + rule operations + not_op:not operation:operation more:('+' operation)* { + def eval(env={}) + [not_op.eval(env), operation.eval(env)] + more.elements.collect { |e| e.operation.eval(env) } + end + } + end + + rule operation + space field:field '.' operation:operation_name lparen arguments:arguments rparen child:sub_operations space { + def eval(env={}) + {:field => field.eval(env), :operation => operation.eval(env), :arguments => arguments.eval(env), :child => child.eval(env)} + end + } + end + + rule sub_operations + ('.' field '.' operation_name lparen arguments rparen)* { + def eval(env={}) + if empty? + nil + else + child = nil + elements.reverse.each do |e| + child = {:field => e.field.eval(env), :operation => e.operation_name.eval(env), :arguments => e.arguments.eval(env), :child => child} + end + child + end + end + } + end + + rule field + [a-zA-Z] [a-zA-Z0-9_]* { + def eval(env={}) + text_value + end + } + end + + rule operation_name + [a-zA-Z] [a-zA-Z0-9_]* { + def eval(env={}) + text_value + end + } + end + + rule arguments + arg:argument more:(',' argument)* { + def eval(env={}) + [arg.eval(env)] + more.elements.collect{ |e| e.argument.eval(env) } + end + } + end + + rule argument + space arg:(string / integer / float / boolean) space { + def eval(env={}) + arg.eval(env) + end + } + end + + rule string + '"' (!'"' . / '\"')* '"' { + def eval(env={}) + text_value[1..-2] + end + } + end + + rule integer + ([1-9] [0-9]* / '0') { + def eval(env={}) + text_value.to_i + end + } + end + + rule boolean + ('true' / 'TRUE' / 'True' / 'false' / 'FALSE' / 'False') { + def eval(env={}) + if text_value.downcase == 'true' + true + else + false + end + end + } + end + + rule float + [1-9] [0-9]* / '.' [0-9]+ / [0-9]+ '.' [0-9] { + def eval(env={}) + text_value.to_f + end + } + end + + rule lparen + space '(' space + end + + rule rparen + space ')' space + end + + rule non_space_char + ![ ] . + end + + rule not + ([nN] [oO] [tT] ' ' / '!')? space { + def eval(env={}) + empty? ? nil : 'not' + end + } + end + + rule newline + space "\n" + end + + rule space + [ ]* + end +end + diff --git a/db/migrate/20100511165552_user_segments.rb b/db/migrate/20100511165552_user_segments.rb new file mode 100644 index 00000000..b6657ccd --- /dev/null +++ b/db/migrate/20100511165552_user_segments.rb @@ -0,0 +1,39 @@ +class UserSegments < ActiveRecord::Migration + def self.up + create_table :user_segments, :force => true do |t| + t.string :name + t.text :description + t.string :type + t.boolean :main_page + t.datetime :last_ran_at + t.integer :last_count + t.text :fields + t.text :segment_options + t.text :segment_options_text + t.string :order_by + t.timestamps + end + + create_table :user_segment_caches, :force => true do |t| + t.integer :user_segment_id + t.text :id_list + t.datetime :created_at + end + + create_table :user_segment_analytics, :force => true do |t| + t.integer :user_segment_id + t.text :fields + t.text :results + t.datetime :start_date + t.datetime :end_date + t.string :step + t.timestamps + end + end + + def self.down + drop_table :user_segments + drop_table :user_segment_caches + drop_table :user_segment_analytics + end +end From 43a98fd58cfb38610615c53d6c0c2afc5d7dd657 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 13 May 2010 23:52:43 +0000 Subject: [PATCH 031/139] Fixes for user segment types. Added specs for most basic parts of user segments. --- app/models/user_segment/core_type.rb | 20 +++- app/models/user_segment/field_handler.rb | 17 ++- app/models/user_segment/field_type.rb | 24 ++-- app/models/user_segment/parser.rb | 4 - spec/models/user_segment/core_type_spec.rb | 111 ++++++++++++++++++ .../models/user_segment/field_handler_spec.rb | 18 +++ spec/models/user_segment/field_spec.rb | 62 ++++++++++ spec/models/user_segment/field_type_spec.rb | 90 ++++++++++++++ spec/models/user_segment/operation_spec.rb | 47 ++++++++ 9 files changed, 373 insertions(+), 20 deletions(-) delete mode 100644 app/models/user_segment/parser.rb create mode 100644 spec/models/user_segment/core_type_spec.rb create mode 100644 spec/models/user_segment/field_handler_spec.rb create mode 100644 spec/models/user_segment/field_spec.rb create mode 100644 spec/models/user_segment/field_type_spec.rb create mode 100644 spec/models/user_segment/operation_spec.rb diff --git a/app/models/user_segment/core_type.rb b/app/models/user_segment/core_type.rb index 5ab25e4f..28b83e60 100644 --- a/app/models/user_segment/core_type.rb +++ b/app/models/user_segment/core_type.rb @@ -1,7 +1,7 @@ class UserSegment::CoreType - @@datetime_format_options = ['day', 'days', 'week', 'weeks', 'month', 'months', 'year', 'years'] + @@datetime_format_options = ['second', 'seconds', 'minute', 'minutes', 'hour', 'hours', 'day', 'days', 'week', 'weeks', 'month', 'months', 'year', 'years'] def self.datetime_format_options @@datetime_format_options end @@ -37,17 +37,35 @@ def self.greater_than(cls, field, value) cls.scoped(:conditions => ["#{field} > ?", value]) end + register_operation :greater_than_or_equal_to, [['Value', :integer]] + + def self.greater_than_or_equal_to(cls, field, value) + cls.scoped(:conditions => ["#{field} >= ?", value]) + end + register_operation :less_than, [['Value', :integer]] def self.less_than(cls, field, value) cls.scoped(:conditions => ["#{field} < ?", value]) end + register_operation :less_than_or_equal_to, [['Value', :integer]] + + def self.less_than_or_equal_to(cls, field, value) + cls.scoped(:conditions => ["#{field} <= ?", value]) + end + register_operation :equals, [['Value', :integer]] def self.equals(cls, field, value) cls.scoped(:conditions => ["#{field} = ?", value]) end + + register_operation :is, [['Value', :integer]] + + def self.is(cls, field, value) + self.equals(cls, field, value) + end end class StringType < UserSegment::FieldType diff --git a/app/models/user_segment/field_handler.rb b/app/models/user_segment/field_handler.rb index 47b1bb30..f8e7d126 100644 --- a/app/models/user_segment/field_handler.rb +++ b/app/models/user_segment/field_handler.rb @@ -1,17 +1,22 @@ class UserSegment::FieldHandler - def self.user_segment_fields - @user_segment_fields ||= {} - end + def self.user_segment_fields; {}; end def self.has_field?(field) self.user_segment_fields[field.to_sym] ? true : false end def self.register_field(field, type, options={}) - self.user_segment_fields[field.to_sym] = options.merge(:type => type) - self.user_segment_fields[field.to_sym][:name] ||= field.to_s.humanize - self.user_segment_fields[field.to_sym][:field] ||= field.to_sym + fields = self.user_segment_fields + + fields[field.to_sym] = options.merge(:type => type) + fields[field.to_sym][:name] ||= field.to_s.humanize + fields[field.to_sym][:field] ||= field.to_sym + + sing = class << self; self; end + sing.send :define_method, :user_segment_fields do + fields + end end end diff --git a/app/models/user_segment/field_type.rb b/app/models/user_segment/field_type.rb index b82402bd..bd722608 100644 --- a/app/models/user_segment/field_type.rb +++ b/app/models/user_segment/field_type.rb @@ -1,15 +1,15 @@ class UserSegment::FieldType - def self.user_segment_field_type_operations - @user_segment_field_type_operations ||= {} - end + def self.user_segment_field_type_operations; {}; end def self.has_operation?(operation) self.user_segment_field_type_operations[operation.to_sym] ? true : false end def self.register_operation(operation, args=[], options={}) + operations = self.user_segment_field_type_operations + arguments = [] argument_names = [] argument_options = [] @@ -29,9 +29,14 @@ def self.register_operation(operation, args=[], options={}) argument_options << opts end - name = options[:name] || operation.to_s.humanize + + operations[operation.to_sym] = options.merge(:arguments => arguments, :argument_names => argument_names, :argument_options => argument_options) + operations[operation.to_sym][:name] ||= operation.to_s.humanize - self.user_segment_field_type_operations[operation.to_sym] = options.merge(:name => name, :arguments => arguments, :argument_names => argument_names, :argument_options => argument_options) + sing = class << self; self; end + sing.send :define_method, :user_segment_field_type_operations do + operations + end end # converts a string to the correct type @@ -43,10 +48,10 @@ def self.convert_to(value, type, opts={}) when :float, :double return value.to_f if value.is_a?(Numeric) || value =~ /^(\d+|\.\d+|\d+\.\d+)$/ when :string - return value + return value if value.is_a?(String) when :date, :datetime begin - return value if value.is_a?(::Time) + return value if value.is_a?(Time) return Time.parse(value) rescue end @@ -55,8 +60,9 @@ def self.convert_to(value, type, opts={}) return value if value when :boolean return value if value.is_a?(TrueClass) || value.is_a?(FalseClass) - return true if value == '1' || value.downcase == 'true' - return false if value == '0' || value.downcase == 'false' + value = value.downcase if value.is_a?(String) + return true if value == 1 || value == '1' || value == 'true' + return false if value == 0 || value == '0' || value == 'false' end nil diff --git a/app/models/user_segment/parser.rb b/app/models/user_segment/parser.rb deleted file mode 100644 index 16a21179..00000000 --- a/app/models/user_segment/parser.rb +++ /dev/null @@ -1,4 +0,0 @@ - -class UserSegment::Parser - -end diff --git a/spec/models/user_segment/core_type_spec.rb b/spec/models/user_segment/core_type_spec.rb new file mode 100644 index 00000000..4c645e69 --- /dev/null +++ b/spec/models/user_segment/core_type_spec.rb @@ -0,0 +1,111 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +describe UserSegment::CoreType do + + reset_domain_tables :end_users + + describe "DateTimeType" do + before(:each) do + EndUser.push_target('test1@test.dev', :created_at => 2.days.ago) + EndUser.push_target('test2@test.dev', :created_at => 5.days.ago) + EndUser.push_target('test3@test.dev') + + @type = UserSegment::CoreType::DateTimeType + end + + it "should return users using before" do + @type.before(EndUser, :created_at, 1, 'day').count.should == 2 + @type.before(EndUser, :created_at, 3, 'days').count.should == 1 + @type.before(EndUser, :created_at, 6, 'days').count.should == 0 + end + + it "should return users using since" do + @type.since(EndUser, :created_at, 1, 'day').count.should == 1 + @type.since(EndUser, :created_at, 3, 'days').count.should == 2 + @type.since(EndUser, :created_at, 6, 'days').count.should == 3 + end + + it "should return users using between" do + @type.between(EndUser, :created_at, 1.day.ago, Time.now).count.should == 1 + @type.between(EndUser, :created_at, 3.day.ago, Time.now).count.should == 2 + @type.between(EndUser, :created_at, 6.day.ago, Time.now).count.should == 3 + end + end + + describe "NumberType" do + before(:each) do + EndUser.push_target('test1@test.dev', :user_level => 1) + EndUser.push_target('test2@test.dev', :user_level => 2) + EndUser.push_target('test3@test.dev', :user_level => 3) + EndUser.push_target('test4@test.dev', :user_level => 3) + + @type = UserSegment::CoreType::NumberType + end + + it "should return users using greater_than" do + @type.greater_than(EndUser, :user_level, 2).count.should == 2 + @type.greater_than(EndUser, :user_level, 3).count.should == 0 + end + + it "should return users using greater_than_or_equal_to" do + @type.greater_than_or_equal_to(EndUser, :user_level, 1).count.should == 4 + @type.greater_than_or_equal_to(EndUser, :user_level, 2).count.should == 3 + @type.greater_than_or_equal_to(EndUser, :user_level, 4).count.should == 0 + end + + it "should return users using less_than" do + @type.less_than(EndUser, :user_level, 1).count.should == 0 + @type.less_than(EndUser, :user_level, 2).count.should == 1 + @type.less_than(EndUser, :user_level, 4).count.should == 4 + end + + it "should return users using less_than_or_equal_to" do + @type.less_than_or_equal_to(EndUser, :user_level, 1).count.should == 1 + @type.less_than_or_equal_to(EndUser, :user_level, 2).count.should == 2 + @type.less_than_or_equal_to(EndUser, :user_level, 3).count.should == 4 + @type.less_than_or_equal_to(EndUser, :user_level, 4).count.should == 4 + end + + it "should return users using equals" do + @type.equals(EndUser, :user_level, 1).count.should == 1 + @type.equals(EndUser, :user_level, 2).count.should == 1 + @type.equals(EndUser, :user_level, 3).count.should == 2 + @type.is(EndUser, :user_level, 3).count.should == 2 + end + end + + describe "StringType" do + before(:each) do + EndUser.push_target('test1@test.dev') + EndUser.push_target('test2@test.dev') + EndUser.push_target('test3@test.dev') + EndUser.push_target('test4@test.dev') + + @type = UserSegment::CoreType::StringType + end + + it "should return users using like" do + @type.like(EndUser, :email, 'test%@test.dev').count.should == 4 + end + + it "should return users using is" do + @type.is(EndUser, :email, 'test1@test.dev').count.should == 1 + end + end + + describe "BooleanType" do + before(:each) do + EndUser.push_target('test1@test.dev', :activated => true) + EndUser.push_target('test2@test.dev', :activated => true) + EndUser.push_target('test3@test.dev', :activated => true) + EndUser.push_target('test4@test.dev', :activated => false) + + @type = UserSegment::CoreType::BooleanType + end + + it "should return users using is" do + @type.is(EndUser, :activated, true).count.should == 3 + @type.is(EndUser, :activated, false).count.should == 1 + end + end +end diff --git a/spec/models/user_segment/field_handler_spec.rb b/spec/models/user_segment/field_handler_spec.rb new file mode 100644 index 00000000..bcd1682f --- /dev/null +++ b/spec/models/user_segment/field_handler_spec.rb @@ -0,0 +1,18 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +describe UserSegment::FieldHandler do + + it "should be able to register a field" do + UserSegment::FieldHandler.register_field(:created, UserSegment::CoreType::DateTimeType, :field => :created_at) + UserSegment::FieldHandler.has_field?(:created).should be_true + UserSegment::FieldHandler.user_segment_fields[:created][:field].should == :created_at + UserSegment::FieldHandler.user_segment_fields[:created][:type].should == UserSegment::CoreType::DateTimeType + UserSegment::FieldHandler.user_segment_fields[:created][:name].should == 'Created' + + UserSegment::FieldHandler.register_field(:created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'EndUser.created') + UserSegment::FieldHandler.has_field?(:created).should be_true + UserSegment::FieldHandler.user_segment_fields[:created][:field].should == :created_at + UserSegment::FieldHandler.user_segment_fields[:created][:type].should == UserSegment::CoreType::DateTimeType + UserSegment::FieldHandler.user_segment_fields[:created][:name].should == 'EndUser.created' + end +end diff --git a/spec/models/user_segment/field_spec.rb b/spec/models/user_segment/field_spec.rb new file mode 100644 index 00000000..85ea21bb --- /dev/null +++ b/spec/models/user_segment/field_spec.rb @@ -0,0 +1,62 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +describe UserSegment::Field do + + reset_domain_tables :end_users + + @handler = EndUserSegmentField.user_segment_fields_handler_info + + before(:each) do + EndUser.push_target('test1@test.dev', :created_at => 2.days.ago, :activated => true) + EndUser.push_target('test2@test.dev', :created_at => 5.days.ago, :activated => false) + EndUser.push_target('test3@test.dev', :activated => false) + end + + it "should be able to use handler" do + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] + @field.handler = @handler + + @field.handler_class.should == EndUserSegmentField + @field.domain_model_class.should == EndUser + @field.end_user_field.should == :id + @field.model_field.should == :created_at + @field.type_class.should == UserSegment::CoreType::DateTimeType + @field.operation_arguments.should == [:integer, :option] + @field.valid_arguments?.should == true + @field.valid?.should == true + end + + it "should return the count" do + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] + @field.handler = @handler + @field.valid?.should == true + @field.count.should == 2 + @field.end_user_ids.length.should == 2 + + @field = UserSegment::Field.new :field => 'created', :operation => 'since', :arguments => [1, 'days'] + @field.handler = @handler + @field.valid?.should == true + @field.count.should == 1 + @field.end_user_ids.length.should == 1 + end + + it "should work with children" do + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'], :child => {:field => 'activated', :operation => 'is', :arguments => [true]} + @field.handler = @handler + @field.valid?.should == true + @field.count.should == 1 + @field.end_user_ids.length.should == 1 + + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'], :child => {:field => 'activated', :operation => 'is', :arguments => [true], :child => {:field => 'email', :operation => 'like', :arguments => ['test%@test.dev']}} + @field.handler = @handler + @field.valid?.should == true + @field.count.should == 1 + @field.end_user_ids.length.should == 1 + + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'], :child => {:field => 'activated', :operation => 'is', :arguments => [false], :child => {:field => 'email', :operation => 'like', :arguments => ['test%@test.dev']}} + @field.handler = @handler + @field.valid?.should == true + @field.count.should == 1 + @field.end_user_ids.length.should == 1 + end +end diff --git a/spec/models/user_segment/field_type_spec.rb b/spec/models/user_segment/field_type_spec.rb new file mode 100644 index 00000000..54c9898a --- /dev/null +++ b/spec/models/user_segment/field_type_spec.rb @@ -0,0 +1,90 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +describe UserSegment::FieldType do + + it "should convert value to integer" do + UserSegment::FieldType.convert_to("0", :integer).should == 0 + UserSegment::FieldType.convert_to(0, :integer).should == 0 + UserSegment::FieldType.convert_to("1", :integer).should == 1 + UserSegment::FieldType.convert_to(99, :integer).should == 99 + UserSegment::FieldType.convert_to(99.0, :integer).should be_nil + UserSegment::FieldType.convert_to("99", :integer).should == 99 + UserSegment::FieldType.convert_to("1n", :integer).should be_nil + end + + it "should convert value to float" do + UserSegment::FieldType.convert_to("0", :float).should == 0.0 + UserSegment::FieldType.convert_to(0, :float).should == 0.0 + UserSegment::FieldType.convert_to("1", :float).should == 1.0 + UserSegment::FieldType.convert_to(99, :float).should == 99.0 + UserSegment::FieldType.convert_to(99.0, :float).should == 99.0 + UserSegment::FieldType.convert_to("99", :float).should == 99.0 + UserSegment::FieldType.convert_to("3.54", :float).should == 3.54 + UserSegment::FieldType.convert_to(3.54, :float).should == 3.54 + UserSegment::FieldType.convert_to("1n", :float).should be_nil + end + + it "should only return string values" do + UserSegment::FieldType.convert_to("hello world", :string).should == "hello world" + UserSegment::FieldType.convert_to(1, :string).should be_nil + UserSegment::FieldType.convert_to(true, :string).should be_nil + UserSegment::FieldType.convert_to(false, :string).should be_nil + UserSegment::FieldType.convert_to(nil, :string).should be_nil + UserSegment::FieldType.convert_to(0.1, :string).should be_nil + UserSegment::FieldType.convert_to(Time.now, :string).should be_nil + end + + it "should convert value to time" do + time = Time.parse "1/1/1990" + UserSegment::FieldType.convert_to(time.strftime("1/1/1990"), :datetime).should == time + time = Time.now + UserSegment::FieldType.convert_to(time, :datetime).should == time + end + + it "should convert value to boolean" do + UserSegment::FieldType.convert_to(true, :boolean).should == true + UserSegment::FieldType.convert_to('true', :boolean).should == true + UserSegment::FieldType.convert_to('TRUE', :boolean).should == true + UserSegment::FieldType.convert_to(1, :boolean).should == true + UserSegment::FieldType.convert_to('1', :boolean).should == true + UserSegment::FieldType.convert_to(false, :boolean).should == false + UserSegment::FieldType.convert_to('false', :boolean).should == false + UserSegment::FieldType.convert_to('FALSE', :boolean).should == false + UserSegment::FieldType.convert_to(0, :boolean).should == false + UserSegment::FieldType.convert_to('0', :boolean).should == false + end + + it "should convert value to option" do + UserSegment::FieldType.convert_to('day', :option, :options => ['day', 'days', 'week', 'weeks']).should == 'day' + UserSegment::FieldType.convert_to('Day', :option, :options => ['day', 'days', 'week', 'weeks']).should == 'day' + UserSegment::FieldType.convert_to('DAY', :option, :options => ['day', 'days', 'week', 'weeks']).should == 'day' + UserSegment::FieldType.convert_to('weeks', :option, :options => ['day', 'days', 'week', 'weeks']).should == 'weeks' + UserSegment::FieldType.convert_to('WeeKs', :option, :options => ['day', 'days', 'week', 'weeks']).should == 'weeks' + UserSegment::FieldType.convert_to('WeEk', :option, :options => ['day', 'days', 'week', 'weeks']).should == 'week' + UserSegment::FieldType.convert_to('now', :option, :options => ['day', 'days', 'week', 'weeks']).should be_nil + UserSegment::FieldType.convert_to('dayss', :option, :options => ['day', 'days', 'week', 'weeks']).should be_nil + end + + it "should covert all the arguments" do + arguments = ['1', 'test', 'true', '1/1/1990', 'Days', '1day'] + types = [:integer, :string, :boolean, :datetime, :option, :integer] + options = [{}, {}, {}, {}, {:options => ['day', 'days', 'week', 'weeks']}] + + converted = UserSegment::FieldType.convert_arguments(arguments, types, options) + converted[0].should == 1 + converted[1].should == 'test' + converted[2].should == true + converted[3].should == Time.parse('1/1/1990') + converted[4].should == 'days' + converted[5].should be_nil + end + + it "should be able to register and operation" do + UserSegment::FieldType.register_operation(:from, [['Value', :integer], ['Option', :option, {:options => ['day', 'days']}]]) + UserSegment::FieldType.has_operation?('from').should be_true + operation = UserSegment::FieldType.user_segment_field_type_operations[:from] + converted = UserSegment::FieldType.convert_arguments([1, 'Day'], operation[:arguments], operation[:argument_options]) + converted[0].should == 1 + converted[1].should == 'day' + end +end diff --git a/spec/models/user_segment/operation_spec.rb b/spec/models/user_segment/operation_spec.rb new file mode 100644 index 00000000..19ca163b --- /dev/null +++ b/spec/models/user_segment/operation_spec.rb @@ -0,0 +1,47 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +describe UserSegment::Operation do + + reset_domain_tables :end_users + + @handler = EndUserSegmentField.user_segment_fields_handler_info + + before(:each) do + EndUser.push_target('test1@test.dev', :created_at => 2.days.ago, :activated => true) + EndUser.push_target('test2@test.dev', :created_at => 5.days.ago, :activated => false) + EndUser.push_target('test3@test.dev', :activated => false) + end + + it "should be able to get the count" do + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] + @field.handler = @handler + + @operation = UserSegment::Operation.new nil, [@field] + @operation.valid?.should be_true + @operation.count.should == 2 + @operation.end_user_ids.length.should == 2 + + @operation = UserSegment::Operation.new 'not', [@field] + @operation.valid?.should be_true + @operation.count.should == 1 + @operation.end_user_ids.length.should == 1 + end + + it "should be able to concat fields" do + @field1 = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] + @field1.handler = @handler + + @field2 = UserSegment::Field.new :field => 'activated', :operation => 'is', :arguments => [false] + @field2.handler = @handler + + @operation = UserSegment::Operation.new nil, [@field1, @field2] + @operation.valid?.should be_true + @operation.count.should == 4 + @operation.end_user_ids.length.should == 3 + + @operation = UserSegment::Operation.new 'not', [@field1, @field2] + @operation.valid?.should be_true + @operation.count.should == 2 + @operation.end_user_ids.length.should == 0 + end +end From 8cd3c210365e3bb2de7a1e87e6909dd1efc75400 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 14 May 2010 14:07:07 +0000 Subject: [PATCH 032/139] Fixed the not condition in the parser. Add test for Operations. Added method in Field Handler called handlers. Makes sure end user fields are returned first. --- app/models/end_user_segment_field.rb | 1 + app/models/user_segment/field.rb | 2 +- app/models/user_segment/field_handler.rb | 7 ++ app/models/user_segment/operations.rb | 3 + app/models/user_segment_option_parser.rb | 112 ++++++++++-------- app/models/user_segment_option_parser.treetop | 6 +- .../models/user_segment/field_handler_spec.rb | 4 + spec/models/user_segment/field_spec.rb | 9 +- spec/models/user_segment/operation_spec.rb | 30 ++--- spec/models/user_segment/operations_spec.rb | 108 +++++++++++++++++ 10 files changed, 206 insertions(+), 76 deletions(-) create mode 100644 spec/models/user_segment/operations_spec.rb diff --git a/app/models/end_user_segment_field.rb b/app/models/end_user_segment_field.rb index d4eb08ef..b5442962 100644 --- a/app/models/end_user_segment_field.rb +++ b/app/models/end_user_segment_field.rb @@ -15,5 +15,6 @@ def self.user_segment_fields_handler_info register_field :registered, UserSegment::CoreType::BooleanType register_field :activated, UserSegment::CoreType::BooleanType register_field :id, UserSegment::CoreType::NumberType + register_field :user_level, UserSegment::CoreType::NumberType end diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index c13685fb..37d69904 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -80,7 +80,7 @@ def model_field end def handler - @handler ||= self.get_handler_info(:user_segment, :fields).find { |info| info[:class].has_field?(self.field) } + @handler ||= UserSegment::FieldHandler.handlers.find { |info| info[:class].has_field?(self.field) } end def handler=(handler) diff --git a/app/models/user_segment/field_handler.rb b/app/models/user_segment/field_handler.rb index f8e7d126..4d112600 100644 --- a/app/models/user_segment/field_handler.rb +++ b/app/models/user_segment/field_handler.rb @@ -1,5 +1,6 @@ class UserSegment::FieldHandler + include HandlerActions def self.user_segment_fields; {}; end @@ -19,4 +20,10 @@ def self.register_field(field, type, options={}) fields end end + + def self.handlers + ([ self.get_handler_info(:user_segment, :fields, 'end_user_segment_field'), + self.get_handler_info(:user_segment, :fields, 'end_user_action_segment_field')] + + self.get_handler_info(:user_segment, :fields)).uniq + end end diff --git a/app/models/user_segment/operations.rb b/app/models/user_segment/operations.rb index b7ee7531..e23561a4 100644 --- a/app/models/user_segment/operations.rb +++ b/app/models/user_segment/operations.rb @@ -21,6 +21,9 @@ def parser def parse(text) if options = self.parser.parse(text) self.operations = options.eval + true + else + false end end diff --git a/app/models/user_segment_option_parser.rb b/app/models/user_segment_option_parser.rb index ca944e3b..0c419dc0 100644 --- a/app/models/user_segment_option_parser.rb +++ b/app/models/user_segment_option_parser.rb @@ -1324,14 +1324,20 @@ module Not0 end module Not1 - def space - elements[1] + def space1 + elements[0] + end + + def space2 + elements[2] end end module Not2 def eval(env={}) - empty? ? nil : 'not' + return nil if empty? + return 'not' if text_value.strip.downcase == 'not' || text_value.strip.downcase == '!' + nil end end @@ -1347,76 +1353,80 @@ def _nt_not end i0, s0 = index, [] - i2 = index - i3, s3 = index, [] - if has_terminal?('\G[nN]', true, index) - r4 = true - @index += 1 - else - r4 = nil - end - s3 << r4 - if r4 - if has_terminal?('\G[oO]', true, index) + r1 = _nt_space + s0 << r1 + if r1 + i3 = index + i4, s4 = index, [] + if has_terminal?('\G[nN]', true, index) r5 = true @index += 1 else r5 = nil end - s3 << r5 + s4 << r5 if r5 - if has_terminal?('\G[tT]', true, index) + if has_terminal?('\G[oO]', true, index) r6 = true @index += 1 else r6 = nil end - s3 << r6 + s4 << r6 if r6 - if has_terminal?(' ', false, index) - r7 = instantiate_node(SyntaxNode,input, index...(index + 1)) + if has_terminal?('\G[tT]', true, index) + r7 = true @index += 1 else - terminal_parse_failure(' ') r7 = nil end - s3 << r7 + s4 << r7 + if r7 + if has_terminal?(' ', false, index) + r8 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure(' ') + r8 = nil + end + s4 << r8 + end end end - end - if s3.last - r3 = instantiate_node(SyntaxNode,input, i3...index, s3) - r3.extend(Not0) - else - @index = i3 - r3 = nil - end - if r3 - r2 = r3 - else - if has_terminal?('!', false, index) - r8 = instantiate_node(SyntaxNode,input, index...(index + 1)) - @index += 1 + if s4.last + r4 = instantiate_node(SyntaxNode,input, i4...index, s4) + r4.extend(Not0) else - terminal_parse_failure('!') - r8 = nil + @index = i4 + r4 = nil end - if r8 - r2 = r8 + if r4 + r3 = r4 else - @index = i2 - r2 = nil + if has_terminal?('!', false, index) + r9 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('!') + r9 = nil + end + if r9 + r3 = r9 + else + @index = i3 + r3 = nil + end + end + if r3 + r2 = r3 + else + r2 = instantiate_node(SyntaxNode,input, index...index) + end + s0 << r2 + if r2 + r10 = _nt_space + s0 << r10 end - end - if r2 - r1 = r2 - else - r1 = instantiate_node(SyntaxNode,input, index...index) - end - s0 << r1 - if r1 - r9 = _nt_space - s0 << r9 end if s0.last r0 = instantiate_node(SyntaxNode,input, i0...index, s0) diff --git a/app/models/user_segment_option_parser.treetop b/app/models/user_segment_option_parser.treetop index d4e4b9e3..3d83bb8d 100644 --- a/app/models/user_segment_option_parser.treetop +++ b/app/models/user_segment_option_parser.treetop @@ -122,9 +122,11 @@ grammar UserSegmentOption end rule not - ([nN] [oO] [tT] ' ' / '!')? space { + space ([nN] [oO] [tT] ' ' / '!')? space { def eval(env={}) - empty? ? nil : 'not' + return nil if empty? + return 'not' if text_value.strip.downcase == 'not' || text_value.strip.downcase == '!' + nil end } end diff --git a/spec/models/user_segment/field_handler_spec.rb b/spec/models/user_segment/field_handler_spec.rb index bcd1682f..fd82ab29 100644 --- a/spec/models/user_segment/field_handler_spec.rb +++ b/spec/models/user_segment/field_handler_spec.rb @@ -15,4 +15,8 @@ UserSegment::FieldHandler.user_segment_fields[:created][:type].should == UserSegment::CoreType::DateTimeType UserSegment::FieldHandler.user_segment_fields[:created][:name].should == 'EndUser.created' end + + it "should always return the EndUserSegmentField as the first handler" do + UserSegment::FieldHandler.handlers[0][:class] == EndUserSegmentField + end end diff --git a/spec/models/user_segment/field_spec.rb b/spec/models/user_segment/field_spec.rb index 85ea21bb..81264a01 100644 --- a/spec/models/user_segment/field_spec.rb +++ b/spec/models/user_segment/field_spec.rb @@ -4,8 +4,6 @@ reset_domain_tables :end_users - @handler = EndUserSegmentField.user_segment_fields_handler_info - before(:each) do EndUser.push_target('test1@test.dev', :created_at => 2.days.ago, :activated => true) EndUser.push_target('test2@test.dev', :created_at => 5.days.ago, :activated => false) @@ -14,7 +12,6 @@ it "should be able to use handler" do @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] - @field.handler = @handler @field.handler_class.should == EndUserSegmentField @field.domain_model_class.should == EndUser @@ -28,13 +25,12 @@ it "should return the count" do @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] - @field.handler = @handler + @field.valid?.should == true @field.count.should == 2 @field.end_user_ids.length.should == 2 @field = UserSegment::Field.new :field => 'created', :operation => 'since', :arguments => [1, 'days'] - @field.handler = @handler @field.valid?.should == true @field.count.should == 1 @field.end_user_ids.length.should == 1 @@ -42,19 +38,16 @@ it "should work with children" do @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'], :child => {:field => 'activated', :operation => 'is', :arguments => [true]} - @field.handler = @handler @field.valid?.should == true @field.count.should == 1 @field.end_user_ids.length.should == 1 @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'], :child => {:field => 'activated', :operation => 'is', :arguments => [true], :child => {:field => 'email', :operation => 'like', :arguments => ['test%@test.dev']}} - @field.handler = @handler @field.valid?.should == true @field.count.should == 1 @field.end_user_ids.length.should == 1 @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'], :child => {:field => 'activated', :operation => 'is', :arguments => [false], :child => {:field => 'email', :operation => 'like', :arguments => ['test%@test.dev']}} - @field.handler = @handler @field.valid?.should == true @field.count.should == 1 @field.end_user_ids.length.should == 1 diff --git a/spec/models/user_segment/operation_spec.rb b/spec/models/user_segment/operation_spec.rb index 19ca163b..3690aac1 100644 --- a/spec/models/user_segment/operation_spec.rb +++ b/spec/models/user_segment/operation_spec.rb @@ -4,44 +4,46 @@ reset_domain_tables :end_users - @handler = EndUserSegmentField.user_segment_fields_handler_info - before(:each) do EndUser.push_target('test1@test.dev', :created_at => 2.days.ago, :activated => true) EndUser.push_target('test2@test.dev', :created_at => 5.days.ago, :activated => false) EndUser.push_target('test3@test.dev', :activated => false) + EndUser.push_target('test4@test.dev', :activated => true) + EndUser.push_target('test5@test.dev', :activated => false) + EndUser.push_target('test6@test.dev', :created_at => 10.days.ago, :activated => true) + EndUser.push_target('test7@test.dev', :activated => false) end it "should be able to get the count" do @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] - @field.handler = @handler @operation = UserSegment::Operation.new nil, [@field] @operation.valid?.should be_true - @operation.count.should == 2 - @operation.end_user_ids.length.should == 2 + @operation.count.should == 3 + @operation.end_user_ids.length.should == 3 + @operation.to_a.should == [nil, @field.to_h] @operation = UserSegment::Operation.new 'not', [@field] @operation.valid?.should be_true - @operation.count.should == 1 - @operation.end_user_ids.length.should == 1 + @operation.count.should == 4 + @operation.end_user_ids.length.should == 4 + @operation.to_a.should == ['not', @field.to_h] end it "should be able to concat fields" do @field1 = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] - @field1.handler = @handler - @field2 = UserSegment::Field.new :field => 'activated', :operation => 'is', :arguments => [false] - @field2.handler = @handler @operation = UserSegment::Operation.new nil, [@field1, @field2] @operation.valid?.should be_true - @operation.count.should == 4 - @operation.end_user_ids.length.should == 3 + @operation.count.should == 7 + @operation.end_user_ids.length.should == 6 + @operation.to_a.should == [nil, @field1.to_h, @field2.to_h] @operation = UserSegment::Operation.new 'not', [@field1, @field2] @operation.valid?.should be_true - @operation.count.should == 2 - @operation.end_user_ids.length.should == 0 + @operation.count.should == 7 + @operation.end_user_ids.length.should == 1 + @operation.to_a.should == ['not', @field1.to_h, @field2.to_h] end end diff --git a/spec/models/user_segment/operations_spec.rb b/spec/models/user_segment/operations_spec.rb new file mode 100644 index 00000000..ce27e177 --- /dev/null +++ b/spec/models/user_segment/operations_spec.rb @@ -0,0 +1,108 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +describe UserSegment::Operations do + + reset_domain_tables :end_users + + before(:each) do + @user1 = EndUser.push_target('test1@test.dev', :created_at => 2.days.ago, :activated => true, :user_level => 1) + @user2 = EndUser.push_target('test2@test.dev', :created_at => 5.days.ago, :activated => false, :user_level => 2) + @user3 = EndUser.push_target('test3@test.dev', :activated => false, :user_level => 3) + @user4 = EndUser.push_target('test4@test.dev', :activated => true, :user_level => 1) + @user5 = EndUser.push_target('test5@test.dev', :activated => false, :user_level => 2) + @user6 = EndUser.push_target('test6@test.dev', :created_at => 10.days.ago, :activated => true, :user_level => 3) + @user7 = EndUser.push_target('test7@test.dev', :activated => false, :user_level => 1) + end + + it "should return the end user ids from a given set of options" do + @operations = UserSegment::Operations.new + options = [[nil, {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}]] + @operations.operations = options + @operations.valid?.should == true + @operations.to_a.should == options + @operations.end_user_ids.length.should == 5 + end + + it "should be able to refine end user ids based on multiple operations" do + @operations = UserSegment::Operations.new + options = [ + [nil, {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}], + [nil, {:field => 'activated', :operation => 'is', :arguments => [true], :child => nil}] + ] + @operations.operations = options + @operations.valid?.should == true + @operations.to_a.should == options + @operations.end_user_ids.length.should == 2 + end + + it "should return the end user ids from a given set operations syntax" do + @operations = UserSegment::Operations.new + options = [[nil, {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}]] + code = <<-CODE + created.since(3, "days") + CODE + @operations.parse(code).should be_true + @operations.valid?.should == true + @operations.to_a.should == options + @operations.end_user_ids.length.should == 5 + + @operations = UserSegment::Operations.new + options = [['not', {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}]] + code = <<-CODE + not created.since(3, "days") + CODE + @operations.parse(code).should be_true + @operations.valid?.should == true + @operations.to_a.should == options + @operations.end_user_ids.length.should == 2 + end + + it "should be able to refine end user ids with multiple operations" do + @operations = UserSegment::Operations.new + options = [ + [nil, {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}], + [nil, {:field => 'activated', :operation => 'is', :arguments => [true], :child => nil}] + ] + code = <<-CODE + created.since(3, "days") + activated.is(true) + CODE + @operations.parse(code).should be_true + @operations.valid?.should == true + @operations.to_a.should == options + @operations.end_user_ids.length.should == 2 + @operations.end_user_ids.include?(@user1.id).should be_true + @operations.end_user_ids.include?(@user4.id).should be_true + + @operations = UserSegment::Operations.new + options = [ + ['not', {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}], + [nil, {:field => 'activated', :operation => 'is', :arguments => [true], :child => nil}] + ] + code = <<-CODE + not created.since(3, "days") + activated.is(true) + CODE + @operations.parse(code).should be_true + @operations.valid?.should == true + @operations.to_a.should == options + @operations.end_user_ids.length.should == 1 + @operations.end_user_ids.include?(@user6.id).should be_true + + @operations = UserSegment::Operations.new + options = [ + ['not', {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}, {:field => 'user_level', :operation => 'is', :arguments => [1], :child => nil}], + [nil, {:field => 'activated', :operation => 'is', :arguments => [true], :child => nil}] + ] + code = <<-CODE + not created.since(3, "days") + user_level.is(1) + activated.is(true) + CODE + @operations.parse(code).should be_true + @operations.valid?.should == true + @operations.to_a.should == options + @operations.end_user_ids.length.should == 1 + @operations.end_user_ids.include?(@user6.id).should be_true + end + +end From 0d808dd1b9b399112fa1321a043b56c0ef119b3e Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 14 May 2010 16:26:49 +0000 Subject: [PATCH 033/139] Fix for strings. Test the parser --- app/models/user_segment_option_parser.rb | 340 ++++++++++-------- app/models/user_segment_option_parser.treetop | 8 +- .../models/user_segment_option_parser_spec.rb | 92 +++++ 3 files changed, 277 insertions(+), 163 deletions(-) create mode 100644 spec/models/user_segment_option_parser_spec.rb diff --git a/app/models/user_segment_option_parser.rb b/app/models/user_segment_option_parser.rb index 0c419dc0..e6cbb866 100644 --- a/app/models/user_segment_option_parser.rb +++ b/app/models/user_segment_option_parser.rb @@ -660,11 +660,11 @@ def _nt_argument if r3 r2 = r3 else - r4 = _nt_integer + r4 = _nt_float if r4 r2 = r4 else - r5 = _nt_float + r5 = _nt_integer if r5 r2 = r5 else @@ -706,7 +706,7 @@ module String1 module String2 def eval(env={}) - text_value[1..-2] + text_value[1..-2].gsub('\"', '"').gsub('\\\'', "'") end end @@ -721,95 +721,142 @@ def _nt_string return cached end - i0, s0 = index, [] + i0 = index + i1, s1 = index, [] if has_terminal?('"', false, index) - r1 = instantiate_node(SyntaxNode,input, index...(index + 1)) + r2 = instantiate_node(SyntaxNode,input, index...(index + 1)) @index += 1 else terminal_parse_failure('"') - r1 = nil + r2 = nil end - s0 << r1 - if r1 - s2, i2 = [], index + s1 << r2 + if r2 + s3, i3 = [], index loop do - i3 = index - i4, s4 = index, [] - i5 = index - if has_terminal?('"', false, index) - r6 = instantiate_node(SyntaxNode,input, index...(index + 1)) - @index += 1 + i4 = index + if has_terminal?('\"', false, index) + r5 = instantiate_node(SyntaxNode,input, index...(index + 2)) + @index += 2 else - terminal_parse_failure('"') - r6 = nil - end - if r6 + terminal_parse_failure('\"') r5 = nil - else - @index = i5 - r5 = instantiate_node(SyntaxNode,input, index...index) end - s4 << r5 if r5 - if index < input_length - r7 = instantiate_node(SyntaxNode,input, index...(index + 1)) - @index += 1 - else - terminal_parse_failure("any character") - r7 = nil - end - s4 << r7 - end - if s4.last - r4 = instantiate_node(SyntaxNode,input, i4...index, s4) - r4.extend(String0) - else - @index = i4 - r4 = nil - end - if r4 - r3 = r4 + r4 = r5 else - if has_terminal?('\"', false, index) - r8 = instantiate_node(SyntaxNode,input, index...(index + 2)) - @index += 2 + if has_terminal?('\G[^"]', true, index) + r6 = true + @index += 1 else - terminal_parse_failure('\"') - r8 = nil + r6 = nil end - if r8 - r3 = r8 + if r6 + r4 = r6 else - @index = i3 - r3 = nil + @index = i4 + r4 = nil end end - if r3 - s2 << r3 + if r4 + s3 << r4 else break end end - r2 = instantiate_node(SyntaxNode,input, i2...index, s2) - s0 << r2 - if r2 + r3 = instantiate_node(SyntaxNode,input, i3...index, s3) + s1 << r3 + if r3 if has_terminal?('"', false, index) - r9 = instantiate_node(SyntaxNode,input, index...(index + 1)) + r7 = instantiate_node(SyntaxNode,input, index...(index + 1)) @index += 1 else terminal_parse_failure('"') - r9 = nil + r7 = nil end - s0 << r9 + s1 << r7 end end - if s0.last - r0 = instantiate_node(SyntaxNode,input, i0...index, s0) - r0.extend(String1) + if s1.last + r1 = instantiate_node(SyntaxNode,input, i1...index, s1) + r1.extend(String0) + else + @index = i1 + r1 = nil + end + if r1 + r0 = r1 r0.extend(String2) else - @index = i0 - r0 = nil + i8, s8 = index, [] + if has_terminal?("'", false, index) + r9 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure("'") + r9 = nil + end + s8 << r9 + if r9 + s10, i10 = [], index + loop do + i11 = index + if has_terminal?("\\'", false, index) + r12 = instantiate_node(SyntaxNode,input, index...(index + 2)) + @index += 2 + else + terminal_parse_failure("\\'") + r12 = nil + end + if r12 + r11 = r12 + else + if has_terminal?('\G[^\']', true, index) + r13 = true + @index += 1 + else + r13 = nil + end + if r13 + r11 = r13 + else + @index = i11 + r11 = nil + end + end + if r11 + s10 << r11 + else + break + end + end + r10 = instantiate_node(SyntaxNode,input, i10...index, s10) + s8 << r10 + if r10 + if has_terminal?("'", false, index) + r14 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure("'") + r14 = nil + end + s8 << r14 + end + end + if s8.last + r8 = instantiate_node(SyntaxNode,input, i8...index, s8) + r8.extend(String1) + else + @index = i8 + r8 = nil + end + if r8 + r0 = r8 + r0.extend(String2) + else + @index = i0 + r0 = nil + end end node_cache[:string][start_index] = r0 @@ -1005,9 +1052,6 @@ module Float1 end module Float2 - end - - module Float3 def eval(env={}) text_value.to_f end @@ -1026,30 +1070,59 @@ def _nt_float i0 = index i1, s1 = index, [] - if has_terminal?('\G[1-9]', true, index) - r2 = true - @index += 1 - else + s2, i2 = [], index + loop do + if has_terminal?('\G[0-9]', true, index) + r3 = true + @index += 1 + else + r3 = nil + end + if r3 + s2 << r3 + else + break + end + end + if s2.empty? + @index = i2 r2 = nil + else + r2 = instantiate_node(SyntaxNode,input, i2...index, s2) end s1 << r2 if r2 - s3, i3 = [], index - loop do - if has_terminal?('\G[0-9]', true, index) - r4 = true - @index += 1 - else - r4 = nil + if has_terminal?('.', false, index) + r4 = instantiate_node(SyntaxNode,input, index...(index + 1)) + @index += 1 + else + terminal_parse_failure('.') + r4 = nil + end + s1 << r4 + if r4 + s5, i5 = [], index + loop do + if has_terminal?('\G[0-9]', true, index) + r6 = true + @index += 1 + else + r6 = nil + end + if r6 + s5 << r6 + else + break + end end - if r4 - s3 << r4 + if s5.empty? + @index = i5 + r5 = nil else - break + r5 = instantiate_node(SyntaxNode,input, i5...index, s5) end + s1 << r5 end - r3 = instantiate_node(SyntaxNode,input, i3...index, s3) - s1 << r3 end if s1.last r1 = instantiate_node(SyntaxNode,input, i1...index, s1) @@ -1060,104 +1133,53 @@ def _nt_float end if r1 r0 = r1 + r0.extend(Float2) else - i5, s5 = index, [] + i7, s7 = index, [] if has_terminal?('.', false, index) - r6 = instantiate_node(SyntaxNode,input, index...(index + 1)) + r8 = instantiate_node(SyntaxNode,input, index...(index + 1)) @index += 1 else terminal_parse_failure('.') - r6 = nil + r8 = nil end - s5 << r6 - if r6 - s7, i7 = [], index + s7 << r8 + if r8 + s9, i9 = [], index loop do if has_terminal?('\G[0-9]', true, index) - r8 = true + r10 = true @index += 1 else - r8 = nil + r10 = nil end - if r8 - s7 << r8 + if r10 + s9 << r10 else break end end - if s7.empty? - @index = i7 - r7 = nil + if s9.empty? + @index = i9 + r9 = nil else - r7 = instantiate_node(SyntaxNode,input, i7...index, s7) + r9 = instantiate_node(SyntaxNode,input, i9...index, s9) end - s5 << r7 + s7 << r9 end - if s5.last - r5 = instantiate_node(SyntaxNode,input, i5...index, s5) - r5.extend(Float1) + if s7.last + r7 = instantiate_node(SyntaxNode,input, i7...index, s7) + r7.extend(Float1) else - @index = i5 - r5 = nil + @index = i7 + r7 = nil end - if r5 - r0 = r5 + if r7 + r0 = r7 + r0.extend(Float2) else - i9, s9 = index, [] - s10, i10 = [], index - loop do - if has_terminal?('\G[0-9]', true, index) - r11 = true - @index += 1 - else - r11 = nil - end - if r11 - s10 << r11 - else - break - end - end - if s10.empty? - @index = i10 - r10 = nil - else - r10 = instantiate_node(SyntaxNode,input, i10...index, s10) - end - s9 << r10 - if r10 - if has_terminal?('.', false, index) - r12 = instantiate_node(SyntaxNode,input, index...(index + 1)) - @index += 1 - else - terminal_parse_failure('.') - r12 = nil - end - s9 << r12 - if r12 - if has_terminal?('\G[0-9]', true, index) - r13 = true - @index += 1 - else - r13 = nil - end - s9 << r13 - end - end - if s9.last - r9 = instantiate_node(SyntaxNode,input, i9...index, s9) - r9.extend(Float2) - r9.extend(Float3) - else - @index = i9 - r9 = nil - end - if r9 - r0 = r9 - else - @index = i0 - r0 = nil - end + @index = i0 + r0 = nil end end diff --git a/app/models/user_segment_option_parser.treetop b/app/models/user_segment_option_parser.treetop index 3d83bb8d..db139bec 100644 --- a/app/models/user_segment_option_parser.treetop +++ b/app/models/user_segment_option_parser.treetop @@ -66,7 +66,7 @@ grammar UserSegmentOption end rule argument - space arg:(string / integer / float / boolean) space { + space arg:(string / float / integer / boolean) space { def eval(env={}) arg.eval(env) end @@ -74,9 +74,9 @@ grammar UserSegmentOption end rule string - '"' (!'"' . / '\"')* '"' { + ('"' ('\"' / [^"])* '"' / "'" ("\\'" / [^'])* "'") { def eval(env={}) - text_value[1..-2] + text_value[1..-2].gsub('\"', '"').gsub('\\\'', "'") end } end @@ -102,7 +102,7 @@ grammar UserSegmentOption end rule float - [1-9] [0-9]* / '.' [0-9]+ / [0-9]+ '.' [0-9] { + ([0-9]+ '.' [0-9]+ / '.' [0-9]+) { def eval(env={}) text_value.to_f end diff --git a/spec/models/user_segment_option_parser_spec.rb b/spec/models/user_segment_option_parser_spec.rb new file mode 100644 index 00000000..43d541c3 --- /dev/null +++ b/spec/models/user_segment_option_parser_spec.rb @@ -0,0 +1,92 @@ +require File.dirname(__FILE__) + "/../spec_helper" +require 'treetop' + +describe UserSegmentOptionParser do + + def parse(text) + parser = UserSegmentOptionParser.new + if data = parser.parse(text) + data.eval + else + raise parser.inspect + nil + end + end + + it "should be able to parse operations to and array" do + code = <<-CODE + created.since(1, "days") + CODE + parse(code).should == [[nil, {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => nil}]] + + code = <<-CODE + created_at.since_ago(1, "days") + CODE + parse(code).should == [[nil, {:field => 'created_at', :operation => 'since_ago', :arguments => [1, "days"], :child => nil}]] + + code = <<-CODE + created_at2.since_ago8(1, "days") + CODE + parse(code).should == [[nil, {:field => 'created_at2', :operation => 'since_ago8', :arguments => [1, "days"], :child => nil}]] + + code = <<-CODE + test.contains("") + CODE + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => [''], :child => nil}]] + + code = <<-CODE + test.contains(true, false) + CODE + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => [true, false], :child => nil}]] + + code = 'test.contains("days\"", 1)' + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => ['days"', 1], :child => nil}]] + + code = <<-CODE + test.contains('1.1') + CODE + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => ['1.1'], :child => nil}]] + + code = "test.contains('1.1\\'')" + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => ["1.1'"], :child => nil}]] + + code = <<-CODE + test.contains(1.1) + CODE + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => [1.1], :child => nil}]] + + code = <<-CODE + test.contains(1.0) + CODE + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => [1.0], :child => nil}]] + + code = <<-CODE + test.contains(.1) + CODE + parse(code).should == [[nil, {:field => 'test', :operation => 'contains', :arguments => [0.1], :child => nil}]] + end + + it "should be able to not an operation" do + code = <<-CODE + Not created.since(1, "days") + CODE + parse(code).should == [['not', {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => nil}]] + end + + it "should be able to chain operations" do + code = <<-CODE + created.since(1, "days").registered.is(true) + CODE + parse(code).should == [[nil, {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => {:field => 'registered', :operation => 'is', :arguments => [true], :child => nil}}]] + + code = <<-CODE + created.since(1, "days").registered.is(true).logged_in.is(false) + CODE + parse(code).should == [[nil, {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => {:field => 'registered', :operation => 'is', :arguments => [true], :child => {:field => 'logged_in', :operation => 'is', :arguments => [false], :child => nil}}}]] + + code = <<-CODE + NOT created.since(1, "days").registered.is(true).logged_in.is(false) + CODE + parse(code).should == [['not', {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => {:field => 'registered', :operation => 'is', :arguments => [true], :child => {:field => 'logged_in', :operation => 'is', :arguments => [false], :child => nil}}}]] + end +end From dd9d820c309df1e7a8dfccfad81e35896049fa53 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 14 May 2010 17:41:30 +0000 Subject: [PATCH 034/139] Testing and/or coditions for option parser. --- .../models/user_segment_option_parser_spec.rb | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/spec/models/user_segment_option_parser_spec.rb b/spec/models/user_segment_option_parser_spec.rb index 43d541c3..9b76782e 100644 --- a/spec/models/user_segment_option_parser_spec.rb +++ b/spec/models/user_segment_option_parser_spec.rb @@ -89,4 +89,27 @@ def parse(text) CODE parse(code).should == [['not', {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => {:field => 'registered', :operation => 'is', :arguments => [true], :child => {:field => 'logged_in', :operation => 'is', :arguments => [false], :child => nil}}}]] end + + it "should be able to or operations" do + code = <<-CODE + created.since(1, "days") + registered.is(true) + CODE + parse(code).should == [[nil, {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => nil}, {:field => 'registered', :operation => 'is', :arguments => [true], :child => nil}]] + + code = <<-CODE + created.since(1, "days") + registered.is(true) + test.is('good') + CODE + parse(code).should == [[nil, {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => nil}, {:field => 'registered', :operation => 'is', :arguments => [true], :child => nil}, {:field => 'test', :operation => 'is', :arguments => ['good'], :child => nil}]] + end + + it "should be able to and operations" do + code = <<-CODE + created.since(1, "days") + registered.is(true) + CODE + parse(code).should == [ + [nil, {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => nil}], + [nil, {:field => 'registered', :operation => 'is', :arguments => [true], :child => nil}] + ] + end end From 429c04eff63fd8a7025920f1fa250f1f8928cf47 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 14 May 2010 17:49:28 +0000 Subject: [PATCH 035/139] Added a test to parse a complicated set of operations. --- spec/models/user_segment_option_parser_spec.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/spec/models/user_segment_option_parser_spec.rb b/spec/models/user_segment_option_parser_spec.rb index 9b76782e..2376782f 100644 --- a/spec/models/user_segment_option_parser_spec.rb +++ b/spec/models/user_segment_option_parser_spec.rb @@ -112,4 +112,17 @@ def parse(text) [nil, {:field => 'registered', :operation => 'is', :arguments => [true], :child => nil}] ] end + + it "should parse a complaticated set of operations" do + code = <<-CODE + created.since(1 , "days").born.before('yesterday')+ registered.is( true ) + registered.is( true ) + not test.is( false ) + product.purchased( 'computer' ).created.since( 1, 'day' ) + CODE + parse(code).should == [ + [nil, {:field => 'created', :operation => 'since', :arguments => [1, "days"], :child => {:field => 'born', :operation => 'before', :arguments => ['yesterday'], :child => nil}}, {:field => 'registered', :operation => 'is', :arguments => [true], :child => nil}], + [nil, {:field => 'registered', :operation => 'is', :arguments => [true], :child => nil}], + ['not', {:field => 'test', :operation => 'is', :arguments => [false], :child => nil}, {:field => 'product', :operation => 'purchased', :arguments => ['computer'], :child => {:field => 'created', :operation => 'since', :arguments => [1, 'day'], :child => nil}}] + ] + end end From 99b4ef572386510ff0e3336ebb43fff429075284 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 14 May 2010 19:38:58 +0000 Subject: [PATCH 036/139] Added each, each_with_index and find to perform actions with segments. --- app/models/user_segment.rb | 54 ++++++++++++++++++++-- app/models/user_segment_cache.rb | 25 ++++++++++ db/migrate/20100511165552_user_segments.rb | 4 ++ 3 files changed, 79 insertions(+), 4 deletions(-) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 13b6b85d..23a1726c 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -1,9 +1,12 @@ class UserSegment < DomainModel + has_many :user_segment_caches, :order => 'created_at, id', :dependent => :destroy, :class_name => 'UserSegmentCache' serialize :segment_options serialize :fields + validates_presence_of :name + def operations return @operations if @operations @operations = UserSegment::Operations.new @@ -11,17 +14,60 @@ def operations @operations end - def operations=(text) + def segment_options_text=(text) + self.write_attribute :segment_options_text, text @operations = UserSegment::Operations.new @operations.parse text + self.segment_options = @operations.valid? ? self.operations.to_a : nil + text end - def before_create + def cache_ids + self.user_segment_caches.delete_all + self.order_by = 'created_at DESC' unless self.order_by + ids = EndUser.find(:all, :select => 'id', :conditions => {:id => self.operations.end_user_ids}, :order => self.order_by) + + num_segements = (self.operations.end_user_ids.length / 1000) + num_segements = num_segements + 1 if (self.operations.end_user_ids.length % 1000) > 0 + + (0..num_segements-1).each do |idx| + start = idx * 1000 + self.user_segment_caches.create :id_list => ids[start..start+999] + end + + self.last_ran_at = Time.now + self.last_count = ids.length + self.save + end + + def end_user_ids + return @end_user_ids if @end_user_ids + @end_user_ids = [] + self.user_segment_caches.each do |segement| + @end_user_ids = @end_user_ids + segement.id_list + end + @end_user_ids + end + + def each(&block) + self.user_segment_caches.each do |segement| + segement.each &block + end + end + + def each_with_index(&block) + idx = 0 + self.user_segment_caches.each do |segement| + idx = segement.each_with_index idx, &block + end end - def before_save - self.segment_options = self.operations.to_a if self.operations && self.operations.valid? + def find(&block) + self.user_segment_caches.each do |segement| + user = segement.find &block + return user if user + end end end diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb index 6ed5c117..9edd9629 100644 --- a/app/models/user_segment_cache.rb +++ b/app/models/user_segment_cache.rb @@ -1,4 +1,29 @@ class UserSegmentCache < DomainModel + belongs_to :user_segment + serialize :id_list + + validates_presence_of :user_segment_id + + def before_create + self.created_at = Time.now unless self.created_at + end + + def end_users + @end_users ||= EndUser.find(:all, :conditions => {:id => self.id_list}) + end + + def each + self.end_users.each { |user| yield user } + end + + def each_with_index(idx=0) + self.end_users.each { |user| yield user, idx; idx = idx.succ } + idx + end + + def find + self.end_users.find { |user| yield user } + end end diff --git a/db/migrate/20100511165552_user_segments.rb b/db/migrate/20100511165552_user_segments.rb index b6657ccd..dfcec4b3 100644 --- a/db/migrate/20100511165552_user_segments.rb +++ b/db/migrate/20100511165552_user_segments.rb @@ -20,6 +20,8 @@ def self.up t.datetime :created_at end + add_index :user_segment_caches, [:user_segment_id], :name => 'user_segment_cache_segment_idx' + create_table :user_segment_analytics, :force => true do |t| t.integer :user_segment_id t.text :fields @@ -29,6 +31,8 @@ def self.up t.string :step t.timestamps end + + add_index :user_segment_analytics, [:user_segment_id], :name => 'user_segment_analytics_segment_idx' end def self.down From 6e32eb50de8bc209d297581f0bf46edd9516b3bb Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 14 May 2010 19:58:56 +0000 Subject: [PATCH 037/139] Can pass options to enumerable methods. --- app/models/user_segment.rb | 12 ++++++------ app/models/user_segment_cache.rb | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 23a1726c..1a532ab1 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -50,22 +50,22 @@ def end_user_ids @end_user_ids end - def each(&block) + def each(opts={}, &block) self.user_segment_caches.each do |segement| - segement.each &block + segement.each opts, &block end end - def each_with_index(&block) + def each_with_index(opts={}, &block) idx = 0 self.user_segment_caches.each do |segement| - idx = segement.each_with_index idx, &block + idx = segement.each_with_index idx, opts, &block end end - def find(&block) + def find(opts={}, &block) self.user_segment_caches.each do |segement| - user = segement.find &block + user = segement.find opts, &block return user if user end end diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb index 9edd9629..73f917ee 100644 --- a/app/models/user_segment_cache.rb +++ b/app/models/user_segment_cache.rb @@ -10,20 +10,22 @@ def before_create self.created_at = Time.now unless self.created_at end - def end_users - @end_users ||= EndUser.find(:all, :conditions => {:id => self.id_list}) + def end_users(opts={}) + return @end_users if @end_users + users_by_id = EndUser.find(:all, :conditions => {:id => self.id_list}).index_by(&:id) + @end_users = self.id_list.map { |id| users_by_id[id] }.compact end - def each - self.end_users.each { |user| yield user } + def each(opts={}) + self.end_users(opts).each { |user| yield user } end - def each_with_index(idx=0) - self.end_users.each { |user| yield user, idx; idx = idx.succ } + def each_with_index(idx=0, opts={}) + self.end_users(opts).each { |user| yield user, idx; idx = idx.succ } idx end - def find - self.end_users.find { |user| yield user } + def find(opts={}) + self.end_users(opts).find { |user| yield user } end end From 4b0b0109078ae8464a6f710ea27345dc2bdfc12e Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 17 May 2010 14:31:56 +0000 Subject: [PATCH 038/139] Don't store user objects in user segment cache. Batch fetch users. --- app/models/user_segment.rb | 50 +++++++++++++++++++--- app/models/user_segment_cache.rb | 39 ++++++++++++++--- db/migrate/20100511165552_user_segments.rb | 3 +- 3 files changed, 78 insertions(+), 14 deletions(-) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 1a532ab1..2a399416 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -1,7 +1,7 @@ class UserSegment < DomainModel - has_many :user_segment_caches, :order => 'created_at, id', :dependent => :destroy, :class_name => 'UserSegmentCache' + has_many :user_segment_caches, :order => 'position', :dependent => :destroy, :class_name => 'UserSegmentCache' serialize :segment_options serialize :fields @@ -26,14 +26,14 @@ def cache_ids self.user_segment_caches.delete_all self.order_by = 'created_at DESC' unless self.order_by - ids = EndUser.find(:all, :select => 'id', :conditions => {:id => self.operations.end_user_ids}, :order => self.order_by) + ids = EndUser.find(:all, :select => 'id', :conditions => {:id => self.operations.end_user_ids}, :order => self.order_by).collect &:id - num_segements = (self.operations.end_user_ids.length / 1000) - num_segements = num_segements + 1 if (self.operations.end_user_ids.length % 1000) > 0 + num_segements = (self.operations.end_user_ids.length / UserSegmentCache::SIZE) + num_segements = num_segements + 1 if (self.operations.end_user_ids.length % UserSegmentCache::SIZE) > 0 (0..num_segements-1).each do |idx| - start = idx * 1000 - self.user_segment_caches.create :id_list => ids[start..start+999] + start = idx * UserSegmentCache::SIZE + self.user_segment_caches.create :id_list => ids[start..start+UserSegmentCache::SIZE-1], :position => idx end self.last_ran_at = Time.now @@ -56,6 +56,14 @@ def each(opts={}, &block) end end + def collect(opts={}, &block) + data = [] + self.user_segment_caches.each do |segement| + data = data + segement.collect(opts, &block) + end + data + end + def each_with_index(opts={}, &block) idx = 0 self.user_segment_caches.each do |segement| @@ -69,5 +77,35 @@ def find(opts={}, &block) return user if user end end + + def paginate(page,args = {}) + args = args.clone.symbolize_keys! + window_size =args.delete(:window) || 2 + + page_size = args.delete(:per_page).to_i + page_size = 20 if page_size <= 0 + + total_count = self.last_count + pages = (total_count.to_f / (page_size || 10)).ceil + pages = 1 if pages < 1 + page = (page ? page.to_i : 1).clamp(1,pages) + + offset = (page-1) * page_size + + position = (offset / UserSegmentCache::SIZE).to_i + + cache = self.user_segment_caches.find_by_position(position) + items = cache ? cache.fetch_users(:offset => (offset % UserSegmentCache::SIZE), :limit => page_size) : [] + + [ { :pages => pages, + :page => page, + :window_size => window_size, + :total => total_count, + :per_page => page_size, + :first => offset+1, + :last => offset + items.length, + :count => items.length + }, items ] + end end diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb index 73f917ee..d207a807 100644 --- a/app/models/user_segment_cache.rb +++ b/app/models/user_segment_cache.rb @@ -1,5 +1,8 @@ class UserSegmentCache < DomainModel + SIZE = 25000 + DEFAULT_BATCH_SIZE = 1000 + belongs_to :user_segment serialize :id_list @@ -10,22 +13,44 @@ def before_create self.created_at = Time.now unless self.created_at end - def end_users(opts={}) - return @end_users if @end_users - users_by_id = EndUser.find(:all, :conditions => {:id => self.id_list}).index_by(&:id) - @end_users = self.id_list.map { |id| users_by_id[id] }.compact + def fetch_users(opts={}) + ids = opts[:offset] && opts[:limit] ? self.id_list[opts[:offset]..opts[:offset]+opts[:limit]-1] : self.id_list + users_by_id = EndUser.find(:all, :conditions => {:id => ids}).index_by(&:id) + ids.map { |id| users_by_id[id] }.compact + end + + def find_in_batches(opts={}) + limit = opts[:batch_size] || DEFAULT_BATCH_SIZE + offset = 0 + num_chunks = (self.id_list.size / limit).to_i + num_chunks = num_chunks.succ if (self.id_list.length % limit) > 0 + (1..num_chunks).each do |chunk| + users = self.fetch_users(:offset => offset, :limit => limit) + offset = offset + limit + yield users + end end def each(opts={}) - self.end_users(opts).each { |user| yield user } + self.find_in_batches(opts) { |users| users.each { |user| yield user } } + end + + def collect(opts={}) + data = [] + self.find_in_batches(opts) { |users| data = data + users.collect { |user| yield user } } + data end def each_with_index(idx=0, opts={}) - self.end_users(opts).each { |user| yield user, idx; idx = idx.succ } + self.find_in_batches(opts) { |users| users.each { |user| yield user, idx; idx = idx.succ } } idx end def find(opts={}) - self.end_users(opts).find { |user| yield user } + self.find_in_batches(opts) do |users| + user = users.find { |user| yield user } + return user if user + end + nil end end diff --git a/db/migrate/20100511165552_user_segments.rb b/db/migrate/20100511165552_user_segments.rb index dfcec4b3..88655354 100644 --- a/db/migrate/20100511165552_user_segments.rb +++ b/db/migrate/20100511165552_user_segments.rb @@ -16,7 +16,8 @@ def self.up create_table :user_segment_caches, :force => true do |t| t.integer :user_segment_id - t.text :id_list + t.integer :position + t.text :id_list, :limit => 16777215 t.datetime :created_at end From b65b131370f1a258f4f80ec650e5dd42fc42bf3b Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 17 May 2010 19:18:03 +0000 Subject: [PATCH 039/139] Can search through a segment. --- app/models/user_segment.rb | 24 ++++++++++++++++++++++++ app/models/user_segment_cache.rb | 27 +++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 2a399416..1e4a5dca 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -107,5 +107,29 @@ def paginate(page,args = {}) :count => items.length }, items ] end + + def search(offset=0, args={}) + args = args.clone.symbolize_keys! + + page_size = args.delete(:per_page).to_i + page_size = 20 if page_size <= 0 + + cache_offset = offset % UserSegmentCache::SIZE + + ids = [] + ((offset / UserSegmentCache::SIZE).to_i..self.user_segment_caches.length-1).each do |position| + cache = self.user_segment_caches.find_by_position(position) + cache_offset, cache_ids = cache.search(cache_offset, args.merge(:limit => page_size-ids.length)) + ids = ids + cache_ids + offset = UserSegmentCache::SIZE * position + cache_offset + cache_offset = 0 + break if ids.length >= page_size + end + + args.delete(:conditions) + args.delete(:joins) + users = EndUser.find(:all, args.merge(:conditions => {:id => ids})) + return [offset, users] + end end diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb index d207a807..4a8e594e 100644 --- a/app/models/user_segment_cache.rb +++ b/app/models/user_segment_cache.rb @@ -19,6 +19,33 @@ def fetch_users(opts={}) ids.map { |id| users_by_id[id] }.compact end + def search(offset=0, opts={}) + opts = opts.clone.symbolize_keys! + opts.delete(:offset) + opts.delete(:include) + limit = opts.delete(:limit) || 20 + batch_size = opts.delete(:batch_size) || DEFAULT_BATCH_SIZE + num_chunks = (self.id_list.size / batch_size).to_i + num_chunks = num_chunks.succ if (self.id_list.length % batch_size) > 0 + + base_scope = EndUser.scoped(opts) + + ids = [] + ((offset/batch_size).to_i..num_chunks-1).each do |chunk| + sub_list = self.id_list[offset..(offset+batch_size-1)] + scope = base_scope.scoped(:select => 'id', :conditions => {:id => sub_list}) + users_by_id = scope.find(:all).index_by(&:id) + ids = ids + sub_list.map { |id| users_by_id[id] ? id : nil }.compact unless users_by_id.empty? + offset = offset + batch_size + break if ids.length > limit + end + + has_more = ids.length > limit + ids = ids[0..limit-1] if has_more + offset = ids.size > 0 ? self.id_list.index(ids[-1]) : 0 + [offset, ids] + end + def find_in_batches(opts={}) limit = opts[:batch_size] || DEFAULT_BATCH_SIZE offset = 0 From 3b8e6eb8bf6918ab85c80542e1625b144334d37f Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 17 May 2010 20:15:50 +0000 Subject: [PATCH 040/139] Added a end user caches table. Used to store a full text index on all the end user fields. --- app/models/end_user.rb | 7 +++++- app/models/end_user_cache.rb | 25 ++++++++++++++++++++++ db/migrate/20100511165552_user_segments.rb | 9 ++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 app/models/end_user_cache.rb diff --git a/app/models/end_user.rb b/app/models/end_user.rb index e5a02326..76bc8e9a 100644 --- a/app/models/end_user.rb +++ b/app/models/end_user.rb @@ -74,7 +74,8 @@ class EndUser < DomainModel has_many :addresses, :class_name => 'EndUserAddress', :dependent => :destroy has_one :tag_cache, :dependent => :destroy - + has_one :end_user_cache, :dependent => :destroy, :class_name => 'EndUserCache' + has_many :end_user_cookies, :dependent => :delete_all, :class_name => 'EndUserCookie' has_many :end_user_actions, :dependent => :delete_all @@ -128,6 +129,10 @@ def after_create #:nodoc: end end + def after_save #:nodoc: + self.end_user_cache ? self.end_user_cache.save : EndUserCache.create(:end_user_id => self.id) + end + ## Validation Fucntions diff --git a/app/models/end_user_cache.rb b/app/models/end_user_cache.rb new file mode 100644 index 00000000..6810b5b9 --- /dev/null +++ b/app/models/end_user_cache.rb @@ -0,0 +1,25 @@ + +class EndUserCache < DomainModel + belongs_to :end_user + validates_presence_of :end_user_id + + def before_save + self.data = self.get_end_user_data.delete_if { |v| v.blank? }.join(' ') + end + + def get_end_user_data + data = [ + self.end_user.email, + self.end_user.name, + self.end_user.user_class.name, + self.end_user.source, + self.end_user.registered? ? 'registered' : nil + ] + end + + def self.reindex + EndUser.find_in_batches do |users| + users.each { |user| user.save } + end + end +end diff --git a/db/migrate/20100511165552_user_segments.rb b/db/migrate/20100511165552_user_segments.rb index 88655354..3174b94b 100644 --- a/db/migrate/20100511165552_user_segments.rb +++ b/db/migrate/20100511165552_user_segments.rb @@ -34,11 +34,20 @@ def self.up end add_index :user_segment_analytics, [:user_segment_id], :name => 'user_segment_analytics_segment_idx' + + create_table :end_user_caches, :force => true, :options => "ENGINE=MyISAM" do |t| + t.integer :end_user_id + t.text :data + end + + add_index :end_user_caches, [:end_user_id], :name => 'end_user_caches_idx', :unique => true + execute "CREATE FULLTEXT INDEX end_user_caches_data_index ON end_user_caches (data)" end def self.down drop_table :user_segments drop_table :user_segment_caches drop_table :user_segment_analytics + drop_table :end_user_caches end end From cfd3154bc27b5efa2ea47e7feecd5de884b5f74b Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 17 May 2010 20:58:11 +0000 Subject: [PATCH 041/139] can use a scope to search for end user ids within end user segments. --- app/models/end_user_cache.rb | 3 ++- app/models/user_segment.rb | 20 +++++++++++++------- app/models/user_segment_cache.rb | 7 ++++--- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/app/models/end_user_cache.rb b/app/models/end_user_cache.rb index 6810b5b9..d984e4ed 100644 --- a/app/models/end_user_cache.rb +++ b/app/models/end_user_cache.rb @@ -13,7 +13,8 @@ def get_end_user_data self.end_user.name, self.end_user.user_class.name, self.end_user.source, - self.end_user.registered? ? 'registered' : nil + self.end_user.registered? ? 'registered' : nil, + self.end_user.tag_names.join(" ") ] end diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 1e4a5dca..4d41489c 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -108,26 +108,32 @@ def paginate(page,args = {}) }, items ] end - def search(offset=0, args={}) + def search(args={}) args = args.clone.symbolize_keys! - page_size = args.delete(:per_page).to_i - page_size = 20 if page_size <= 0 + offset = args.delete(:offset).to_i + limit = args.delete(:limit).to_i + limit = 20 if limit <= 0 cache_offset = offset % UserSegmentCache::SIZE + if args[:scope].nil? + args[:scope] = EndUser.scoped(:conditions => args.delete(:conditions), :joins => args.delete(:joins)) + args[:end_user_field] = :id + end + ids = [] ((offset / UserSegmentCache::SIZE).to_i..self.user_segment_caches.length-1).each do |position| cache = self.user_segment_caches.find_by_position(position) - cache_offset, cache_ids = cache.search(cache_offset, args.merge(:limit => page_size-ids.length)) + cache_offset, cache_ids = cache.search(cache_offset, args.merge(:limit => limit-ids.length)) ids = ids + cache_ids offset = UserSegmentCache::SIZE * position + cache_offset cache_offset = 0 - break if ids.length >= page_size + break if ids.length >= limit end - args.delete(:conditions) - args.delete(:joins) + args.delete(:scope) + args.delete(:end_user_field) users = EndUser.find(:all, args.merge(:conditions => {:id => ids})) return [offset, users] end diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb index 4a8e594e..ba53782e 100644 --- a/app/models/user_segment_cache.rb +++ b/app/models/user_segment_cache.rb @@ -28,13 +28,14 @@ def search(offset=0, opts={}) num_chunks = (self.id_list.size / batch_size).to_i num_chunks = num_chunks.succ if (self.id_list.length % batch_size) > 0 - base_scope = EndUser.scoped(opts) + base_scope = opts.delete(:scope) || EndUser + end_user_field = opts.delete(:end_user_field) || :end_user_id ids = [] ((offset/batch_size).to_i..num_chunks-1).each do |chunk| sub_list = self.id_list[offset..(offset+batch_size-1)] - scope = base_scope.scoped(:select => 'id', :conditions => {:id => sub_list}) - users_by_id = scope.find(:all).index_by(&:id) + scope = base_scope.scoped(:select => end_user_field.to_s, :conditions => {end_user_field.to_sym => sub_list}) + users_by_id = scope.find(:all).index_by(&end_user_field.to_sym) ids = ids + sub_list.map { |id| users_by_id[id] ? id : nil }.compact unless users_by_id.empty? offset = offset + batch_size break if ids.length > limit From 01013096cce2865a9a9188d0bf45a3474027af9b Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 18 May 2010 18:17:03 +0000 Subject: [PATCH 042/139] Added a search box to members page. Can set the text for active next and previous links. Added EndUserSearch to handle search through EndUserCache with and without user segments. --- app/controllers/members_controller.rb | 139 +++++++++---------------- app/helpers/cms_helper.rb | 7 +- app/models/end_user_cache.rb | 2 + app/models/end_user_search.rb | 22 ++++ app/models/user_segment.rb | 4 +- app/views/members/_targets_table.rhtml | 44 +++----- app/views/members/index.rhtml | 20 ++-- lib/active_table.rb | 7 +- 8 files changed, 103 insertions(+), 142 deletions(-) create mode 100644 app/models/end_user_search.rb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 486bab33..82a2f712 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -14,18 +14,15 @@ class MembersController < CmsController # :nodoc: all include ActiveTable::Controller active_table :email_targets_table, EndUser, - [ hdr(:icon, 'check'), - hdr(:static, 'edit', :width => '16'), - hdr(:option, 'user_level',:options => EndUser.user_level_select_options,:label => 'Lvl', :width=> 40), - hdr(:string, 'email'), - hdr(:string, 'first_name',:label => 'First'), - hdr(:string, 'last_name',:label => 'Last'), - hdr(:date_range, 'created_at',:label => 'Created'), - hdr(:date_range, 'registered_at',:label => 'Reg.'), - hdr(:option, 'user_class_id',:label=> 'Profile',:options => :get_user_classes), - hdr(:option, 'source',:options => EndUser.source_select_options,:label => 'Src. Type',:width=>90), - hdr(:string, 'lead_source',:label => 'Src.' ), - 'tags' + [ hdr(:icon, 'check', :width => '16'), + hdr(:static, 'Profile', :width => '70'), + hdr(:static, 'Image', :width => '70'), + 'Name', + 'Email', + hdr(:static, 'Src. Type', :label => 'Src. Type'), + hdr(:static, 'Src.', :label => 'Src.'), + hdr(:static, 'Created', :width => '120'), + hdr(:static, 'Reg.', :label => 'Reg.', :width => '120') ], :count_callback => 'count_end_users', :find_callback => 'find_end_users' @@ -35,47 +32,56 @@ class MembersController < CmsController # :nodoc: all def segmentations - @segment= session[:et] - @segmentations = MarketSegment.find(:all,:conditions => 'segment_type = "members" AND market_campaign_id IS NULL',:order => :name).collect { |seg| - [ seg.name, seg.id ] - } - - @loaded_segment_id = session[:et_segment] - @loaded_segment_name = session[:et_segment_name] + @segmentations ||= UserSegment.find(:all, :conditions => {:main_page => true}, :order => 'name') + end + def segment + @segment ||= UserSegment.find_by_id params[:path][0] end def count_end_users(opts) - - @seg = MarketSegment.new(:segment_type => 'members',:options => { :tags => @segment[:tags], :tags_select => @segment[:tags_select], - :conditions => opts[:conditions], :order => opts[:order], - :search => session[:active_table][:email_targets_table] }) - @seg.target_count + if self.search_results + pages, users = self.search_results + if self.search.user_segment + self.search.offsets.length * self.search.per_page - (self.search.per_page - users.length) + else + pages[:total] + end + elsif self.segment + self.segment.last_count + else + EndUser.count :conditions => 'client_user_id IS NULL' + end end def find_end_users(opts) + if self.search_results + pages, users = self.search_results + users + elsif self.segment + pages, users = self.segment.paginate self.search.page, :per_page => 25 + users + else + EndUser.find(:all, :conditions => 'client_user_id IS NULL', :include => [:user_class, :domain_file], :offset => opts[:offset], :limit => opts[:limit], :order => opts[:order]) + end + end + + def search + return @search if @search + + @search = EndUserSearch.new + @search.terms = params[:terms] + @search.per_page = 25 + @search.offset = (params[:offset] || 0).to_i + @search.offsets = (params[:offsets] || [0]).collect { |n| n.to_i } + @search.user_segment = self.segment + @search.page = (params[:page] || 1).to_i + @search.offset = @search.offsets[@search.page-1] if @search.user_segment && @search.offsets.length >= @search.page + @search + end - # (set in handle_table_actions) - if we are saving this segment, find one with the same name, - # or create a new one - if @save_segment - @seg = MarketSegment.find_by_name(@save_segment,:conditions => 'segment_type="members"') || - MarketSegment.new(:segment_type => 'members', :name => @save_segment) - else - @seg = MarketSegment.new(:segment_type => 'members') - end - - @seg.options = { :tags => @segment[:tags], :tags_select => @segment[:tags_select], - :conditions => opts[:conditions], :order => opts[:order], - :search => session[:active_table][:email_targets_table] } - - session[:members_table_segment] = @seg.options.clone - if @save_segment - @seg.save - session[:et_segment] = @seg.id - session[:et_segment_name] = @seg.name - end - - @seg.target_find(:offset => opts[:offset], :limit => opts[:limit], :order => opts[:order]) + def search_results + @search_results ||= self.search.search if self.search.terms end def get_user_classes @@ -104,30 +110,6 @@ def handle_table_actions end end end - elsif request.post? && params[:save_segment] - @save_segment = params[:save_segment] - @update_segments = true - elsif request.post? && params[:load_segment] - load_segment = MarketSegment.find_by_id(params[:load_segment].to_i) - - if load_segment - params.delete(:email_targets_table) - session[:active_table][:email_targets_table] = load_segment.options[:search] - session[:et] = { :tags => load_segment.options[:tags], :tags_select => load_segment.options[:tags_select] } - session[:et_segment] = load_segment.id - session[:et_segment_name] = load_segment.name - else - session[:et_segment] = nil - session[:et_segment_name] = nil - end - @update_segments = true - elsif request.post? && params[:delete_segment] - load_segment = MarketSegment.find_by_id(params[:delete_segment].to_i) - load_segment.destroy - session[:et_segment] = nil - session[:et_segment_name] = nil - @update_segments = true - end end @@ -162,25 +144,6 @@ def display_targets_table(display = true) if params[:table_action] || params[:segment_action] handle_table_actions end - - default_options = { :tags => [], - :tags_select => 'any' - } - - session[:et] ||= default_options.clone - session[:et_segment] ||= nil - - if(params[:tag]) - session[:et][:tags] << params[:tag] - session[:et][:tags].uniq! - elsif params[:remove_tag] - session[:et][:tags].delete(params[:remove_tag]) - elsif params[:tags_select] - session[:et][:tags_select] = params[:tags_select] - elsif params[:clear_tag] - session[:et][:tags] = [] - end - @segment= session[:et] @active_table_output = email_targets_table_generate params, :per_page => 25, :include => :tag_cache, :conditions => 'client_user_id IS NULL', :order => 'created_at DESC' diff --git a/app/helpers/cms_helper.rb b/app/helpers/cms_helper.rb index 8fa220aa..c000a4c5 100644 --- a/app/helpers/cms_helper.rb +++ b/app/helpers/cms_helper.rb @@ -520,6 +520,9 @@ def active_table_for(name,active_table_output,options={},&block) table_actions = options.delete(:actions) more_actions = options.delete(:more_actions) + next_link_text = options.delete(:next) || '>' + previous_link_text = options.delete(:previous) || '<' + options[:class] ||= "active_table" form_elements = options.delete(:form_elements) @@ -694,7 +697,7 @@ def active_table_for(name,active_table_output,options={},&block) initial = true if(pagination[:page] > 1) initial = false - concat( "
        • <
          • ") + concat( "
        • #{previous_link_text}
          • ") end concat(pagination[:pages].collect { |number| first = true if initial @@ -709,7 +712,7 @@ def active_table_for(name,active_table_output,options={},&block) }.to_s ) if(pagination[:page] < pagination[:pages_count]) - concat( "
        • >
          • ") + concat( "
        • #{next_link_text}
          • ") end concat('') end diff --git a/app/models/end_user_cache.rb b/app/models/end_user_cache.rb index d984e4ed..5f8eefc6 100644 --- a/app/models/end_user_cache.rb +++ b/app/models/end_user_cache.rb @@ -3,6 +3,8 @@ class EndUserCache < DomainModel belongs_to :end_user validates_presence_of :end_user_id + named_scope :search, lambda { |query| {:conditions => ['MATCH (data) AGAINST (?)', query], :order => "MATCH (data) AGAINST (#{self.quote_value(query)}) DESC"} } + def before_save self.data = self.get_end_user_data.delete_if { |v| v.blank? }.join(' ') end diff --git a/app/models/end_user_search.rb b/app/models/end_user_search.rb new file mode 100644 index 00000000..18bdb624 --- /dev/null +++ b/app/models/end_user_search.rb @@ -0,0 +1,22 @@ + +class EndUserSearch + attr_accessor :terms, :offset, :page, :per_page, :user_segment, :offsets + + def search(opts={}) + scope = EndUserCache.search self.terms + if self.user_segment + self.offsets << self.offset unless self.offsets.include?(self.offset) + new_offset, users = self.user_segment.search opts.merge(:scope => scope, :offset => self.offset, :limit => self.per_page) + if users.length >= self.per_page + self.offsets << (new_offset+1) unless self.offsets.include?(new_offset+1) + end + [new_offset, users] + else + pages, ids = scope.paginate(self.page, :select => 'end_user_id') + ids = ids.collect { |cache| cache[:end_user_id] } + users_by_id = EndUser.find(:all, opts.merge(:conditions => {:id => ids})).index_by(&:id) + users = ids.map { |id| users_by_id[id] } + [pages, users] + end + end +end diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 4d41489c..f95afec0 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -26,7 +26,7 @@ def cache_ids self.user_segment_caches.delete_all self.order_by = 'created_at DESC' unless self.order_by - ids = EndUser.find(:all, :select => 'id', :conditions => {:id => self.operations.end_user_ids}, :order => self.order_by).collect &:id + ids = EndUser.find(:all, :select => 'id', :conditions => {:id => self.operations.end_user_ids, :client_user_id => nil}, :order => self.order_by).collect &:id num_segements = (self.operations.end_user_ids.length / UserSegmentCache::SIZE) num_segements = num_segements + 1 if (self.operations.end_user_ids.length % UserSegmentCache::SIZE) > 0 @@ -78,7 +78,7 @@ def find(opts={}, &block) end end - def paginate(page,args = {}) + def paginate(page=1, args={}) args = args.clone.symbolize_keys! window_size =args.delete(:window) || 2 diff --git a/app/views/members/_targets_table.rhtml b/app/views/members/_targets_table.rhtml index bc8f43ea..5e13d9a9 100644 --- a/app/views/members/_targets_table.rhtml +++ b/app/views/members/_targets_table.rhtml @@ -1,15 +1,3 @@ -<% if @update_tags -%> - -<% end -%> - -<% if @update_segments -%> - -<% end -%> - <% @user_classes = [] @user_level_options = EndUser.user_level_select_options @source_options = EndUser.source_options_hash @@ -21,9 +9,10 @@ @user_class_objs.each { |cls| @user_classes[cls.id] = h(cls.name.t) } %> <% active_table_for :email_targets_table, @active_table_output, - :refresh_url => url_for(:action => 'display_targets_table'), + :refresh_url => url_for(:action => 'display_targets_table', :path => @segment ? @segment.id : nil, :terms => @search.terms, :offsets => @search.offsets.empty? ? nil : @search.offsets), :class => 'active_table', :width => '100%', + :next => @search.user_segment && @search.terms ? 'more' : '>', :actions => [ ['Add Tags','js','MemberEditor.addTags();'], ['Remove Tags','js','MemberEditor.removeTags();'] ], @@ -33,33 +22,28 @@           		<%= entry_checkbox 'user',t.id %> <%= t.user_class ? t.user_class.name : '-' %> - <% unless @user_class_index[t.user_class_id].editor? %> - <%= theme_image_tag 'icons/table_actions/edit.gif' %> - <% end -%> + <%= image = t.image ? t.image.image_tag(:thumb) : 'No Image'.t + t.editor? ? image : content_tag(:a, image, {:href => url_for(:action => 'edit', :path => t.id)}) + %> <%= t.user_level %><%= h t.email.blank? ? 'No Email'.t : t.email %> - <%= h(truncate(t.first_name,:length => 30)) %> + <%= t.editor? ? h(t.name) : content_tag(:a, t.name, {:href => url_for(:action => 'edit', :path => t.id)}) %> - <%= h(truncate(t.last_name ,:llength => 30)) %> + <%= email = t.email.blank? ? 'No Email'.t : t.email + t.editor? ? h(email) : content_tag(:a, email, {:href => url_for(:action => 'edit', :path => t.id)}) + %> + <%= h @source_options[t.source] %><%= h t.lead_source.blank? ? '-' : t.lead_source %> <%= t.created_at ? t.created_at.strftime(DEFAULT_DATE_FORMAT.t) : '-' %> + <%= t.registered_at ? t.registered_at.strftime(DEFAULT_DATE_FORMAT.t) : '-' %> <%= @user_classes[t.user_class_id] if t.user_class_id %><%= h @source_options[t.source] %><%= h t.lead_source.blank? ? '-' : t.lead_source %><% user_tags = t.tag_cache_tags.to_s.split(",") %> - <%= user_tags[0..5].collect {|tag| "#{tag}" }.join(", ") %> - <%= "+(#{user_tags.length-6})" if user_tags.length > 6 %> -
          <%= entry_checkbox 'user',t.id %> + <% if t.ready? -%> + <%= theme_image_tag('icons/actions/edit.gif') %> + <% end -%> + <%= t.main_page ? 'Yes'.t : 'No'.t %><%= h t.name %> + <% if t.ready? -%> + <%= h t.name %> + <% else -%> + <%= t.name %> + <% end -%> + <%= h(t.description ? t.description : '') %><%= t.status %> <%= t.last_count %><%= t.last_ran_at.strftime(DEFAULT_DATETIME_FORMAT.t) %><%= t.last_ran_at.strftime(DEFAULT_DATETIME_FORMAT.t) if t.last_ran_at %> <%= t.created_at.strftime(DEFAULT_DATETIME_FORMAT.t) %><%= t.updated_at.strftime(DEFAULT_DATETIME_FORMAT.t) %>
          <%= entry_checkbox 'user',t.id %>
          <%= entry_checkbox 'user_segments',t.id %> <% if t.ready? -%> <%= theme_image_tag('icons/actions/edit.gif') %> From 17c02557c42dec6d0a8dc283cb3824331b781e6e Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 19 May 2010 17:00:56 +0000 Subject: [PATCH 047/139] Created 1 form for updating and creating segments. --- app/models/user_segment.rb | 13 +++++++++++++ app/views/members/_segment_form.html.erb | 11 +++++++++++ app/views/members/create_segment.html.erb | 10 +--------- app/views/members/edit_segment.html.erb | 10 +--------- 4 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 app/views/members/_segment_form.html.erb diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 8414b3d9..f7ce208b 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -8,6 +8,11 @@ class UserSegment < DomainModel validates_presence_of :name validates_presence_of :segment_options + def initialize(opts={}) + super + self.fields = [] unless self.fields + end + def ready?; self.status == 'finished'; end def validate @@ -166,5 +171,13 @@ def search(args={}) def before_create self.status = 'new' end + + def self.fields_options + [['Source', 'source'], ['Date of Birth', 'dob'], ['Gender', 'gender'], ['Created', 'created_at'], ['Registered', 'registered_at']] + end + + def self.order_by_options + [['Created Desc', 'created_at DESC'], ['Created Asc', 'created_at'], ['Email', 'email']] + end end diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb new file mode 100644 index 00000000..49d96b0a --- /dev/null +++ b/app/views/members/_segment_form.html.erb @@ -0,0 +1,11 @@ + +<% admin_form_for :segment, @segment do |f| -%> +<%= f.text_field :name %> +<%= f.text_area :description, :rows => 3 %> +<%= f.select :order_by, UserSegment.order_by_options %> +<%= f.check_boxes :main_page, [['display on people page', true]], :single => true %> +<%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> +<%= f.text_area :segment_options_text, :rows => 8, :label => 'Operations' %> +<%= f.spacer %> +<%= f.cancel_submit_buttons 'Cancel', (@segment.id ? 'Save' : 'Create') %> +<% end -%> diff --git a/app/views/members/create_segment.html.erb b/app/views/members/create_segment.html.erb index 3f034e01..a5919db3 100644 --- a/app/views/members/create_segment.html.erb +++ b/app/views/members/create_segment.html.erb @@ -1,9 +1 @@ - -<% admin_form_for :segment, @segment do |f| -%> -<%= f.text_field :name %> -<%= f.text_area :description, :rows => 3 %> -<%= f.check_boxes :main_page, [['display on people page', true]], :single => true %> -<%= f.text_area :segment_options_text, :rows => 8, :label => 'Operations' %> -<%= f.spacer %> -<%= f.cancel_submit_buttons 'Cancel', 'Create' %> -<% end -%> +<%= render :partial => 'segment_form' %> diff --git a/app/views/members/edit_segment.html.erb b/app/views/members/edit_segment.html.erb index 9b317c67..a5919db3 100644 --- a/app/views/members/edit_segment.html.erb +++ b/app/views/members/edit_segment.html.erb @@ -1,9 +1 @@ - -<% admin_form_for :segment, @segment do |f| -%> -<%= f.text_field :name %> -<%= f.text_area :description, :rows => 3 %> -<%= f.check_boxes :main_page, [['display on people page', true]], :single => true %> -<%= f.text_area :segment_options_text, :rows => 8, :label => 'Operations' %> -<%= f.spacer %> -<%= f.cancel_submit_buttons 'Cancel', 'Save' %> -<% end -%> +<%= render :partial => 'segment_form' %> From 43cfcfcea41f801b6b75a20433e41de0e15d7c50 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 19 May 2010 18:19:32 +0000 Subject: [PATCH 048/139] Can copy a segment. Dynamically display user fields based on segmentation. --- app/controllers/members_controller.rb | 54 ++++++++++++++++++------- app/models/user_segment.rb | 7 +++- app/views/members/_targets_table.rhtml | 33 +++++++++------ app/views/members/copy_segment.html.erb | 1 + 4 files changed, 66 insertions(+), 29 deletions(-) create mode 100644 app/views/members/copy_segment.html.erb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 8bf4eaea..8a295345 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -12,21 +12,9 @@ class MembersController < CmsController # :nodoc: all # need to include - include ActiveTable::Controller - active_table :email_targets_table, - EndUser, - [ hdr(:icon, 'check', :width => '16'), - hdr(:static, 'Profile', :width => '70'), - hdr(:static, 'Image', :width => '70'), - 'Name', - 'Email' - ], - :count_callback => 'count_end_users', - :find_callback => 'find_end_users' - + include ActiveTable::Controller protected - def segmentations return @segmentations if @segmentations @@ -107,6 +95,25 @@ def handle_table_actions end end + def email_targets_table_generate(opts,*find_options) + @generated_active_table_columns = [ + ActiveTable::IconHeader.new('check', :width => '16'), + ActiveTable::StaticHeader.new('Profile', :width => '70'), + ActiveTable::StaticHeader.new('Image', :width => '70'), + ActiveTable::StaticHeader.new('Name'), + ActiveTable::StaticHeader.new('Email') + ] + + if self.segment && self.segment.fields + self.segment.fields.each do |field| + option = UserSegment.fields_options.rassoc(field) + @generated_active_table_columns << ActiveTable::StaticHeader.new(option[1], :label => option[0]) if option + end + end + + active_table_generate('end_users', EndUser, @generated_active_table_columns, {:count_callback => 'count_end_users', :find_callback => 'find_end_users'}, opts, *find_options) + end + public def lookup_autocomplete @@ -132,7 +139,6 @@ def lookup_autocomplete render :partial => 'lookup_autocomplete' end - def display_targets_table(display = true) if params[:table_action] || params[:segment_action] @@ -154,7 +160,9 @@ def display_targets_table(display = true) # Members editing def index cms_page_path [], "People" - + + return redirect_to(:action => 'segments') if self.segment && ! self.segment.ready? + segmentations display_targets_table(false) @@ -212,6 +220,22 @@ def edit_segment cms_page_path ['People', 'Segments'], '%s Segment' / @segment.name + if request.post? && params[:segment] + if @segment.update_attributes params[:segment] + @segment.refresh if @segment.should_refresh? + redirect_to :action => 'segments' + end + end + end + + def copy_segment + segment_to_copy = UserSegment.find params[:path][0] + + cms_page_path ['People', 'Segments'], 'Copy %s Segment' / segment_to_copy.name + + @segment = UserSegment.new segment_to_copy.attributes.symbolize_keys.slice(:name, :description, :fields, :main_page, :segment_options_text, :order_by) + @segment.name += ' (Copy)' unless request.post? + if request.post? && params[:segment] if @segment.update_attributes params[:segment] @segment.refresh diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index f7ce208b..04ae783e 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -28,6 +28,7 @@ def operations def segment_options_text=(text) text = text.gsub("\r", '').strip + @should_refresh = self.segment_options_text != text self.write_attribute :segment_options_text, text @operations = UserSegment::Operations.new @operations.parse text @@ -35,6 +36,10 @@ def segment_options_text=(text) text end + def should_refresh? + @should_refresh + end + def refresh if self.status == 'new' || self.ready? self.status = 'refreshing' @@ -173,7 +178,7 @@ def before_create end def self.fields_options - [['Source', 'source'], ['Date of Birth', 'dob'], ['Gender', 'gender'], ['Created', 'created_at'], ['Registered', 'registered_at']] + [['Source', 'source'], ['Date of Birth', 'dob'], ['Gender', 'gender'], ['Created', 'created_at'], ['Registered', 'registered_at'], ['User Class', 'user_class']] end def self.order_by_options diff --git a/app/views/members/_targets_table.rhtml b/app/views/members/_targets_table.rhtml index 91556828..c351e0d1 100644 --- a/app/views/members/_targets_table.rhtml +++ b/app/views/members/_targets_table.rhtml @@ -1,22 +1,12 @@ -<% @user_classes = [] - @user_level_options = EndUser.user_level_select_options - @source_options = EndUser.source_options_hash - @view = "View".t - @edit = "Edit".t - @delete = "Delete".t - @user_class_objs = UserClass.find(:all) - @user_class_index = @user_class_objs.index_by(&:id) - @user_class_objs.each { |cls| @user_classes[cls.id] = h(cls.name.t) } %> - <% active_table_for :email_targets_table, @active_table_output, :refresh_url => url_for(:action => 'display_targets_table', :path => @segment ? @segment.id : nil, :terms => @search.terms, :offsets => @search.offsets.empty? ? nil : @search.offsets), :class => 'active_table', :width => '100%', :next => @search.user_segment && @search.terms ? 'more' : '>', - :actions => [ ['Add Tags','js','MemberEditor.addTags();'], - ['Remove Tags','js','MemberEditor.removeTags();'] + :actions => [['Add Tags','js','MemberEditor.addTags();'], + ['Remove Tags','js','MemberEditor.removeTags();'] ], - :more_actions => [ ['Delete Targets','delete','Delete the selected users?'] ], + :more_actions => [['Delete Targets','delete','Delete the selected users?']], :update => 'targets_table' do |t| %>
          @@ -36,6 +26,23 @@ t.editor? ? h(email) : content_tag(:a, email, {:href => url_for(:action => 'edit', :path => t.id)}) %> #{value.name}#{value.strftime(DEFAULT_DATETIME_FORMAT.t)}-#{value}
          <% @builder.operation_arguments.each_with_index do |arg, idx| -%> -
        • - +
          • + + + <% end -%> - +
          <%= @builder.operation_argument_names[idx] %> <% arg_options = @builder.operation_argument_options[idx] - label = @builder.operation_argument_names[idx] if arg_options[:options] -%> - <%= f.select "argument#{idx}", arg_options[:options], :label => label %> + <%= f.select "argument#{idx}", arg_options[:options] %> <% else -%> - <%= f.text_field "argument#{idx}", :label => label %> + <%= f.text_field "argument#{idx}" %> <% end -%> - +
          <% end %> diff --git a/app/views/members/_operation_form_operation.html.erb b/app/views/members/_operation_form_operation.html.erb index 3e091048..c0035f92 100644 --- a/app/views/members/_operation_form_operation.html.erb +++ b/app/views/members/_operation_form_operation.html.erb @@ -1,7 +1,7 @@ <% cms_unstyled_fields_for :builder, @builder do |f| %> -
        • -<%= f.select :operation, @builder.operation_options, {}, :onchange => 'OperationBuilder.updateArguments();' %> +
        • +<%= f.select :operation, @builder.operation_options, {}, :onchange => 'OperationBuilder.updateArguments();', :style => 'width:250px;' %>
        • From ba7194d06a8fdc5c28f66f65d14574a9681b4888 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 20 May 2010 22:01:21 +0000 Subject: [PATCH 055/139] Display the builder in a popup window. --- app/views/members/_segment_form.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb index 7c757e98..6dbe64b8 100644 --- a/app/views/members/_segment_form.html.erb +++ b/app/views/members/_segment_form.html.erb @@ -1,10 +1,12 @@ - <% admin_form_for :segment, @segment do |f| -%> <%= f.text_field :name %> <%= f.text_area :description, :rows => 3 %> <%= f.select :order_by, UserSegment.order_by_options %> <%= f.check_boxes :main_page, [['display on people page', true]], :single => true %> <%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> +<% f.custom_field '' do %> +Builder +<% end %> <%= f.text_area :segment_options_text, :rows => 8, :label => 'Operations' %> <%= f.spacer %> <%= f.cancel_submit_buttons 'Cancel', (@segment.id ? 'Save' : 'Create') %> From 55decd6eba2ad90093da9b592275a05d62ea4474 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 21 May 2010 15:51:33 +0000 Subject: [PATCH 056/139] Can append operation to user segment options text. --- app/controllers/members_controller.rb | 13 +++++----- app/models/end_user_segment_field.rb | 12 +++++----- app/models/user_segment/core_type.rb | 6 ++--- app/models/user_segment/operation_builder.rb | 2 +- app/views/members/_operation_form.html.erb | 24 ++++++++++++------- .../_operation_form_arguments.html.erb | 8 +++++-- .../_operation_form_expression.html.erb | 1 + .../_operation_form_operation.html.erb | 12 +++++++--- app/views/members/_segment_form.html.erb | 13 +++++++++- app/views/members/update_builder.rjs | 2 ++ 10 files changed, 63 insertions(+), 30 deletions(-) create mode 100644 app/views/members/update_builder.rjs diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 77317760..2dffcaaf 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -8,7 +8,7 @@ class MembersController < CmsController # :nodoc: all cms_admin_paths "people", "People" => { :controller => '/members' }, - "Segments" => { :action => 'segments' } + "List" => { :action => 'segments' } # need to include @@ -236,12 +236,12 @@ def validate end def segments - cms_page_path ['People'], 'Segments' + cms_page_path ['People'], 'List' user_segments_table(false) end def create_segment - cms_page_path ['People', 'Segments'], 'Create a Segment' + cms_page_path ['People', 'List'], 'Create a List' @builder = UserSegment::OperationBuilder.new nil @@ -260,7 +260,7 @@ def create_segment def edit_segment @segment = UserSegment.find params[:path][0] - cms_page_path ['People', 'Segments'], '%s Segment' / @segment.name + cms_page_path ['People', 'List'], '%s List' / @segment.name @builder = UserSegment::OperationBuilder.new nil @@ -281,7 +281,7 @@ def edit_segment def copy_segment segment_to_copy = UserSegment.find params[:path][0] - cms_page_path ['People', 'Segments'], 'Copy %s Segment' / segment_to_copy.name + cms_page_path ['People', 'List'], 'Copy %s List' / segment_to_copy.name @builder = UserSegment::OperationBuilder.new nil @@ -308,6 +308,7 @@ def builder cms_page_path ['People'], 'Operation Builder' @builder = UserSegment::OperationBuilder.new nil + @builder.build(:field => 'created', :operation => 'since', :argument0 => 2, :argument1 => 'days') if request.post? && params[:builder] @builder.build(params[:builder]) @@ -322,7 +323,7 @@ def update_builder return render :partial => 'operation_form_arguments' if params[:arguments] return render :partial => 'operation_form_operation' if params[:operation] return render :partial => 'operation_form_expression' if params[:expression] - return :nothing => true + return render :nothing => true unless params[:commit] end def create diff --git a/app/models/end_user_segment_field.rb b/app/models/end_user_segment_field.rb index 8efd6e93..841f92d9 100644 --- a/app/models/end_user_segment_field.rb +++ b/app/models/end_user_segment_field.rb @@ -9,11 +9,11 @@ def self.user_segment_fields_handler_info } end - register_field :email, UserSegment::CoreType::StringType, :name => 'User: Email' - register_field :gender, UserSegment::CoreType::StringType, :name => 'User: Gender' - register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'User: Created' - register_field :registered, UserSegment::CoreType::BooleanType, :name => 'User: Registered' - register_field :activated, UserSegment::CoreType::BooleanType, :name => 'User: Activated' - register_field :user_level, UserSegment::CoreType::NumberType, :name => 'User: User Level' + register_field :email, UserSegment::CoreType::StringType, :name => 'Users: Email' + register_field :gender, UserSegment::CoreType::StringType, :name => 'Users: Gender' + register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'Users: Created' + register_field :registered, UserSegment::CoreType::BooleanType, :name => 'Users: Registered' + register_field :activated, UserSegment::CoreType::BooleanType, :name => 'Users: Activated' + register_field :user_level, UserSegment::CoreType::NumberType, :name => 'Users: User Level' end diff --git a/app/models/user_segment/core_type.rb b/app/models/user_segment/core_type.rb index 28b83e60..0f50c01d 100644 --- a/app/models/user_segment/core_type.rb +++ b/app/models/user_segment/core_type.rb @@ -8,14 +8,14 @@ def self.datetime_format_options class DateTimeType < UserSegment::FieldType - register_operation :before, [['Value', :integer], ['Format', :option, {:options => UserSegment::CoreType.datetime_format_options}]] + register_operation :before, [['Value', :integer], ['Format', :option, {:options => UserSegment::CoreType.datetime_format_options, :description => 'ago'}]] def self.before(cls, field, value, format) time = value.send(format).ago cls.scoped(:conditions => ["#{field} <= ?", time]) end - register_operation :since, [['Value', :integer], ['Format', :option, {:options => UserSegment::CoreType.datetime_format_options}]] + register_operation :since, [['Value', :integer], ['Format', :option, {:options => UserSegment::CoreType.datetime_format_options, :description => 'ago'}]] def self.since(cls, field, value, format) time = value.send(format).ago @@ -83,7 +83,7 @@ def self.is(cls, field, string) end class BooleanType < UserSegment::FieldType - register_operation :is, [['Boolean', :boolean]] + register_operation :is, [['', :boolean]] def self.is(cls, field, string) cls.scoped(:conditions => ["#{field} = ?", string]) diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb index 03a62d60..08e67641 100644 --- a/app/models/user_segment/operation_builder.rb +++ b/app/models/user_segment/operation_builder.rb @@ -1,6 +1,6 @@ class UserSegment::OperationBuilder < HashModel - attributes :operator => nil, :field => 'created', :operation => 'since', :arguments => [], :child => nil + attributes :operator => nil, :field => nil, :operation => nil, :arguments => [], :child => nil def operator_options [['Not', 'not'], ['', nil]] diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb index 633eddb0..1e45d9ad 100644 --- a/app/views/members/_operation_form.html.erb +++ b/app/views/members/_operation_form.html.erb @@ -13,14 +13,22 @@ OperationBuilder = { updateExpression: function() { <%= remote_function :url => url_for(:action => 'update_builder', :expression => 1), :submit => 'builder', :update => 'expression' %>; + }, + + appendExpression: function() { + <%= remote_function :url => url_for(:action => 'update_builder', :commit => 1), :submit => 'builder' %>; + }, + + appendOptionsText: function(expr) { + with(window.opener) { setTimeout(function(){UserSegment.appendOptionsText(expr);}, 1); } } } -
          -User Segment Syntax Helper -<% cms_unstyled_form_for :builder, @builder, :html => {:id => 'builder', :onsubmit => 'OperationBuilder.updateExpression(); return false;'} do |f| -%> -
            +
            +User List Syntax Builder +<% cms_unstyled_form_for :builder, @builder, :html => {:id => 'builder', :onsubmit => 'OperationBuilder.appendExpression(); return false;', :class => "admin_form"} do |f| -%> +
            • <%= 'I am'.t %> (<%= f.check_boxes :operator, [['not', 'not']], :single => true, :separator => '' %>) @@ -28,10 +36,10 @@ OperationBuilder = {
            • <%= 'looking for'.t %> - <%= f.select :field, @builder.field_options, {}, :onchange => 'OperationBuilder.updateOperations();' %> + <%= f.select :field, @builder.field_options, {}, :onchange => 'OperationBuilder.updateOperations();', :style => 'width:200px;' %>
              • -
              +
              <%= render :partial => 'operation_form_operation' %>
              @@ -39,8 +47,8 @@ OperationBuilder = { <%= render :partial => 'operation_form_expression' %> -
            • -<%= f.submit_tag 'Build' %> +
            • +<%= f.cancel_submit_buttons 'Close', 'Add to Operations', {:onclick => 'window.close();'} %>
              • <% end -%> diff --git a/app/views/members/_operation_form_arguments.html.erb b/app/views/members/_operation_form_arguments.html.erb index 154c8f4d..b4146cbf 100644 --- a/app/views/members/_operation_form_arguments.html.erb +++ b/app/views/members/_operation_form_arguments.html.erb @@ -3,16 +3,20 @@ <% @builder.operation_arguments.each_with_index do |arg, idx| -%> - - + + <%= "" if description %> <% end -%>
              <%= @builder.operation_argument_names[idx] %> + <%= @builder.operation_argument_names[idx] %> <% arg_options = @builder.operation_argument_options[idx] + description = arg_options[:description] if arg_options[:options] -%> <%= f.select "argument#{idx}", arg_options[:options] %> + <% elsif @builder.operation_arguments[idx] == :boolean -%> + <%= f.yes_no "argument#{idx}" %> <% else -%> <%= f.text_field "argument#{idx}" %> <% end -%>
               #{description}
              <% end %> diff --git a/app/views/members/_operation_form_expression.html.erb b/app/views/members/_operation_form_expression.html.erb index 301293fb..76d09eca 100644 --- a/app/views/members/_operation_form_expression.html.erb +++ b/app/views/members/_operation_form_expression.html.erb @@ -1,4 +1,5 @@ <% cms_unstyled_fields_for :builder, @builder do |f| -%> +
              Snippet
              <%= f.text_area_tag :expr, @builder.to_expr, :style => 'width:400px; height: 50px;', :readonly => true %> <% end -%> diff --git a/app/views/members/_operation_form_operation.html.erb b/app/views/members/_operation_form_operation.html.erb index c0035f92..e2df7520 100644 --- a/app/views/members/_operation_form_operation.html.erb +++ b/app/views/members/_operation_form_operation.html.erb @@ -1,8 +1,14 @@ <% cms_unstyled_fields_for :builder, @builder do |f| %> -
            • -<%= f.select :operation, @builder.operation_options, {}, :onchange => 'OperationBuilder.updateArguments();', :style => 'width:250px;' %> -
              • + +<% if @builder.operation_options.length == 1 -%> + <%= f.hidden_field :operation %> +<% else -%> +
            • + <%= f.select :operation, @builder.operation_options, {}, :onchange => 'OperationBuilder.updateArguments();', :style => 'width:140px;' %> + function +
              • +<% end -%>
            • <%= render :partial => 'operation_form_arguments' %> diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb index 6dbe64b8..8d6aa47c 100644 --- a/app/views/members/_segment_form.html.erb +++ b/app/views/members/_segment_form.html.erb @@ -1,3 +1,14 @@ + + <% admin_form_for :segment, @segment do |f| -%> <%= f.text_field :name %> <%= f.text_area :description, :rows => 3 %> @@ -5,7 +16,7 @@ <%= f.check_boxes :main_page, [['display on people page', true]], :single => true %> <%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> <% f.custom_field '' do %> -Builder +Builder <% end %> <%= f.text_area :segment_options_text, :rows => 8, :label => 'Operations' %> <%= f.spacer %> diff --git a/app/views/members/update_builder.rjs b/app/views/members/update_builder.rjs new file mode 100644 index 00000000..5c67fb14 --- /dev/null +++ b/app/views/members/update_builder.rjs @@ -0,0 +1,2 @@ + +page.call 'OperationBuilder.appendOptionsText', @builder.to_expr From 0468e7aa4c95308f88132b5f05b56396e13cc97d Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 21 May 2010 20:01:13 +0000 Subject: [PATCH 057/139] Can build expressions with conditions and or or --- app/controllers/members_controller.rb | 3 +- app/models/user_segment/field.rb | 12 +++--- app/models/user_segment/operation_builder.rb | 39 ++++++++++++++++--- app/views/members/_operation_form.html.erb | 7 +--- .../_operation_form_arguments.html.erb | 10 ++--- .../members/_operation_form_child.html.erb | 11 ++++++ .../_operation_form_operation.html.erb | 20 +++++++--- 7 files changed, 72 insertions(+), 30 deletions(-) create mode 100644 app/views/members/_operation_form_child.html.erb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 2dffcaaf..6269f8bb 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -320,8 +320,7 @@ def builder def update_builder @builder = UserSegment::OperationBuilder.new nil @builder.build(params[:builder]) - return render :partial => 'operation_form_arguments' if params[:arguments] - return render :partial => 'operation_form_operation' if params[:operation] + return render :partial => 'operation_form_operation', :locals => {:builder => @builder, :form_id => 'builder'} if params[:operation] return render :partial => 'operation_form_expression' if params[:expression] return render :nothing => true unless params[:commit] end diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index d8aebf93..493a3895 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -13,7 +13,7 @@ def validate end unless self.operation.blank? - self.errors.add(:operation, 'invalid operation') unless self.type_class && self.type_class.has_operation?(self.operation) + self.errors.add(:operation, 'invalid operation') if ! self.type_class || ! self.type_class.has_operation?(self.operation) if self.operation_info self.errors.add(:arguments, 'are missing') if self.arguments.empty? && ! self.operation_arguments.empty? @@ -25,7 +25,7 @@ def validate end end - self.errors.add(:child, 'is invalid') if self.child_field && ! self.child_field.valid? + self.errors.add(:child, 'is invalid') if self.child && self.child_field && ! self.child_field.valid? end def count @@ -74,7 +74,7 @@ def operation_info end def type_class - @type_class ||= self.handler_class.user_segment_fields[self.field.to_sym][:type] if self.handler_class + @type_class ||= self.handler_class.user_segment_fields[self.field.to_sym][:type] if self.handler_class && self.handler_class.user_segment_fields && self.handler_class.user_segment_fields[self.field.to_sym] end def model_field @@ -82,7 +82,7 @@ def model_field end def handler - @handler ||= UserSegment::FieldHandler.handlers.find { |info| info[:class].has_field?(self.field) } + @handler ||= UserSegment::FieldHandler.handlers.find { |info| info[:class].has_field?(self.field) } unless self.field.blank? end def handler=(handler) @@ -110,9 +110,9 @@ def child_field @child_field end - def to_expr + def to_expr(opts={}) output = "#{field}.#{operation}(" + self.arguments.collect { |arg| arg.is_a?(String) || arg.is_a?(Time) ? "\"#{arg}\"" : arg.to_s }.join(', ') + ")" - output += self.child.to_s if self.child + output += '.' + self.child_field.to_expr if self.child && self.child_field && opts[:nochild].nil? output end end diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb index 08e67641..6a3eed12 100644 --- a/app/models/user_segment/operation_builder.rb +++ b/app/models/user_segment/operation_builder.rb @@ -1,24 +1,44 @@ class UserSegment::OperationBuilder < HashModel - attributes :operator => nil, :field => nil, :operation => nil, :arguments => [], :child => nil + attributes :operator => nil, :field => nil, :operation => nil, :arguments => nil, :condition => nil + + def strict?; true; end + def arguments; @arguments ||= []; end def operator_options [['Not', 'not'], ['', nil]] end + def condition_options + [['', nil], ['And', 'and'], ['Or', 'or']] + end + + def validate + self.errors.add(:field, 'is invalid') unless self.user_segment_field.valid? + self.errors.add(:condition, 'is invalid') if ! self.condition.blank? && ! self.child_field.valid? + end + def build(opts={}) self.operator = opts[:operator] self.field = opts[:field] self.operation = opts[:operation] - unless self.operation_options.rassoc(self.operation) - self.operation = self.operation_options[0][1] - @user_segment_field = nil + self.condition = opts[:condition] + unless self.field.blank? + unless self.operation_options.rassoc(self.operation) + self.operation = self.operation_options[0][1] + @user_segment_field = nil + end end self.operation_arguments.each_with_index do |type, idx| arg = "argument#{idx}" self.send("#{arg}=", opts[arg.to_sym]) if opts[arg.to_sym] end + + if opts[:child] + self.child_field.build(opts[:child]) + self.user_segment_field.child = self.child_field.user_segment_field.to_h if self.condition == 'and' + end end def field_options @@ -30,6 +50,7 @@ def field_options end end @field_options.sort! { |a, b| a[0] <=> b[0] } + @field_options end def user_segment_field @@ -79,9 +100,15 @@ def method_missing(arg, *args) end def to_expr - return '' unless self.user_segment_field.valid? + return '' unless self.valid? output = self.operator == 'not' ? 'not ' : '' - output += self.user_segment_field.to_expr + output += self.user_segment_field.to_expr(:nochild => 1) + output += '.' + self.child_field.to_expr if self.condition == 'and' + output += ' + ' + self.child_field.to_expr if self.condition == 'or' output end + + def child_field + @child_field ||= UserSegment::OperationBuilder.new nil + end end diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb index 1e45d9ad..c1818ac7 100644 --- a/app/views/members/_operation_form.html.erb +++ b/app/views/members/_operation_form.html.erb @@ -6,11 +6,6 @@ OperationBuilder = { OperationBuilder.updateExpression(); }, - updateArguments: function() { - <%= remote_function :url => url_for(:action => 'update_builder', :arguments => 1), :submit => 'builder', :update => 'arguments' %>; - OperationBuilder.updateExpression(); - }, - updateExpression: function() { <%= remote_function :url => url_for(:action => 'update_builder', :expression => 1), :submit => 'builder', :update => 'expression' %>; }, @@ -40,7 +35,7 @@ OperationBuilder = {
              • -<%= render :partial => 'operation_form_operation' %> +<%= render :partial => 'operation_form_operation', :locals => {:builder => @builder, :form_id => 'builder'} %>
            • diff --git a/app/views/members/_operation_form_arguments.html.erb b/app/views/members/_operation_form_arguments.html.erb index b4146cbf..9f7d1e8e 100644 --- a/app/views/members/_operation_form_arguments.html.erb +++ b/app/views/members/_operation_form_arguments.html.erb @@ -1,15 +1,15 @@ -<% cms_unstyled_fields_for :builder, @builder do |f| %> +<% cms_unstyled_fields_for form_id, builder do |f| %> - <% @builder.operation_arguments.each_with_index do |arg, idx| -%> + <% builder.operation_arguments.each_with_index do |arg, idx| -%> - + + diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index 594a90de..4810fbf8 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -105,7 +105,7 @@ <%= p.link "Download Visible Targets",:icon => 'download.gif', :controller => :member_export %> <%= p.link "Tag List", :icon => 'show.gif', :action => 'tags' %> <%= p.link "Access Tokens", :icon => 'access.gif', :controller => '/access_token' if myself.has_role?('editor_access_tokens') %> - <%= p.link "Segments", :icon => 'access.gif', :action => 'segments' %> + <%= p.link "User Lists", :icon => 'access.gif', :action => 'segments' %> <% end -%>
              @@ -113,7 +113,7 @@
              <%= form_tag %> <% if @segment && @segment.last_ran_at -%> - Edit | Refresh + Refresh | Edit <% else -%> Edit <% end -%> @@ -123,7 +123,7 @@ <%= 'updated on %s' / @segment.last_ran_at.strftime(DEFAULT_DATETIME_FORMAT.t) %>
              <% end -%> -Create a Segment +Create a User List
              From fdfb00a02e9e6096d450525a75373cb6879c7972 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 24 May 2010 17:22:31 +0000 Subject: [PATCH 060/139] Added end user gender type. --- app/controllers/members_controller.rb | 1 - app/models/end_user_segment_field.rb | 2 +- app/models/end_user_segment_type.rb | 17 +++++++++++++++++ app/views/members/_operation_form.html.erb | 4 +++- .../members/_operation_form_arguments.html.erb | 10 +++++++--- 5 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 app/models/end_user_segment_type.rb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 5163f909..a84b97ba 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -309,7 +309,6 @@ def builder cms_page_path ['People'], 'Operation Builder' @builder = UserSegment::OperationBuilder.new nil - @builder.build(:field => 'created', :operation => 'since', :argument0 => 2, :argument1 => 'days') if request.post? && params[:builder] @builder.build(params[:builder]) diff --git a/app/models/end_user_segment_field.rb b/app/models/end_user_segment_field.rb index 841f92d9..abc3e5e4 100644 --- a/app/models/end_user_segment_field.rb +++ b/app/models/end_user_segment_field.rb @@ -10,7 +10,7 @@ def self.user_segment_fields_handler_info end register_field :email, UserSegment::CoreType::StringType, :name => 'Users: Email' - register_field :gender, UserSegment::CoreType::StringType, :name => 'Users: Gender' + register_field :gender, EndUserSegmentType::GenderType, :name => 'Users: Gender' register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'Users: Created' register_field :registered, UserSegment::CoreType::BooleanType, :name => 'Users: Registered' register_field :activated, UserSegment::CoreType::BooleanType, :name => 'Users: Activated' diff --git a/app/models/end_user_segment_type.rb b/app/models/end_user_segment_type.rb new file mode 100644 index 00000000..748f04e7 --- /dev/null +++ b/app/models/end_user_segment_type.rb @@ -0,0 +1,17 @@ + +class EndUserSegmentType + + class GenderType < UserSegment::FieldType + include HandlerActions + + def self.gender_options + [['Female', 'f'], ['Male', 'm']] + end + + register_operation :is, [['Gender', :option, {:options => EndUserSegmentType::GenderType.gender_options, :form_field => 'radio_buttons'}]] + + def self.is(cls, field, gender) + cls.scoped(:conditions => ["#{field} = ?", gender]) + end + end +end diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb index 1f5f17b7..fbbd6fcf 100644 --- a/app/views/members/_operation_form.html.erb +++ b/app/views/members/_operation_form.html.erb @@ -36,7 +36,9 @@ OperationBuilder = {
              -<%= render :partial => 'operation_form_operation', :locals => {:builder => @builder, :form_id => 'builder'} %> + <% if @builder.operation_options.length > 0 -%> + <%= render :partial => 'operation_form_operation', :locals => {:builder => @builder, :form_id => 'builder'} %> + <% end -%>
            • diff --git a/app/views/members/_operation_form_arguments.html.erb b/app/views/members/_operation_form_arguments.html.erb index 9f7d1e8e..91cb05e0 100644 --- a/app/views/members/_operation_form_arguments.html.erb +++ b/app/views/members/_operation_form_arguments.html.erb @@ -5,10 +5,14 @@
              • + @@ -43,12 +50,6 @@ - - - <% end -%> - diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index 2c423c52..cd9989cb 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -115,7 +115,7 @@ <% action_panel :handler => 'members' do |p| -%> <%= p.link "Add a user",:icon => 'add.gif', :action => 'create' %> <%= p.link "Import Email Targets",:icon => 'upload.gif', :controller => :member_import %> - <%= p.link "Download Visible Targets",:icon => 'download.gif', :controller => :member_export %> + <%= p.link "Download Visible Targets",:icon => 'download.gif', :controller => :member_export, :action => 'index', :path => @segment ? @segment.id : nil %> <%= p.link "Tag List", :icon => 'show.gif', :action => 'tags' %> <%= p.link "Access Tokens", :icon => 'access.gif', :controller => '/access_token' if myself.has_role?('editor_access_tokens') %> <%= p.link "User Lists", :icon => 'access.gif', :action => 'segments' %> diff --git a/app/workers/member_export_worker.rb b/app/workers/member_export_worker.rb index 595028ca..1cd118b0 100644 --- a/app/workers/member_export_worker.rb +++ b/app/workers/member_export_worker.rb @@ -24,18 +24,28 @@ def do_work(args) filename = tmp_path + dmn.id.to_s + "_member_export" results[:filename] = filename + + @segment = UserSegment.find_by_id args[:user_segment_id] - current_segment = MarketSegment.new(:segment_type => 'members',:options => args[:export_segmentation]) - - @members = current_segment.target_find - CSV.open(filename,'w') do |writer| - @members.each_with_index do |user,idx| - user.export_csv(writer, :header => idx == 0, - :include => args[:export_options]) + if @segment + @segment.each_with_index do |user,idx| + user.export_csv(writer, :header => idx == 0, + :include => args[:export_options]) + end + else + idx = 0 + EndUser.find_in_batches(:conditions => {:client_user_id => nil}) do |users| + users.each do |user| + user.export_csv(writer, :header => idx == 0, + :include => args[:export_options]) + idx = idx.succ + end + end end end - results[:entries] = @members.length + + results[:entries] = @segment ? @segment.last_count : EndUser.count(:conditions => {:client_user_id => nil}) results[:type] = 'csv' results[:completed] = 1 From d6b9da609ef7b9a034e9c222830dfc72703b0b0b Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 25 May 2010 19:42:28 +0000 Subject: [PATCH 069/139] Added support for selecting a model for building a segment. Create a UserSegment instead of a market segment when creating a subscription. --- app/controllers/content_controller.rb | 1 + app/models/user_segment/field_type.rb | 10 +++++++++- app/models/user_subscription.rb | 7 ++++--- .../user_subscription_entry_segment_field.rb | 20 +++++++++++++++++++ .../_operation_form_arguments.html.erb | 4 +++- .../subscription/_subscription_table.rhtml | 2 +- 6 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 app/models/user_subscription_entry_segment_field.rb diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb index 452612e7..572cea5b 100644 --- a/app/controllers/content_controller.rb +++ b/app/controllers/content_controller.rb @@ -29,6 +29,7 @@ class ContentController < ModuleController #:nodoc: all register_handler :user_segment, :fields, 'EndUserSegmentField' register_handler :user_segment, :fields, 'EndUserActionSegmentField' register_handler :user_segment, :fields, 'EndUserCacheSegmentField' + register_handler :user_segment, :fields, 'UserSubscriptionEntrySegmentField' def index @content_models,@content_actions = CmsController.get_content_models_and_actions diff --git a/app/models/user_segment/field_type.rb b/app/models/user_segment/field_type.rb index b70b3e43..42c2ff2b 100644 --- a/app/models/user_segment/field_type.rb +++ b/app/models/user_segment/field_type.rb @@ -40,7 +40,7 @@ def self.register_operation(operation, args=[], options={}) end # converts a string to the correct type - # supported types are :integer, :float, :double, :date, :datetime, :option, :boolean + # supported types are :integer, :float, :double, :date, :datetime, :option, :boolean, :model def self.convert_to(value, type, opts={}) return value if value.nil? @@ -73,11 +73,19 @@ def self.convert_to(value, type, opts={}) value = value.downcase if value.is_a?(String) return true if value == 1 || value == '1' || value == 'true' return false if value == 0 || value == '0' || value == 'false' + when :model + options = self.model_options(opts) + values = options.rassoc(value.to_i) + return values[1] if values end nil end + def self.model_options(opts={}) + opts[:class].find(:all, {:select => 'id, name', :order => 'name'}.merge(opts[:options] || {})).collect { |item| [item.name, item.id] } + end + def self.convert_arguments(arguments, types, options) (0..arguments.length-1).collect do |idx| self.convert_to(arguments[idx], types[idx], options[idx]) diff --git a/app/models/user_subscription.rb b/app/models/user_subscription.rb index e024d78c..6a020738 100644 --- a/app/models/user_subscription.rb +++ b/app/models/user_subscription.rb @@ -11,9 +11,10 @@ class UserSubscription < DomainModel has_many :unsubscribed_entries, :class_name => 'UserSubscriptionEntry', :conditions => 'verified = 1 AND subscribed=0' def after_create #:nodoc:all - MarketSegment.create(:user_subscription_id => self.id, :name => 'Subscribers to '.t + self.name ,:segment_type => 'subscription', - :options => { 'user_subscription_id' => self.id }, - :description => 'Sends an Campaign to all users who are subscribed to this subscription'.t ) + segment = UserSegment.create(:name => 'Subscribers to '.t + self.name, :segment_type => 'filtered', + :description => 'Sends an Campaign to all users who are subscribed to this subscription'.t, + :segment_options_text => "user_subscription_id.is(#{self.id})") + segment.refresh end def after_update #:nodoc:all diff --git a/app/models/user_subscription_entry_segment_field.rb b/app/models/user_subscription_entry_segment_field.rb new file mode 100644 index 00000000..514c0e6e --- /dev/null +++ b/app/models/user_subscription_entry_segment_field.rb @@ -0,0 +1,20 @@ + +class UserSubscriptionEntrySegmentField < UserSegment::FieldHandler + + def self.user_segment_fields_handler_info + { + :name => 'User Subscription Entry Segment Fields', + :domain_model_class => UserSubscriptionEntry + } + end + + class UserSubscriptionType < UserSegment::FieldType + register_operation :is, [['User Subscription', :model, {:class => UserSubscription}]] + + def self.is(cls, field, id) + cls.scoped(:conditions => ["#{field} = ?", id]) + end + end + + register_field :user_subscription_id, UserSubscriptionEntrySegmentField::UserSubscriptionType, :name => 'User Subscription' +end diff --git a/app/views/members/_operation_form_arguments.html.erb b/app/views/members/_operation_form_arguments.html.erb index 91cb05e0..abc35653 100644 --- a/app/views/members/_operation_form_arguments.html.erb +++ b/app/views/members/_operation_form_arguments.html.erb @@ -11,7 +11,9 @@ description = arg_options[:description] %> - <% if arg_options[:options] -%> + <% if builder.operation_arguments[idx] == :model -%> + <%= f.select("argument#{idx}", [["Select a #{builder.operation_argument_names[idx]}", nil]] + UserSegment::FieldType.model_options(arg_options)) %> + <% elsif arg_options[:options] -%> <%= arg_options[:form_field] == 'radio_buttons' ? f.radio_buttons("argument#{idx}", arg_options[:options]) : f.select("argument#{idx}", arg_options[:options]) %> <% elsif builder.operation_arguments[idx] == :boolean -%> <%= f.yes_no "argument#{idx}" %> diff --git a/app/views/subscription/_subscription_table.rhtml b/app/views/subscription/_subscription_table.rhtml index 3daf5d2a..aef92fc2 100644 --- a/app/views/subscription/_subscription_table.rhtml +++ b/app/views/subscription/_subscription_table.rhtml @@ -7,7 +7,7 @@ - + From 08b6f8b86e3329b8697f0a12e0cce3daad7f019e Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 25 May 2010 19:47:30 +0000 Subject: [PATCH 070/139] Removed Market Segment tests --- spec/controllers/members_controller_spec.rb | 25 --------------------- 1 file changed, 25 deletions(-) diff --git a/spec/controllers/members_controller_spec.rb b/spec/controllers/members_controller_spec.rb index 163c7036..cf4634c7 100644 --- a/spec/controllers/members_controller_spec.rb +++ b/spec/controllers/members_controller_spec.rb @@ -258,31 +258,6 @@ @user1.reload @user1.tag_names.empty?.should be_true end - - it "should be able to save segment" do - assert_difference 'MarketSegment.count', 1 do - @output = post 'display_targets_table', :table_action => '', :save_segment => 'new_test_segment' - end - end - - it "should be able to load a segment" do - assert_difference 'MarketSegment.count', 0 do - MarketSegment.should_receive(:find_by_id).with(1).and_return(nil) - @output = post 'display_targets_table', :table_action => '', :load_segment => 1 - end - end - - it "should be able to delete a segment" do - @segment = MarketSegment.create :name => 'new_test_segment', :segment_type => 'members' - @segment.id.should_not be_nil - - assert_difference 'MarketSegment.count', -1 do - @output = post 'display_targets_table', :table_action => '', :delete_segment => @segment.id - end - - @segment = MarketSegment.find_by_name('new_test_segment') - @segment.should be_nil - end end it "should render generate_vip page" do From e09e47f1ef1db43c5ec64ab17b3b3733b7f39268 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 25 May 2010 20:55:41 +0000 Subject: [PATCH 071/139] Use domain model function select options. Added garbage collection to user segment cache. --- app/models/user_segment/field_type.rb | 2 +- app/models/user_segment_cache.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/user_segment/field_type.rb b/app/models/user_segment/field_type.rb index 42c2ff2b..b4c68b75 100644 --- a/app/models/user_segment/field_type.rb +++ b/app/models/user_segment/field_type.rb @@ -83,7 +83,7 @@ def self.convert_to(value, type, opts={}) end def self.model_options(opts={}) - opts[:class].find(:all, {:select => 'id, name', :order => 'name'}.merge(opts[:options] || {})).collect { |item| [item.name, item.id] } + opts[:class].select_options end def self.convert_arguments(arguments, types, options) diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb index ba53782e..3aa49cd0 100644 --- a/app/models/user_segment_cache.rb +++ b/app/models/user_segment_cache.rb @@ -56,6 +56,8 @@ def find_in_batches(opts={}) users = self.fetch_users(:offset => offset, :limit => limit) offset = offset + limit yield users + users = nil + GC.start end end From d2af02d45c6c9b641fbd3d1609e1d96b02df6845 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 25 May 2010 21:22:00 +0000 Subject: [PATCH 072/139] Removed need for market segment. --- app/models/user_subscription.rb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/models/user_subscription.rb b/app/models/user_subscription.rb index 6a020738..32dad45b 100644 --- a/app/models/user_subscription.rb +++ b/app/models/user_subscription.rb @@ -3,8 +3,6 @@ class UserSubscription < DomainModel validates_presence_of :name - has_one :market_segment, :dependent => :destroy - has_many :user_subscription_entries, :dependent => :delete_all, :include => :end_user has_many :active_subscriptions, :class_name => 'UserSubscriptionEntry', :conditions => 'verified = 1 AND subscribed=1' @@ -17,13 +15,6 @@ def after_create #:nodoc:all segment.refresh end - def after_update #:nodoc:all - if self.market_segment - self.market_segment.name = 'Subscribers to '.t + self.name - self.market_segment.save - end - end - # Subscribe a user via a admin subscription def admin_subscribe_user(user,options={}) self.user_subscription_entries.find_by_end_user_id(user.id) || From 46fee58737f9ac58ab346fda6fe628874d4e6117 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 26 May 2010 13:47:20 +0000 Subject: [PATCH 073/139] Action type use model options. --- app/models/end_user_action_segment_type.rb | 4 ++-- app/models/user_segment/field_type.rb | 3 ++- app/views/members/_operation_form_arguments.html.erb | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/end_user_action_segment_type.rb b/app/models/end_user_action_segment_type.rb index b986e178..7f10918f 100644 --- a/app/models/end_user_action_segment_type.rb +++ b/app/models/end_user_action_segment_type.rb @@ -4,11 +4,11 @@ class EndUserActionSegmentType class ActionType < UserSegment::FieldType include HandlerActions - def self.action_options + def self.select_options(opts={}) self.get_handlers(:action).collect { |handler| [handler[1][:description], handler[1][:handler].to_s] } end - register_operation :is, [['Action', :option, {:options => EndUserActionSegmentType::ActionType.action_options}]] + register_operation :is, [['Action', :model, {:class => EndUserActionSegmentType::ActionType}]] def self.is(cls, field, path) path = path.split('/') diff --git a/app/models/user_segment/field_type.rb b/app/models/user_segment/field_type.rb index b4c68b75..2e43e8db 100644 --- a/app/models/user_segment/field_type.rb +++ b/app/models/user_segment/field_type.rb @@ -75,7 +75,8 @@ def self.convert_to(value, type, opts={}) return false if value == 0 || value == '0' || value == 'false' when :model options = self.model_options(opts) - values = options.rassoc(value.to_i) + value = value.to_i if options.size > 0 && options[0].is_a?(Array) && options[0][1].is_a?(Integer) + values = options.rassoc(value) return values[1] if values end diff --git a/app/views/members/_operation_form_arguments.html.erb b/app/views/members/_operation_form_arguments.html.erb index abc35653..b132411d 100644 --- a/app/views/members/_operation_form_arguments.html.erb +++ b/app/views/members/_operation_form_arguments.html.erb @@ -12,7 +12,7 @@ %> <% if builder.operation_arguments[idx] == :model -%> - <%= f.select("argument#{idx}", [["Select a #{builder.operation_argument_names[idx]}", nil]] + UserSegment::FieldType.model_options(arg_options)) %> + <%= f.select("argument#{idx}", [["--Select %s--" / builder.operation_argument_names[idx], nil]] + UserSegment::FieldType.model_options(arg_options)) %> <% elsif arg_options[:options] -%> <%= arg_options[:form_field] == 'radio_buttons' ? f.radio_buttons("argument#{idx}", arg_options[:options]) : f.select("argument#{idx}", arg_options[:options]) %> <% elsif builder.operation_arguments[idx] == :boolean -%> From 15af19319d4efaeda87f5427caaf4e193536f7be Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 26 May 2010 16:17:57 +0000 Subject: [PATCH 074/139] Added market segment id to user segment. Create a market segment after creating a user segment. Removed members and custom from market segment added user_segment instead. --- app/models/market_segment.rb | 235 +++++---------------- app/models/user_segment.rb | 16 ++ app/models/user_subscription.rb | 16 +- db/migrate/20100511165552_user_segments.rb | 14 +- 4 files changed, 84 insertions(+), 197 deletions(-) diff --git a/app/models/market_segment.rb b/app/models/market_segment.rb index 13b9441e..fe1ceb69 100644 --- a/app/models/market_segment.rb +++ b/app/models/market_segment.rb @@ -9,12 +9,12 @@ class MarketSegment < DomainModel belongs_to :user_subscription has_options :segment_type, - [ [ 'Subscription', 'subscription' ], - [ 'Registered Members', 'members' ] , - [ 'Content Model', 'content_model'] ] + [['Subscription', 'subscription'], + ['User List', 'user_segment'], + ['Content Model', 'content_model']] - named_scope :with_segment_type, lambda { |segment_type| segment_type == 'custom' || segment_type == 'content_model' ? {:conditions => 'segment_type = "custom" || segment_type = "content_model"'} : {:conditions => ['segment_type = ?', segment_type]} } + named_scope :with_segment_type, lambda { |segment_type| {:conditions => {:segment_type => segment_type}} } named_scope :for_campaign, lambda { |campaign| campaign.id ? {:conditions => ['market_campaign_id IS NULL OR market_campaign_id = ?', campaign.id]} : {:conditions => 'market_campaign_id IS NULL'} } named_scope :order_by_name, :order => :name @@ -24,56 +24,43 @@ def save_segment def options_model(val = nil) case self.segment_type - when 'subscription': + when 'subscription' SubscriptionOptions.new(val || self.options) - when 'members': - MembersOptions.new(val || self.options) - when 'content_model': + when 'content_model' ContentModelOptions.new(val || self.options) - when 'custom': - CustomModelOptions.new(val || self.options) + when 'user_segment' + UserSegmentOptions.new(val || self.options) else DefaultsHashObject.new end - - end - - def self.create_custom(campaign,user_ids) - self.create(:options => { :user_ids => user_ids }, :segment_type => 'custom', :name => "#{campaign.name} Custom Segment", :market_campaign_id => campaign.id ) end - class CustomModelOptions < HashModel #:nodoc:all - default_options :user_ids => [] - - integer_array_options :user_ids - end - class SubscriptionOptions < HashModel #:nodoc:all - default_options :user_subscription_id => nil - - validates_presence_of :user_subscription_id + default_options :user_subscription_id => nil + + validates_presence_of :user_subscription_id end - class MembersOptions < HashModel #:nodoc:all - default_options :filter_profiles => nil, :filter_tags => nil, :tags_type => 'any', :affected_profiles => nil, :affected_tags => :nil - - validates_presence_of + class UserSegmentOptions < HashModel #:nodoc:all + default_options :user_segment_id => nil + + validates_presence_of :user_segment_id end class ContentModelOptions < HashModel #:nodoc:all - default_options :content_model_id => nil,:email_field => nil - - validates_presence_of :content_model_id, :email_field + default_options :content_model_id => nil,:email_field => nil + + validates_presence_of :content_model_id, :email_field end def available_fields case self.segment_type - when 'subscription': + when 'subscription' vars = [ [ 'Email'.t,'email', [ 'email','e-mail','e mail' ] ], [ 'Name'.t, 'name', [ 'name', 'name'.t ] ] ] - when 'members': + when 'user_segment' vars = [ [ 'Email'.t,'email', [ 'email','e-mail','e mail' ] ], [ 'Full Name'.t, 'name', [ 'name', 'name'.t, 'full name'.t ] ], @@ -99,7 +86,6 @@ def available_fields vars << [ 'View Online Link'.t,'view_online', [ 'view_online' ,'view online', 'view_online_link', 'view online link']] vars << [ 'Unsubscribe Url'.t,'unsubscribe_href', [ 'unsubscribe_url','unsubscribe url','unsubscribe_url' ] ] vars << [ 'View Online Url'.t,'view_online_href', [ 'view_online_url' ,'view online url', 'view_online_href', 'view online href']] - end def target_count(options = {}) @@ -120,180 +106,69 @@ def target_entries(options = {}) self.send(self.segment_type + '_target_entries',options) end - def target_find(options = {}) - options = options.clone - options.symbolize_keys! - if self.segment_type == 'members' - self.send('members_target_find',options) - else - raise 'Invalid Find' - end + def content_model + return @content_model if @content_model + return nil unless self.options[:content_model_id] + @content_model = ContentModel.find_by_id(self.options[:content_model_id]) end - def content_model - return nil unless self.options[:content_model_id] - mdl = ContentModel.find_by_id(self.options[:content_model_id]) - mdl + def user_segment + return @user_segment if @user_segment + return nil unless self.options[:user_segment_id] + @user_segment = UserSegment.find_by_id(self.options[:user_segment_id]) end private - - def custom_target_count(options={ }) - opts = self.options_model - if opts.user_ids.length > 0 - EndUser.count(:conditions => { :id => opts.user_ids }) - else - 0 - end - end - - def custom_target_list(options) - opts = self.options_model - if opts.user_ids.length > 0 - EndUser.find(:all,:conditions => { :id => opts.user_ids },:select => 'end_users.email,end_users.id,end_users.full_name,end_users.first_name,end_users.last_name,end_users.middle_name,end_users.client_user_id').map { |elm| [ elm.email,elm.name ]} - else - [] - end - end - - def custom_target_entries(options) - opts = self.options_model - if opts.user_ids.length > 0 - EndUser.find(:all,:conditions => { :id => opts.user_ids }).map { |elm| [ elm.email,elm, elm.id ]} - else - [] - end - end - def subscription_target_count(options={}) - self.user_subscription.active_subscriptions.count() + return 0 unless self.user_subscription + self.user_subscription.active_subscriptions.count() end # Return the subscription list, - # Stop at 1000 def subscription_target_list(options) - self.user_subscription.active_subscriptions.find(:all,options).collect { |sub| [ sub.email, sub.name ] } + return [] unless self.user_subscription + self.user_subscription.active_subscriptions.find(:all,options).collect { |sub| [ sub.email, sub.name ] } end def subscription_target_entries(options) - if self.user_subscription.require_registered_user? - self.user_subscription.active_subscriptions.find(:all,options).collect { |entry| [ entry.email, entry.end_user, entry.id ] } - else - self.user_subscription.active_subscriptions.find(:all,options).collect { |entry| [ entry.email, entry, entry.id ] } - end + return [] unless self.user_subscription + if self.user_subscription.require_registered_user? + self.user_subscription.active_subscriptions.find(:all,options).collect { |entry| [ entry.email, entry.end_user, entry.id ] } + else + self.user_subscription.active_subscriptions.find(:all,options).collect { |entry| [ entry.email, entry, entry.id ] } + end end def content_model_target_count(options={}) - mdl = ContentModel.find_by_id(self.options[:content_model_id]) - mdl.content_model.count + return 0 unless self.content_model + self.content_model.count end def content_model_target_list(options) - mdl = ContentModel.find_by_id(self.options[:content_model_id]) - email_field = self.options[:email_field] - mdl.content_model.find(:all,options).collect { |sub| [ sub.send(email_field), sub.identifier_name ] } + return [] unless self.content_model + email_field = self.options[:email_field] + self.content_model.find(:all,options).collect { |sub| [ sub.send(email_field), sub.identifier_name ] } end def content_model_target_entries(options) - mdl = ContentModel.find_by_id(self.options[:content_model_id]) - email_field = self.options[:email_field] - mdl.content_model.find(:all,options).collect { |entry| [ entry.send(email_field), entry, entry.id ] } - end - - - def member_target_affected_tag_names - self.options ||= {} - affected_tags =(self.options[:affected_tags].split(",") + [ 0 ]).collect { |pid| quote_value(pid) }.join(",") - affected_tag_names = Tag.find(:all, :conditions => "tags.id IN (#{affected_tags})").collect { |tag| tag.name } + return [] unless self.content_model + email_field = self.options[:email_field] + self.content_model.find(:all,options).collect { |entry| [ entry.send(email_field), entry, entry.id ] } end - - def members_target_count(opts={}) - opts = opts.clone - - options.symbolize_keys! - - conditions = options[:conditions] || '1' - conditions = [conditions] unless conditions.is_a?(Array) - - if opts[:conditions] - new_conds = opts[:conditions] - new_conds = [new_conds] unless new_conds.is_a?(Array) - - conditions[0] += " AND (" + new_conds[0] + ")" - conditions += new_conds[1..-1] - - end - opts[:conditions] = conditions - - if options[:tags].is_a?(Array) && options[:tags].length > 0 - - case options[:tags_select] - when 'all': - opts[:all] = options[:tags] - EndUser.count_tagged_with(opts) - when 'not_any': - opts[:any] = options[:tags] - EndUser.count_not_tagged_with(opts) - when 'not_all': - opts[:all] = options[:tags] - EndUser.count_not_tagged_with(opts) - else - opts[:any] = options[:tags] - EndUser.count_tagged_with(opts) - end - else - EndUser.count(:id,opts) - end + def user_segment_target_count(options={}) + return 0 unless self.user_segment + self.user_segment.last_count end - def members_target_find(opts) - opts = opts.clone - options.symbolize_keys! - - conditions = options[:conditions] || '1' - conditions = [conditions] unless conditions.is_a?(Array) - - if opts[:conditions] - conditions = [conditions] unless conditions.is_a?(Array) - new_conds = opts[:conditions] - new_conds = [new_conds] unless new_conds.is_a?(Array) - - conditions[0] += " AND (" + new_conds[0] + ")" - conditions += new_conds[1..-1] - - end - opts[:conditions] = conditions - - - if options[:tags].is_a?(Array) && options[:tags].length > 0 - case options[:tags_select] - when 'all': - opts[:all] = options[:tags] - EndUser.find_tagged_with(opts) - when 'not_any': - opts[:any] = options[:tags] - EndUser.find_not_tagged_with(opts) - when 'not_all': - opts[:all] = options[:tags] - EndUser.find_not_tagged_with(opts) - else - opts[:any] = options[:tags] - EndUser.find_tagged_with(opts) - end - else - opts[:include] = :tag_cache - EndUser.find(:all,opts) - end - end - - def members_target_list(options) - members_target_find(options).collect { |usr| [ usr.email, usr.name ] } + def user_segment_target_list(options) + return [] unless self.user_segment + self.user_segment.collect { |sub| [ sub.email, sub.name ] } end - def members_target_entries(options) - members_target_find(options).collect { |usr| [ usr.email, usr, usr.id ] } - + def user_segment_target_entries(options) + return [] unless self.user_segment + self.user_segment.collect { |entry| [ entry.email, entry, entry.id ] } end end diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 3a63e68c..61c04064 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -5,6 +5,8 @@ class UserSegment < DomainModel serialize :segment_options serialize :fields + belongs_to :market_segment, :dependent => :destroy + validates_presence_of :name validates_presence_of :segment_type @@ -224,5 +226,19 @@ def self.order_by_options def to_expr self.operations.to_expr end + + def after_create #:nodoc:all + self.market_segment = MarketSegment.create(:name => self.name ,:segment_type => 'user_segment', + :options => {:user_segment_id => self.id}, + :description => 'Sends a Campaign to all users in this list'.t) + self.save + end + + def after_save #:nodoc:all + if self.market_segment && self.market_segment.name != self.name + self.market_segment.name = self.name + self.market_segment.save + end + end end diff --git a/app/models/user_subscription.rb b/app/models/user_subscription.rb index 32dad45b..e024d78c 100644 --- a/app/models/user_subscription.rb +++ b/app/models/user_subscription.rb @@ -3,16 +3,24 @@ class UserSubscription < DomainModel validates_presence_of :name + has_one :market_segment, :dependent => :destroy + has_many :user_subscription_entries, :dependent => :delete_all, :include => :end_user has_many :active_subscriptions, :class_name => 'UserSubscriptionEntry', :conditions => 'verified = 1 AND subscribed=1' has_many :unsubscribed_entries, :class_name => 'UserSubscriptionEntry', :conditions => 'verified = 1 AND subscribed=0' def after_create #:nodoc:all - segment = UserSegment.create(:name => 'Subscribers to '.t + self.name, :segment_type => 'filtered', - :description => 'Sends an Campaign to all users who are subscribed to this subscription'.t, - :segment_options_text => "user_subscription_id.is(#{self.id})") - segment.refresh + MarketSegment.create(:user_subscription_id => self.id, :name => 'Subscribers to '.t + self.name ,:segment_type => 'subscription', + :options => { 'user_subscription_id' => self.id }, + :description => 'Sends an Campaign to all users who are subscribed to this subscription'.t ) + end + + def after_update #:nodoc:all + if self.market_segment + self.market_segment.name = 'Subscribers to '.t + self.name + self.market_segment.save + end end # Subscribe a user via a admin subscription diff --git a/db/migrate/20100511165552_user_segments.rb b/db/migrate/20100511165552_user_segments.rb index 4285c441..afcdfd58 100644 --- a/db/migrate/20100511165552_user_segments.rb +++ b/db/migrate/20100511165552_user_segments.rb @@ -4,6 +4,7 @@ def self.up t.string :name t.text :description t.string :segment_type + t.integer :market_segment_id t.string :status t.boolean :main_page t.datetime :last_ran_at @@ -24,18 +25,6 @@ def self.up add_index :user_segment_caches, [:user_segment_id], :name => 'user_segment_cache_segment_idx' - create_table :user_segment_analytics, :force => true do |t| - t.integer :user_segment_id - t.text :fields - t.text :results - t.datetime :start_date - t.datetime :end_date - t.string :step - t.timestamps - end - - add_index :user_segment_analytics, [:user_segment_id], :name => 'user_segment_analytics_segment_idx' - create_table :end_user_caches, :force => true, :options => "ENGINE=MyISAM" do |t| t.integer :end_user_id t.text :data @@ -48,7 +37,6 @@ def self.up def self.down drop_table :user_segments drop_table :user_segment_caches - drop_table :user_segment_analytics drop_table :end_user_caches end end From 42261170c7031b3aeb51d8e8332be6ed08300258 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 26 May 2010 17:34:01 +0000 Subject: [PATCH 075/139] Fix time argument display for filters. Fix end user cache: when updating try to find cache if missing. --- app/models/end_user.rb | 1 + app/models/user_segment/field.rb | 11 ++++++++++- app/models/user_segment/operation_builder.rb | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/models/end_user.rb b/app/models/end_user.rb index 76bc8e9a..0b26f1fc 100644 --- a/app/models/end_user.rb +++ b/app/models/end_user.rb @@ -130,6 +130,7 @@ def after_create #:nodoc: end def after_save #:nodoc: + self.end_user_cache = EndUserCache.find_by_end_user_id(self.id) unless self.end_user_cache self.end_user_cache ? self.end_user_cache.save : EndUserCache.create(:end_user_id => self.id) end diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index e28bcc51..7f40d70e 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -111,7 +111,16 @@ def child_field end def to_expr(opts={}) - output = "#{field}.#{operation}(" + self.arguments.collect { |arg| arg.is_a?(String) || arg.is_a?(Time) ? "\"#{arg}\"" : arg.to_s }.join(', ') + ")" + output = "#{field}.#{operation}(" + self.arguments.collect do |arg| + if arg.is_a?(String) + "\"#{arg}\"" + elsif arg.is_a?(Time) + "\"#{arg.strftime('%m/%d/%Y %H:%M:%S')}\"" + else + arg.to_s + end + end.join(', ') + ")" + output += '.' + self.child_field.to_expr if self.child && self.child_field && opts[:nochild].nil? output end diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb index 7fea71c8..b9d7874e 100644 --- a/app/models/user_segment/operation_builder.rb +++ b/app/models/user_segment/operation_builder.rb @@ -95,7 +95,8 @@ def convert_to(value, idx) def method_missing(arg, *args) arg = arg.to_s if arg =~ /^argument(\d+)$/ - self.arguments[$1.to_i] + val = self.arguments[$1.to_i] + val.strftime('%m/%d/%Y %H:%M:%S') if val.is_a?(Time) elsif arg =~ /^argument(\d+)=$/ self.arguments[$1.to_i] = self.convert_to(args[0], $1.to_i) if $1.to_i < self.operation_arguments.length else From 2ebd8d954ff5bfa51e49dc5bec1679cb111c8582 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 26 May 2010 20:02:24 +0000 Subject: [PATCH 076/139] Added email_target_table_columns and added a test to make sure the params have a path before fetching the segment. --- app/controllers/members_controller.rb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 17d4b8a7..18c7bfa0 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -23,7 +23,7 @@ def segmentations end def segment - @segment ||= UserSegment.find_by_id params[:path][0] + @segment ||= UserSegment.find_by_id(params[:path][0]) if params[:path] end def count_end_users(opts) @@ -99,8 +99,10 @@ def handle_table_actions end end - def email_targets_table_generate(opts,*find_options) - @generated_active_table_columns = [ + def email_targets_table_columns(opts={}) + return @email_targets_table_columns if @email_targets_table_columns + + @email_targets_table_columns = [ ActiveTable::IconHeader.new('check', :width => '16'), ActiveTable::StaticHeader.new('', :width => '24'), ActiveTable::StaticHeader.new('Profile', :width => '70'), @@ -118,10 +120,14 @@ def email_targets_table_generate(opts,*find_options) @fields.each do |field| option = UserSegment.fields_options.rassoc(field) - @generated_active_table_columns << ActiveTable::StaticHeader.new(option[1], :label => option[0]) if option + @email_targets_table_columns << ActiveTable::StaticHeader.new(option[1], :label => option[0]) if option end - active_table_generate('end_users', EndUser, @generated_active_table_columns, {:count_callback => 'count_end_users', :find_callback => 'find_end_users'}, opts, *find_options) + @email_targets_table_columns + end + + def email_targets_table_generate(opts,*find_options) + active_table_generate('end_users', EndUser, self.email_targets_table_columns, {:count_callback => 'count_end_users', :find_callback => 'find_end_users'}, opts, *find_options) end public From 0b3910003a4cb75be0fc9acb3625386c4b36b4c1 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 27 May 2010 17:40:49 +0000 Subject: [PATCH 077/139] EndUser no longer uses acts_as_taggable. Use tag suport simillar to DomainModels. --- app/controllers/content_controller.rb | 1 + app/controllers/members_controller.rb | 11 +- app/models/content_tag.rb | 3 +- app/models/domain_model.rb | 2 +- app/models/end_user.rb | 230 +++++------------- app/models/end_user_cache.rb | 2 +- app/models/end_user_tag.rb | 4 - app/models/end_user_tag_segment_field.rb | 26 ++ .../end_user_import_extension.rb | 2 +- app/models/tag.rb | 13 + app/views/members/_add_tags_form.rhtml | 8 +- app/views/members/_user_cloud.rhtml | 4 +- app/views/members/edit.rhtml | 13 +- db/migrate/20100511165552_user_segments.rb | 4 + spec/controllers/editor/auth_renderer_spec.rb | 5 +- spec/controllers/members_controller_spec.rb | 18 +- spec/models/end_user_spec.rb | 86 +------ spec/models/triggered_action_spec.rb | 2 +- 18 files changed, 148 insertions(+), 286 deletions(-) create mode 100644 app/models/end_user_tag_segment_field.rb diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb index 572cea5b..0ba56fa7 100644 --- a/app/controllers/content_controller.rb +++ b/app/controllers/content_controller.rb @@ -29,6 +29,7 @@ class ContentController < ModuleController #:nodoc: all register_handler :user_segment, :fields, 'EndUserSegmentField' register_handler :user_segment, :fields, 'EndUserActionSegmentField' register_handler :user_segment, :fields, 'EndUserCacheSegmentField' + register_handler :user_segment, :fields, 'EndUserTagSegmentField' register_handler :user_segment, :fields, 'UserSubscriptionEntrySegmentField' def index diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 18c7bfa0..126c1b85 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -87,7 +87,7 @@ def handle_table_actions end when 'clear_tags' update_users.each do |user| - user.tag_names = '' if user + user.clear_tags! if user end when 'add_users' custom_segment = UserSegment.find params[:user_segment_id] @@ -161,7 +161,7 @@ def display_targets_table(display = true) handle_table_actions end - @active_table_output = email_targets_table_generate params, :per_page => 25, :include => :tag_cache, :conditions => 'client_user_id IS NULL', :order => self.class.module_options.order_by + @active_table_output = email_targets_table_generate params, :per_page => 25, :conditions => 'client_user_id IS NULL', :order => self.class.module_options.order_by if display @update_tags = true @@ -533,18 +533,15 @@ def member_visits end def add_tags_form - @tags = EndUser.tags_count(:order => 'name') render :partial => 'add_tags_form' end def remove_tags_form - @users = EndUser.find(:all,:conditions => [ 'end_users.id IN (' + params[:user_ids].to_a.collect { |uid| DomainModel.connection.quote(uid) }.join(",") + ")" ], :include => :tag_cache) + @users = EndUser.find(:all,:conditions => [ 'end_users.id IN (' + params[:user_ids].to_a.collect { |uid| DomainModel.connection.quote(uid) }.join(",") + ")" ]) @existing_tags = [] @users.each do |usr| - if usr.tag_cache && !usr.tag_cache.tags.blank? - @existing_tags += usr.tag_cache.tags.split(",") - end + @existing_tags += usr.tags_array if usr.tags_array end @existing_tags.uniq! diff --git a/app/models/content_tag.rb b/app/models/content_tag.rb index 2314cc99..11c15b36 100644 --- a/app/models/content_tag.rb +++ b/app/models/content_tag.rb @@ -14,7 +14,8 @@ def self.get_tag_cloud(class_name,sizes = []) :select => 'content_tags.name as name, content_tags.id, COUNT(content_tag_tags.id) as cnt', :joins => :content_tag_tags,:order => 'content_tags.name',:group => 'content_tags.id') content_tags.collect do |tg| - { :name => tg.name, :count => tg.cnt, :id => tg.id } + size = sizes.size < tg.cnt.to_i ? sizes[-1] : sizes[tg.cnt-1] + { :name => tg.name, :count => tg.cnt, :id => tg.id, :size => size } end end diff --git a/app/models/domain_model.rb b/app/models/domain_model.rb index 7f6f9081..54e29fb6 100644 --- a/app/models/domain_model.rb +++ b/app/models/domain_model.rb @@ -640,7 +640,7 @@ def tag_cache_after_save #:nodoc: unless @existing_tags.include?(tag_name) tg = ContentTag.get_tag(self.class.to_s,tag_name) # Be explicit about the content_type for Content models (which don't have a real class name) - self.content_tag_tags.create(:content_tag => tg,:content_type => self.class.to_s,:content_tag_id => self.id) + self.content_tag_tags.create(:content_tag_id => tg.id,:content_type => self.class.to_s,:content_id => self.id) end end end diff --git a/app/models/end_user.rb b/app/models/end_user.rb index 0b26f1fc..2f7a7fea 100644 --- a/app/models/end_user.rb +++ b/app/models/end_user.rb @@ -73,7 +73,6 @@ class EndUser < DomainModel belongs_to :work_address, :class_name => 'EndUserAddress', :foreign_key => :work_address_id has_many :addresses, :class_name => 'EndUserAddress', :dependent => :destroy - has_one :tag_cache, :dependent => :destroy has_one :end_user_cache, :dependent => :destroy, :class_name => 'EndUserCache' has_many :end_user_cookies, :dependent => :delete_all, :class_name => 'EndUserCookie' @@ -84,10 +83,10 @@ class EndUser < DomainModel has_many :access_tokens, :through => :end_user_tokens - acts_as_taggable :join_table => 'end_user_tags', :join_class_name => 'EndUserTag' - - has_many :end_user_tags, :class_name => 'EndUserTag' - #has_many :tags, :through => :user_tags + has_many :end_user_tags + has_many :tags, :through => :end_user_tags + after_save :tag_cache_after_save + include ContentTagFunctionality belongs_to :source_user, :class_name => 'EndUser' @@ -123,12 +122,6 @@ class EndUser < DomainModel after_save :update_editor_login end - def after_create #:nodoc: - if @tag_cache - self.tag(@tag_cache) - end - end - def after_save #:nodoc: self.end_user_cache = EndUserCache.find_by_end_user_id(self.id) unless self.end_user_cache self.end_user_cache ? self.end_user_cache.save : EndUserCache.create(:end_user_id => self.id) @@ -626,182 +619,81 @@ def current_billing_address end end - ## Tag Functionality - TODO: Rewrite Needed - - # attr_reader :tag_cache - - # Model issue + # Returns a list of existing tags + def self.tag_options + Tag.select_options + end + + # Returns a tag cloud + def self.tag_cloud(sizes=[]) + Tag.get_tag_cloud + end + def clear_tags! #:nodoc: - connection.execute("DELETE FROM end_user_tags WHERE end_user_id=" + quote_value(self.id)) + self.end_user_tags.delete_all + end + + def tags_array + if @tag_name_cache.is_a?(Array) + @tag_name_cache + else + self.tags.collect(&:name) + end end # Immediately tag this user with the listed tags, saving them to the tag cache # if the user hasn't been saved yet - def tag(tags_list, options = {}) - if !self.id - if !@tag_cache.to_s.blank? - @tag_cache = @tag_cache.split(",") - else - @tag_cache = [] - end - @tag_cache << tags_list.to_s unless tags_list.blank? - @tag_cache = @tag_cache.join(",") - return + def tag(tags_list, options={}) + if self.id + tags_list = tags_list.join(",") if tags_list.is_a?(Array) + self.add_tags(tags_list) + else + @tag_name_cache ||= [] + tags_list = self.tag_name_helper(tags_list) unless tags_list.is_a?(Array) + @tag_name_cache = @tag_name_cache + tags_list end - super - update_tag_cache(self.tag_names(true).join(",")) - end # Immediately remove the listed tags from the user def tag_remove(tags, options = {}) - super - update_tag_cache(self.tag_names(true).join(",")) + self.remove_tags(tags) end - def update_tag_cache(names) #:nodoc: - (self.tag_cache || self.build_tag_cache).update_attribute(:tags,names) - end - - def tag_names_add(tag_list,options={}) #:nodoc: - self.tag(tag_list,options.merge({:separator => ',', :clear => false})) + self.tag(tag_list) end - - # Immediately tag a user given the a string of comma-separated tags - def tag_names=(tags,options={}) - self.tag_names_original(tags,options.merge({:separator => ',', :clear => true})) - end - # returns a list of tag_cached_tags, optionally joined on find - def tag_cache_tags - if self.attributes.has_key?('tag_cache_tags') - self.attributes['tag_cache_tags'] - else - (self.tag_cache ? self.tag_cache.tags : '') - end - end def tag_cache_tmp - @tag_cache - end - - # Finds end userse that are tagged with - # [:any] - # Any of the named tags - # [:all] - # All of the named tags - def self.find_tagged_with(options = {}) - options = { :separator => ' ' }.merge(options) - - tag_names = Taggable::Acts::AsTaggable.split_tag_names(options[:any] || options[:all], options[:separator], normalizer) - raise "No tags were passed to :any or :all options" if tag_names.empty? - - o, o_pk, o_fk, t, tn, t_pk, t_fk, jt = set_locals_for_sql - sql = "SELECT #{o}.*, tag_cache.tags as tag_cache_tags FROM (#{jt}, #{o}, #{t}) LEFT JOIN tag_cache ON ( #{o}.#{o_pk} = tag_cache.end_user_id ) WHERE #{jt}.#{t_fk} = #{t}.#{t_pk} - AND #{o}.#{o_pk} = #{jt}.#{o_fk}" - sql << " AND (" - sql << tag_names.collect {|tag| sanitize_sql( ["#{t}.#{tn} = ?",tag])}.join(" OR ") - sql << ")" - sql << " AND #{sanitize_sql(options[:conditions])}" if options[:conditions] - if postgresql? - sql << " GROUP BY #{model_columns_for_sql}" - else - sql << " GROUP BY #{o}.#{o_pk}" - end - sql << " HAVING COUNT(#{o}.#{o_pk}) = #{tag_names.length}" if options[:all] - sql << " ORDER BY #{options[:order]} " if options[:order] - add_limit!(sql, options) - - find_by_sql(sql) - end - - # Counts the number of users tagged with :any or :all of certain tags - def self.count_tagged_with(options = {}) - options = { :separator => ' ' }.merge(options) - - tag_names = Taggable::Acts::AsTaggable.split_tag_names(options[:any] || options[:all], options[:separator], normalizer) - raise "No tags were passed to :any or :all options" if tag_names.empty? - - o, o_pk, o_fk, t, tn, t_pk, t_fk, jt = set_locals_for_sql - sql = "SELECT COUNT(DISTINCT #{o}.id) as cnt FROM (#{jt}, #{o}, #{t}) WHERE #{jt}.#{t_fk} = #{t}.#{t_pk} - AND #{o}.#{o_pk} = #{jt}.#{o_fk}" - sql << " AND (" - sql << tag_names.collect {|tag| sanitize_sql( ["#{t}.#{tn} = ?",tag])}.join(" OR ") - sql << ")" - sql << " AND #{sanitize_sql(options[:conditions])}" if options[:conditions] - if options[:all] - sql << " GROUP BY #{o}.#{o_pk}" - sql << " HAVING COUNT(#{o}.#{o_pk}) = #{tag_names.length}" - sql = 'SELECT COUNT(*) FROM (' + sql + ') as counter' - end - count_by_sql(sql) - end - - # Same as EndUser#find_tagged_with except it returns users not tagged with certain tags - def self.find_not_tagged_with(options = {}) - options = { :separator => ',' }.merge(options) - - tag_names = Taggable::Acts::AsTaggable.split_tag_names(options[:any] || options[:all], options[:separator], normalizer) - - - - o, o_pk, o_fk, t, tn, t_pk, t_fk, jt = set_locals_for_sql - sql = "SELECT #{o}.*, tag_cache.tags as tag_cache_tags FROM #{o} LEFT JOIN tag_cache ON ( #{o}.#{o_pk} = tag_cache.end_user_id ) LEFT JOIN #{jt} ON ( #{o}.#{o_pk} = #{jt}.#{o_fk} ) LEFT JOIN #{t} ON ( #{jt}.#{t_fk} = #{t}.#{t_pk} - " - - sql << " AND (" - sql << tag_names.collect {|tag| sanitize_sql( ["#{t}.#{tn} = ?",tag])}.join(" OR ") - sql << ") )" - sql << " WHERE #{sanitize_sql(options[:conditions])}" if options[:conditions] - if postgresql? - sql << " GROUP BY #{model_columns_for_sql}" - else - sql << " GROUP BY #{o}.#{o_pk}" - end - if options[:any] - sql << " HAVING COUNT(#{t}.id) = 0 " - else - sql << " HAVING COUNT(#{t}.id) < " + tag_names.length.to_s + @tag_name_cache + end + + def tag_cache_after_save #:nodoc: + if @tag_name_cache.is_a?(Array) + @tag_name_cache.uniq! + tags = self.end_user_tags + + @existing_tags = [] + tags.each do |tg| + if tg.tag && @tag_name_cache.include?(tg.tag.name) + @existing_tags << tg.tag.name + else + tg.destroy + tg.tag.destroy if(tg.tag && tg.tag.end_user_tags.size == 0) + end + end + + @tag_name_cache.each do |tag_name| + unless @existing_tags.include?(tag_name) + tg = Tag.get_tag(tag_name) + # Be explicit about the content_type for Content models (which don't have a real class name) + self.end_user_tags.create(:tag_id => tg.id) + end + end end - sql << " ORDER BY #{options[:order]} " if options[:order] - add_limit!(sql, options) - - find_by_sql(sql) + + @tag_name_cache = nil end - - # Same as EndUser#count_tagged_with except it counts users not tagged with certain tags - def self.count_not_tagged_with(options = {}) - options = { :separator => ',' }.merge(options) - tag_names = Taggable::Acts::AsTaggable.split_tag_names(options[:any] || options[:all], options[:separator], normalizer) - - - - o, o_pk, o_fk, t, tn, t_pk, t_fk, jt = set_locals_for_sql - sql = "SELECT COUNT(DISTINCT #{o}.id) FROM #{o} LEFT JOIN #{jt} ON ( #{o}.#{o_pk} = #{jt}.#{o_fk} ) LEFT JOIN #{t} ON ( #{jt}.#{t_fk} = #{t}.#{t_pk} - " - - sql << " AND (" - sql << tag_names.collect {|tag| sanitize_sql( ["#{t}.#{tn} = ?",tag])}.join(" OR ") - sql << ") )" - sql << " WHERE #{sanitize_sql(options[:conditions])}" if options[:conditions] - if postgresql? - sql << " GROUP BY #{model_columns_for_sql}" - else - sql << " GROUP BY #{o}.#{o_pk}" - end - if options[:any] - sql << " HAVING COUNT(#{t}.id) = 0 " - else - sql << " HAVING COUNT(#{t}.id) < " + tag_names.length.to_s - end - - sql = 'SELECT COUNT(*) FROM (' + sql + ') as counter' - - count_by_sql(sql) - end - - # Validates a users registration given a list of required fields def validate_registration(opts = {}) fields = %w(gender first_name last_name dob username) @@ -813,8 +705,6 @@ def validate_registration(opts = {}) end end - - # Return a hashed password given an optional salt def self.hash_password(pw,salt=nil) diff --git a/app/models/end_user_cache.rb b/app/models/end_user_cache.rb index 5f8eefc6..3b5c5793 100644 --- a/app/models/end_user_cache.rb +++ b/app/models/end_user_cache.rb @@ -16,7 +16,7 @@ def get_end_user_data self.end_user.user_class.name, self.end_user.source, self.end_user.registered? ? 'registered' : nil, - self.end_user.tag_names.join(" ") + self.end_user.tag_names ] end diff --git a/app/models/end_user_tag.rb b/app/models/end_user_tag.rb index 7bd99395..ab9bf9a9 100644 --- a/app/models/end_user_tag.rb +++ b/app/models/end_user_tag.rb @@ -1,10 +1,6 @@ # Copyright (C) 2009 Pascal Rettig. - class EndUserTag < DomainModel - - belongs_to :tag belongs_to :end_user - end diff --git a/app/models/end_user_tag_segment_field.rb b/app/models/end_user_tag_segment_field.rb new file mode 100644 index 00000000..54775c27 --- /dev/null +++ b/app/models/end_user_tag_segment_field.rb @@ -0,0 +1,26 @@ + +class EndUserTagSegmentField < UserSegment::FieldHandler + + def self.user_segment_fields_handler_info + { + :name => 'End User Tag Segment Fields', + :domain_model_class => EndUserTag + } + end + + class EndUserTagType < UserSegment::FieldType + register_operation :is, [['Tag', :model, {:class => EndUserTagSegmentField::EndUserTagType}]] + + def self.select_options + Tag.find(:all, :select => 'name').collect(&:name).sort.collect { |name| [name, name] } + end + + def self.is(cls, field, name) + tg = Tag.find_by_name name + id = tg ? tg.id : 0 + cls.scoped(:conditions => ["#{field} = ?", id]) + end + end + + register_field :tag, EndUserTagSegmentField::EndUserTagType, :field => :tag_id, :name => 'Users: Tag' +end diff --git a/app/models/model_extension/end_user_import_extension.rb b/app/models/model_extension/end_user_import_extension.rb index 499bf7a5..d2bb95b2 100644 --- a/app/models/model_extension/end_user_import_extension.rb +++ b/app/models/model_extension/end_user_import_extension.rb @@ -18,7 +18,7 @@ def export_csv(writer,options = {}) #:nodoc: fields << [ 'vip_number', 'VIP Number'.t ] end if opts.include?('tags') - fields << ['tag_cache_tags', 'Tags'.t ] + fields << ['tag_names', 'Tags'.t ] end diff --git a/app/models/tag.rb b/app/models/tag.rb index 94cfa533..99be55d8 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -13,4 +13,17 @@ class Tag < DomainModel def after_create #:nodoc: self.create_tag_note() end + + def self.get_tag(tag_name) + self.find_by_name(tag_name) || self.create(:name => tag_name) + end + + def self.get_tag_cloud(sizes=[]) + tags = Tag.find(:all, :select => 'tags.name, tags.id, COUNT(tags.id) as cnt', + :joins => :end_user_tags, :order => 'tags.name', :group => 'tags.id') + tags.collect do |tg| + size = sizes.size < tg.cnt.to_i ? sizes[-1] : sizes[tg.cnt-1] + { :name => tg.name, :count => tg.cnt, :id => tg.id, :size => size } + end + end end diff --git a/app/views/members/_add_tags_form.rhtml b/app/views/members/_add_tags_form.rhtml index ce1619f6..38ffdca0 100644 --- a/app/views/members/_add_tags_form.rhtml +++ b/app/views/members/_add_tags_form.rhtml @@ -2,9 +2,9 @@

              Add Tags to Targets

              Existing Tags:
              -<% EndUser.cloud(@tags, %w(10 12 14 16 20)) do |tg, font_size| -%> - <%= tg -%> -<% end -%> +<% EndUser.tag_cloud.each do |tag| -%> + <%= h tag[:name] -%> +<% end -%>

              Tags to Add (Comma Separated List):
              @@ -15,4 +15,4 @@ Tags to Add (Comma Separated List):
              - \ No newline at end of file + diff --git a/app/views/members/_user_cloud.rhtml b/app/views/members/_user_cloud.rhtml index 41f44f12..49faff6c 100644 --- a/app/views/members/_user_cloud.rhtml +++ b/app/views/members/_user_cloud.rhtml @@ -1,7 +1,7 @@ <% all_tags = Tag.find(:all,:include => :tag_note).index_by(&:name) cloud = [] - EndUser.cloud(EndUser.tags_count(:order => 'name'), %w(10 12 14 16 20)) do |tg, font_size| - cloud << [tg,font_size] + EndUser.tag_cloud(%w(10 12 14 16 20)).each do |tag| + cloud << [tag[:name], tag[:size]] end %> diff --git a/app/views/members/edit.rhtml b/app/views/members/edit.rhtml index 8a995ee7..3282b75c 100644 --- a/app/views/members/edit.rhtml +++ b/app/views/members/edit.rhtml @@ -100,7 +100,7 @@ MemberEditor = { <%= f.header 'Tags' %>               @@ -201,16 +201,9 @@ MemberEditor = { diff --git a/db/migrate/20100511165552_user_segments.rb b/db/migrate/20100511165552_user_segments.rb index afcdfd58..e372d99e 100644 --- a/db/migrate/20100511165552_user_segments.rb +++ b/db/migrate/20100511165552_user_segments.rb @@ -32,11 +32,15 @@ def self.up add_index :end_user_caches, [:end_user_id], :name => 'end_user_caches_idx', :unique => true execute "CREATE FULLTEXT INDEX end_user_caches_data_index ON end_user_caches (data)" + + execute "ALTER TABLE end_user_tags ADD COLUMN id INT PRIMARY KEY AUTO_INCREMENT" end def self.down drop_table :user_segments drop_table :user_segment_caches drop_table :end_user_caches + + execute "ALTER TABLE end_user_tags DROP COLUMN id" end end diff --git a/spec/controllers/editor/auth_renderer_spec.rb b/spec/controllers/editor/auth_renderer_spec.rb index cc73e5ff..8837abf1 100644 --- a/spec/controllers/editor/auth_renderer_spec.rb +++ b/spec/controllers/editor/auth_renderer_spec.rb @@ -107,7 +107,7 @@ def generate_renderer(data = {}) renderer_post @rnd, :user => { :email => "test@webiva.com" } EndUser.count.should == 1 usr = EndUser.find(:first) - usr.tag_names.should == ['test1','test2'] + usr.tag_names.should == 'Test1, Test2' end it "should be able to set the user source" do @@ -195,7 +195,8 @@ def generate_renderer(data = {:required_fields => [ ]}) it "should be able to add tag names" do @rnd = generate_renderer(:add_tags => 'test1,test2',:required_fields => []) renderer_post @rnd, :user => { :first_name => 'first' } - @myself.tag_names.should == ['test1','test2'] + @myself.reload + @myself.tag_names.should == 'Test1, Test2' end it "should set access token" do diff --git a/spec/controllers/members_controller_spec.rb b/spec/controllers/members_controller_spec.rb index cf4634c7..d61353a0 100644 --- a/spec/controllers/members_controller_spec.rb +++ b/spec/controllers/members_controller_spec.rb @@ -230,33 +230,33 @@ describe "handle end_user table actions" do it "should be able to delete a user" do - @output = post 'display_targets_table', :table_action => 'delete', :user => {@user1.id => 1} + @output = post 'display_targets_table', :table_action => 'delete', :user => {@user1.id => @user1.id} @deleted_user = EndUser.find_by_id @user1.id @deleted_user.should be_nil end it "should be able to add tags to users" do - @output = post 'display_targets_table', :table_action => 'add_tags', :user => {@user1.id => 1}, :added_tags => 'new_tag' + @output = post 'display_targets_table', :table_action => 'add_tags', :user => {@user1.id => @user1.id}, :added_tags => 'new_tag' @user1.reload - @user1.tag_names.include?('new_tag').should be_true + @user1.tag_names.include?('New_tag').should be_true end it "should be able to remove tags to users" do @user1.tag(['new_tag']) @user1.reload - @user1.tag_names.include?('new_tag').should be_true - @output = post 'display_targets_table', :table_action => 'remove_tags', :user => {@user1.id => 1}, :removed_tags => 'new_tag' + @user1.tag_names.include?('New_tag').should be_true + @output = post 'display_targets_table', :table_action => 'remove_tags', :user => {@user1.id => @user1.id}, :removed_tags => 'new_tag' @user1.reload - @user1.tag_names.include?('new_tag').should_not be_true + @user1.tag_names.include?('New_tag').should_not be_true end it "should be able to clear tags to users" do @user1.tag(['new_tag']) @user1.reload - @user1.tag_names.include?('new_tag').should be_true - @output = post 'display_targets_table', :table_action => 'clear_tags', :user => {@user1.id => 1} + @user1.tag_names.include?('New_tag').should be_true + @output = post 'display_targets_table', :table_action => 'clear_tags', :user => {@user1.id => @user1.id} @user1.reload - @user1.tag_names.empty?.should be_true + @user1.tag_names.blank?.should be_true end end diff --git a/spec/models/end_user_spec.rb b/spec/models/end_user_spec.rb index 1710db2b..49f0c402 100644 --- a/spec/models/end_user_spec.rb +++ b/spec/models/end_user_spec.rb @@ -2,7 +2,7 @@ describe EndUser do - reset_domain_tables :end_users, :end_user_tags, :tags, 'tag_cache', :domain_files, :end_user_actions, :configurations, :roles, :user_roles + reset_domain_tables :end_users, :end_user_tags, :tags, :domain_files, :end_user_actions, :configurations, :roles, :user_roles before(:each) do @user = EndUser.new @@ -182,9 +182,11 @@ EndUser.push_target("user2@webiva.com") @user2 = EndUser.find(:last) @user2.tag_names_add('bunnies') + @user2.reload @user2.tag_names_add('piglets') - - @user2.tag_cache_tags.should == 'bunnies,piglets' + @user2.reload + + @user2.tag_names.should == 'Bunnies, Piglets' end it 'should remove a user tag' do @@ -192,85 +194,24 @@ @user2 = EndUser.find(:last) @user2.tag_names_add('piglets') + @user2.reload @user2.tag_remove('bunnies') - @user2.tag_cache_tags.should_not include('bunnies') + @user2.reload + @user2.tag_names.should_not include('Bunnies') end it 'should update a users current tags' do @user1 = EndUser.push_target("USER2@webiva.com") @user1.tag_names_add('piglets') + @user1.reload @user1.tag_names_add('bunnies') + @user1.reload @user1.tag_names=('rhinos,tigers') - @user1.tag_cache_tags.should == "rhinos,tigers" - end - - it 'should return users with searched tags' do - @user1 = EndUser.push_target("USERa@webiva.com") - @user2 = EndUser.push_target("USERb@webiva.com") - @user3 = EndUser.push_target("USERc@webiva.com") - @user4 = EndUser.push_target("USERd@webiva.com") - @user5 = EndUser.push_target("USERe@webiva.com") - - @user1.tag_names_add('piglets') - @user2.tag_names_add('bunnies') - @user3.tag_names_add('bunnies') - @user4.tag_names_add('bunnies') - @user5.tag_names_add('bunnies') - - @userlist = EndUser.find_tagged_with({:any => 'bunnies'}) - @userlist[0].id.should == @user2.id - @userlist[1].id.should == @user3.id - @userlist[2].id.should == @user4.id - @userlist[3].id.should == @user5.id - + @user1.reload + @user1.tag_names.should == "Rhinos, Tigers" end - it 'should return users without searched tags' do - @user1 = EndUser.push_target("USERa@webiva.com") - @user2 = EndUser.push_target("USERb@webiva.com") - @user3 = EndUser.push_target("USERc@webiva.com") - @user4 = EndUser.push_target("USERd@webiva.com") - @user5 = EndUser.push_target("USERe@webiva.com") - - @user1.tag_names_add('piglets') - @user2.tag_names_add('bunnies') - @user3.tag_names_add('bunnies') - @user4.tag_names_add('bunnies') - @user5.tag_names_add('bunnies') - - @userlist = EndUser.find_not_tagged_with({:any => 'bunnies'}) - @userlist[0].id.should == @user1.id - - end - it 'should count users with a searched tag' do - @user1 = EndUser.push_target("USER2@webiva.com") - @user2 = EndUser.push_target("USER3@webiva.com") - - - @user1.tag_names_add('piglets') - @user1.tag_names_add('bunnies') - @user2.tag_names_add('piglets') - @user2.tag_names_add('bunnies') - - @usercount = EndUser.count_tagged_with({:any => 'bunnies'}) - @usercount.should == 2 - end - it 'should not count users with a searched tag' do - @user1 = EndUser.push_target("USER2@webiva.com") - @user2 = EndUser.push_target("USER3@webiva.com") - @user3 = EndUser.push_target("USER4@webiva.com") - @user4 = EndUser.push_target("USER5@webiva.com") - - - @user1.tag_names_add('piglets') - @user1.tag_names_add('bunnies') - @user2.tag_names_add('piglets') - @user2.tag_names_add('bunnies') - - @usercount = EndUser.count_not_tagged_with({:any => 'bunnies'}) - @usercount.should == 2 - end it 'should create a hashed passwd for new users' do @user1 = EndUser.push_target("test1@webiva.com") @user1.update_attributes( :first_name=> 'User', :user_level => 1, :last_name => '2', :language => 'en' ,:registered => 1, :password => 'bunnies', :password_confirmation => 'bunnies') @@ -288,8 +229,7 @@ @user1.tag('piglets,bunnies,rhinos') @user1.update_attributes(:first_name => 'User', :user_level => 1, :last_name => '2', :language => 'en' ,:registered => 1, :password => 'bunnies', :password_confirmation => 'bunnies') - @user1.tag_names.should == ["piglets,bunnies,rhinos"] - + @user1.tag_names.should == "Piglets, Bunnies, Rhinos" end ### User Roles it 'should return a list of roles associated with a user' do diff --git a/spec/models/triggered_action_spec.rb b/spec/models/triggered_action_spec.rb index f264c959..cddeca74 100644 --- a/spec/models/triggered_action_spec.rb +++ b/spec/models/triggered_action_spec.rb @@ -36,7 +36,7 @@ user.reload - user.tag_names.should == ['Testerama'] + user.tag_names.should == 'Testerama' end it "should be able perform the set user referrer core action" do From 17ecacae9a23d53e139738e83493d7a401b12a76 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 27 May 2010 17:50:56 +0000 Subject: [PATCH 078/139] Fix for string arguments --- app/models/user_segment/operation_builder.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb index b9d7874e..7a156927 100644 --- a/app/models/user_segment/operation_builder.rb +++ b/app/models/user_segment/operation_builder.rb @@ -96,7 +96,8 @@ def method_missing(arg, *args) arg = arg.to_s if arg =~ /^argument(\d+)$/ val = self.arguments[$1.to_i] - val.strftime('%m/%d/%Y %H:%M:%S') if val.is_a?(Time) + val = val.strftime('%m/%d/%Y %H:%M:%S') if val.is_a?(Time) + val elsif arg =~ /^argument(\d+)=$/ self.arguments[$1.to_i] = self.convert_to(args[0], $1.to_i) if $1.to_i < self.operation_arguments.length else From ae39f10fc84bab4afd4510a2427e19610fca845b Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 27 May 2010 17:57:13 +0000 Subject: [PATCH 079/139] Fixed refresh test. --- app/models/user_segment.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 61c04064..12d107c2 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -32,7 +32,7 @@ def operations def segment_options_text=(text) text = text.gsub("\r", '').strip - @should_refresh = self.segment_options_text != text + @should_refresh = @should_refresh || self.segment_options_text != text self.write_attribute :segment_options_text, text @operations = UserSegment::Operations.new @operations.parse text @@ -41,7 +41,7 @@ def segment_options_text=(text) end def order_by=(order) - @should_refresh = self.order_by != order + @should_refresh = @should_refresh || self.order_by != order self.write_attribute :order_by, order order end From 1fe7a6a4efc8040834b1aba688b8445f1f694b30 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 27 May 2010 20:06:42 +0000 Subject: [PATCH 080/139] Add a rspec for operation builder. --- app/models/user_segment.rb | 4 + app/models/user_segment/field_handler.rb | 3 +- app/models/user_segment/operation_builder.rb | 3 +- spec/models/user_segment/field_spec.rb | 8 + .../user_segment/operation_builder_spec.rb | 154 ++++++++++++++++++ 5 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 spec/models/user_segment/operation_builder_spec.rb diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 12d107c2..7f4588f5 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -227,6 +227,10 @@ def to_expr self.operations.to_expr end + def to_builder + self.operations.to_builder + end + def after_create #:nodoc:all self.market_segment = MarketSegment.create(:name => self.name ,:segment_type => 'user_segment', :options => {:user_segment_id => self.id}, diff --git a/app/models/user_segment/field_handler.rb b/app/models/user_segment/field_handler.rb index 4d112600..31573821 100644 --- a/app/models/user_segment/field_handler.rb +++ b/app/models/user_segment/field_handler.rb @@ -23,7 +23,8 @@ def self.register_field(field, type, options={}) def self.handlers ([ self.get_handler_info(:user_segment, :fields, 'end_user_segment_field'), - self.get_handler_info(:user_segment, :fields, 'end_user_action_segment_field')] + + self.get_handler_info(:user_segment, :fields, 'end_user_action_segment_field'), + self.get_handler_info(:user_segment, :fields, 'end_user_tag_segment_field')] + self.get_handler_info(:user_segment, :fields)).uniq end end diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb index 7a156927..4563ba86 100644 --- a/app/models/user_segment/operation_builder.rb +++ b/app/models/user_segment/operation_builder.rb @@ -15,6 +15,7 @@ def condition_options def validate self.errors.add(:field, 'is invalid') unless self.user_segment_field.valid? + self.errors.add(:condition, 'is invalid') unless self.condition_options.rassoc(self.condition) self.errors.add(:condition, 'is invalid') if ! self.condition.blank? && ! self.child_field.valid? end @@ -24,7 +25,7 @@ def build(opts={}) self.operation = opts[:operation] self.condition = opts[:condition] self.parent = opts[:parent] - unless self.field.blank? + unless self.operation_options.empty? unless self.operation_options.rassoc(self.operation) self.operation = self.operation_options[0][1] @user_segment_field = nil diff --git a/spec/models/user_segment/field_spec.rb b/spec/models/user_segment/field_spec.rb index 81264a01..27a8f409 100644 --- a/spec/models/user_segment/field_spec.rb +++ b/spec/models/user_segment/field_spec.rb @@ -10,6 +10,14 @@ EndUser.push_target('test3@test.dev', :activated => false) end + it "should be valid or invalid" do + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] + @field.valid?.should be_true + + @field = UserSegment::Field.new :field => 'created', :operation => 'invalid_operation', :arguments => [1, 'days'] + @field.valid?.should be_false + end + it "should be able to use handler" do @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'] diff --git a/spec/models/user_segment/operation_builder_spec.rb b/spec/models/user_segment/operation_builder_spec.rb new file mode 100644 index 00000000..57c571c7 --- /dev/null +++ b/spec/models/user_segment/operation_builder_spec.rb @@ -0,0 +1,154 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +describe UserSegment::OperationBuilder do + + reset_domain_tables :user_segments + + def build(opts=nil) + @builder = UserSegment::OperationBuilder.new nil + @builder.build(opts) if opts + @builder + end + + def segment + @segment = UserSegment.create :name => 'Test', :segment_type => 'filtered', :segment_options_text => @builder.to_expr + end + + it "should be valid or invalid" do + build.valid?.should be_false + build(:field => 'email', :operation => 'is', :argument0 => 'test@test.dev').valid?.should be_true + segment.valid?.should be_true + + # if the field is invalid the builder is invalid + build(:field => 'invalid_email_field', :operation => 'is', :argument0 => 'test@test.dev').valid?.should be_false + + # if the operation is invalid for the field it will set it to the first operation + build(:field => 'email', :operation => 'invalid_operation', :argument0 => 'test@test.dev').valid?.should be_true + @builder.operation.should == 'is' + segment.valid?.should be_true + + # if the operation is missing an argument then the builder is invalid + build(:field => 'email', :operation => 'is', :argument0 => nil).valid?.should be_false + + # setting the condition without the child invalidates the builder + build(:field => 'email', :operation => 'is', :argument0 => 'test@test.dev', :condition => 'and').valid?.should be_false + + build(:field => 'email', :operation => 'is', :argument0 => 'test@test.dev', :condition => 'and', :child => {:field => 'created', :operation => 'since', :argument0 => '2', :argument1 => 'days'}).valid?.should be_true + segment.valid?.should be_true + end + + it "should not allow invalid and conditions" do + build(:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login').valid?.should be_true + segment.valid?.should be_true + build(:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'and', :child => {:field => 'email', :operation => 'is', :argument0 => 'test@test.dev'}).valid?.should be_false + build(:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'and', :child => {:field => 'occurred', :operation => 'before', :argument0 => '2', :argument1 => 'days'}).valid?.should be_true + segment.valid?.should be_true + + build(:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'blah', :child => {:field => 'occurred', :operation => 'before', :argument0 => '2', :argument1 => 'days'}).valid?.should be_false + end + + it "should or conditions" do + build(:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login').valid?.should be_true + segment.valid?.should be_true + build(:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'or', :child => {:field => 'email', :operation => 'is', :argument0 => 'test@test.dev'}).valid?.should be_true + segment.valid?.should be_true + build(:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'or', :child => {:field => 'occurred', :operation => 'before', :argument0 => '2', :argument1 => 'days'}).valid?.should be_true + segment.valid?.should be_true + end + + it "should with conditions" do + build(:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login').valid?.should be_true + segment.valid?.should be_true + build(:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'with', :child => {:field => 'email', :operation => 'is', :argument0 => 'test@test.dev'}).valid?.should be_true + segment.valid?.should be_true + build(:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'with', :child => {:field => 'occurred', :operation => 'before', :argument0 => '2', :argument1 => 'days'}).valid?.should be_true + segment.valid?.should be_true + end + + it "should write output valid expression text" do + build(:field => 'email', :operation => 'is', :argument0 => 'test@test.dev').valid?.should be_true + @builder.to_expr.should == 'email.is("test@test.dev")' + segment.valid?.should be_true + + build(:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'and', :child => {:field => 'occurred', :operation => 'before', :argument0 => '2', :argument1 => 'days'}).valid?.should be_true + @builder.to_expr.should == 'user_action.is("/editor/auth/login").occurred.before(2, "days")' + segment.valid?.should be_true + + build(:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'or', :child => {:field => 'email', :operation => 'is', :argument0 => 'test@test.dev'}).valid?.should be_true + @builder.to_expr.should == 'user_action.is("/editor/auth/login") + email.is("test@test.dev")' + segment.valid?.should be_true + + build(:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'with', :child => {:field => 'email', :operation => 'is', :argument0 => 'test@test.dev'}).valid?.should be_true + @builder.to_expr.should == "user_action.is(\"/editor/auth/login\")\nemail.is(\"test@test.dev\")" + segment.valid?.should be_true + + build(:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'with', :child => {:field => 'email', :operation => 'is', :argument0 => 'test@test.dev', :condition => 'with', :child => {:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'and', :child => {:field => 'occurred', :operation => 'before', :argument0 => '2', :argument1 => 'days', :condition => 'or', :child => {:field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'or', :child => {:field => 'email', :operation => 'is', :argument0 => 'test@test.dev'}}}}}).valid?.should be_true + @builder.to_expr.should == "user_action.is(\"/editor/auth/login\")\nemail.is(\"test@test.dev\")\nuser_action.is(\"/editor/auth/login\").occurred.before(2, \"days\") + user_action.is(\"/editor/auth/login\") + email.is(\"test@test.dev\")" + segment.valid?.should be_true + end + + it "should have valid prebuilt filters" do + UserSegment::OperationBuilder.prebuilt_filters.each do |name, options| + build(options).valid?.should be_true + segment.valid?.should be_true + end + end + + it "should handle Time arguments" do + build(:field => 'created', :operation => 'between', :argument0 => '1/2/2010', :argument1 => '2/2/2010').valid?.should be_true + @builder.argument0.should == '01/02/2010 00:00:00' + @builder.argument1.should == '02/02/2010 00:00:00' + @builder.to_expr.should == 'created.between("01/02/2010 00:00:00", "02/02/2010 00:00:00")' + segment.valid?.should be_true + end + + it "should handle the not operator" do + build(:operator => 'not', :field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'with', :child => {:field => 'email', :operation => 'is', :argument0 => 'test@test.dev'}).valid?.should be_true + @builder.to_expr.should == "not user_action.is(\"/editor/auth/login\")\nemail.is(\"test@test.dev\")" + segment.valid?.should be_true + + build(:operator => '', :field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'with', :child => {:operator => 'not', :field => 'email', :operation => 'is', :argument0 => 'test@test.dev'}).valid?.should be_true + @builder.to_expr.should == "user_action.is(\"/editor/auth/login\")\nnot email.is(\"test@test.dev\")" + segment.valid?.should be_true + + build(:operator => 'not', :field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'with', :child => {:operator => 'not', :field => 'email', :operation => 'is', :argument0 => 'test@test.dev'}).valid?.should be_true + @builder.to_expr.should == "not user_action.is(\"/editor/auth/login\")\nnot email.is(\"test@test.dev\")" + segment.valid?.should be_true + + build(:operator => 'not', :field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'or', :child => {:field => 'email', :operation => 'is', :argument0 => 'test@test.dev'}).valid?.should be_true + @builder.to_expr.should == "not user_action.is(\"/editor/auth/login\") + email.is(\"test@test.dev\")" + segment.valid?.should be_true + end + + it "should be able to create a builder from a user segment" do + user_segment = UserSegment.create :name => 'Test', :segment_type => 'filtered', :segment_options_text => "user_action.is( \"/editor/auth/login\" )\nemail.is(\"test@test.dev\") \n user_action.is(\"/editor/auth/login\").occurred.before( 2, 'days' ).created.since(3,'months') + user_action.is(\"/editor/auth/login\") + email.is(\"test@test.dev\" )\nnot created.before( 3, 'years')" + user_segment.valid?.should be_true + build(user_segment.to_builder).valid?.should be_true + + @builder.to_expr.should == "user_action.is(\"/editor/auth/login\")\nemail.is(\"test@test.dev\")\nuser_action.is(\"/editor/auth/login\").occurred.before(2, \"days\").created.since(3, \"months\") + user_action.is(\"/editor/auth/login\") + email.is(\"test@test.dev\")\nnot created.before(3, \"years\")" + + @builder.to_expr.should == user_segment.to_expr + + @builder.condition.should == 'with' + @builder.child_field.field.should == 'email' + + @builder.child_field.condition.should == 'with' + @builder.child_field.child_field.field.should == 'user_action' + + @builder.child_field.child_field.condition.should == 'and' + @builder.child_field.child_field.child_field.field.should == 'occurred' + + @builder.child_field.child_field.child_field.condition.should == 'and' + @builder.child_field.child_field.child_field.child_field.field.should == 'created' + + @builder.child_field.child_field.child_field.child_field.condition.should == 'or' + @builder.child_field.child_field.child_field.child_field.child_field.field.should == 'user_action' + + @builder.child_field.child_field.child_field.child_field.child_field.condition.should == 'or' + @builder.child_field.child_field.child_field.child_field.child_field.child_field.field.should == 'email' + + @builder.child_field.child_field.child_field.child_field.child_field.child_field.condition.should == 'with' + @builder.child_field.child_field.child_field.child_field.child_field.child_field.child_field.field.should == 'created' + @builder.child_field.child_field.child_field.child_field.child_field.child_field.child_field.operator.should == 'not' + end +end From a9c4cf04f15b4004ef04480ec305f61d8fcee7eb Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 27 May 2010 21:05:55 +0000 Subject: [PATCH 081/139] Fixed MatchType function. Added test for to_expr and to_builder --- app/models/user_segment/core_type.rb | 2 +- spec/models/user_segment/core_type_spec.rb | 16 ++++++++++++++++ spec/models/user_segment/field_spec.rb | 18 ++++++++++++++++++ spec/models/user_segment/field_type_spec.rb | 16 +++++++++++++++- spec/models/user_segment/operation_spec.rb | 8 ++++++++ spec/models/user_segment/operations_spec.rb | 3 ++- 6 files changed, 60 insertions(+), 3 deletions(-) diff --git a/app/models/user_segment/core_type.rb b/app/models/user_segment/core_type.rb index 6431f640..45efa0cd 100644 --- a/app/models/user_segment/core_type.rb +++ b/app/models/user_segment/core_type.rb @@ -93,7 +93,7 @@ def self.is(cls, field, string) class MatchType < UserSegment::FieldType register_operation :search, [['Query', :string]] - def self.like(cls, field, query) + def self.search(cls, field, query) cls.scoped(:conditions => ["MATCH (#{field}) AGAINST (?)", query]) end end diff --git a/spec/models/user_segment/core_type_spec.rb b/spec/models/user_segment/core_type_spec.rb index 4c645e69..1f976ab0 100644 --- a/spec/models/user_segment/core_type_spec.rb +++ b/spec/models/user_segment/core_type_spec.rb @@ -108,4 +108,20 @@ @type.is(EndUser, :activated, false).count.should == 1 end end + + describe "MatchType" do + before(:each) do + EndUser.push_target('test1@test.dev', :first_name => 'Doug', :activated => true) + EndUser.push_target('test2@test.dev', :last_name => 'Smith', :activated => true) + EndUser.push_target('test3@test.dev', :activated => true) + EndUser.push_target('test4@test.dev', :activated => false) + + @type = UserSegment::CoreType::MatchType + end + + it "should return users using search" do + @type.search(EndUserCache, :data, 'doug').count.should == 1 + @type.search(EndUserCache, :data, 'blah').count.should == 0 + end + end end diff --git a/spec/models/user_segment/field_spec.rb b/spec/models/user_segment/field_spec.rb index 27a8f409..681abf27 100644 --- a/spec/models/user_segment/field_spec.rb +++ b/spec/models/user_segment/field_spec.rb @@ -60,4 +60,22 @@ @field.count.should == 1 @field.end_user_ids.length.should == 1 end + + it "should be able to create the expression" do + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'], :child => {:field => 'activated', :operation => 'is', :arguments => [false], :child => {:field => 'email', :operation => 'like', :arguments => ['test%@test.dev']}} + @field.valid?.should == true + + @field.to_expr.should == "created.before(1, \"days\").activated.is(false).email.like(\"test%@test.dev\")" + @field.to_expr(:nochild => 1).should == "created.before(1, \"days\")" + end + + it "should be able to create the builder hash" do + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'], :child => {:field => 'activated', :operation => 'is', :arguments => [false], :child => {:field => 'email', :operation => 'like', :arguments => ['test%@test.dev']}} + @field.valid?.should == true + + @field.to_builder.should == {:field => 'created', :operation => 'before', :condition => 'and', :argument0 => 1, :argument1 => 'days', :child => {:field => 'activated', :operation => 'is', :argument0 => false, :condition => 'and', :child => {:field => 'email', :operation => 'like', :argument0 => 'test%@test.dev'}}} + + + @field.to_builder(:condition => 'with', :child => {:field => 'registered', :operation => 'is', :argument0 => true}).should == {:field => 'created', :operation => 'before', :condition => 'and', :argument0 => 1, :argument1 => 'days', :child => {:field => 'activated', :operation => 'is', :argument0 => false, :condition => 'and', :child => {:field => 'email', :operation => 'like', :argument0 => 'test%@test.dev', :condition => 'with', :child => {:field => 'registered', :operation => 'is', :argument0 => true}}}} + end end diff --git a/spec/models/user_segment/field_type_spec.rb b/spec/models/user_segment/field_type_spec.rb index 54c9898a..3df91e27 100644 --- a/spec/models/user_segment/field_type_spec.rb +++ b/spec/models/user_segment/field_type_spec.rb @@ -2,6 +2,8 @@ describe UserSegment::FieldType do + reset_domain_tables :tags + it "should convert value to integer" do UserSegment::FieldType.convert_to("0", :integer).should == 0 UserSegment::FieldType.convert_to(0, :integer).should == 0 @@ -36,7 +38,7 @@ it "should convert value to time" do time = Time.parse "1/1/1990" - UserSegment::FieldType.convert_to(time.strftime("1/1/1990"), :datetime).should == time + UserSegment::FieldType.convert_to("1/1/1990", :datetime).should == time time = Time.now UserSegment::FieldType.convert_to(time, :datetime).should == time end @@ -87,4 +89,16 @@ converted[0].should == 1 converted[1].should == 'day' end + + it "should support model options" do + bunnies = Tag.get_tag('bunnies') + rabbits = Tag.get_tag('rabbits') + poster = Tag.get_tag('poster') + walker = Tag.get_tag('walker') + + UserSegment::FieldType.convert_to(bunnies.id.to_s, :model, :class => Tag).should == bunnies.id + UserSegment::FieldType.convert_to(poster.id, :model, :class => Tag).should == poster.id + UserSegment::FieldType.convert_to(98789, :model, :class => Tag).should be_nil + UserSegment::FieldType.convert_to('Walker', :model, :class => Tag).should be_nil + end end diff --git a/spec/models/user_segment/operation_spec.rb b/spec/models/user_segment/operation_spec.rb index 3690aac1..defd0873 100644 --- a/spec/models/user_segment/operation_spec.rb +++ b/spec/models/user_segment/operation_spec.rb @@ -22,12 +22,16 @@ @operation.count.should == 3 @operation.end_user_ids.length.should == 3 @operation.to_a.should == [nil, @field.to_h] + @operation.to_expr.should == 'created.before(1, "days")' + @operation.to_builder.should == {:operator => nil, :field => 'created', :operation => 'before', :argument0 => 1, :argument1 => 'days'} @operation = UserSegment::Operation.new 'not', [@field] @operation.valid?.should be_true @operation.count.should == 4 @operation.end_user_ids.length.should == 4 @operation.to_a.should == ['not', @field.to_h] + @operation.to_expr.should == 'not created.before(1, "days")' + @operation.to_builder.should == {:operator => 'not', :field => 'created', :operation => 'before', :argument0 => 1, :argument1 => 'days'} end it "should be able to concat fields" do @@ -39,11 +43,15 @@ @operation.count.should == 7 @operation.end_user_ids.length.should == 6 @operation.to_a.should == [nil, @field1.to_h, @field2.to_h] + @operation.to_expr.should == 'created.before(1, "days") + activated.is(false)' + @operation.to_builder.should == {:operator => nil, :field => 'created', :operation => 'before', :argument0 => 1, :argument1 => 'days', :condition => 'or', :child => {:field => 'activated', :operation => 'is', :argument0 => false}} @operation = UserSegment::Operation.new 'not', [@field1, @field2] @operation.valid?.should be_true @operation.count.should == 7 @operation.end_user_ids.length.should == 1 @operation.to_a.should == ['not', @field1.to_h, @field2.to_h] + @operation.to_expr.should == 'not created.before(1, "days") + activated.is(false)' + @operation.to_builder.should == {:operator => 'not', :field => 'created', :operation => 'before', :argument0 => 1, :argument1 => 'days', :condition => 'or', :child => {:field => 'activated', :operation => 'is', :argument0 => false}} end end diff --git a/spec/models/user_segment/operations_spec.rb b/spec/models/user_segment/operations_spec.rb index ce27e177..96ad3a0c 100644 --- a/spec/models/user_segment/operations_spec.rb +++ b/spec/models/user_segment/operations_spec.rb @@ -103,6 +103,7 @@ @operations.to_a.should == options @operations.end_user_ids.length.should == 1 @operations.end_user_ids.include?(@user6.id).should be_true + @operations.to_expr.should == "not created.since(3, \"days\") + user_level.is(1)\nactivated.is(true)" + @operations.to_builder.should == {:operator => 'not', :condition => 'or', :field => 'created', :operation => 'since', :argument0 => 3, :argument1 => 'days', :child => {:field => 'user_level', :operation => 'is', :argument0 => 1, :condition => 'with', :child => {:operator => nil, :field => 'activated', :operation => 'is', :argument0 => true}}} end - end From 2e7e9b2eb7d580c8dc765ea222f732f57afd2e09 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 27 May 2010 21:27:34 +0000 Subject: [PATCH 082/139] Added Tags as a field options to display. Fixed table actions on the index page. --- app/models/user_segment.rb | 16 ++++++++++++---- app/views/members/index.rhtml | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 7f4588f5..cd2c5b97 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -32,7 +32,7 @@ def operations def segment_options_text=(text) text = text.gsub("\r", '').strip - @should_refresh = @should_refresh || self.segment_options_text != text + self.should_refresh = self.segment_options_text != text self.write_attribute :segment_options_text, text @operations = UserSegment::Operations.new @operations.parse text @@ -41,15 +41,23 @@ def segment_options_text=(text) end def order_by=(order) - @should_refresh = @should_refresh || self.order_by != order + self.should_refresh = self.order_by != order self.write_attribute :order_by, order order end - def should_refresh? + def should_refresh @should_refresh end + def should_refresh=(refresh) + @should_refresh ||= refresh + end + + def should_refresh? + self.should_refresh + end + def refresh if self.status == 'new' || self.ready? self.status = 'refreshing' @@ -216,7 +224,7 @@ def before_create end def self.fields_options - [['Source', 'source'], ['Date of Birth', 'dob'], ['Gender', 'gender'], ['Created', 'created_at'], ['Registered', 'registered_at'], ['User Class', 'user_class']] + [['Source', 'source'], ['Date of Birth', 'dob'], ['Gender', 'gender'], ['Created', 'created_at'], ['Registered', 'registered_at'], ['User Class', 'user_class'], ['Tags', 'tag_names']] end def self.order_by_options diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index cd9989cb..1479e2cf 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -89,7 +89,7 @@ }, tableAction: function(action,params) { - ActiveTable.action(action,null,"email_targets_table","<%= url_for :action => 'display_targets_table' %>",'targets_table',params); + ActiveTable.action(action,null,"email_targets_table","<%= url_for :action => 'display_targets_table', :path => @segment ? @segment.id : nil, :terms => @search.terms, :offsets => @search.offsets.empty? ? nil : @search.offsets %>",'targets_table',params); }, changeSegments: function() { From 4d8754b99246264b79bf668e067733ee40d256a0 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 27 May 2010 21:54:53 +0000 Subject: [PATCH 083/139] Started to add tests for the user segment model --- app/models/user_segment.rb | 10 ++----- spec/models/user_segment_spec.rb | 49 ++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 spec/models/user_segment_spec.rb diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index cd2c5b97..55986ee4 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -9,6 +9,9 @@ class UserSegment < DomainModel validates_presence_of :name validates_presence_of :segment_type + validates_presence_of :segment_options_text, :if => Proc.new { |seg| seg.segment_type == 'filtered' } + + validates_inclusion_of :segment_type, :in => %w(filtered custom) def ready?; self.status == 'finished'; end @@ -16,13 +19,6 @@ def fields self.read_attribute(:fields) || [] end - def validate - if self.segment_type == 'filtered' - self.errors.add(:segment_options_text, 'is invalid') if self.segment_options_text && self.segment_options.nil? - self.errors.add(:segment_options, 'is missing') if self.segment_options.nil? - end - end - def operations return @operations if @operations @operations = UserSegment::Operations.new diff --git a/spec/models/user_segment_spec.rb b/spec/models/user_segment_spec.rb new file mode 100644 index 00000000..609886ed --- /dev/null +++ b/spec/models/user_segment_spec.rb @@ -0,0 +1,49 @@ +require File.dirname(__FILE__) + "/../spec_helper" + +describe UserSegment do + + reset_domain_tables :user_segments, :end_users + + before(:each) do + @user1 = EndUser.push_target('test1@test.dev', :first_name => 'Doug', :activated => true) + @user2 = EndUser.push_target('test2@test.dev', :last_name => 'Smith', :activated => true) + @user3 = EndUser.push_target('test3@test.dev', :activated => true) + @user4 = EndUser.push_target('test4@test.dev', :activated => false) + end + + it "should require a name and a type" do + @segment = UserSegment.new + @segment.valid?.should be_false + @segment.should have(1).error_on(:name) + @segment.should have(2).error_on(:segment_type) + @segment.should have(0).error_on(:segment_options_text) + + @segment = UserSegment.new :segment_type => 'filtered' + @segment.valid?.should be_false + @segment.should have(1).error_on(:name) + @segment.should have(1).error_on(:segment_options_text) + end + + it "should be able to create custom segments" do + @segment = UserSegment.create :name => 'Test', :segment_type => 'custom' + @segment.add_ids [@user1.id, @user2.id, @user3.id] + @segment.ready?.should be_true + @test_segment = UserSegment.find @segment.id + @test_segment.end_user_ids.should == [@user1.id, @user2.id, @user3.id] + + @segment = UserSegment.find @segment.id + @segment.remove_ids [@user1.id, @user3.id] + @test_segment = UserSegment.find @segment.id + @test_segment.end_user_ids.should == [@user2.id] + end + + it "should be able to filter for users" do + @segment = UserSegment.create :name => 'Test', :segment_type => 'filtered', :segment_options_text => 'activated.is(true)' + @segment.should_refresh?.should be_true + @segment.refresh + @segment.ready?.should be_true + @segment.end_user_ids.length.should == 3 + @segment.last_count.should == 3 + @segment.last_ran_at.should_not be_nil + end +end From ba83315af06dd28a4886ea60bcea79d814f9a6f4 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 28 May 2010 14:39:42 +0000 Subject: [PATCH 084/139] Do not cache any ids in instance variables. --- app/models/user_segment.rb | 7 ++----- app/models/user_segment/field.rb | 3 +-- app/models/user_segment/operation.rb | 14 ++++++-------- app/models/user_segment/operations.rb | 8 ++++---- spec/models/user_segment_cache_spec.rb | 13 +++++++++++++ 5 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 spec/models/user_segment_cache_spec.rb diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 55986ee4..b83cb97f 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -119,12 +119,9 @@ def sort_ids(ids) end def end_user_ids - return @end_user_ids if @end_user_ids - @end_user_ids = [] - self.user_segment_caches.each do |segement| - @end_user_ids = @end_user_ids + segement.id_list + self.user_segment_caches.inject([]) do |ids, segement| + ids + segement.id_list end - @end_user_ids end def each(opts={}, &block) diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index 7f40d70e..9110be7c 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -33,10 +33,9 @@ def count end def end_user_ids(ids=nil) - return @end_user_ids if @end_user_ids scope = self.get_scope scope = scope.scoped(:conditions => {self.end_user_field => ids}) if ids - @end_user_ids = scope.find(:all, :select => self.end_user_field).collect &self.end_user_field + scope.find(:all, :select => self.end_user_field).collect &self.end_user_field end def get_scope(scope=nil) diff --git a/app/models/user_segment/operation.rb b/app/models/user_segment/operation.rb index d8b4b00c..c822293e 100644 --- a/app/models/user_segment/operation.rb +++ b/app/models/user_segment/operation.rb @@ -18,21 +18,19 @@ def count end def end_user_ids(ids=nil) - return @end_user_ids if @end_user_ids - - @end_user_ids = [] - @fields.each { |fld| @end_user_ids = @end_user_ids + fld.end_user_ids(ids) } - @end_user_ids.uniq! + user_ids = [] + @fields.each { |fld| user_ids = user_ids + fld.end_user_ids(ids) } + user_ids.uniq! if @operator == 'not' if ids - @end_user_ids = ids - @end_user_ids + user_ids = ids - user_ids else - @end_user_ids = (@end_user_ids.empty? ? EndUser.find(:all, :select => 'id') : EndUser.find(:all, :select => 'id', :conditions => ['id NOT IN(?)', @end_user_ids])).collect &:id + user_ids = (user_ids.empty? ? EndUser.find(:all, :select => 'id') : EndUser.find(:all, :select => 'id', :conditions => ['id NOT IN(?)', user_ids])).collect &:id end end - @end_user_ids + user_ids end def to_builder(opts={}) diff --git a/app/models/user_segment/operations.rb b/app/models/user_segment/operations.rb index 07e8d2fd..515132dd 100644 --- a/app/models/user_segment/operations.rb +++ b/app/models/user_segment/operations.rb @@ -3,15 +3,15 @@ class UserSegment::Operations def end_user_ids - return @end_user_ids if @end_user_ids return [] unless self.valid? + ids = nil self.operations.sort_by { |op| op.count }.each do |op| - @end_user_ids = op.end_user_ids(@end_user_ids) - return [] if @end_user_ids.empty? + ids = op.end_user_ids(ids) + return [] if ids.empty? end - @end_user_ids + ids end def parser diff --git a/spec/models/user_segment_cache_spec.rb b/spec/models/user_segment_cache_spec.rb new file mode 100644 index 00000000..20897306 --- /dev/null +++ b/spec/models/user_segment_cache_spec.rb @@ -0,0 +1,13 @@ +require File.dirname(__FILE__) + "/../spec_helper" + +describe UserSegmentCache do + + reset_domain_tables :user_segments, :user_segment_caches, :end_users + + it "should require a user segment" do + @cache = UserSegmentCache.new + @cache.valid?.should be_false + @cache.should have(1).error_on(:user_segment_id) + end + +end From 1d9fd3bad6bc0cdf79af1eb167a4fba328df6f6e Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 28 May 2010 15:48:28 +0000 Subject: [PATCH 085/139] Renamed Operations class to Filter. Added tests for UserSegmentCache. --- app/models/user_segment.rb | 14 +- .../user_segment/{operations.rb => filter.rb} | 2 +- app/models/user_segment_cache.rb | 5 +- .../{operations_spec.rb => filter_spec.rb} | 16 +-- spec/models/user_segment_cache_spec.rb | 126 ++++++++++++++++++ 5 files changed, 145 insertions(+), 18 deletions(-) rename app/models/user_segment/{operations.rb => filter.rb} (97%) rename spec/models/user_segment/{operations_spec.rb => filter_spec.rb} (92%) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index b83cb97f..f3950da8 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -20,19 +20,19 @@ def fields end def operations - return @operations if @operations - @operations = UserSegment::Operations.new - @operations.operations = self.segment_options if self.segment_options - @operations + return @filter if @filter + @filter = UserSegment::Filter.new + @filter.operations = self.segment_options if self.segment_options + @filter end def segment_options_text=(text) text = text.gsub("\r", '').strip self.should_refresh = self.segment_options_text != text self.write_attribute :segment_options_text, text - @operations = UserSegment::Operations.new - @operations.parse text - self.segment_options = @operations.valid? ? self.operations.to_a : nil + @filter = UserSegment::Filter.new + @filter.parse text + self.segment_options = @filter.valid? ? self.operations.to_a : nil text end diff --git a/app/models/user_segment/operations.rb b/app/models/user_segment/filter.rb similarity index 97% rename from app/models/user_segment/operations.rb rename to app/models/user_segment/filter.rb index 515132dd..8bc2043d 100644 --- a/app/models/user_segment/operations.rb +++ b/app/models/user_segment/filter.rb @@ -1,6 +1,6 @@ require 'treetop' -class UserSegment::Operations +class UserSegment::Filter def end_user_ids return [] unless self.valid? diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb index 3aa49cd0..7e1356ef 100644 --- a/app/models/user_segment_cache.rb +++ b/app/models/user_segment_cache.rb @@ -15,6 +15,7 @@ def before_create def fetch_users(opts={}) ids = opts[:offset] && opts[:limit] ? self.id_list[opts[:offset]..opts[:offset]+opts[:limit]-1] : self.id_list + return [] if ! ids || ids.empty? users_by_id = EndUser.find(:all, :conditions => {:id => ids}).index_by(&:id) ids.map { |id| users_by_id[id] }.compact end @@ -28,7 +29,7 @@ def search(offset=0, opts={}) num_chunks = (self.id_list.size / batch_size).to_i num_chunks = num_chunks.succ if (self.id_list.length % batch_size) > 0 - base_scope = opts.delete(:scope) || EndUser + base_scope = opts.delete(:scope) || EndUserCache end_user_field = opts.delete(:end_user_field) || :end_user_id ids = [] @@ -43,7 +44,7 @@ def search(offset=0, opts={}) has_more = ids.length > limit ids = ids[0..limit-1] if has_more - offset = ids.size > 0 ? self.id_list.index(ids[-1]) : 0 + offset = ids.size > 0 ? self.id_list.index(ids[-1]) : self.id_list.length - 1 [offset, ids] end diff --git a/spec/models/user_segment/operations_spec.rb b/spec/models/user_segment/filter_spec.rb similarity index 92% rename from spec/models/user_segment/operations_spec.rb rename to spec/models/user_segment/filter_spec.rb index 96ad3a0c..a4977736 100644 --- a/spec/models/user_segment/operations_spec.rb +++ b/spec/models/user_segment/filter_spec.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + "/../../spec_helper" -describe UserSegment::Operations do +describe UserSegment::Filter do reset_domain_tables :end_users @@ -15,7 +15,7 @@ end it "should return the end user ids from a given set of options" do - @operations = UserSegment::Operations.new + @operations = UserSegment::Filter.new options = [[nil, {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}]] @operations.operations = options @operations.valid?.should == true @@ -24,7 +24,7 @@ end it "should be able to refine end user ids based on multiple operations" do - @operations = UserSegment::Operations.new + @operations = UserSegment::Filter.new options = [ [nil, {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}], [nil, {:field => 'activated', :operation => 'is', :arguments => [true], :child => nil}] @@ -36,7 +36,7 @@ end it "should return the end user ids from a given set operations syntax" do - @operations = UserSegment::Operations.new + @operations = UserSegment::Filter.new options = [[nil, {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}]] code = <<-CODE created.since(3, "days") @@ -46,7 +46,7 @@ @operations.to_a.should == options @operations.end_user_ids.length.should == 5 - @operations = UserSegment::Operations.new + @operations = UserSegment::Filter.new options = [['not', {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}]] code = <<-CODE not created.since(3, "days") @@ -58,7 +58,7 @@ end it "should be able to refine end user ids with multiple operations" do - @operations = UserSegment::Operations.new + @operations = UserSegment::Filter.new options = [ [nil, {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}], [nil, {:field => 'activated', :operation => 'is', :arguments => [true], :child => nil}] @@ -74,7 +74,7 @@ @operations.end_user_ids.include?(@user1.id).should be_true @operations.end_user_ids.include?(@user4.id).should be_true - @operations = UserSegment::Operations.new + @operations = UserSegment::Filter.new options = [ ['not', {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}], [nil, {:field => 'activated', :operation => 'is', :arguments => [true], :child => nil}] @@ -89,7 +89,7 @@ @operations.end_user_ids.length.should == 1 @operations.end_user_ids.include?(@user6.id).should be_true - @operations = UserSegment::Operations.new + @operations = UserSegment::Filter.new options = [ ['not', {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}, {:field => 'user_level', :operation => 'is', :arguments => [1], :child => nil}], [nil, {:field => 'activated', :operation => 'is', :arguments => [true], :child => nil}] diff --git a/spec/models/user_segment_cache_spec.rb b/spec/models/user_segment_cache_spec.rb index 20897306..1ae607da 100644 --- a/spec/models/user_segment_cache_spec.rb +++ b/spec/models/user_segment_cache_spec.rb @@ -4,10 +4,136 @@ reset_domain_tables :user_segments, :user_segment_caches, :end_users + before(:each) do + @user1 = EndUser.push_target('test1@test.dev', :first_name => 'Doug', :activated => true) + @user2 = EndUser.push_target('test2@test.dev', :last_name => 'Smith', :activated => true) + @user3 = EndUser.push_target('test3@test.dev', :activated => true) + @user4 = EndUser.push_target('test4@test.dev', :activated => false) + @user5 = EndUser.push_target('test5@test.dev', :activated => false, :user_level => 2) + @user6 = EndUser.push_target('test6@test.dev', :created_at => 10.days.ago, :last_name => 'Smith', :activated => true, :user_level => 3) + @user7 = EndUser.push_target('test7@test.dev', :first_name => 'Doug', :activated => false, :user_level => 1) + + @id_list = [@user7.id, @user2.id, @user1.id, @user5.id, @user4.id, @user6.id, @user3.id] + end + + def new_cache + UserSegmentCache.new :user_segment_id => 1, :position => 0, :id_list => @id_list + end + it "should require a user segment" do @cache = UserSegmentCache.new @cache.valid?.should be_false @cache.should have(1).error_on(:user_segment_id) end + it "should be able fetch users" do + @cache = new_cache + + # all users + users = @cache.fetch_users + users.each_with_index do |user, idx| + user.id.should == @id_list[idx] + end + + users = @cache.fetch_users(:offset => 0, :limit => 1000) + users.each_with_index do |user, idx| + user.id.should == @id_list[idx] + end + users[7].should be_nil + + users = @cache.fetch_users(:offset => 3, :limit => 2) + users[0].id.should == @user5.id + users[1].id.should == @user4.id + users[2].should be_nil + + users = @cache.fetch_users(:offset => 10, :limit => 100) + users.empty?.should be_true + + users = @cache.fetch_users(:offset => 6, :limit => 100000) + users[0].id.should == @user3.id + users[1].should be_nil + end + + it "should be able to search through a cache" do + @cache = new_cache + + scope = EndUserCache.search 'doug' + + offset, ids = @cache.search 0, :scope => scope, :end_user_field => :end_user_id, :batch_size => 2 + offset.should == 2 + ids.length.should == 2 + ids[0].should == @user7.id + ids[1].should == @user1.id + + offset, ids = @cache.search 3, :scope => scope, :end_user_field => :end_user_id, :batch_size => 2 + ids.length.should == 0 + offset.should == (@id_list.length-1) + + offset, ids = @cache.search 7, :scope => scope, :end_user_field => :end_user_id, :batch_size => 2 + ids.length.should == 0 + offset.should == (@id_list.length-1) + + offset, ids = @cache.search 0, :limit => 1, :scope => scope, :end_user_field => :end_user_id, :batch_size => 2 + offset.should == 0 + ids.length.should == 1 + ids[0].should == @user7.id + + offset, ids = @cache.search 2, :limit => 1, :scope => scope, :end_user_field => :end_user_id, :batch_size => 1 + offset.should == 2 + ids.length.should == 1 + ids[0].should == @user1.id + + offset, ids = @cache.search 2, :limit => 1, :scope => scope, :end_user_field => :end_user_id + offset.should == 2 + ids.length.should == 1 + ids[0].should == @user1.id + end + + it "should be able to process users in caches" do + @cache = new_cache + + cnt = 0 + @cache.each do |user| + @id_list[cnt].should == user.id + cnt = cnt.succ + end + cnt.should == @id_list.length + + (1..@id_list.length).each do |batch_size| + cnt = 0 + @cache.each(:batch_size => batch_size) do |user| + @id_list[cnt].should == user.id + cnt = cnt.succ + end + cnt.should == @id_list.length + end + + @cache.each_with_index do |user,idx| + user.id.should == @id_list[idx] + end + + @cache.collect do |user| + user.id + end.should == @id_list + + user = @cache.find(:batch_size => 2) do |user| + user.first_name == 'Doug' + end + + user.id.should == @user7.id + + @user7.destroy + + user = @cache.find(:batch_size => 2) do |user| + user.first_name == 'Doug' + end + + user.id.should == @user1.id + + user = @cache.find(:batch_size => 2) do |user| + user.first_name == 'Frank' + end + + user.should be_nil + end end From ac15a017247ef4ce960f5561e913413a2c5d7cfd Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 28 May 2010 18:00:33 +0000 Subject: [PATCH 086/139] Tested searching and paginating over a segment. --- app/models/user_segment.rb | 1 + spec/models/user_segment_cache_spec.rb | 1 + spec/models/user_segment_spec.rb | 183 ++++++++++++++++++++++++- 3 files changed, 179 insertions(+), 6 deletions(-) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index f3950da8..1d56542a 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -150,6 +150,7 @@ def find(opts={}, &block) user = segement.find opts, &block return user if user end + nil end def paginate(page=1, args={}) diff --git a/spec/models/user_segment_cache_spec.rb b/spec/models/user_segment_cache_spec.rb index 1ae607da..13329b5e 100644 --- a/spec/models/user_segment_cache_spec.rb +++ b/spec/models/user_segment_cache_spec.rb @@ -12,6 +12,7 @@ @user5 = EndUser.push_target('test5@test.dev', :activated => false, :user_level => 2) @user6 = EndUser.push_target('test6@test.dev', :created_at => 10.days.ago, :last_name => 'Smith', :activated => true, :user_level => 3) @user7 = EndUser.push_target('test7@test.dev', :first_name => 'Doug', :activated => false, :user_level => 1) + @user8 = EndUser.push_target('test8@test.dev', :first_name => 'Doug', :activated => true) @id_list = [@user7.id, @user2.id, @user1.id, @user5.id, @user4.id, @user6.id, @user3.id] end diff --git a/spec/models/user_segment_spec.rb b/spec/models/user_segment_spec.rb index 609886ed..e474a365 100644 --- a/spec/models/user_segment_spec.rb +++ b/spec/models/user_segment_spec.rb @@ -5,10 +5,14 @@ reset_domain_tables :user_segments, :end_users before(:each) do - @user1 = EndUser.push_target('test1@test.dev', :first_name => 'Doug', :activated => true) - @user2 = EndUser.push_target('test2@test.dev', :last_name => 'Smith', :activated => true) - @user3 = EndUser.push_target('test3@test.dev', :activated => true) - @user4 = EndUser.push_target('test4@test.dev', :activated => false) + @user1 = EndUser.push_target('test1@test.dev', :created_at => 1.days.ago, :first_name => 'Doug', :activated => true) + @user2 = EndUser.push_target('test2@test.dev', :created_at => 2.days.ago, :last_name => 'Smith', :activated => true) + @user3 = EndUser.push_target('test3@test.dev', :created_at => 3.days.ago, :activated => true) + @user4 = EndUser.push_target('test4@test.dev', :created_at => 4.days.ago, :activated => false) + @user5 = EndUser.push_target('test5@test.dev', :created_at => 5.days.ago, :activated => false, :user_level => 2) + @user6 = EndUser.push_target('test6@test.dev', :created_at => 6.days.ago, :last_name => 'Smith', :activated => true, :user_level => 3) + @user7 = EndUser.push_target('test7@test.dev', :created_at => 7.days.ago, :first_name => 'Doug', :activated => false, :user_level => 1) + @user8 = EndUser.push_target('test8@test.dev', :created_at => 8.days.ago, :first_name => 'Doug', :activated => true) end it "should require a name and a type" do @@ -38,12 +42,179 @@ end it "should be able to filter for users" do + size = UserSegmentCache::SIZE + UserSegmentCache::SIZE = 2 @segment = UserSegment.create :name => 'Test', :segment_type => 'filtered', :segment_options_text => 'activated.is(true)' @segment.should_refresh?.should be_true @segment.refresh @segment.ready?.should be_true - @segment.end_user_ids.length.should == 3 - @segment.last_count.should == 3 + @segment.end_user_ids.length.should == 5 + @segment.user_segment_caches.length.should == 3 + @segment.last_count.should == 5 @segment.last_ran_at.should_not be_nil + UserSegmentCache::SIZE = size + end + + it "should be able to search through users" do + size = UserSegmentCache::SIZE + UserSegmentCache::SIZE = 2 + @segment = UserSegment.create :name => 'Test', :segment_type => 'filtered', :segment_options_text => 'activated.is(true)' + @segment.should_refresh?.should be_true + @segment.refresh + @segment.ready?.should be_true + @segment.end_user_ids.length.should == 5 + @segment.user_segment_caches.length.should == 3 + @segment.last_count.should == 5 + @segment.last_ran_at.should_not be_nil + + scope = EndUserCache.search 'doug' + + offset, users = @segment.search :scope => scope, :end_user_field => :end_user_id + users.length.should == 2 + users[0].id.should == @user1.id + users[1].id.should == @user8.id + offset.should == 4 + + offset, users = @segment.search :offset => 5, :scope => scope, :end_user_field => :end_user_id + users.length.should == 0 + offset.should == 4 # because it is the index of the last element + + offset, users = @segment.search :scope => scope, :end_user_field => :end_user_id, :limit => 1 + users.length.should == 1 + users[0].id.should == @user1.id + offset.should == 0 + + offset, users = @segment.search :offset => 1, :scope => scope, :end_user_field => :end_user_id, :limit => 1 + users.length.should == 1 + users[0].id.should == @user8.id + offset.should == 4 + + offset, users = @segment.search :conditions => {:first_name => 'Doug'} + users.length.should == 2 + users[0].id.should == @user1.id + users[1].id.should == @user8.id + offset.should == 4 + + UserSegmentCache::SIZE = size + end + + it "should be able to paginate through the segment" do + size = UserSegmentCache::SIZE + UserSegmentCache::SIZE = 2 + @segment = UserSegment.create :name => 'Test', :segment_type => 'filtered', :segment_options_text => 'activated.is(true)' + @segment.should_refresh?.should be_true + @segment.refresh + @segment.ready?.should be_true + @segment.end_user_ids.length.should == 5 + @segment.user_segment_caches.length.should == 3 + @segment.last_count.should == 5 + @segment.last_ran_at.should_not be_nil + + pages, users = @segment.paginate 1, :per_page => 2 + users.length.should == 2 + pages[:count].should == 2 + pages[:total].should == 5 + pages[:page].should == 1 + pages[:first].should == 1 + pages[:last].should == 2 + pages[:pages].should == 3 + + pages, users = @segment.paginate 2, :per_page => 2 + users.length.should == 2 + pages[:count].should == 2 + pages[:total].should == 5 + pages[:page].should == 2 + pages[:first].should == 3 + pages[:last].should == 4 + pages[:pages].should == 3 + + pages, users = @segment.paginate 3, :per_page => 2 + users.length.should == 1 + pages[:count].should == 1 + pages[:total].should == 5 + pages[:page].should == 3 + pages[:first].should == 5 + pages[:last].should == 5 + pages[:pages].should == 3 + + # returns the last element again + pages, users = @segment.paginate 4, :per_page => 2 + users.length.should == 1 + pages[:count].should == 1 + pages[:total].should == 5 + pages[:page].should == 3 # page is set to the last page + pages[:first].should == 5 + pages[:last].should == 5 + pages[:pages].should == 3 + + UserSegmentCache::SIZE = size + end + + it "should be able to iterate over the users" do + size = UserSegmentCache::SIZE + UserSegmentCache::SIZE = 2 + @segment = UserSegment.create :name => 'Test', :segment_type => 'filtered', :segment_options_text => 'activated.is(true)' + @segment.should_refresh?.should be_true + @segment.refresh + @segment.ready?.should be_true + @segment.end_user_ids.length.should == 5 + @segment.user_segment_caches.length.should == 3 + @segment.last_count.should == 5 + @segment.last_ran_at.should_not be_nil + + @id_list = [@user1.id, @user2.id, @user3.id, @user6.id, @user8.id] + + cnt = 0 + @segment.each do |user| + @id_list[cnt].should == user.id + cnt = cnt.succ + end + cnt.should == @id_list.length + + @segment.each_with_index do |user,idx| + user.id.should == @id_list[idx] + end + + @segment.collect do |user| + user.id + end.should == @id_list + + user = @segment.find do |user| + user.first_name == 'Doug' + end + + user.id.should == @user1.id + + @user1.destroy + + user = @segment.find do |user| + user.first_name == 'Doug' + end + + user.id.should == @user8.id + + user = @segment.find do |user| + user.first_name == 'Frank' + end + + user.should be_nil + + UserSegmentCache::SIZE = size + end + + it "should be able to change the ordering of the users" do + @segment = UserSegment.create :name => 'Test', :segment_type => 'filtered', :segment_options_text => 'activated.is(true)' + @segment.should_refresh?.should be_true + @segment.refresh + @segment.ready?.should be_true + @segment.end_user_ids.length.should == 5 + + @id_list = [@user1.id, @user2.id, @user3.id, @user6.id, @user8.id] + @segment.end_user_ids.should == @id_list + + @segment.order_by = 'created_at' + @segment.should_refresh?.should be_true + @segment.refresh + @segment.end_user_ids.should == @id_list.reverse end end From 51da7c491877891e82386d9db2212341d7e08855 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 28 May 2010 19:27:53 +0000 Subject: [PATCH 087/139] Make sure segment fields exists. Test segment types. --- app/models/end_user_action_segment_field.rb | 6 +-- app/models/end_user_action_segment_type.rb | 34 ++++++++++-- app/models/end_user_segment_field.rb | 10 ++++ app/models/end_user_segment_type.rb | 26 ++++++++- .../end_user_action_segment_field_spec.rb | 15 ++++++ .../end_user_action_segment_type_spec.rb | 41 ++++++++++++++ spec/models/end_user_segment_field_spec.rb | 18 +++++++ spec/models/end_user_segment_type_spec.rb | 53 +++++++++++++++++++ 8 files changed, 194 insertions(+), 9 deletions(-) create mode 100644 spec/models/end_user_action_segment_field_spec.rb create mode 100644 spec/models/end_user_action_segment_type_spec.rb create mode 100644 spec/models/end_user_segment_field_spec.rb create mode 100644 spec/models/end_user_segment_type_spec.rb diff --git a/app/models/end_user_action_segment_field.rb b/app/models/end_user_action_segment_field.rb index da14e714..5f3fc84b 100644 --- a/app/models/end_user_action_segment_field.rb +++ b/app/models/end_user_action_segment_field.rb @@ -8,9 +8,9 @@ def self.user_segment_fields_handler_info } end - register_field :user_action, EndUserActionSegmentType::ActionType, :name => 'User Actions' - register_field :action, UserSegment::CoreType::StringType, :name => 'User Actions: Action' - register_field :renderer, UserSegment::CoreType::StringType, :name => 'User Actions: Renderer' + register_field :user_action, EndUserActionSegmentType::UserActionType, :field => [:renderer, :action], :name => 'User Actions' + register_field :action, EndUserActionSegmentType::ActionType, :name => 'User Actions: Action' + register_field :renderer, EndUserActionSegmentType::RendererType, :name => 'User Actions: Renderer' register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'User Actions: Created' register_field :occurred, UserSegment::CoreType::DateTimeType, :field => :action_at, :name => 'User Actions: Occurred' diff --git a/app/models/end_user_action_segment_type.rb b/app/models/end_user_action_segment_type.rb index 7f10918f..867854cc 100644 --- a/app/models/end_user_action_segment_type.rb +++ b/app/models/end_user_action_segment_type.rb @@ -1,18 +1,44 @@ class EndUserActionSegmentType - class ActionType < UserSegment::FieldType + class UserActionType < UserSegment::FieldType include HandlerActions - def self.select_options(opts={}) + def self.select_options self.get_handlers(:action).collect { |handler| [handler[1][:description], handler[1][:handler].to_s] } end - register_operation :is, [['Action', :model, {:class => EndUserActionSegmentType::ActionType}]] + register_operation :is, [['Action', :model, {:class => EndUserActionSegmentType::UserActionType}]] def self.is(cls, field, path) path = path.split('/') - cls.scoped(:conditions => ["renderer = ? and action = ?", path[0..-2].join('/'), path[-1]]) + cls.scoped(:conditions => ["#{field[0]} = ? and #{field[1]} = ?", path[0..-2].join('/'), path[-1]]) + end + end + + class ActionType < UserSegment::FieldType + + def self.select_options + EndUserAction.find(:all, :select => 'DISTINCT action').collect(&:action).sort + end + + register_operation :is, [['Action', :model, {:class => EndUserActionSegmentType::ActionType}]] + + def self.is(cls, field, action) + cls.scoped(:conditions => ["#{field} = ?", action]) + end + end + + class RendererType < UserSegment::FieldType + + def self.select_options + EndUserAction.find(:all, :select => 'DISTINCT renderer').collect(&:renderer).sort + end + + register_operation :is, [['Renderer', :model, {:class => EndUserActionSegmentType::RendererType}]] + + def self.is(cls, field, renderer) + cls.scoped(:conditions => ["#{field} = ?", renderer]) end end end diff --git a/app/models/end_user_segment_field.rb b/app/models/end_user_segment_field.rb index abc3e5e4..ff4bc237 100644 --- a/app/models/end_user_segment_field.rb +++ b/app/models/end_user_segment_field.rb @@ -15,5 +15,15 @@ def self.user_segment_fields_handler_info register_field :registered, UserSegment::CoreType::BooleanType, :name => 'Users: Registered' register_field :activated, UserSegment::CoreType::BooleanType, :name => 'Users: Activated' register_field :user_level, UserSegment::CoreType::NumberType, :name => 'Users: User Level' + register_field :dob, UserSegment::CoreType::DateTimeType, :name => 'Users: DOB' + register_field :last_name, UserSegment::CoreType::StringType, :name => 'Users: Last Name' + register_field :first_name, UserSegment::CoreType::StringType, :name => 'Users: First Name' + register_field :source, EndUserSegmentType::SourceType, :name => 'Users: Source' + register_field :lead_source, EndUserSegmentType::LeadSourceType, :name => 'Users: Lead Source' + register_field :registered_at, UserSegment::CoreType::DateTimeType, :name => 'Users: Registered At' + register_field :referrer, UserSegment::CoreType::StringType, :name => 'Users: Referrer' + register_field :username, UserSegment::CoreType::StringType, :name => 'Users: Username' + register_field :introduction, UserSegment::CoreType::StringType, :name => 'Users: Introduction' + register_field :suffix, UserSegment::CoreType::StringType, :name => 'Users: Suffix' end diff --git a/app/models/end_user_segment_type.rb b/app/models/end_user_segment_type.rb index 748f04e7..035964e9 100644 --- a/app/models/end_user_segment_type.rb +++ b/app/models/end_user_segment_type.rb @@ -2,8 +2,6 @@ class EndUserSegmentType class GenderType < UserSegment::FieldType - include HandlerActions - def self.gender_options [['Female', 'f'], ['Male', 'm']] end @@ -14,4 +12,28 @@ def self.is(cls, field, gender) cls.scoped(:conditions => ["#{field} = ?", gender]) end end + + class SourceType < UserSegment::FieldType + def self.select_options + EndUser.find(:all, :select => 'DISTINCT source').collect(&:source).sort + end + + register_operation :is, [['Source', :model, {:class => EndUserSegmentType::SourceType}]] + + def self.is(cls, field, source) + cls.scoped(:conditions => ["#{field} = ?", source]) + end + end + + class LeadSourceType < UserSegment::FieldType + def self.select_options + EndUser.find(:all, :select => 'DISTINCT lead_source').collect(&:lead_source).sort + end + + register_operation :is, [['Lead Source', :model, {:class => EndUserSegmentType::LeadSourceType}]] + + def self.is(cls, field, source) + cls.scoped(:conditions => ["#{field} = ?", source]) + end + end end diff --git a/spec/models/end_user_action_segment_field_spec.rb b/spec/models/end_user_action_segment_field_spec.rb new file mode 100644 index 00000000..1166cb74 --- /dev/null +++ b/spec/models/end_user_action_segment_field_spec.rb @@ -0,0 +1,15 @@ +require File.dirname(__FILE__) + "/../spec_helper" + +describe EndUserActionSegmentField do + + it "should only have valid EndUserAction fields" do + obj = EndUserActionSegmentField.user_segment_fields_handler_info[:domain_model_class].new + EndUserActionSegmentField.user_segment_fields.each do |key, value| + if value[:field].is_a?(Array) + value[:field].each { |fld| obj.has_attribute?(fld).should be_true } + else + obj.has_attribute?(value[:field]).should be_true + end + end + end +end diff --git a/spec/models/end_user_action_segment_type_spec.rb b/spec/models/end_user_action_segment_type_spec.rb new file mode 100644 index 00000000..5251eafa --- /dev/null +++ b/spec/models/end_user_action_segment_type_spec.rb @@ -0,0 +1,41 @@ +require File.dirname(__FILE__) + "/../spec_helper" + +describe EndUserActionSegmentType do + + reset_domain_tables :end_user_actions + + before(:each) do + EndUserAction.create :end_user_id => 1, :renderer => '/editor/auth', :action => 'login' + EndUserAction.create :end_user_id => 2, :renderer => '/editor/auth', :action => 'login' + EndUserAction.create :end_user_id => 3, :renderer => '/editor/auth', :action => 'login' + EndUserAction.create :end_user_id => 4, :renderer => '/editor/auth', :action => 'login' + EndUserAction.create :end_user_id => 5, :renderer => '/editor/auth', :action => 'login' + EndUserAction.create :end_user_id => 5, :renderer => '/editor/auth', :action => 'logout' + EndUserAction.create :end_user_id => 3, :renderer => '/editor/auth', :action => 'logout' + EndUserAction.create :end_user_id => 1, :renderer => '/editor/auth', :action => 'logout' + end + + describe "UserActionType" do + it "should be able to find users" do + @type = EndUserActionSegmentType::UserActionType + @type.select_options + @type.is(EndUserAction, [:renderer, :action], '/editor/auth/login').count.should == 5 + end + end + + describe "ActionType" do + it "should be able to find users" do + @type = EndUserActionSegmentType::ActionType + @type.select_options.length.should == 2 + @type.is(EndUserAction, :action, 'login').count.should == 5 + end + end + + describe "RendererType" do + it "should be able to find users" do + @type = EndUserActionSegmentType::RendererType + @type.select_options.length.should == 1 + @type.is(EndUserAction, :renderer, '/editor/auth').count.should == 8 + end + end +end diff --git a/spec/models/end_user_segment_field_spec.rb b/spec/models/end_user_segment_field_spec.rb new file mode 100644 index 00000000..b1f3cb92 --- /dev/null +++ b/spec/models/end_user_segment_field_spec.rb @@ -0,0 +1,18 @@ +require File.dirname(__FILE__) + "/../spec_helper" + +describe EndUserSegmentField do + + reset_domain_tables :end_users + + def field(field, operation, arguments) + arguments = [arguments] unless arguments.is_a?(Array) + @field = UserSegment::Field.new :field => field, :operation => operation, :arguments => arguments + end + + it "should only have valid EndUser fields" do + obj = EndUserSegmentField.user_segment_fields_handler_info[:domain_model_class].new + EndUserSegmentField.user_segment_fields.each do |key, value| + obj.has_attribute?(value[:field]).should be_true + end + end +end diff --git a/spec/models/end_user_segment_type_spec.rb b/spec/models/end_user_segment_type_spec.rb new file mode 100644 index 00000000..e9f33d8b --- /dev/null +++ b/spec/models/end_user_segment_type_spec.rb @@ -0,0 +1,53 @@ +require File.dirname(__FILE__) + "/../spec_helper" + +describe EndUserSegmentType do + + reset_domain_tables :end_users + + describe "GenderType" do + before(:each) do + EndUser.push_target('test1@test.dev', :gender => 'm') + EndUser.push_target('test2@test.dev', :gender => 'f') + EndUser.push_target('test3@test.dev', :gender => 'f') + + @type = EndUserSegmentType::GenderType + end + + it "should return users using based on gender" do + @type.is(EndUser, :gender, 'm').count.should == 1 + @type.is(EndUser, :gender, 'f').count.should == 2 + end + end + + describe "SourceType" do + before(:each) do + EndUser.push_target('test1@test.dev', :source => 'import') + EndUser.push_target('test2@test.dev', :source => 'import') + EndUser.push_target('test3@test.dev', :source => 'site') + + @type = EndUserSegmentType::SourceType + end + + it "should return users using based on source" do + @type.select_options.length.should == 2 + @type.is(EndUser, :source, 'import').count.should == 2 + @type.is(EndUser, :source, 'site').count.should == 1 + end + end + + describe "LeadSourceType" do + before(:each) do + EndUser.push_target('test1@test.dev', :lead_source => 'import') + EndUser.push_target('test2@test.dev', :lead_source => 'import') + EndUser.push_target('test3@test.dev', :lead_source => 'site') + + @type = EndUserSegmentType::LeadSourceType + end + + it "should return users using based on lead_source" do + @type.select_options.length.should == 2 + @type.is(EndUser, :lead_source, 'import').count.should == 2 + @type.is(EndUser, :lead_source, 'site').count.should == 1 + end + end +end From b9afe22a7c4e8c2fae1a22ae74cd821f4b934c35 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 28 May 2010 19:56:15 +0000 Subject: [PATCH 088/139] Added tests for remaing segment field classes. --- .../end_user_cache_segment_field_spec.rb | 10 +++++ spec/models/end_user_segment_field_spec.rb | 8 ---- .../models/end_user_tag_segment_field_spec.rb | 30 +++++++++++++++ ...r_subscription_entry_segment_field_spec.rb | 37 +++++++++++++++++++ 4 files changed, 77 insertions(+), 8 deletions(-) create mode 100644 spec/models/end_user_cache_segment_field_spec.rb create mode 100644 spec/models/end_user_tag_segment_field_spec.rb create mode 100644 spec/models/user_subscription_entry_segment_field_spec.rb diff --git a/spec/models/end_user_cache_segment_field_spec.rb b/spec/models/end_user_cache_segment_field_spec.rb new file mode 100644 index 00000000..ac420edf --- /dev/null +++ b/spec/models/end_user_cache_segment_field_spec.rb @@ -0,0 +1,10 @@ +require File.dirname(__FILE__) + "/../spec_helper" + +describe EndUserCacheSegmentField do + it "should only have valid EndUser fields" do + obj = EndUserCacheSegmentField.user_segment_fields_handler_info[:domain_model_class].new + EndUserCacheSegmentField.user_segment_fields.each do |key, value| + obj.has_attribute?(value[:field]).should be_true + end + end +end diff --git a/spec/models/end_user_segment_field_spec.rb b/spec/models/end_user_segment_field_spec.rb index b1f3cb92..6ab9d198 100644 --- a/spec/models/end_user_segment_field_spec.rb +++ b/spec/models/end_user_segment_field_spec.rb @@ -1,14 +1,6 @@ require File.dirname(__FILE__) + "/../spec_helper" describe EndUserSegmentField do - - reset_domain_tables :end_users - - def field(field, operation, arguments) - arguments = [arguments] unless arguments.is_a?(Array) - @field = UserSegment::Field.new :field => field, :operation => operation, :arguments => arguments - end - it "should only have valid EndUser fields" do obj = EndUserSegmentField.user_segment_fields_handler_info[:domain_model_class].new EndUserSegmentField.user_segment_fields.each do |key, value| diff --git a/spec/models/end_user_tag_segment_field_spec.rb b/spec/models/end_user_tag_segment_field_spec.rb new file mode 100644 index 00000000..71200d1a --- /dev/null +++ b/spec/models/end_user_tag_segment_field_spec.rb @@ -0,0 +1,30 @@ +require File.dirname(__FILE__) + "/../spec_helper" + +describe EndUserTagSegmentField do + it "should only have valid EndUser fields" do + obj = EndUserTagSegmentField.user_segment_fields_handler_info[:domain_model_class].new + EndUserTagSegmentField.user_segment_fields.each do |key, value| + obj.has_attribute?(value[:field]).should be_true + end + end + + describe "EndUserTagType" do + reset_domain_tables :end_users, :tags + + before(:each) do + @user1 = EndUser.push_target('test1@test.dev') + @user1.tag('robots, poster, one, two') + @user2 = EndUser.push_target('test2@test.dev') + @user2.tag('fake, flagger, three') + @user3 = EndUser.push_target('test3@test.dev') + @user3.tag('bunnies, one, two, three') + + @type = EndUserTagSegmentField::EndUserTagType + end + + it "should be able to find user by tag" do + @type.select_options.length.should == 8 + @type.is(EndUserTag, :tag_id, 'One').count.should == 2 + end + end +end diff --git a/spec/models/user_subscription_entry_segment_field_spec.rb b/spec/models/user_subscription_entry_segment_field_spec.rb new file mode 100644 index 00000000..ed90db52 --- /dev/null +++ b/spec/models/user_subscription_entry_segment_field_spec.rb @@ -0,0 +1,37 @@ +require File.dirname(__FILE__) + "/../spec_helper" + +describe UserSubscriptionEntrySegmentField do + it "should only have valid EndUser fields" do + obj = UserSubscriptionEntrySegmentField.user_segment_fields_handler_info[:domain_model_class].new + UserSubscriptionEntrySegmentField.user_segment_fields.each do |key, value| + obj.has_attribute?(value[:field]).should be_true + end + end + + describe "UserSubscriptionType" do + reset_domain_tables :user_subscriptions, :user_subscription_entries + + before(:each) do + @subscription1 = UserSubscription.create :name => 'Test1' + @subscription2 = UserSubscription.create :name => 'Test2' + @subscription3 = UserSubscription.create :name => 'Test3' + @subscription4 = UserSubscription.create :name => 'Test4' + UserSubscriptionEntry.create :user_subscription_id => @subscription1.id, :end_user_id => 1 + UserSubscriptionEntry.create :user_subscription_id => @subscription1.id, :end_user_id => 2 + UserSubscriptionEntry.create :user_subscription_id => @subscription1.id, :end_user_id => 3 + UserSubscriptionEntry.create :user_subscription_id => @subscription1.id, :end_user_id => 4 + + UserSubscriptionEntry.create :user_subscription_id => @subscription3.id, :end_user_id => 1 + UserSubscriptionEntry.create :user_subscription_id => @subscription3.id, :end_user_id => 2 + + UserSubscriptionEntry.create :user_subscription_id => @subscription4.id, :end_user_id => 5 + UserSubscriptionEntry.create :user_subscription_id => @subscription4.id, :end_user_id => 6 + + @type = UserSubscriptionEntrySegmentField::UserSubscriptionType + end + + it "should be able to find user from their subscriptions" do + @type.is(UserSubscriptionEntry, :user_subscription_id, @subscription3.id).count.should == 2 + end + end +end From 7c0dc307321b6b3bb501deb75acf9bc476f200fa Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 28 May 2010 20:10:33 +0000 Subject: [PATCH 089/139] Fix, had to remove null sources. --- app/models/end_user_segment_type.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/end_user_segment_type.rb b/app/models/end_user_segment_type.rb index 035964e9..0f7ec16c 100644 --- a/app/models/end_user_segment_type.rb +++ b/app/models/end_user_segment_type.rb @@ -15,7 +15,7 @@ def self.is(cls, field, gender) class SourceType < UserSegment::FieldType def self.select_options - EndUser.find(:all, :select => 'DISTINCT source').collect(&:source).sort + EndUser.find(:all, :select => 'DISTINCT source').collect(&:source).reject { |source| source.blank? }.sort.collect { |source| [source, source] } end register_operation :is, [['Source', :model, {:class => EndUserSegmentType::SourceType}]] @@ -27,7 +27,7 @@ def self.is(cls, field, source) class LeadSourceType < UserSegment::FieldType def self.select_options - EndUser.find(:all, :select => 'DISTINCT lead_source').collect(&:lead_source).sort + EndUser.find(:all, :select => 'DISTINCT lead_source').collect(&:lead_source).reject { |lead_source| lead_source.blank? }.sort.collect { |source| [source, source] } end register_operation :is, [['Lead Source', :model, {:class => EndUserSegmentType::LeadSourceType}]] From ff248e59b86212c41acd37491120c12bc3125ff6 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 28 May 2010 20:13:15 +0000 Subject: [PATCH 090/139] If operator or condition is blank set it to nil --- app/models/user_segment/operation_builder.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb index 4563ba86..e66e46b1 100644 --- a/app/models/user_segment/operation_builder.rb +++ b/app/models/user_segment/operation_builder.rb @@ -21,9 +21,11 @@ def validate def build(opts={}) self.operator = opts[:operator] + self.operator = nil if self.operator.blank? self.field = opts[:field] self.operation = opts[:operation] self.condition = opts[:condition] + self.condition = nil if self.condition.blank? self.parent = opts[:parent] unless self.operation_options.empty? unless self.operation_options.rassoc(self.operation) From 99b7ec8fbb06d508dc826a327006b1d8b7c6498f Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 28 May 2010 21:28:28 +0000 Subject: [PATCH 091/139] Added tests for user list support in the members controller. --- app/controllers/members_controller.rb | 9 +- app/views/members/builder.html.erb | 1 - spec/controllers/members_controller_spec.rb | 146 ++++++++++++++++++++ 3 files changed, 151 insertions(+), 5 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 126c1b85..abdbbbd3 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -91,9 +91,10 @@ def handle_table_actions end when 'add_users' custom_segment = UserSegment.find params[:user_segment_id] - custom_segment.add_ids params[:user].keys.collect { |uid| uid.to_i } + custom_segment.add_ids params[:user].keys.collect { |uid| uid.to_i } if custom_segment && custom_segment.segment_type == 'custom' when 'remove_users' - self.segment.remove_ids(params[:user].keys.collect { |uid| uid.to_i }) if self.segment && self.segment.segment_type == 'custom' + custom_segment = UserSegment.find params[:user_segment_id] + custom_segment.remove_ids(params[:user].keys.collect { |uid| uid.to_i }) if custom_segment && custom_segment.segment_type == 'custom' end end end @@ -218,7 +219,7 @@ def options cms_page_path ['People'], "Everyone Options" @options = self.class.module_options(params[:options]) - + if request.post? && @options.valid? if params[:commit] Configuration.set_config_model(@options) @@ -316,7 +317,7 @@ def refresh_segment def builder cms_page_path ['People'], 'Operation Builder' - @segment = UserSegment.find_by_id params[:path][0] + @segment = UserSegment.find_by_id params[:path][0] if params[:path] @builder = @segment ? UserSegment::OperationBuilder.create_builder(@segment) : UserSegment::OperationBuilder.new(nil) @filter = params[:filter] @builder.build(UserSegment::OperationBuilder.get_prebuilt_filter(@filter)) if @filter diff --git a/app/views/members/builder.html.erb b/app/views/members/builder.html.erb index b3beea57..aa3674a4 100644 --- a/app/views/members/builder.html.erb +++ b/app/views/members/builder.html.erb @@ -12,7 +12,6 @@ <%= submit_tag 'Select' %> - <% end -%> diff --git a/spec/controllers/members_controller_spec.rb b/spec/controllers/members_controller_spec.rb index d61353a0..10090c71 100644 --- a/spec/controllers/members_controller_spec.rb +++ b/spec/controllers/members_controller_spec.rb @@ -286,4 +286,150 @@ @output = get 'login', :path => [@user1.id] end end + + describe "user lists" do + reset_domain_tables :user_segments + + before(:each) do + mock_editor + @user1 = EndUser.push_target('user1@test.dev', :first_name => 'User1', :last_name => 'Last1') + @user2 = EndUser.push_target('user2@test.dev', :first_name => 'User2', :last_name => 'Last2') + @user3 = EndUser.push_target('user3@test.dev', :first_name => 'User3', :last_name => 'Last3') + @user4 = EndUser.push_target('user4@test.dev', :first_name => 'User4', :last_name => 'Last4') + @user5 = EndUser.push_target('user5@test.dev', :first_name => 'User5', :last_name => 'Last5', :membership_id => 'number5') + @subscription = UserSubscription.create :name => 'test' + + @user1.action('/editor/auth/user_registration', :identifier => @user1.email) + @user2.action('/editor/auth/user_registration', :identifier => @user2.email) + @user3.action('/editor/auth/user_registration', :identifier => @user3.email) + + @segment1 = UserSegment.create :name => 'Segment 1', :segment_type => 'filtered', :segment_options_text => 'created.since(1, "days")', :main_page => false + @segment1.refresh + + @segment2 = UserSegment.create :name => 'Segment 2', :segment_type => 'filtered', :segment_options_text => 'created.before(1, "days")', :main_page => true + @segment2.refresh + + @segment3 = UserSegment.create :name => 'Custom Segment', :segment_type => 'custom', :main_page => true + @segment3.add_ids [@user4.id, @user3.id] + end + + it "should handle user list" do + # Test all the permutations of an active table + controller.should handle_active_table(:user_segments_table) do |args| + post 'user_segments_table', args + end + end + + it "should be able to delete a user list" do + @output = post 'user_segments_table', :table_action => 'delete', :user_segments => {@segment1.id => @segment1.id} + @deleted_segment = UserSegment.find_by_id @segment1.id + @deleted_segment.should be_nil + end + + it "should be able to add segments to main_page" do + @segment1.main_page.should be_false + @output = post 'user_segments_table', :table_action => 'add', :user_segments => {@segment1.id => @segment1.id} + @segment1.reload + @segment1.main_page.should be_true + end + + it "should be able to remove segments from the main_page" do + @segment2.main_page.should be_true + @output = post 'user_segments_table', :table_action => 'remove', :user_segments => {@segment2.id => @segment2.id} + @segment2.reload + @segment2.main_page.should be_false + end + + it "should be able to create a user list" do + assert_difference 'UserSegment.count', 1 do + post 'create_segment', :commit => 1, :segment => {:name => 'Segment 3', :segment_options_text => 'email.like("%test.dev")'} + end + @segment = UserSegment.find(:last) + @segment.end_user_ids.length.should == 5 + end + + it "should be able to edit a user list" do + assert_difference 'UserSegment.count', 0 do + post 'edit_segment', :path => [@segment1.id], :commit => 1, :segment => {:name => 'New Segment Name', :segment_options_text => 'email.like("%test.dev")'} + end + @segment1.reload + @segment1.name.should == 'New Segment Name' + @segment1.end_user_ids.length.should == 5 + end + + it "should be able to copy a user list" do + assert_difference 'UserSegment.count', 1 do + post 'copy_segment', :path => [@segment1.id], :commit => 1, :segment => {} + end + @segment = UserSegment.find(:last) + @segment.segment_options_text.should == @segment1.segment_options_text + end + + it "should be able to refresh a user list" do + @segment1.last_count.should == 5 + + EndUser.push_target('user6@test.dev') + + get 'refresh_segment', :path => [@segment1.id] + + @segment1.reload + @segment1.last_count.should == 6 + end + + it "should be able to render add_users_form" do + get 'add_users_form' + end + + it "should be able to select and existing custom user segment" do + post 'add_users_form', :choice => 'existing', :segment => {:id => @segment3.id} + end + + it "should be able to create a custom user segment" do + assert_difference 'UserSegment.count', 1 do + post 'add_users_form', :choice => 'new', :segment => {:name => 'new segment'} + end + @segment = UserSegment.find(:last) + @segment.name.should == 'new segment' + end + + it "should be able to add users to a custom segment" do + @segment3.last_count.should == 2 + post 'display_targets_table', :table_action => 'add_users', :user_segment_id => @segment3.id, :user => {@user5.id => @user5.id} + @segment3.reload + @segment3.last_count.should == 3 + end + + it "should be able to remove users from a custom segment" do + @segment3.last_count.should == 2 + post 'display_targets_table', :table_action => 'remove_users', :user_segment_id => @segment3.id, :user => {@user4.id => @user4.id} + @segment3.reload + @segment3.last_count.should == 1 + end + + it "should be able to render the builder" do + get 'builder' + end + + it "should be able to render the custom builder" do + post 'builder', :filter => 'custom' + end + + it "should be able to render the builder for a segment" do + post 'builder', :path => [@segment1.id] + end + + it "should render operation partial" do + post 'update_builder', :operation => 1, :builder => @segment1.to_builder + end + + it "should render expression partial" do + post 'update_builder', :expression => 1, :builder => @segment1.to_builder + end + end + + it "should be able to update options" do + mock_editor + post 'options', :commit => 1, :options => {:order_by => 'created_at', :fields => ['gender']} + controller.class.module_options.fields.should == ['gender'] + end end From 404ac0d6143ed1c4ca574d8af13a27365394660c Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 28 May 2010 21:34:06 +0000 Subject: [PATCH 092/139] Needed to reset the segment cache table --- spec/controllers/members_controller_spec.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spec/controllers/members_controller_spec.rb b/spec/controllers/members_controller_spec.rb index 10090c71..134a4b73 100644 --- a/spec/controllers/members_controller_spec.rb +++ b/spec/controllers/members_controller_spec.rb @@ -3,7 +3,7 @@ describe MembersController do integrate_views - reset_domain_tables :end_users, :user_subscriptions, :user_subscription_entries, :tags, :mail_templates, :end_user_addresses, :tag_notes, :end_user_tags, :market_segments + reset_domain_tables :end_users, :user_subscriptions, :user_subscription_entries, :tags, :mail_templates, :end_user_addresses, :tag_notes, :end_user_tags, :market_segments, :user_segments, :user_segment_caches describe "editor tests" do before(:each) do @@ -288,8 +288,6 @@ end describe "user lists" do - reset_domain_tables :user_segments - before(:each) do mock_editor @user1 = EndUser.push_target('user1@test.dev', :first_name => 'User1', :last_name => 'Last1') From 408059f35b5e526ccf1cc83d6ebeaa2958d72e25 Mon Sep 17 00:00:00 2001 From: Pascal Rettig Date: Tue, 1 Jun 2010 08:54:54 -0400 Subject: [PATCH 093/139] Fix for renderer cache and module paragraphs (like RSS feeds) --- app/controllers/paragraph_renderer.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/paragraph_renderer.rb b/app/controllers/paragraph_renderer.rb index 93bf57ba..be86221e 100644 --- a/app/controllers/paragraph_renderer.rb +++ b/app/controllers/paragraph_renderer.rb @@ -666,7 +666,8 @@ def renderer_cache(obj=nil,display_string=nil,options={ },&block) unless editor? || options[:skip] if obj.nil? - result = DataCache.get_content("Paragraph",paragraph.id.to_s,display_string) + paragraph_cache_id = paragraph.id == -1 ? "Mod#{site_node.id}" : paragraph.id.to_s + result = DataCache.get_content("Paragraph",paragraph_cache_id,display_string) elsif obj.is_a?(Array) cls = obj[0].is_a?(String) ? obj[0].constantize : obj[0] result = cls.cache_fetch(display_string,obj[1]) @@ -689,7 +690,7 @@ def renderer_cache(obj=nil,display_string=nil,options={ },&block) unless editor? || options[:skip] if obj.nil? - DataCache.put_content("Paragraph",paragraph.id.to_s,display_string,output,expiration) + DataCache.put_content("Paragraph",paragraph_cache_id,display_string,output,expiration) elsif obj.is_a?(Array) cls.cache_put(display_string,output,obj[1],expiration) elsif obj.is_a?(ActiveRecord::Base) From 3abd90c293a21ab8200326e7550fe85ed7ab4139 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 1 Jun 2010 18:31:36 +0000 Subject: [PATCH 094/139] Display an overlay while user list is refreshing. --- app/controllers/members_controller.rb | 7 +++++-- app/views/members/_refresh_segment.html.erb | 8 ++++++++ app/views/members/index.rhtml | 10 +++++++++- app/views/members/refresh_segment_status.rjs | 5 +++++ 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 app/views/members/_refresh_segment.html.erb create mode 100644 app/views/members/refresh_segment_status.rjs diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 881a0228..841d32a2 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -319,8 +319,11 @@ def copy_segment def refresh_segment @segment = UserSegment.find params[:path][0] @segment.refresh - return redirect_to(:action => 'index', :path => @segment.id) if @segment.segment_type == 'custom' - redirect_to :action => 'segments' + render :partial => 'refresh_segment' + end + + def refresh_segment_status + @segment = UserSegment.find params[:path][0] end def builder diff --git a/app/views/members/_refresh_segment.html.erb b/app/views/members/_refresh_segment.html.erb new file mode 100644 index 00000000..441f7e63 --- /dev/null +++ b/app/views/members/_refresh_segment.html.erb @@ -0,0 +1,8 @@ +
              +

              <%= "Refreshing %s User List" / @segment.name %>

              +

              <%= "Please wait while user list is updated." %>

              +
              + + diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index 27f88864..aee6f15e 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -108,6 +108,14 @@ addUsersToListTableAction: function(id) { this.tableAction('add_users', "user_segment_id=" + id); SCMS.closeOverlay(); + }, + + refreshUserList: function() { + SCMS.remoteOverlay("<%= url_for :action => 'refresh_segment', :path => @segment ? @segment.id : nil %>"); + }, + + refreshUserListStatus: function() { + <%= remote_function :url => url_for(:action => 'refresh_segment_status', :path => @segment ? @segment.id : nil) %>; } } @@ -126,7 +134,7 @@
              <%= form_tag %> <% if @segment && @segment.last_ran_at -%> - Refresh | Edit + Refresh | Edit <% else -%> Edit <% end -%> diff --git a/app/views/members/refresh_segment_status.rjs b/app/views/members/refresh_segment_status.rjs new file mode 100644 index 00000000..a3383b47 --- /dev/null +++ b/app/views/members/refresh_segment_status.rjs @@ -0,0 +1,5 @@ +if @segment.ready? + page << 'SCMS.closeOverlay();' +else + page << 'setTimeout(MemberEditor.refreshUserListStatus, 1000);' +end From 8a41749f4b46c354d67bb83d910fe878fa4033b9 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 1 Jun 2010 18:58:46 +0000 Subject: [PATCH 095/139] Refresh the table if status is not finished. Use options display methods. --- app/models/user_segment/field.rb | 2 +- app/views/members/_user_segments_table.html.erb | 16 ++++++++++++++-- app/views/members/index.rhtml | 4 ++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index 3168ceaa..61d53131 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -20,7 +20,7 @@ def add_error(attr, message) when :arguments @failure_reasons << "Arguments #{message} for '#{self.field}.#{self.operation}()'" when :child - @failure_reasons = @failure_reasons + self.child.failure_reasons + @failure_reasons = @failure_reasons + self.child_field.failure_reasons end self.errors.add(attr, message) diff --git a/app/views/members/_user_segments_table.html.erb b/app/views/members/_user_segments_table.html.erb index 98fa7ce8..1379ec54 100644 --- a/app/views/members/_user_segments_table.html.erb +++ b/app/views/members/_user_segments_table.html.erb @@ -1,9 +1,15 @@ +<% +refresh_table = false +-%> <% active_table_for :user_segments_table, @active_table_output, :refresh_url => url_for(:action => 'user_segments_table'), :style => 'width:100%', :actions => [['Add to Main Page', 'add'], ['Remove from Main Page', 'remove']], :more_actions => [['Copy User Lists', 'duplicate'], ['Delete User Lists','delete','Delete the selected lists?']] do |t| %>
              > +<% + refresh_table ||= ! t.ready? +-%> - + - + <% end -%> + +<% if refresh_table -%> + +<% end -%> diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index aee6f15e..b69b189f 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -170,4 +170,8 @@ From a8544b65d978def98eec4de3ddf188f716757b8e Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 1 Jun 2010 19:05:36 +0000 Subject: [PATCH 096/139] Only refresh filtered segments after a day. --- app/views/members/index.rhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index b69b189f..4a8817d6 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -171,7 +171,7 @@ From 1fd42ed3882644a463c4e5c38f1c92b2a5a2c1ef Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 1 Jun 2010 21:24:52 +0000 Subject: [PATCH 097/139] Added a helper for the filter builder. Renamed fields. Use grouped_select for field options. --- app/controllers/members_controller.rb | 7 +- app/models/end_user_action_segment_field.rb | 2 +- app/models/end_user_cache_segment_field.rb | 4 +- app/models/end_user_segment_field.rb | 34 ++++---- app/models/end_user_tag_segment_field.rb | 4 +- app/models/user_segment/core_type.rb | 8 +- app/models/user_segment/field.rb | 6 +- app/models/user_segment/operation_builder.rb | 18 +++++ .../user_subscription_entry_segment_field.rb | 2 +- app/views/members/_operation_form.html.erb | 2 +- .../members/_operation_form_child.html.erb | 2 +- app/views/members/builder_help.html.erb | 78 +++++++++++++++++++ 12 files changed, 133 insertions(+), 34 deletions(-) create mode 100644 app/views/members/builder_help.html.erb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 841d32a2..eb87f5c2 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -326,9 +326,12 @@ def refresh_segment_status @segment = UserSegment.find params[:path][0] end - def builder - cms_page_path ['People'], 'Operation Builder' + def builder_help + @handlers = UserSegment::FieldHandler.handlers + render :action => 'builder_help', :layout => 'manage_window' + end + def builder @segment = UserSegment.find_by_id params[:path][0] if params[:path] @builder = @segment ? UserSegment::OperationBuilder.create_builder(@segment) : UserSegment::OperationBuilder.new(nil) @filter = params[:filter] diff --git a/app/models/end_user_action_segment_field.rb b/app/models/end_user_action_segment_field.rb index 5f3fc84b..7888750f 100644 --- a/app/models/end_user_action_segment_field.rb +++ b/app/models/end_user_action_segment_field.rb @@ -3,7 +3,7 @@ class EndUserActionSegmentField < UserSegment::FieldHandler def self.user_segment_fields_handler_info { - :name => 'End User Action Segment Fields', + :name => 'User Action Fields', :domain_model_class => EndUserAction } end diff --git a/app/models/end_user_cache_segment_field.rb b/app/models/end_user_cache_segment_field.rb index e9e7cc64..82c626d4 100644 --- a/app/models/end_user_cache_segment_field.rb +++ b/app/models/end_user_cache_segment_field.rb @@ -3,11 +3,11 @@ class EndUserCacheSegmentField < UserSegment::FieldHandler def self.user_segment_fields_handler_info { - :name => 'End User Cache Segment Fields', + :name => 'User Cache Fields', :domain_model_class => EndUserCache } end - register_field :cache, UserSegment::CoreType::MatchType, :field => :data, :name => 'User Caches: Cache' + register_field :cache, UserSegment::CoreType::MatchType, :field => :data, :name => 'Cache' end diff --git a/app/models/end_user_segment_field.rb b/app/models/end_user_segment_field.rb index ff4bc237..c7768563 100644 --- a/app/models/end_user_segment_field.rb +++ b/app/models/end_user_segment_field.rb @@ -3,27 +3,27 @@ class EndUserSegmentField < UserSegment::FieldHandler def self.user_segment_fields_handler_info { - :name => 'End User Segment Fields', + :name => 'User Fields', :domain_model_class => EndUser, :end_user_field => :id } end - register_field :email, UserSegment::CoreType::StringType, :name => 'Users: Email' - register_field :gender, EndUserSegmentType::GenderType, :name => 'Users: Gender' - register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'Users: Created' - register_field :registered, UserSegment::CoreType::BooleanType, :name => 'Users: Registered' - register_field :activated, UserSegment::CoreType::BooleanType, :name => 'Users: Activated' - register_field :user_level, UserSegment::CoreType::NumberType, :name => 'Users: User Level' - register_field :dob, UserSegment::CoreType::DateTimeType, :name => 'Users: DOB' - register_field :last_name, UserSegment::CoreType::StringType, :name => 'Users: Last Name' - register_field :first_name, UserSegment::CoreType::StringType, :name => 'Users: First Name' - register_field :source, EndUserSegmentType::SourceType, :name => 'Users: Source' - register_field :lead_source, EndUserSegmentType::LeadSourceType, :name => 'Users: Lead Source' - register_field :registered_at, UserSegment::CoreType::DateTimeType, :name => 'Users: Registered At' - register_field :referrer, UserSegment::CoreType::StringType, :name => 'Users: Referrer' - register_field :username, UserSegment::CoreType::StringType, :name => 'Users: Username' - register_field :introduction, UserSegment::CoreType::StringType, :name => 'Users: Introduction' - register_field :suffix, UserSegment::CoreType::StringType, :name => 'Users: Suffix' + register_field :email, UserSegment::CoreType::StringType, :name => 'Email' + register_field :gender, EndUserSegmentType::GenderType, :name => 'Gender' + register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'Created' + register_field :registered, UserSegment::CoreType::BooleanType, :name => 'Registered' + register_field :activated, UserSegment::CoreType::BooleanType, :name => 'Activated' + register_field :user_level, UserSegment::CoreType::NumberType, :name => 'User Level' + register_field :dob, UserSegment::CoreType::DateTimeType, :name => 'DOB' + register_field :last_name, UserSegment::CoreType::StringType, :name => 'Last Name' + register_field :first_name, UserSegment::CoreType::StringType, :name => 'First Name' + register_field :source, EndUserSegmentType::SourceType, :name => 'Source' + register_field :lead_source, EndUserSegmentType::LeadSourceType, :name => 'Lead Source' + register_field :registered_at, UserSegment::CoreType::DateTimeType, :name => 'Registered At' + register_field :referrer, UserSegment::CoreType::StringType, :name => 'Referrer' + register_field :username, UserSegment::CoreType::StringType, :name => 'Username' + register_field :introduction, UserSegment::CoreType::StringType, :name => 'Introduction' + register_field :suffix, UserSegment::CoreType::StringType, :name => 'Suffix' end diff --git a/app/models/end_user_tag_segment_field.rb b/app/models/end_user_tag_segment_field.rb index 54775c27..d9b2e6e4 100644 --- a/app/models/end_user_tag_segment_field.rb +++ b/app/models/end_user_tag_segment_field.rb @@ -3,7 +3,7 @@ class EndUserTagSegmentField < UserSegment::FieldHandler def self.user_segment_fields_handler_info { - :name => 'End User Tag Segment Fields', + :name => 'User Tag Fields', :domain_model_class => EndUserTag } end @@ -22,5 +22,5 @@ def self.is(cls, field, name) end end - register_field :tag, EndUserTagSegmentField::EndUserTagType, :field => :tag_id, :name => 'Users: Tag' + register_field :tag, EndUserTagSegmentField::EndUserTagType, :field => :tag_id, :name => 'Tag' end diff --git a/app/models/user_segment/core_type.rb b/app/models/user_segment/core_type.rb index 45efa0cd..8b1aa46d 100644 --- a/app/models/user_segment/core_type.rb +++ b/app/models/user_segment/core_type.rb @@ -69,13 +69,13 @@ def self.is(cls, field, value) end class StringType < UserSegment::FieldType - register_operation :like, [['String', :string]] + register_operation :like, [['String', :string]], :description => 'use % for wild card matches' def self.like(cls, field, string) cls.scoped(:conditions => ["#{field} like ?", string]) end - register_operation :is, [['String', :string]] + register_operation :is, [['String', :string]], :description => 'exact match' def self.is(cls, field, string) cls.scoped(:conditions => ["#{field} = ?", string]) @@ -83,7 +83,7 @@ def self.is(cls, field, string) end class BooleanType < UserSegment::FieldType - register_operation :is, [['', :boolean]] + register_operation :is, [['Boolean', :boolean]] def self.is(cls, field, string) cls.scoped(:conditions => ["#{field} = ?", string]) @@ -91,7 +91,7 @@ def self.is(cls, field, string) end class MatchType < UserSegment::FieldType - register_operation :search, [['Query', :string]] + register_operation :search, [['Query', :string]], :description => 'full text search' def self.search(cls, field, query) cls.scoped(:conditions => ["MATCH (#{field}) AGAINST (?)", query]) diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index 61d53131..7f949a58 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -7,11 +7,13 @@ class UserSegment::Field < HashModel def strict?; true; end - def failure_reasons; @failure_reasons; end + def failure_reasons; @failure_reasons || []; end def add_error(attr, message) @failure_reasons ||= [] + self.errors.add(attr, message) + case attr when :field @failure_reasons << "'#{self.field}' is an invalid field" @@ -22,8 +24,6 @@ def add_error(attr, message) when :child @failure_reasons = @failure_reasons + self.child_field.failure_reasons end - - self.errors.add(attr, message) end def validate diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb index e66e46b1..b18babe6 100644 --- a/app/models/user_segment/operation_builder.rb +++ b/app/models/user_segment/operation_builder.rb @@ -60,6 +60,24 @@ def field_options @field_options = [['Select a field', nil]] + @field_options.sort { |a, b| a[0] <=> b[0] } end + def field_group_options + return @field_group_options if @field_group_options + @field_group_options = [] + seen_options = {} + UserSegment::FieldHandler.handlers.each do |handler| + if self.parent.nil? || self.parent.user_segment_field.handler == handler + options = [] + handler[:class].user_segment_fields.each do |field, values| + options << [values[:name], field.to_s] unless seen_options[field.to_s] + seen_options[field.to_s] = 1 + end + options.sort! { |a, b| a[0] <=> b[0] } + @field_group_options << [handler[:name], options] + end + end + @field_group_options = [['', [['Select a field', nil]]]] + @field_group_options + end + def user_segment_field return @user_segment_field if @user_segment_field @user_segment_field = UserSegment::Field.new :field => self.field, :operation => self.operation, :arguments => self.arguments diff --git a/app/models/user_subscription_entry_segment_field.rb b/app/models/user_subscription_entry_segment_field.rb index 514c0e6e..5acafe90 100644 --- a/app/models/user_subscription_entry_segment_field.rb +++ b/app/models/user_subscription_entry_segment_field.rb @@ -3,7 +3,7 @@ class UserSubscriptionEntrySegmentField < UserSegment::FieldHandler def self.user_segment_fields_handler_info { - :name => 'User Subscription Entry Segment Fields', + :name => 'User Subscription Fields', :domain_model_class => UserSubscriptionEntry } end diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb index 89bfbb89..904bf7c5 100644 --- a/app/views/members/_operation_form.html.erb +++ b/app/views/members/_operation_form.html.erb @@ -32,7 +32,7 @@ OperationBuilder = {
            • <%= 'looking for'.t %> - <%= f.select :field, @builder.field_options, {}, :onchange => 'OperationBuilder.updateOperations();', :style => 'width:200px;' %> + <%= f.grouped_select :field, @builder.field_group_options, {}, :onchange => 'OperationBuilder.updateOperations();', :style => 'width:200px;' %>
              • diff --git a/app/views/members/_operation_form_child.html.erb b/app/views/members/_operation_form_child.html.erb index 530c1e26..6204e4eb 100644 --- a/app/views/members/_operation_form_child.html.erb +++ b/app/views/members/_operation_form_child.html.erb @@ -8,7 +8,7 @@ <% end -%>
            • - <%= f.select :field, builder.field_options, {}, :onchange => 'OperationBuilder.updateOperations();', :style => 'width:200px;' %> + <%= f.grouped_select :field, builder.field_group_options, {}, :onchange => 'OperationBuilder.updateOperations();', :style => 'width:200px;' %>
              • <% if builder.operation_options.length > 0 -%> diff --git a/app/views/members/builder_help.html.erb b/app/views/members/builder_help.html.erb new file mode 100644 index 00000000..69aaf3e0 --- /dev/null +++ b/app/views/members/builder_help.html.erb @@ -0,0 +1,78 @@ + + +<% + types = {} + seen_fields = {} +%> +
              + +
              +
                +<% @handlers.each do |info| -%> + +

              • <%= info[:name] %>

                +
                  + <% info[:class].user_segment_fields.keys.collect { |key| key.to_s }.sort.each do |key| -%> + <% field_name = key + field = info[:class].user_segment_fields[key.to_sym] + type_name = field[:type].to_s.underscore.split("/")[-1].sub(/_type$/,'').humanize + -%> +
                • <%= '* ' if seen_fields[key] %><%= field[:name].sub(/^.*?: /, '') %>: <%= key %> + - <%= type_name %> +
                  • + <% seen_fields[key] = 1 + types[type_name] = field[:type] + -%> + <% end -%> +
                +
                • + +<% end -%> +
              +

              * available through AND condition only

              +
              + +
              +
                +<% types.sort.each do |type_name, type_class| -%> +
              • <%= type_name %> +
                  + <% type_class.user_segment_field_type_operations.keys.collect { |key| key.to_s }.sort.each do |key| -%> + <% operation = type_class.user_segment_field_type_operations[key.to_sym] -%> +
                • <%= key %>(<%= operation[:argument_names].join(', ') %>) <%= h(' - ' + operation[:description]) if operation[:description] %> +
                    + <% operation[:arguments].each_with_index do |arg,idx| -%> +
                  • <%= operation[:argument_names][idx] %> - <%= arg %> + <% if arg == :option -%> +
                    • + <%= operation[:argument_options][idx][:options].collect { |opt| opt = "#{opt[1]} '#{opt[0]}'" if opt.is_a?(Array); opt }.join(', ') if arg == :option %> +
                    + <% end -%> +
                    • + <% end -%> +
                  +
                  • + <% end -%> +
                +
                • +<% end -%> +
              +
              + +
              +
              + From 4f9078fdfbafd7b387f9315e9f3e9775c45b60c2 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 1 Jun 2010 21:31:19 +0000 Subject: [PATCH 098/139] Added a link to the helper. --- app/views/members/_segment_form.html.erb | 4 ++++ app/views/members/builder_help.html.erb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb index 441162bc..261d8754 100644 --- a/app/views/members/_segment_form.html.erb +++ b/app/views/members/_segment_form.html.erb @@ -23,8 +23,12 @@ UserSegment = { <% if @segment.segment_type == 'filtered' -%> <% f.custom_field '' do %> <%= @segment.id ? 'Edit filter'.t : 'Create a filter'.t %> + <% end %> <%= f.text_area :segment_options_text, :rows => 8, :style => 'width:400px;', :label => 'Filter' %> + <% f.custom_field '' do %> + + <% end %> <% end -%> <%= f.spacer %> diff --git a/app/views/members/builder_help.html.erb b/app/views/members/builder_help.html.erb index 69aaf3e0..845c8664 100644 --- a/app/views/members/builder_help.html.erb +++ b/app/views/members/builder_help.html.erb @@ -18,7 +18,7 @@ ul ul li { types = {} seen_fields = {} %> -
              +
                From 606368aeddbcd542ff4241416c81c05b72ec2206 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 2 Jun 2010 13:41:56 +0000 Subject: [PATCH 099/139] Make sure option type doen't break when type is not a string. --- app/models/user_segment/field_type.rb | 8 ++++---- spec/models/user_segment/field_type_spec.rb | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/models/user_segment/field_type.rb b/app/models/user_segment/field_type.rb index 2c9cb456..d38f2d26 100644 --- a/app/models/user_segment/field_type.rb +++ b/app/models/user_segment/field_type.rb @@ -58,17 +58,17 @@ def self.convert_to(value, type, opts={}) rescue end when :option - return nil unless value.is_a?(String) + value = value.downcase if value.is_a?(String) value = opts[:options].find do |o| if o.is_a?(Array) - o[1].downcase == value.downcase + o[1] == value else - o.downcase == value.downcase + o == value end end return value[1] if value.is_a?(Array) - return value if value + return value when :boolean return value if value.is_a?(TrueClass) || value.is_a?(FalseClass) value = value.downcase if value.is_a?(String) diff --git a/spec/models/user_segment/field_type_spec.rb b/spec/models/user_segment/field_type_spec.rb index 3df91e27..2e0f71bd 100644 --- a/spec/models/user_segment/field_type_spec.rb +++ b/spec/models/user_segment/field_type_spec.rb @@ -101,4 +101,12 @@ UserSegment::FieldType.convert_to(98789, :model, :class => Tag).should be_nil UserSegment::FieldType.convert_to('Walker', :model, :class => Tag).should be_nil end + + it "should support multiple option types" do + UserSegment::FieldType::convert_to('day', :option, :options => ['day', 'days', 'week', 'weeks']).should == 'day' + UserSegment::FieldType::convert_to('day', :option, :options => [['Day', 'day'], ['Days', 'days'], ['Week', 'week'], ['Weeks', 'weeks']]).should == 'day' + UserSegment::FieldType::convert_to(3, :option, :options => [1, 2, 4, 5, 3]).should == 3 + UserSegment::FieldType::convert_to(false, :option, :options => [true, false]).should == false + UserSegment::FieldType::convert_to(nil, :option, :options => [true, false]).should == nil + end end From 8760b81c3544d847cd22d442812c7f16bd017680 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 2 Jun 2010 14:27:59 +0000 Subject: [PATCH 100/139] Created a custom field for filter. Added a little instruction for the filter help. --- app/views/members/_segment_form.html.erb | 13 +++++++------ app/views/members/builder_help.html.erb | 23 ++++++++++++++++++++--- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb index 261d8754..432fb40a 100644 --- a/app/views/members/_segment_form.html.erb +++ b/app/views/members/_segment_form.html.erb @@ -21,13 +21,14 @@ UserSegment = { <%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> <% if @segment.segment_type == 'filtered' -%> - <% f.custom_field '' do %> - <%= @segment.id ? 'Edit filter'.t : 'Create a filter'.t %> + <% f.custom_field 'Filter' do %> + - <% end %> - <%= f.text_area :segment_options_text, :rows => 8, :style => 'width:400px;', :label => 'Filter' %> - <% f.custom_field '' do %> - +
                + <%= "
                #{f.output_error_message('Filter', :segment_options_text)}
                " if @segment.errors[:segment_options_text] %> + <%= text_area_tag 'segment[segment_options_text]', @segment.segment_options_text, :rows => 8, :style => 'width:400px;' %> +
                + <% end %> <% end -%> diff --git a/app/views/members/builder_help.html.erb b/app/views/members/builder_help.html.erb index 845c8664..e858aafc 100644 --- a/app/views/members/builder_help.html.erb +++ b/app/views/members/builder_help.html.erb @@ -1,6 +1,7 @@ <% types = {} seen_fields = {} %> -
                +
                + +

                Instructions

                + +

                +A filter is a set of operations used to create a list of users. An operation is a field and its method. +
                +Ex: created.since(7, "days") - Will return all the user who where created in the last 7 days. +
                +
                +

                +

                Fields

                  <% @handlers.each do |info| -%> -

                • <%= info[:name] %>

                  +
                • <%= info[:name] %>
                    <% info[:class].user_segment_fields.keys.collect { |key| key.to_s }.sort.each do |key| -%> <% field_name = key @@ -47,13 +63,14 @@ ul ul li {
                +

                Types

                  <% types.sort.each do |type_name, type_class| -%>
                • <%= type_name %>
                    <% type_class.user_segment_field_type_operations.keys.collect { |key| key.to_s }.sort.each do |key| -%> <% operation = type_class.user_segment_field_type_operations[key.to_sym] -%> -
                  • <%= key %>(<%= operation[:argument_names].join(', ') %>) <%= h(' - ' + operation[:description]) if operation[:description] %> +
                  • <%= key %>(<%= operation[:argument_names].join(', ') %>) <%= h(' - ' + operation[:description]) if operation[:description] %>
                      <% operation[:arguments].each_with_index do |arg,idx| -%>
                    • <%= operation[:argument_names][idx] %> - <%= arg %> From e293ba5ccdc68b6bf0e948616d7db0e7e98530a0 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 2 Jun 2010 15:04:25 +0000 Subject: [PATCH 101/139] Fix, only 1 error on segment type now. --- spec/models/user_segment_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/models/user_segment_spec.rb b/spec/models/user_segment_spec.rb index e474a365..d2d083c9 100644 --- a/spec/models/user_segment_spec.rb +++ b/spec/models/user_segment_spec.rb @@ -19,7 +19,7 @@ @segment = UserSegment.new @segment.valid?.should be_false @segment.should have(1).error_on(:name) - @segment.should have(2).error_on(:segment_type) + @segment.should have(1).error_on(:segment_type) @segment.should have(0).error_on(:segment_options_text) @segment = UserSegment.new :segment_type => 'filtered' From 5bc7c5044b28cbe91f73f48818496ae57e6c0037 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 3 Jun 2010 21:59:10 +0000 Subject: [PATCH 102/139] Can display fields from a user segment. --- app/controllers/members_controller.rb | 19 +++++- app/models/end_user_cache_segment_field.rb | 3 +- app/models/end_user_segment_field.rb | 73 +++++++++++++++++----- app/models/end_user_tag_segment_field.rb | 24 ++++++- app/models/user_segment.rb | 36 +++++++++-- app/models/user_segment/core_type.rb | 40 ++++-------- app/models/user_segment/field.rb | 4 ++ app/models/user_segment/field_handler.rb | 29 ++++++++- app/views/members/_segment_form.html.erb | 1 + app/views/members/_targets_table.rhtml | 16 ++--- app/views/members/options.html.erb | 1 + db/migrate/20100511165552_user_segments.rb | 1 + 12 files changed, 181 insertions(+), 66 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index eb87f5c2..bfbbf061 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -118,6 +118,8 @@ def email_targets_table_columns(opts={}) @fields = self.class.module_options.fields end + @segment_fields = UserSegment.segment_fields(@fields) + @fields.each do |field| option = UserSegment.fields_options.rassoc(field) @email_targets_table_columns << ActiveTable::StaticHeader.new(option[1], :label => option[0]) if option @@ -169,7 +171,9 @@ def display_targets_table(display = true) handle_table_actions end - @active_table_output = email_targets_table_generate params, :per_page => 25, :conditions => 'client_user_id IS NULL', :order => self.class.module_options.order_by + @active_table_output = email_targets_table_generate params, self.class.module_options.order_options.merge(:per_page => 25, :conditions => 'client_user_id IS NULL') + + @handlers_data = UserSegment.get_handlers_data(@active_table_output.data(&:id), @segment_fields) if display @update_tags = true @@ -244,7 +248,7 @@ def self.module_options(vals=nil) end class Options < HashModel - attributes :fields => [], :order_by => 'created_at DESC' + attributes :fields => [], :order_by => 'created', :order_direction => 'DESC' def validate if self.fields @@ -254,6 +258,15 @@ def validate if self.order_by self.errors.add(:order_by, 'is invalid') unless UserSegment.order_by_options.rassoc(self.order_by) end + + if self.order_direction + self.errors.add(:order_direction, 'is invalid') unless UserSegment.order_direction_options.include?(self.order_direction) + end + end + + def order_options + sort_field = UserSegment::FieldHandler.sortable_fields[self.order_by.to_sym] + sort_field[:handler].order_options(self.order_by, self.order_direction) end end @@ -267,7 +280,7 @@ def create_segment @builder = UserSegment::OperationBuilder.new nil - @segment = UserSegment.new :main_page => true, :segment_type => 'filtered' + @segment = UserSegment.new :main_page => true, :segment_type => 'filtered', :order_by => 'created', :order_direction => 'DESC' if request.post? && params[:segment] return redirect_to :action => 'index' unless params[:commit] diff --git a/app/models/end_user_cache_segment_field.rb b/app/models/end_user_cache_segment_field.rb index 82c626d4..c859cb42 100644 --- a/app/models/end_user_cache_segment_field.rb +++ b/app/models/end_user_cache_segment_field.rb @@ -8,6 +8,5 @@ def self.user_segment_fields_handler_info } end - register_field :cache, UserSegment::CoreType::MatchType, :field => :data, :name => 'Cache' - + register_field :cache, UserSegment::CoreType::MatchType, :field => :data, :name => 'Cache', :search_only => true end diff --git a/app/models/end_user_segment_field.rb b/app/models/end_user_segment_field.rb index c7768563..c1c06df1 100644 --- a/app/models/end_user_segment_field.rb +++ b/app/models/end_user_segment_field.rb @@ -9,21 +9,62 @@ def self.user_segment_fields_handler_info } end - register_field :email, UserSegment::CoreType::StringType, :name => 'Email' - register_field :gender, EndUserSegmentType::GenderType, :name => 'Gender' - register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'Created' - register_field :registered, UserSegment::CoreType::BooleanType, :name => 'Registered' - register_field :activated, UserSegment::CoreType::BooleanType, :name => 'Activated' - register_field :user_level, UserSegment::CoreType::NumberType, :name => 'User Level' - register_field :dob, UserSegment::CoreType::DateTimeType, :name => 'DOB' - register_field :last_name, UserSegment::CoreType::StringType, :name => 'Last Name' - register_field :first_name, UserSegment::CoreType::StringType, :name => 'First Name' - register_field :source, EndUserSegmentType::SourceType, :name => 'Source' - register_field :lead_source, EndUserSegmentType::LeadSourceType, :name => 'Lead Source' - register_field :registered_at, UserSegment::CoreType::DateTimeType, :name => 'Registered At' - register_field :referrer, UserSegment::CoreType::StringType, :name => 'Referrer' - register_field :username, UserSegment::CoreType::StringType, :name => 'Username' - register_field :introduction, UserSegment::CoreType::StringType, :name => 'Introduction' - register_field :suffix, UserSegment::CoreType::StringType, :name => 'Suffix' + register_field :email, UserSegment::CoreType::StringType, :name => 'Email', :sortable => true + register_field :gender, EndUserSegmentType::GenderType, :name => 'Gender', :sortable => true + register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'Created', :sortable => true + register_field :registered, UserSegment::CoreType::BooleanType, :name => 'Registered', :sortable => true + register_field :activated, UserSegment::CoreType::BooleanType, :name => 'Activated', :sortable => true + register_field :user_level, UserSegment::CoreType::NumberType, :name => 'User Level', :sortable => true + register_field :dob, UserSegment::CoreType::DateTimeType, :name => 'DOB', :sortable => true + register_field :last_name, UserSegment::CoreType::StringType, :name => 'Last Name', :sortable => true + register_field :first_name, UserSegment::CoreType::StringType, :name => 'First Name', :sortable => true + register_field :source, EndUserSegmentType::SourceType, :name => 'Source', :sortable => true + register_field :lead_source, EndUserSegmentType::LeadSourceType, :name => 'Lead Source', :sortable => true + register_field :registered_at, UserSegment::CoreType::DateTimeType, :name => 'Registered At', :sortable => true + register_field :referrer, UserSegment::CoreType::StringType, :name => 'Referrer', :sortable => true + register_field :username, UserSegment::CoreType::StringType, :name => 'Username', :sortable => true + register_field :introduction, UserSegment::CoreType::StringType, :name => 'Introduction', :sortable => true + register_field :suffix, UserSegment::CoreType::StringType, :name => 'Suffix', :sortable => true + def self.order_options(order_by, direction) + field = self.user_segment_fields[order_by.to_sym][:field] + {:order => "end_users.#{field} #{direction}"} + end + + def self.field_display_value(user, field) + display_field = self.user_segment_fields[field.to_sym][:display_field] + + value = t.send(display_field) + if value.is_a?(DomainModel) + value.name + elsif value.is_a?(Time) + value.strftime(DEFAULT_DATETIME_FORMAT.t) + elsif value.nil? + '-' + else + value.to_s + end + end + + def self.get_handler_data(ids, fields) + end + + def self.field_heading(field) + self.user_segment_fields[field][:name] + end + + def self.field_output(user, handler_data, field) + display_field = self.user_segment_fields[field][:display_field] + + value = user.send(display_field) + return nil if value.nil? + + if value.is_a?(DomainModel) + value.name + elsif value.is_a?(Time) + value.strftime(DEFAULT_DATETIME_FORMAT.t) + else + value.to_s + end + end end diff --git a/app/models/end_user_tag_segment_field.rb b/app/models/end_user_tag_segment_field.rb index d9b2e6e4..f2af3b01 100644 --- a/app/models/end_user_tag_segment_field.rb +++ b/app/models/end_user_tag_segment_field.rb @@ -22,5 +22,27 @@ def self.is(cls, field, name) end end - register_field :tag, EndUserTagSegmentField::EndUserTagType, :field => :tag_id, :name => 'Tag' + register_field :tag, EndUserTagSegmentField::EndUserTagType, :field => :tag_id, :name => 'Tag', :sortable => true + + def self.order_options(order_by, direction) + {:include => [:end_user_tags, :tags], :order => "tags.name #{direction}"} + end + + def self.field_heading(field) + self.user_segment_fields[field][:name] + end + + def self.get_handler_data(ids, fields) + EndUserTag.find(:all, :include => 'tag', :conditions => {:end_user_id => ids}).group_by(&:end_user_id) + end + + def self.field_output(user, handler_data, field) + return nil unless handler_data[user.id] + + if field == :tag + handler_data[user.id].collect{ |ut| ut.tag.name }.join(', ') + else + nil + end + end end diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 7ea8bc0c..d34d507a 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -10,8 +10,11 @@ class UserSegment < DomainModel validates_presence_of :name validates_presence_of :segment_type validates_presence_of :segment_options_text, :if => Proc.new { |seg| seg.segment_type == 'filtered' } + validates_presence_of :order_by + validates_presence_of :order_direction has_options :segment_type, [['Filtered', 'filtered'], ['Custom', 'custom']] + has_options :order_direction, [['Ascending', 'ASC'], ['Descending', 'DESC']] has_options :status, [['New', 'new'], @@ -28,6 +31,11 @@ def fields self.read_attribute(:fields) || [] end + def before_validation #:nodoc: + self.order_by = 'created_at' if self.order_by.blank? + self.order_direction = 'DESC' if self.order_direction.blank? + end + def validate self.errors.add(:segment_options_text, nil, :message => self.operations.failure_reason) if self.segment_options_text && self.segment_options.nil? end @@ -59,6 +67,12 @@ def order_by=(order) order end + def order_direction=(direction) + self.should_refresh = self.order_direction != direction + self.write_attribute :order_direction, direction + direction + end + def should_refresh @should_refresh end @@ -118,8 +132,9 @@ def sort_ids(ids) self.user_segment_caches.delete_all - self.order_by = 'created_at DESC' unless self.order_by - ids = EndUser.find(:all, :select => 'id', :conditions => {:id => ids, :client_user_id => nil}, :order => self.order_by).collect &:id + sort_field = UserSegment::FieldHandler.sortable_fields[self.order_by.to_sym] + scope = EndUser.scoped(sort_field[:handler].order_options(self.order_by, self.order_direction)) + ids = scope.find(:all, :select => 'DISTINCT end_users.id', :conditions => {:id => ids, :client_user_id => nil}).collect &:id num_segements = (ids.length / UserSegmentCache::SIZE) num_segements = num_segements + 1 if (ids.length % UserSegmentCache::SIZE) > 0 @@ -235,11 +250,11 @@ def before_create end def self.fields_options - [['Source', 'source'], ['Date of Birth', 'dob'], ['Gender', 'gender'], ['Created', 'created_at'], ['Registered', 'registered_at'], ['Profile', 'user_class'], ['Tags', 'tag_names']] + UserSegment::FieldHandler.display_fields.collect { |field, info| [info[:handler].field_heading(field), field.to_s] } end def self.order_by_options - [['Created Desc', 'created_at DESC'], ['Created Asc', 'created_at'], ['Email', 'email']] + UserSegment::FieldHandler.sortable_fields.collect { |field, info| [info[:handler].field_heading(field), field.to_s] } end def to_expr @@ -283,5 +298,18 @@ def list_name self.name + ' (Custom)' end end + + def self.segment_fields(fields) + fields.collect { |field| UserSegment::Field.new :field => field } + end + + def self.get_handlers_data(ids, segment_fields) + handlers = {} + segment_fields.each { |sf| handlers[sf.handler_class] ||= []; handlers[sf.handler_class] << sf.model_field } + + data = {} + handlers.each { |handler, fields| data[handler.to_s] = handler.get_handler_data(ids, fields) } + data + end end diff --git a/app/models/user_segment/core_type.rb b/app/models/user_segment/core_type.rb index 8b1aa46d..4dd6a139 100644 --- a/app/models/user_segment/core_type.rb +++ b/app/models/user_segment/core_type.rb @@ -29,42 +29,28 @@ def self.between(cls, field, from, to) end end + @@number_type_operators = ['>', '>=', '=', '<=', '<'] + def self.number_type_operators + @@number_type_operators + end class NumberType < UserSegment::FieldType - register_operation :greater_than, [['Value', :integer]] - - def self.greater_than(cls, field, value) - cls.scoped(:conditions => ["#{field} > ?", value]) - end - - register_operation :greater_than_or_equal_to, [['Value', :integer]] - - def self.greater_than_or_equal_to(cls, field, value) - cls.scoped(:conditions => ["#{field} >= ?", value]) - end - - register_operation :less_than, [['Value', :integer]] - - def self.less_than(cls, field, value) - cls.scoped(:conditions => ["#{field} < ?", value]) - end - - register_operation :less_than_or_equal_to, [['Value', :integer]] + register_operation :is, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]] - def self.less_than_or_equal_to(cls, field, value) - cls.scoped(:conditions => ["#{field} <= ?", value]) + def self.is(cls, field, operator, value) + cls.scoped(:conditions => ["#{field} #{operator} ?", value]) end - register_operation :equals, [['Value', :integer]] + register_operation :sum, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]] - def self.equals(cls, field, value) - cls.scoped(:conditions => ["#{field} = ?", value]) + def self.sum(cls, field, operator, value) + cls.scoped(:select => "SUM(#{field}) as #{field}_sum", :group => field, :having => "#{field}_sum #{operator} #{value}") end - register_operation :is, [['Value', :integer]] + register_operation :average, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]] - def self.is(cls, field, value) - self.equals(cls, field, value) + def self.average(cls, field, operator, value) + cls.scoped(:select => "AVERAGE(#{field}) as #{field}_average", :group => field, :having => "#{field}_average #{operator} #{value}") end end diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index 7f949a58..10a3a890 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -155,4 +155,8 @@ def to_builder(opts={}) end options end + + def field_output(end_user, handler_data) + self.handler_class.field_output(end_user, handler_data, self.field.to_sym) + end end diff --git a/app/models/user_segment/field_handler.rb b/app/models/user_segment/field_handler.rb index 31573821..cf99bf1a 100644 --- a/app/models/user_segment/field_handler.rb +++ b/app/models/user_segment/field_handler.rb @@ -11,9 +11,10 @@ def self.has_field?(field) def self.register_field(field, type, options={}) fields = self.user_segment_fields - fields[field.to_sym] = options.merge(:type => type) + fields[field.to_sym] = options.merge(:type => type, :handler => self) fields[field.to_sym][:name] ||= field.to_s.humanize fields[field.to_sym][:field] ||= field.to_sym + fields[field.to_sym][:display_field] ||= fields[field.to_sym][:field] sing = class << self; self; end sing.send :define_method, :user_segment_fields do @@ -27,4 +28,30 @@ def self.handlers self.get_handler_info(:user_segment, :fields, 'end_user_tag_segment_field')] + self.get_handler_info(:user_segment, :fields)).uniq end + + def self.sortable_fields + fields = {} + self.handlers.each do |handler| + next unless handler[:class].respond_to?(:order_options) + handler[:class].user_segment_fields.each do |field, info| + next unless info[:sortable] + next if fields[field] + fields[field] = info + end + end + fields + end + + def self.display_fields + fields = {} + self.handlers.each do |handler| + next unless handler[:class].respond_to?(:field_output) + handler[:class].user_segment_fields.each do |field, info| + next if info[:search_only] + next if fields[field] + fields[field] = info + end + end + fields + end end diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb index 432fb40a..d6f3b47d 100644 --- a/app/views/members/_segment_form.html.erb +++ b/app/views/members/_segment_form.html.erb @@ -17,6 +17,7 @@ UserSegment = { <%= f.text_field :name %> <%= f.text_area :description, :rows => 3 %> <%= f.select :order_by, UserSegment.order_by_options %> +<%= f.radio_buttons :order_direction, UserSegment.order_direction_select_options %> <%= f.check_boxes :main_page, [['add to quick select list', true]], :single => true %> <%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> diff --git a/app/views/members/_targets_table.rhtml b/app/views/members/_targets_table.rhtml index 1eeba3d7..c952f885 100644 --- a/app/views/members/_targets_table.rhtml +++ b/app/views/members/_targets_table.rhtml @@ -33,19 +33,11 @@ %> - <% if @fields -%> - <% @fields.each do |field| -%> + <% if @segment_fields -%> + <% @segment_fields.each do |field| -%> <%= - value = t.send(field) - if value.is_a?(DomainModel) - "
              " - elsif value.is_a?(Time) - "" - elsif value.nil? - "" - else - "" - end + value = field.field_output(t, @handlers_data[field.handler_class.to_s]) + "" %> <% end -%> <% end -%> diff --git a/app/views/members/options.html.erb b/app/views/members/options.html.erb index 8673c11d..edfc155b 100644 --- a/app/views/members/options.html.erb +++ b/app/views/members/options.html.erb @@ -1,6 +1,7 @@ <% admin_form_for :options, @options do |f| -%> <%= f.select :order_by, UserSegment.order_by_options %> +<%= f.radio_buttons :order_direction, UserSegment.order_direction_select_options %> <%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> <%= f.spacer %> <%= f.cancel_submit_buttons 'Cancel', 'Save' %> diff --git a/db/migrate/20100511165552_user_segments.rb b/db/migrate/20100511165552_user_segments.rb index e372d99e..eda02fe0 100644 --- a/db/migrate/20100511165552_user_segments.rb +++ b/db/migrate/20100511165552_user_segments.rb @@ -13,6 +13,7 @@ def self.up t.text :segment_options t.text :segment_options_text t.string :order_by + t.string :order_direction t.timestamps end From c387a3ed5d829b07f27300b5ec4debb68b8df7a5 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 3 Jun 2010 23:08:32 +0000 Subject: [PATCH 103/139] Can sort on action fields. Fix for member default ordering. --- app/controllers/members_controller.rb | 4 +-- app/models/end_user_action_segment_field.rb | 35 ++++++++++++++++--- app/models/end_user_segment_field.rb | 2 +- app/models/user_segment.rb | 4 +-- app/models/user_segment/field_type.rb | 8 +++-- .../user_subscription_entry_segment_field.rb | 18 ++++++++++ 6 files changed, 60 insertions(+), 11 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index bfbbf061..cd3e4ee0 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -40,10 +40,10 @@ def find_end_users(opts) if self.search_results self.search.users elsif self.segment - pages, users = self.segment.paginate self.search.page, :per_page => 25, :include => [:user_class, :domain_file] + pages, users = self.segment.paginate self.search.page, :per_page => 25 users else - EndUser.find(:all, :conditions => 'client_user_id IS NULL', :include => [:user_class, :domain_file], :offset => opts[:offset], :limit => opts[:limit], :order => opts[:order]) + EndUser.find(:all, :conditions => 'client_user_id IS NULL', :offset => opts[:offset], :limit => opts[:limit], :order => opts[:order], :include => opts[:include], :joins => opts[:joins]) end end diff --git a/app/models/end_user_action_segment_field.rb b/app/models/end_user_action_segment_field.rb index 7888750f..be76f03a 100644 --- a/app/models/end_user_action_segment_field.rb +++ b/app/models/end_user_action_segment_field.rb @@ -8,10 +8,37 @@ def self.user_segment_fields_handler_info } end - register_field :user_action, EndUserActionSegmentType::UserActionType, :field => [:renderer, :action], :name => 'User Actions' - register_field :action, EndUserActionSegmentType::ActionType, :name => 'User Actions: Action' - register_field :renderer, EndUserActionSegmentType::RendererType, :name => 'User Actions: Renderer' + register_field :user_action, EndUserActionSegmentType::UserActionType, :field => [:renderer, :action], :name => 'User Actions', :display_field => :description, :sortable => true + register_field :action, EndUserActionSegmentType::ActionType, :name => 'User Actions: Action', :sortable => true + register_field :renderer, EndUserActionSegmentType::RendererType, :name => 'User Actions: Renderer', :sortable => true register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'User Actions: Created' - register_field :occurred, UserSegment::CoreType::DateTimeType, :field => :action_at, :name => 'User Actions: Occurred' + register_field :occurred, UserSegment::CoreType::DateTimeType, :field => :action_at, :name => 'User Actions: Occurred', :sortable => true + def self.order_options(order_by, direction) + if order_by.to_sym == :user_action + {:include => [:end_user_actions], :order => "end_user_actions.renderer #{direction}, end_user_actions.action #{direction}"} + else + field = self.user_segment_fields[order_by.to_sym][:field] + {:include => [:end_user_actions], :order => "end_user_actions.#{field} #{direction}"} + end + end + + def self.field_heading(field) + self.user_segment_fields[field][:name] + end + + def self.get_handler_data(ids, fields) + EndUserAction.find(:all, :conditions => {:end_user_id => ids}).group_by(&:end_user_id) + end + + def self.field_output(user, handler_data, field) + return nil unless handler_data[user.id] + + display_field = self.user_segment_fields[field][:display_field] + handler_data[user.id].collect do |item| + value = item.send(display_field) + value = value.strftime(DEFAULT_DATETIME_FORMAT.t) if value.is_a?(Time) + value + end.join(', ') + end end diff --git a/app/models/end_user_segment_field.rb b/app/models/end_user_segment_field.rb index c1c06df1..60394061 100644 --- a/app/models/end_user_segment_field.rb +++ b/app/models/end_user_segment_field.rb @@ -9,7 +9,7 @@ def self.user_segment_fields_handler_info } end - register_field :email, UserSegment::CoreType::StringType, :name => 'Email', :sortable => true + register_field :email, UserSegment::CoreType::StringType, :name => 'Email', :sortable => true, :search_only => true register_field :gender, EndUserSegmentType::GenderType, :name => 'Gender', :sortable => true register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'Created', :sortable => true register_field :registered, UserSegment::CoreType::BooleanType, :name => 'Registered', :sortable => true diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index d34d507a..2b2e8558 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -250,11 +250,11 @@ def before_create end def self.fields_options - UserSegment::FieldHandler.display_fields.collect { |field, info| [info[:handler].field_heading(field), field.to_s] } + UserSegment::FieldHandler.display_fields.collect { |field, info| [info[:handler].field_heading(field), field.to_s] }.sort { |a, b| a[0] <=> b[0] } end def self.order_by_options - UserSegment::FieldHandler.sortable_fields.collect { |field, info| [info[:handler].field_heading(field), field.to_s] } + UserSegment::FieldHandler.sortable_fields.collect { |field, info| [info[:handler].field_heading(field), field.to_s] }.sort { |a, b| a[0] <=> b[0] } end def to_expr diff --git a/app/models/user_segment/field_type.rb b/app/models/user_segment/field_type.rb index d38f2d26..26efa133 100644 --- a/app/models/user_segment/field_type.rb +++ b/app/models/user_segment/field_type.rb @@ -77,8 +77,12 @@ def self.convert_to(value, type, opts={}) when :model options = self.model_options(opts) value = value.to_i if options.size > 0 && options[0].is_a?(Array) && options[0][1].is_a?(Integer) - values = options.rassoc(value) - return values[1] if values + if options[0].is_a?(Array) + values = options.rassoc(value) + return values[1] if values + else + return value if options.include?(value) + end end nil diff --git a/app/models/user_subscription_entry_segment_field.rb b/app/models/user_subscription_entry_segment_field.rb index 5acafe90..e3cf2298 100644 --- a/app/models/user_subscription_entry_segment_field.rb +++ b/app/models/user_subscription_entry_segment_field.rb @@ -17,4 +17,22 @@ def self.is(cls, field, id) end register_field :user_subscription_id, UserSubscriptionEntrySegmentField::UserSubscriptionType, :name => 'User Subscription' + + def self.field_heading(field) + self.user_segment_fields[field][:name] + end + + def self.get_handler_data(ids, fields) + UserSubscriptionEntry.find(:all, :include => :user_subscription, :conditions => {:end_user_id => ids}).group_by(&:end_user_id) + end + + def self.field_output(user, handler_data, field) + return nil unless handler_data[user.id] + + if field == :user_subscription_id + handler_data[user.id].collect{ |s| s.user_subscription.name }.join(', ') + else + nil + end + end end From 36240089cd14f02f24dbea46e519bd211324256d Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 4 Jun 2010 13:25:27 +0000 Subject: [PATCH 104/139] Can only sort the Everyone tab by EndUser fields. --- app/controllers/members_controller.rb | 12 ++++++++++-- app/models/user_segment.rb | 8 ++++---- app/models/user_segment/field_handler.rb | 5 +++-- app/views/members/options.html.erb | 4 ++-- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index cd3e4ee0..cac450c4 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -252,11 +252,11 @@ class Options < HashModel def validate if self.fields - self.errors.add(:fields, 'is invalid') if self.fields.find { |f| UserSegment.fields_options.rassoc(f).nil? } + self.errors.add(:fields, 'is invalid') if self.fields.find { |f| self.fields_options.rassoc(f).nil? } end if self.order_by - self.errors.add(:order_by, 'is invalid') unless UserSegment.order_by_options.rassoc(self.order_by) + self.errors.add(:order_by, 'is invalid') unless self.order_by_options.rassoc(self.order_by) end if self.order_direction @@ -268,6 +268,14 @@ def order_options sort_field = UserSegment::FieldHandler.sortable_fields[self.order_by.to_sym] sort_field[:handler].order_options(self.order_by, self.order_direction) end + + def fields_options + UserSegment.fields_options + end + + def order_by_options + UserSegment.order_by_options(:end_user_only => true) + end end def segments diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 2b2e8558..68243bce 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -249,12 +249,12 @@ def before_create self.status = 'new' end - def self.fields_options - UserSegment::FieldHandler.display_fields.collect { |field, info| [info[:handler].field_heading(field), field.to_s] }.sort { |a, b| a[0] <=> b[0] } + def self.fields_options(opts={}) + UserSegment::FieldHandler.display_fields(opts).collect { |field, info| [info[:handler].field_heading(field), field.to_s] }.sort { |a, b| a[0] <=> b[0] } end - def self.order_by_options - UserSegment::FieldHandler.sortable_fields.collect { |field, info| [info[:handler].field_heading(field), field.to_s] }.sort { |a, b| a[0] <=> b[0] } + def self.order_by_options(opts={}) + UserSegment::FieldHandler.sortable_fields(opts).collect { |field, info| [info[:handler].field_heading(field), field.to_s] }.sort { |a, b| a[0] <=> b[0] } end def to_expr diff --git a/app/models/user_segment/field_handler.rb b/app/models/user_segment/field_handler.rb index cf99bf1a..a9da0a0a 100644 --- a/app/models/user_segment/field_handler.rb +++ b/app/models/user_segment/field_handler.rb @@ -29,10 +29,11 @@ def self.handlers self.get_handler_info(:user_segment, :fields)).uniq end - def self.sortable_fields + def self.sortable_fields(opts={}) fields = {} self.handlers.each do |handler| next unless handler[:class].respond_to?(:order_options) + next if opts[:end_user_only] && handler[:domain_model_class] != EndUser handler[:class].user_segment_fields.each do |field, info| next unless info[:sortable] next if fields[field] @@ -42,7 +43,7 @@ def self.sortable_fields fields end - def self.display_fields + def self.display_fields(opts={}) fields = {} self.handlers.each do |handler| next unless handler[:class].respond_to?(:field_output) diff --git a/app/views/members/options.html.erb b/app/views/members/options.html.erb index edfc155b..0ff99be8 100644 --- a/app/views/members/options.html.erb +++ b/app/views/members/options.html.erb @@ -1,8 +1,8 @@ <% admin_form_for :options, @options do |f| -%> -<%= f.select :order_by, UserSegment.order_by_options %> +<%= f.select :order_by, @options.order_by_options %> <%= f.radio_buttons :order_direction, UserSegment.order_direction_select_options %> -<%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> +<%= f.ordered_array :fields, @options.fields_options, :label => 'Fields to Display' %> <%= f.spacer %> <%= f.cancel_submit_buttons 'Cancel', 'Save' %> <% end -%> From d2914cd04c974e86f5e1e4fd511969e74f03bbe4 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 4 Jun 2010 13:57:38 +0000 Subject: [PATCH 105/139] Fix for fetching missing images. Can include additional tables to fetch data from. --- app/controllers/members_controller.rb | 15 +++++++++------ app/models/configuration.rb | 6 +++--- app/models/user_segment.rb | 2 +- app/models/user_segment_cache.rb | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index cac450c4..39fae507 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -36,14 +36,15 @@ def count_end_users(opts) end end - def find_end_users(opts) + def find_end_users(opts={}) if self.search_results self.search.users elsif self.segment - pages, users = self.segment.paginate self.search.page, :per_page => 25 + pages, users = self.segment.paginate self.search.page, :per_page => 25, :include => opts[:include] users else - EndUser.find(:all, :conditions => 'client_user_id IS NULL', :offset => opts[:offset], :limit => opts[:limit], :order => opts[:order], :include => opts[:include], :joins => opts[:joins]) + opts = opts.merge(self.class.module_options.order_options) + EndUser.find(:all, :conditions => 'client_user_id IS NULL', :offset => opts[:offset], :limit => opts[:limit], :order => opts[:order], :include => opts[:include]) end end @@ -171,7 +172,7 @@ def display_targets_table(display = true) handle_table_actions end - @active_table_output = email_targets_table_generate params, self.class.module_options.order_options.merge(:per_page => 25, :conditions => 'client_user_id IS NULL') + @active_table_output = email_targets_table_generate params, :per_page => 25, :include => [:user_class, :domain_file] @handlers_data = UserSegment.get_handlers_data(@active_table_output.data(&:id), @segment_fields) @@ -265,8 +266,10 @@ def validate end def order_options - sort_field = UserSegment::FieldHandler.sortable_fields[self.order_by.to_sym] - sort_field[:handler].order_options(self.order_by, self.order_direction) + info = UserSegment::FieldHandler.sortable_fields(:end_user_only => true)[self.order_by.to_sym] + return {:order => 'created_at DESC'} unless info + field = info[:field] + {:order => "#{field} #{self.order_direction}"} end def fields_options diff --git a/app/models/configuration.rb b/app/models/configuration.rb index 680393d1..24948b06 100644 --- a/app/models/configuration.rb +++ b/app/models/configuration.rb @@ -147,11 +147,11 @@ def self.missing_image(gender=nil) return img if img if gender.to_s == 'm' - img = DomainFile.find_by_id(self.options.missing_male_image_id) + img = DomainFile.find_by_id(self.options.missing_male_image_id) if self.options.missing_male_image_id elsif gender.to_s == 'f' - img = DomainFile.find_by_id(self.options.missing_female_image_id) + img = DomainFile.find_by_id(self.options.missing_female_image_id) if self.options.missing_female_image_id end - img ||= DomainFile.find_by_id(self.options.missing_image_id) + img ||= DomainFile.find_by_id(self.options.missing_image_id) if self.options.missing_image_id DataCache.put_local_cache("missing_image_#{gender}",img) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 68243bce..6a79f652 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -202,7 +202,7 @@ def paginate(page=1, args={}) position = (offset / UserSegmentCache::SIZE).to_i cache = self.user_segment_caches.find_by_position(position) - items = cache ? cache.fetch_users(:offset => (offset % UserSegmentCache::SIZE), :limit => page_size) : [] + items = cache ? cache.fetch_users(:offset => (offset % UserSegmentCache::SIZE), :limit => page_size, :include => args[:include]) : [] [ { :pages => pages, :page => page, diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb index 7e1356ef..fcec8509 100644 --- a/app/models/user_segment_cache.rb +++ b/app/models/user_segment_cache.rb @@ -16,7 +16,7 @@ def before_create def fetch_users(opts={}) ids = opts[:offset] && opts[:limit] ? self.id_list[opts[:offset]..opts[:offset]+opts[:limit]-1] : self.id_list return [] if ! ids || ids.empty? - users_by_id = EndUser.find(:all, :conditions => {:id => ids}).index_by(&:id) + users_by_id = EndUser.find(:all, :conditions => {:id => ids}, :include => opts[:include]).index_by(&:id) ids.map { |id| users_by_id[id] }.compact end From 1405f21183743f22f988ce7fa48edefd45043cc6 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 4 Jun 2010 14:37:11 +0000 Subject: [PATCH 106/139] For user segments return a scope to sort end users by. --- app/models/end_user_action_segment_field.rb | 6 +++--- app/models/end_user_segment_field.rb | 4 ++-- app/models/end_user_tag_segment_field.rb | 4 ++-- app/models/user_segment.rb | 10 ++++++++-- app/models/user_segment/field_handler.rb | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/models/end_user_action_segment_field.rb b/app/models/end_user_action_segment_field.rb index be76f03a..9441fd66 100644 --- a/app/models/end_user_action_segment_field.rb +++ b/app/models/end_user_action_segment_field.rb @@ -14,12 +14,12 @@ def self.user_segment_fields_handler_info register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'User Actions: Created' register_field :occurred, UserSegment::CoreType::DateTimeType, :field => :action_at, :name => 'User Actions: Occurred', :sortable => true - def self.order_options(order_by, direction) + def self.sort_scope(order_by, direction) if order_by.to_sym == :user_action - {:include => [:end_user_actions], :order => "end_user_actions.renderer #{direction}, end_user_actions.action #{direction}"} + EndUserAction.scoped :order => "renderer #{direction}, action #{direction}" else field = self.user_segment_fields[order_by.to_sym][:field] - {:include => [:end_user_actions], :order => "end_user_actions.#{field} #{direction}"} + EndUserAction.scoped :order => "#{field} #{direction}" end end diff --git a/app/models/end_user_segment_field.rb b/app/models/end_user_segment_field.rb index 60394061..9c992d59 100644 --- a/app/models/end_user_segment_field.rb +++ b/app/models/end_user_segment_field.rb @@ -26,9 +26,9 @@ def self.user_segment_fields_handler_info register_field :introduction, UserSegment::CoreType::StringType, :name => 'Introduction', :sortable => true register_field :suffix, UserSegment::CoreType::StringType, :name => 'Suffix', :sortable => true - def self.order_options(order_by, direction) + def self.sort_scope(order_by, direction) field = self.user_segment_fields[order_by.to_sym][:field] - {:order => "end_users.#{field} #{direction}"} + EndUser.scoped :order => "end_users.#{field} #{direction}" end def self.field_display_value(user, field) diff --git a/app/models/end_user_tag_segment_field.rb b/app/models/end_user_tag_segment_field.rb index f2af3b01..0b1793d6 100644 --- a/app/models/end_user_tag_segment_field.rb +++ b/app/models/end_user_tag_segment_field.rb @@ -24,8 +24,8 @@ def self.is(cls, field, name) register_field :tag, EndUserTagSegmentField::EndUserTagType, :field => :tag_id, :name => 'Tag', :sortable => true - def self.order_options(order_by, direction) - {:include => [:end_user_tags, :tags], :order => "tags.name #{direction}"} + def self.sort_scope(order_by, direction) + EndUserTag.scoped :joins => :tag, :order => "tags.name #{direction}" end def self.field_heading(field) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 6a79f652..8e39a434 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -132,9 +132,15 @@ def sort_ids(ids) self.user_segment_caches.delete_all + # remove client users + ids = EndUser.find(:all, :select => 'id', :conditions => {:id => ids, :client_user_id => nil}).collect &:id + sort_field = UserSegment::FieldHandler.sortable_fields[self.order_by.to_sym] - scope = EndUser.scoped(sort_field[:handler].order_options(self.order_by, self.order_direction)) - ids = scope.find(:all, :select => 'DISTINCT end_users.id', :conditions => {:id => ids, :client_user_id => nil}).collect &:id + scope = sort_field[:handler].sort_scope(self.order_by, self.order_direction) + end_user_field = sort_field[:handler].user_segment_fields_handler_info[:end_user_field] || :end_user_id + sorted_ids = scope.find(:all, :select => "DISTINCT #{end_user_field}", :conditions => {end_user_field => ids}).collect &end_user_field + + ids = sorted_ids + (ids - sorted_ids) num_segements = (ids.length / UserSegmentCache::SIZE) num_segements = num_segements + 1 if (ids.length % UserSegmentCache::SIZE) > 0 diff --git a/app/models/user_segment/field_handler.rb b/app/models/user_segment/field_handler.rb index a9da0a0a..80295bd5 100644 --- a/app/models/user_segment/field_handler.rb +++ b/app/models/user_segment/field_handler.rb @@ -32,7 +32,7 @@ def self.handlers def self.sortable_fields(opts={}) fields = {} self.handlers.each do |handler| - next unless handler[:class].respond_to?(:order_options) + next unless handler[:class].respond_to?(:sort_scope) next if opts[:end_user_only] && handler[:domain_model_class] != EndUser handler[:class].user_segment_fields.each do |field, info| next unless info[:sortable] From 8857fbf3fcbc7bdb80192fde4ac30cd256de09a1 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 4 Jun 2010 16:31:19 +0000 Subject: [PATCH 107/139] Added the group by field to all field type functions. --- app/models/end_user_action_segment_type.rb | 6 +-- app/models/end_user_segment_type.rb | 6 +-- app/models/end_user_tag_segment_field.rb | 2 +- app/models/user_segment.rb | 3 ++ app/models/user_segment/core_type.rb | 44 ++++++++++++++----- app/models/user_segment/field.rb | 9 +++- .../user_subscription_entry_segment_field.rb | 2 +- 7 files changed, 50 insertions(+), 22 deletions(-) diff --git a/app/models/end_user_action_segment_type.rb b/app/models/end_user_action_segment_type.rb index 867854cc..89a9efe0 100644 --- a/app/models/end_user_action_segment_type.rb +++ b/app/models/end_user_action_segment_type.rb @@ -10,7 +10,7 @@ def self.select_options register_operation :is, [['Action', :model, {:class => EndUserActionSegmentType::UserActionType}]] - def self.is(cls, field, path) + def self.is(cls, group_field, field, path) path = path.split('/') cls.scoped(:conditions => ["#{field[0]} = ? and #{field[1]} = ?", path[0..-2].join('/'), path[-1]]) end @@ -24,7 +24,7 @@ def self.select_options register_operation :is, [['Action', :model, {:class => EndUserActionSegmentType::ActionType}]] - def self.is(cls, field, action) + def self.is(cls, group_field, field, action) cls.scoped(:conditions => ["#{field} = ?", action]) end end @@ -37,7 +37,7 @@ def self.select_options register_operation :is, [['Renderer', :model, {:class => EndUserActionSegmentType::RendererType}]] - def self.is(cls, field, renderer) + def self.is(cls, group_field, field, renderer) cls.scoped(:conditions => ["#{field} = ?", renderer]) end end diff --git a/app/models/end_user_segment_type.rb b/app/models/end_user_segment_type.rb index 0f7ec16c..ea6a4319 100644 --- a/app/models/end_user_segment_type.rb +++ b/app/models/end_user_segment_type.rb @@ -8,7 +8,7 @@ def self.gender_options register_operation :is, [['Gender', :option, {:options => EndUserSegmentType::GenderType.gender_options, :form_field => 'radio_buttons'}]] - def self.is(cls, field, gender) + def self.is(cls, group_field, field, gender) cls.scoped(:conditions => ["#{field} = ?", gender]) end end @@ -20,7 +20,7 @@ def self.select_options register_operation :is, [['Source', :model, {:class => EndUserSegmentType::SourceType}]] - def self.is(cls, field, source) + def self.is(cls, group_field, field, source) cls.scoped(:conditions => ["#{field} = ?", source]) end end @@ -32,7 +32,7 @@ def self.select_options register_operation :is, [['Lead Source', :model, {:class => EndUserSegmentType::LeadSourceType}]] - def self.is(cls, field, source) + def self.is(cls, group_field, field, source) cls.scoped(:conditions => ["#{field} = ?", source]) end end diff --git a/app/models/end_user_tag_segment_field.rb b/app/models/end_user_tag_segment_field.rb index 0b1793d6..ef805f8a 100644 --- a/app/models/end_user_tag_segment_field.rb +++ b/app/models/end_user_tag_segment_field.rb @@ -15,7 +15,7 @@ def self.select_options Tag.find(:all, :select => 'name').collect(&:name).sort.collect { |name| [name, name] } end - def self.is(cls, field, name) + def self.is(cls, group_field, field, name) tg = Tag.find_by_name name id = tg ? tg.id : 0 cls.scoped(:conditions => ["#{field} = ?", id]) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 8e39a434..1aacedb1 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -135,6 +135,9 @@ def sort_ids(ids) # remove client users ids = EndUser.find(:all, :select => 'id', :conditions => {:id => ids, :client_user_id => nil}).collect &:id + self.order_by ||= 'created' + self.order_direction ||= 'DESC' + sort_field = UserSegment::FieldHandler.sortable_fields[self.order_by.to_sym] scope = sort_field[:handler].sort_scope(self.order_by, self.order_direction) end_user_field = sort_field[:handler].user_segment_fields_handler_info[:end_user_field] || :end_user_id diff --git a/app/models/user_segment/core_type.rb b/app/models/user_segment/core_type.rb index 4dd6a139..677323ea 100644 --- a/app/models/user_segment/core_type.rb +++ b/app/models/user_segment/core_type.rb @@ -10,21 +10,21 @@ def self.datetime_format_options class DateTimeType < UserSegment::FieldType register_operation :before, [['Value', :integer], ['Format', :option, {:options => UserSegment::CoreType.datetime_format_options, :description => 'ago'}]] - def self.before(cls, field, value, format) + def self.before(cls, group_field, field, value, format) time = value.send(format).ago cls.scoped(:conditions => ["#{field} <= ?", time]) end register_operation :since, [['Value', :integer], ['Format', :option, {:options => UserSegment::CoreType.datetime_format_options, :description => 'ago'}]] - def self.since(cls, field, value, format) + def self.since(cls, group_field, field, value, format) time = value.send(format).ago cls.scoped(:conditions => ["#{field} >= ?", time]) end register_operation :between, [['From', :datetime], ['To', :datetime]] - def self.between(cls, field, from, to) + def self.between(cls, group_field, field, from, to) cls.scoped(:conditions => ["#{field} between ? and ?", from, to]) end end @@ -37,33 +37,53 @@ def self.number_type_operators class NumberType < UserSegment::FieldType register_operation :is, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]] - def self.is(cls, field, operator, value) + def self.is(cls, group_field, field, operator, value) cls.scoped(:conditions => ["#{field} #{operator} ?", value]) end register_operation :sum, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]] - def self.sum(cls, field, operator, value) - cls.scoped(:select => "SUM(#{field}) as #{field}_sum", :group => field, :having => "#{field}_sum #{operator} #{value}") + def self.sum(cls, group_field, field, operator, value) + cls.scoped(:select => "SUM(#{field}) as #{field}_sum", :group => group_field, :having => "#{field}_sum #{operator} #{value}") end register_operation :average, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]] - def self.average(cls, field, operator, value) - cls.scoped(:select => "AVERAGE(#{field}) as #{field}_average", :group => field, :having => "#{field}_average #{operator} #{value}") + def self.average(cls, group_field, field, operator, value) + cls.scoped(:select => "AVERAGE(#{field}) as #{field}_average", :group => group_field, :having => "#{field}_average #{operator} #{value}") + end + + register_operation :min, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]] + + def self.min(cls, group_field, field, operator, value) + cls.scoped(:select => "MIN(#{field}) as #{field}_min", :group => group_field, :having => "#{field}_min #{operator} #{value}") + end + + register_operation :max, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]] + + def self.max(cls, group_field, field, operator, value) + cls.scoped(:select => "MAX(#{field}) as #{field}_max", :group => group_field, :having => "#{field}_max #{operator} #{value}") + end + end + + class CountType < UserSegment::FieldType + register_operation :count, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]] + + def self.count(cls, group_field, field, operator, value) + cls.scoped(:select => "COUNT(#{field}) as #{field}_count", :group => group_field, :having => "#{field}_count #{operator} #{value}") end end class StringType < UserSegment::FieldType register_operation :like, [['String', :string]], :description => 'use % for wild card matches' - def self.like(cls, field, string) + def self.like(cls, group_field, field, string) cls.scoped(:conditions => ["#{field} like ?", string]) end register_operation :is, [['String', :string]], :description => 'exact match' - def self.is(cls, field, string) + def self.is(cls, group_field, field, string) cls.scoped(:conditions => ["#{field} = ?", string]) end end @@ -71,7 +91,7 @@ def self.is(cls, field, string) class BooleanType < UserSegment::FieldType register_operation :is, [['Boolean', :boolean]] - def self.is(cls, field, string) + def self.is(cls, group_field, field, string) cls.scoped(:conditions => ["#{field} = ?", string]) end end @@ -79,7 +99,7 @@ def self.is(cls, field, string) class MatchType < UserSegment::FieldType register_operation :search, [['Query', :string]], :description => 'full text search' - def self.search(cls, field, query) + def self.search(cls, group_field, field, query) cls.scoped(:conditions => ["MATCH (#{field}) AGAINST (?)", query]) end end diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index 10a3a890..0a1dda78 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -55,13 +55,18 @@ def count def end_user_ids(ids=nil) scope = self.get_scope scope = scope.scoped(:conditions => {self.end_user_field => ids}) if ids - scope.find(:all, :select => self.end_user_field).collect &self.end_user_field + + # this is because scopes do not combine selects + select = self.end_user_field.to_s + select += ", #{scope.proxy_options[:select]}" if scope.proxy_options[:select] + + scope.find(:all, :select => select).collect &self.end_user_field end def get_scope(scope=nil) return @scope if @scope scope ||= self.domain_model_class - @scope = self.type_class.send(self.operation, scope, self.model_field, *self.converted_arguments) + @scope = self.type_class.send(self.operation, scope, self.end_user_field, self.model_field, *self.converted_arguments) @scope = self.child_field.get_scope(@scope) if self.child_field @scope end diff --git a/app/models/user_subscription_entry_segment_field.rb b/app/models/user_subscription_entry_segment_field.rb index e3cf2298..b44606ec 100644 --- a/app/models/user_subscription_entry_segment_field.rb +++ b/app/models/user_subscription_entry_segment_field.rb @@ -11,7 +11,7 @@ def self.user_segment_fields_handler_info class UserSubscriptionType < UserSegment::FieldType register_operation :is, [['User Subscription', :model, {:class => UserSubscription}]] - def self.is(cls, field, id) + def self.is(cls, group_field, field, id) cls.scoped(:conditions => ["#{field} = ?", id]) end end From 42caede06961e3a59b7f21d9ccde0cb040f40d02 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 4 Jun 2010 19:16:42 +0000 Subject: [PATCH 108/139] Can specify additional display methods. --- app/controllers/members_controller.rb | 8 ++-- app/models/end_user_action_segment_field.rb | 11 +---- app/models/end_user_segment_field.rb | 32 +------------ app/models/end_user_tag_segment_field.rb | 14 +----- app/models/user_segment.rb | 9 +++- app/models/user_segment/field_handler.rb | 25 +++++++++- app/models/user_segment/field_type.rb | 48 +++++++++++++++++++ .../user_subscription_entry_segment_field.rb | 9 +--- app/views/members/_targets_table.rhtml | 8 ++-- 9 files changed, 93 insertions(+), 71 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 39fae507..42458e59 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -119,11 +119,9 @@ def email_targets_table_columns(opts={}) @fields = self.class.module_options.fields end - @segment_fields = UserSegment.segment_fields(@fields) - @fields.each do |field| - option = UserSegment.fields_options.rassoc(field) - @email_targets_table_columns << ActiveTable::StaticHeader.new(option[1], :label => option[0]) if option + info = UserSegment::FieldHandler.display_fields[field.to_sym] + @email_targets_table_columns << ActiveTable::StaticHeader.new(field, :label => info[:handler].field_heading(field.to_sym)) if info end @email_targets_table_columns @@ -174,7 +172,7 @@ def display_targets_table(display = true) @active_table_output = email_targets_table_generate params, :per_page => 25, :include => [:user_class, :domain_file] - @handlers_data = UserSegment.get_handlers_data(@active_table_output.data(&:id), @segment_fields) + @handlers_data = UserSegment.get_handlers_data(@active_table_output.data(&:id), @fields) if display @update_tags = true diff --git a/app/models/end_user_action_segment_field.rb b/app/models/end_user_action_segment_field.rb index 9441fd66..78f25450 100644 --- a/app/models/end_user_action_segment_field.rb +++ b/app/models/end_user_action_segment_field.rb @@ -8,7 +8,7 @@ def self.user_segment_fields_handler_info } end - register_field :user_action, EndUserActionSegmentType::UserActionType, :field => [:renderer, :action], :name => 'User Actions', :display_field => :description, :sortable => true + register_field :user_action, EndUserActionSegmentType::UserActionType, :field => [:renderer, :action], :name => 'User Actions', :display_field => :description, :sortable => true, :display_field => :description register_field :action, EndUserActionSegmentType::ActionType, :name => 'User Actions: Action', :sortable => true register_field :renderer, EndUserActionSegmentType::RendererType, :name => 'User Actions: Renderer', :sortable => true register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'User Actions: Created' @@ -32,13 +32,6 @@ def self.get_handler_data(ids, fields) end def self.field_output(user, handler_data, field) - return nil unless handler_data[user.id] - - display_field = self.user_segment_fields[field][:display_field] - handler_data[user.id].collect do |item| - value = item.send(display_field) - value = value.strftime(DEFAULT_DATETIME_FORMAT.t) if value.is_a?(Time) - value - end.join(', ') + UserSegment::FieldType.field_output(user, handler_data, field) end end diff --git a/app/models/end_user_segment_field.rb b/app/models/end_user_segment_field.rb index 9c992d59..9d7a379f 100644 --- a/app/models/end_user_segment_field.rb +++ b/app/models/end_user_segment_field.rb @@ -31,40 +31,10 @@ def self.sort_scope(order_by, direction) EndUser.scoped :order => "end_users.#{field} #{direction}" end - def self.field_display_value(user, field) - display_field = self.user_segment_fields[field.to_sym][:display_field] - - value = t.send(display_field) - if value.is_a?(DomainModel) - value.name - elsif value.is_a?(Time) - value.strftime(DEFAULT_DATETIME_FORMAT.t) - elsif value.nil? - '-' - else - value.to_s - end - end - def self.get_handler_data(ids, fields) end - def self.field_heading(field) - self.user_segment_fields[field][:name] - end - def self.field_output(user, handler_data, field) - display_field = self.user_segment_fields[field][:display_field] - - value = user.send(display_field) - return nil if value.nil? - - if value.is_a?(DomainModel) - value.name - elsif value.is_a?(Time) - value.strftime(DEFAULT_DATETIME_FORMAT.t) - else - value.to_s - end + UserSegment::FieldType.field_output(user, handler_data, field) end end diff --git a/app/models/end_user_tag_segment_field.rb b/app/models/end_user_tag_segment_field.rb index ef805f8a..49001085 100644 --- a/app/models/end_user_tag_segment_field.rb +++ b/app/models/end_user_tag_segment_field.rb @@ -22,27 +22,17 @@ def self.is(cls, group_field, field, name) end end - register_field :tag, EndUserTagSegmentField::EndUserTagType, :field => :tag_id, :name => 'Tag', :sortable => true + register_field :tag, EndUserTagSegmentField::EndUserTagType, :field => :tag_id, :name => 'Tag', :sortable => true, :display_field => :tag def self.sort_scope(order_by, direction) EndUserTag.scoped :joins => :tag, :order => "tags.name #{direction}" end - def self.field_heading(field) - self.user_segment_fields[field][:name] - end - def self.get_handler_data(ids, fields) EndUserTag.find(:all, :include => 'tag', :conditions => {:end_user_id => ids}).group_by(&:end_user_id) end def self.field_output(user, handler_data, field) - return nil unless handler_data[user.id] - - if field == :tag - handler_data[user.id].collect{ |ut| ut.tag.name }.join(', ') - else - nil - end + UserSegment::FieldType.field_output(user, handler_data, field) end end diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 1aacedb1..b905789c 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -312,9 +312,14 @@ def self.segment_fields(fields) fields.collect { |field| UserSegment::Field.new :field => field } end - def self.get_handlers_data(ids, segment_fields) + def self.get_handlers_data(ids, fields) handlers = {} - segment_fields.each { |sf| handlers[sf.handler_class] ||= []; handlers[sf.handler_class] << sf.model_field } + fields.each do |field| + info = UserSegment::FieldHandler.display_fields[field.to_sym] + next unless info + handlers[info[:handler]] ||= [] + handlers[info[:handler]] << field.to_sym + end data = {} handlers.each { |handler, fields| data[handler.to_s] = handler.get_handler_data(ids, fields) } diff --git a/app/models/user_segment/field_handler.rb b/app/models/user_segment/field_handler.rb index 80295bd5..a0690c25 100644 --- a/app/models/user_segment/field_handler.rb +++ b/app/models/user_segment/field_handler.rb @@ -30,6 +30,9 @@ def self.handlers end def self.sortable_fields(opts={}) + key = 'user_segment_sortable_fields_' + opts.to_s + return DataCache.local_cache(key) if DataCache.local_cache(key) + fields = {} self.handlers.each do |handler| next unless handler[:class].respond_to?(:sort_scope) @@ -40,10 +43,14 @@ def self.sortable_fields(opts={}) fields[field] = info end end - fields + + DataCache.put_local_cache(key, fields) end def self.display_fields(opts={}) + key = 'user_segment_display_fields_' + opts.to_s + return DataCache.local_cache(key) if DataCache.local_cache(key) + fields = {} self.handlers.each do |handler| next unless handler[:class].respond_to?(:field_output) @@ -51,8 +58,22 @@ def self.display_fields(opts={}) next if info[:search_only] next if fields[field] fields[field] = info + + if info[:display_methods] + info[:display_methods].each do |name, method| + field_method = "#{field}_#{method}".to_sym + fields[field_method] = info.merge(:base_field => field, :display_method => method, :name => "#{info[:name]} #{name}") unless fields[field_method] + end + end end end - fields + + DataCache.put_local_cache(key, fields) + end + + def self.field_heading(field) + info = self.display_fields[field] + return '' unless info + info[:name] end end diff --git a/app/models/user_segment/field_type.rb b/app/models/user_segment/field_type.rb index 26efa133..47390a58 100644 --- a/app/models/user_segment/field_type.rb +++ b/app/models/user_segment/field_type.rb @@ -97,4 +97,52 @@ def self.convert_arguments(arguments, types, options) self.convert_to(arguments[idx], types[idx], options[idx]) end end + + def self.field_output(mdl, handler_data, field) + info = UserSegment::FieldHandler.display_fields[field] + return nil unless info + + display_field = info[:display_field] + + value = nil + if handler_data.nil? + return nil unless mdl.respond_to?(display_field) + value = mdl.send(display_field) + else + return nil unless handler_data[mdl.id] + + data = handler_data[mdl.id] + if data.is_a?(Array) + value = data.collect { |d| d.send(display_field) } + + case info[:display_method] + when 'max' + value = value.max + when 'min' + value = value.min + when 'sum' + value = value.inject(0) { |a,b| a + b } + when 'average' + value = value.inject(0) { |a,b| a + b } / value.size + when 'count' + value = value.size + end + + if value.is_a?(Array) + value = value.collect do |v| + v = v.strftime(DEFAULT_DATETIME_FORMAT.t) if v.is_a?(Time) + v = v.name if v.is_a?(DomainModel) + v + end + value = value.join(', ') + end + else + value = data.send(display_field) + end + end + + value = value.strftime(DEFAULT_DATETIME_FORMAT.t) if value.is_a?(Time) + value = value.name if value.is_a?(DomainModel) + value + end end diff --git a/app/models/user_subscription_entry_segment_field.rb b/app/models/user_subscription_entry_segment_field.rb index b44606ec..48aa0ffb 100644 --- a/app/models/user_subscription_entry_segment_field.rb +++ b/app/models/user_subscription_entry_segment_field.rb @@ -16,6 +16,7 @@ def self.is(cls, group_field, field, id) end end + register_field :num_subscription, UserSegment::CoreType::CountType, :field => :end_user_id, :name => '# Subscriptions', :display_method => 'count' register_field :user_subscription_id, UserSubscriptionEntrySegmentField::UserSubscriptionType, :name => 'User Subscription' def self.field_heading(field) @@ -27,12 +28,6 @@ def self.get_handler_data(ids, fields) end def self.field_output(user, handler_data, field) - return nil unless handler_data[user.id] - - if field == :user_subscription_id - handler_data[user.id].collect{ |s| s.user_subscription.name }.join(', ') - else - nil - end + UserSegment::FieldType.field_output(user, handler_data, field) end end diff --git a/app/views/members/_targets_table.rhtml b/app/views/members/_targets_table.rhtml index c952f885..07f6a798 100644 --- a/app/views/members/_targets_table.rhtml +++ b/app/views/members/_targets_table.rhtml @@ -33,10 +33,12 @@ %> - <% if @segment_fields -%> - <% @segment_fields.each do |field| -%> + <% if @fields -%> + <% @fields.each do |field| -%> <%= - value = field.field_output(t, @handlers_data[field.handler_class.to_s]) + info = UserSegment::FieldHandler.display_fields[field.to_sym] + next unless info + value = info[:handler].field_output(t, @handlers_data[info[:handler].to_s], field.to_sym) "" %> <% end -%> From 31c3c4268bdeb49e060b2d5ec033d7d35be6b40e Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 4 Jun 2010 19:53:03 +0000 Subject: [PATCH 109/139] Must specify full name of additional methods. --- app/models/user_segment/field_handler.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user_segment/field_handler.rb b/app/models/user_segment/field_handler.rb index a0690c25..f6c0b6a6 100644 --- a/app/models/user_segment/field_handler.rb +++ b/app/models/user_segment/field_handler.rb @@ -62,7 +62,7 @@ def self.display_fields(opts={}) if info[:display_methods] info[:display_methods].each do |name, method| field_method = "#{field}_#{method}".to_sym - fields[field_method] = info.merge(:base_field => field, :display_method => method, :name => "#{info[:name]} #{name}") unless fields[field_method] + fields[field_method] = info.merge(:base_field => field, :display_method => method, :name => name) unless fields[field_method] end end end From b52593722156212abdb0826992e1475896db325d Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 4 Jun 2010 20:24:21 +0000 Subject: [PATCH 110/139] Can specify sort methods. --- app/models/user_segment.rb | 3 ++- app/models/user_segment/field_handler.rb | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index b905789c..b391e1d4 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -141,7 +141,8 @@ def sort_ids(ids) sort_field = UserSegment::FieldHandler.sortable_fields[self.order_by.to_sym] scope = sort_field[:handler].sort_scope(self.order_by, self.order_direction) end_user_field = sort_field[:handler].user_segment_fields_handler_info[:end_user_field] || :end_user_id - sorted_ids = scope.find(:all, :select => "DISTINCT #{end_user_field}", :conditions => {end_user_field => ids}).collect &end_user_field + scope = scope.scoped(:select => "DISTINCT #{end_user_field}") unless scope.proxy_options[:select] + sorted_ids = scope.find(:all, :conditions => {end_user_field => ids}).collect &end_user_field ids = sorted_ids + (ids - sorted_ids) diff --git a/app/models/user_segment/field_handler.rb b/app/models/user_segment/field_handler.rb index f6c0b6a6..e3e96891 100644 --- a/app/models/user_segment/field_handler.rb +++ b/app/models/user_segment/field_handler.rb @@ -41,6 +41,13 @@ def self.sortable_fields(opts={}) next unless info[:sortable] next if fields[field] fields[field] = info + + if info[:sort_methods] + info[:sort_methods].each do |name, method| + field_method = "#{field}_#{method}".to_sym + fields[field_method] = info.merge(:base_field => field, :sort_method => method, :name => name) unless fields[field_method] + end + end end end From 4ab0f2f7200ea1d630d6fdc2104a0c7771c7e2ae Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 4 Jun 2010 20:43:06 +0000 Subject: [PATCH 111/139] Fixed rspecs for user segments. --- app/models/user_segment.rb | 2 +- spec/models/user_segment/core_type_spec.rb | 62 +++++++++++----------- spec/models/user_segment_spec.rb | 3 +- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index b391e1d4..6a2b5ee1 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -32,7 +32,7 @@ def fields end def before_validation #:nodoc: - self.order_by = 'created_at' if self.order_by.blank? + self.order_by = 'created' if self.order_by.blank? self.order_direction = 'DESC' if self.order_direction.blank? end diff --git a/spec/models/user_segment/core_type_spec.rb b/spec/models/user_segment/core_type_spec.rb index 1f976ab0..4f327349 100644 --- a/spec/models/user_segment/core_type_spec.rb +++ b/spec/models/user_segment/core_type_spec.rb @@ -14,21 +14,21 @@ end it "should return users using before" do - @type.before(EndUser, :created_at, 1, 'day').count.should == 2 - @type.before(EndUser, :created_at, 3, 'days').count.should == 1 - @type.before(EndUser, :created_at, 6, 'days').count.should == 0 + @type.before(EndUser, :id, :created_at, 1, 'day').count.should == 2 + @type.before(EndUser, :id, :created_at, 3, 'days').count.should == 1 + @type.before(EndUser, :id, :created_at, 6, 'days').count.should == 0 end it "should return users using since" do - @type.since(EndUser, :created_at, 1, 'day').count.should == 1 - @type.since(EndUser, :created_at, 3, 'days').count.should == 2 - @type.since(EndUser, :created_at, 6, 'days').count.should == 3 + @type.since(EndUser, :id, :created_at, 1, 'day').count.should == 1 + @type.since(EndUser, :id, :created_at, 3, 'days').count.should == 2 + @type.since(EndUser, :id, :created_at, 6, 'days').count.should == 3 end it "should return users using between" do - @type.between(EndUser, :created_at, 1.day.ago, Time.now).count.should == 1 - @type.between(EndUser, :created_at, 3.day.ago, Time.now).count.should == 2 - @type.between(EndUser, :created_at, 6.day.ago, Time.now).count.should == 3 + @type.between(EndUser, :id, :created_at, 1.day.ago, Time.now).count.should == 1 + @type.between(EndUser, :id, :created_at, 3.day.ago, Time.now).count.should == 2 + @type.between(EndUser, :id, :created_at, 6.day.ago, Time.now).count.should == 3 end end @@ -43,34 +43,34 @@ end it "should return users using greater_than" do - @type.greater_than(EndUser, :user_level, 2).count.should == 2 - @type.greater_than(EndUser, :user_level, 3).count.should == 0 + @type.is(EndUser, :id, :user_level, '>', 2).count.should == 2 + @type.is(EndUser, :id, :user_level, '>', 3).count.should == 0 end it "should return users using greater_than_or_equal_to" do - @type.greater_than_or_equal_to(EndUser, :user_level, 1).count.should == 4 - @type.greater_than_or_equal_to(EndUser, :user_level, 2).count.should == 3 - @type.greater_than_or_equal_to(EndUser, :user_level, 4).count.should == 0 + @type.is(EndUser, :id, :user_level, '>=', 1).count.should == 4 + @type.is(EndUser, :id, :user_level, '>=', 2).count.should == 3 + @type.is(EndUser, :id, :user_level, '>=', 4).count.should == 0 end it "should return users using less_than" do - @type.less_than(EndUser, :user_level, 1).count.should == 0 - @type.less_than(EndUser, :user_level, 2).count.should == 1 - @type.less_than(EndUser, :user_level, 4).count.should == 4 + @type.is(EndUser, :id, :user_level, '<', 1).count.should == 0 + @type.is(EndUser, :id, :user_level, '<', 2).count.should == 1 + @type.is(EndUser, :id, :user_level, '<', 4).count.should == 4 end it "should return users using less_than_or_equal_to" do - @type.less_than_or_equal_to(EndUser, :user_level, 1).count.should == 1 - @type.less_than_or_equal_to(EndUser, :user_level, 2).count.should == 2 - @type.less_than_or_equal_to(EndUser, :user_level, 3).count.should == 4 - @type.less_than_or_equal_to(EndUser, :user_level, 4).count.should == 4 + @type.is(EndUser, :id, :user_level, '<=', 1).count.should == 1 + @type.is(EndUser, :id, :user_level, '<=', 2).count.should == 2 + @type.is(EndUser, :id, :user_level, '<=', 3).count.should == 4 + @type.is(EndUser, :id, :user_level, '<=', 4).count.should == 4 end it "should return users using equals" do - @type.equals(EndUser, :user_level, 1).count.should == 1 - @type.equals(EndUser, :user_level, 2).count.should == 1 - @type.equals(EndUser, :user_level, 3).count.should == 2 - @type.is(EndUser, :user_level, 3).count.should == 2 + @type.is(EndUser, :id, :user_level, '=', 1).count.should == 1 + @type.is(EndUser, :id, :user_level, '=', 2).count.should == 1 + @type.is(EndUser, :id, :user_level, '=', 3).count.should == 2 + @type.is(EndUser, :id, :user_level, '=', 3).count.should == 2 end end @@ -85,11 +85,11 @@ end it "should return users using like" do - @type.like(EndUser, :email, 'test%@test.dev').count.should == 4 + @type.like(EndUser, :id, :email, 'test%@test.dev').count.should == 4 end it "should return users using is" do - @type.is(EndUser, :email, 'test1@test.dev').count.should == 1 + @type.is(EndUser, :id, :email, 'test1@test.dev').count.should == 1 end end @@ -104,8 +104,8 @@ end it "should return users using is" do - @type.is(EndUser, :activated, true).count.should == 3 - @type.is(EndUser, :activated, false).count.should == 1 + @type.is(EndUser, :id, :activated, true).count.should == 3 + @type.is(EndUser, :id, :activated, false).count.should == 1 end end @@ -120,8 +120,8 @@ end it "should return users using search" do - @type.search(EndUserCache, :data, 'doug').count.should == 1 - @type.search(EndUserCache, :data, 'blah').count.should == 0 + @type.search(EndUserCache, :end_user_id, :data, 'doug').count.should == 1 + @type.search(EndUserCache, :end_user_id, :data, 'blah').count.should == 0 end end end diff --git a/spec/models/user_segment_spec.rb b/spec/models/user_segment_spec.rb index d2d083c9..a2309c18 100644 --- a/spec/models/user_segment_spec.rb +++ b/spec/models/user_segment_spec.rb @@ -212,7 +212,8 @@ @id_list = [@user1.id, @user2.id, @user3.id, @user6.id, @user8.id] @segment.end_user_ids.should == @id_list - @segment.order_by = 'created_at' + @segment.order_by = 'created' + @segment.order_direction = 'ASC' @segment.should_refresh?.should be_true @segment.refresh @segment.end_user_ids.should == @id_list.reverse From bf85fdc2658e87b66929f9932e49897cbba904af Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 7 Jun 2010 14:54:21 +0000 Subject: [PATCH 112/139] Fix bug with scope select. Added a validation check to see if mulitple complex functions have been combined. --- app/models/user_segment/core_type.rb | 20 ++++++++-------- app/models/user_segment/field.rb | 36 +++++++++++++++++++++------- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/app/models/user_segment/core_type.rb b/app/models/user_segment/core_type.rb index 677323ea..e9108252 100644 --- a/app/models/user_segment/core_type.rb +++ b/app/models/user_segment/core_type.rb @@ -41,36 +41,36 @@ def self.is(cls, group_field, field, operator, value) cls.scoped(:conditions => ["#{field} #{operator} ?", value]) end - register_operation :sum, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]] + register_operation :sum, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]], :complex => true def self.sum(cls, group_field, field, operator, value) - cls.scoped(:select => "SUM(#{field}) as #{field}_sum", :group => group_field, :having => "#{field}_sum #{operator} #{value}") + cls.scoped(:select => "#{field}, SUM(#{field}) as #{field}_sum", :group => group_field, :having => "#{field}_sum #{operator} #{value}") end - register_operation :average, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]] + register_operation :average, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]], :complex => true def self.average(cls, group_field, field, operator, value) - cls.scoped(:select => "AVERAGE(#{field}) as #{field}_average", :group => group_field, :having => "#{field}_average #{operator} #{value}") + cls.scoped(:select => "#{field}, AVERAGE(#{field}) as #{field}_average", :group => group_field, :having => "#{field}_average #{operator} #{value}") end - register_operation :min, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]] + register_operation :min, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]], :complex => true def self.min(cls, group_field, field, operator, value) - cls.scoped(:select => "MIN(#{field}) as #{field}_min", :group => group_field, :having => "#{field}_min #{operator} #{value}") + cls.scoped(:select => "#{field}, MIN(#{field}) as #{field}_min", :group => group_field, :having => "#{field}_min #{operator} #{value}") end - register_operation :max, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]] + register_operation :max, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]], :complex => true def self.max(cls, group_field, field, operator, value) - cls.scoped(:select => "MAX(#{field}) as #{field}_max", :group => group_field, :having => "#{field}_max #{operator} #{value}") + cls.scoped(:select => "#{field}, MAX(#{field}) as #{field}_max", :group => group_field, :having => "#{field}_max #{operator} #{value}") end end class CountType < UserSegment::FieldType - register_operation :count, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]] + register_operation :count, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]], :complex => true def self.count(cls, group_field, field, operator, value) - cls.scoped(:select => "COUNT(#{field}) as #{field}_count", :group => group_field, :having => "#{field}_count #{operator} #{value}") + cls.scoped(:select => "#{field}, COUNT(#{field}) as #{field}_count", :group => group_field, :having => "#{field}_count #{operator} #{value}") end end diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index 0a1dda78..84ec7048 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -12,13 +12,16 @@ def failure_reasons; @failure_reasons || []; end def add_error(attr, message) @failure_reasons ||= [] - self.errors.add(attr, message) + self.errors.add(attr, message) unless attr == :complex case attr when :field @failure_reasons << "'#{self.field}' is an invalid field" when :operation @failure_reasons << "'#{self.operation}' is an invalid function on '#{self.field}'" + when :complex + self.errors.add(:operation, 'is invalid') + @failure_reasons << "Too many complex functions combined. Move '#{self.field}.#{self.operation}()' to a new line." when :arguments @failure_reasons << "Arguments #{message} for '#{self.field}.#{self.operation}()'" when :child @@ -45,7 +48,24 @@ def validate end end - self.add_error(:child, 'is invalid') if self.child && self.child_field && ! self.child_field.valid? + if self.child && self.child_field + if self.child_field.valid? + is_complex = self.complex_operation + c = self.child_field + while c + if c.complex_operation + if is_complex + # error + self.add_error(:complex, 'too many') + end + is_complex = true + end + c = c.child_field + end + else + self.add_error(:child, 'is invalid') + end + end end def count @@ -55,12 +75,8 @@ def count def end_user_ids(ids=nil) scope = self.get_scope scope = scope.scoped(:conditions => {self.end_user_field => ids}) if ids - - # this is because scopes do not combine selects - select = self.end_user_field.to_s - select += ", #{scope.proxy_options[:select]}" if scope.proxy_options[:select] - - scope.find(:all, :select => select).collect &self.end_user_field + scope = scope.scoped(:select => self.end_user_field) + scope.find(:all).collect &self.end_user_field end def get_scope(scope=nil) @@ -97,6 +113,10 @@ def operation_info @operation_info ||= self.type_class.user_segment_field_type_operations[self.operation.to_sym] if self.type_class end + def complex_operation + self.operation_info[:complex] if self.operation_info + end + def type_class @type_class ||= self.handler_class.user_segment_fields[self.field.to_sym][:type] if self.handler_class && self.handler_class.user_segment_fields && self.handler_class.user_segment_fields[self.field.to_sym] end From 96dd636e172116a4f498e6cd4c400c2733dc1d08 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 7 Jun 2010 16:15:50 +0000 Subject: [PATCH 113/139] Update specs for segment field types, group by field is required. Commented out has_many site_nodes from site_module. Updated operation builder to check to see if the parent field is complex and only display the available operations. --- app/models/site_module.rb | 2 +- app/models/user_segment/field.rb | 2 +- app/models/user_segment/operation_builder.rb | 18 ++++++++++++++++-- app/views/members/builder_help.html.erb | 3 ++- spec/controllers/members_controller_spec.rb | 2 +- .../end_user_action_segment_type_spec.rb | 6 +++--- spec/models/end_user_segment_type_spec.rb | 12 ++++++------ spec/models/end_user_tag_segment_field_spec.rb | 2 +- spec/models/user_segment/core_type_spec.rb | 2 +- spec/models/user_segment/filter_spec.rb | 8 ++++---- ...er_subscription_entry_segment_field_spec.rb | 2 +- .../spec/models/user_profile_entry_spec.rb | 4 ++++ .../spec/models/user_profile_type_spec.rb | 4 ++++ 13 files changed, 45 insertions(+), 22 deletions(-) diff --git a/app/models/site_module.rb b/app/models/site_module.rb index 238fa8c3..a4c6af86 100644 --- a/app/models/site_module.rb +++ b/app/models/site_module.rb @@ -1,7 +1,7 @@ # Copyright (C) 2009 Pascal Rettig. class SiteModule < DomainModel - has_many :site_nodes, :dependent => :destroy +# has_many :site_nodes, :dependent => :destroy has_many :page_paragraphs, :dependent => :destroy serialize :options diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index 84ec7048..12129794 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -110,7 +110,7 @@ def operation_argument_names end def operation_info - @operation_info ||= self.type_class.user_segment_field_type_operations[self.operation.to_sym] if self.type_class + @operation_info ||= self.type_class.user_segment_field_type_operations[self.operation.to_sym] if self.operation && self.type_class end def complex_operation diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb index b18babe6..505c25ad 100644 --- a/app/models/user_segment/operation_builder.rb +++ b/app/models/user_segment/operation_builder.rb @@ -83,14 +83,28 @@ def user_segment_field @user_segment_field = UserSegment::Field.new :field => self.field, :operation => self.operation, :arguments => self.arguments end + def already_complex + if self.parent && self.parent.condition == 'and' + self.parent.user_segment_field.complex_operation || self.parent.already_complex + else + false + end + end + def operation_options return @operation_options if @operation_options @operation_options = [] + is_complex = self.already_complex + if self.user_segment_field.type_class @operation_options = self.user_segment_field.type_class.user_segment_field_type_operations.collect do |operation, values| - [values[:name], operation.to_s] - end + if is_complex && values[:complex] + nil + else + [values[:name], operation.to_s] + end + end.compact end @operation_options.sort! { |a, b| a[0] <=> b[0] } diff --git a/app/views/members/builder_help.html.erb b/app/views/members/builder_help.html.erb index e858aafc..6bd50a4d 100644 --- a/app/views/members/builder_help.html.erb +++ b/app/views/members/builder_help.html.erb @@ -70,7 +70,7 @@ Ex: created.since(7, "days") - Will return all the user who where
                <% type_class.user_segment_field_type_operations.keys.collect { |key| key.to_s }.sort.each do |key| -%> <% operation = type_class.user_segment_field_type_operations[key.to_sym] -%> -
              • <%= key %>(<%= operation[:argument_names].join(', ') %>) <%= h(' - ' + operation[:description]) if operation[:description] %> +
              • <%= '* ' if operation[:complex] %><%= key %>(<%= operation[:argument_names].join(', ') %>) <%= h(' - ' + operation[:description]) if operation[:description] %>
                  <% operation[:arguments].each_with_index do |arg,idx| -%>
                • <%= operation[:argument_names][idx] %> - <%= arg %> @@ -88,6 +88,7 @@ Ex: created.since(7, "days") - Will return all the user who where
                  • <% end -%>
                +

                * complex functions can not be combined using AND condition


                diff --git a/spec/controllers/members_controller_spec.rb b/spec/controllers/members_controller_spec.rb index 134a4b73..85c82598 100644 --- a/spec/controllers/members_controller_spec.rb +++ b/spec/controllers/members_controller_spec.rb @@ -427,7 +427,7 @@ it "should be able to update options" do mock_editor - post 'options', :commit => 1, :options => {:order_by => 'created_at', :fields => ['gender']} + post 'options', :commit => 1, :options => {:order_by => 'created', :order_direction => 'DESC', :fields => ['gender']} controller.class.module_options.fields.should == ['gender'] end end diff --git a/spec/models/end_user_action_segment_type_spec.rb b/spec/models/end_user_action_segment_type_spec.rb index 5251eafa..61689ea0 100644 --- a/spec/models/end_user_action_segment_type_spec.rb +++ b/spec/models/end_user_action_segment_type_spec.rb @@ -19,7 +19,7 @@ it "should be able to find users" do @type = EndUserActionSegmentType::UserActionType @type.select_options - @type.is(EndUserAction, [:renderer, :action], '/editor/auth/login').count.should == 5 + @type.is(EndUserAction, :end_user_id, [:renderer, :action], '/editor/auth/login').count.should == 5 end end @@ -27,7 +27,7 @@ it "should be able to find users" do @type = EndUserActionSegmentType::ActionType @type.select_options.length.should == 2 - @type.is(EndUserAction, :action, 'login').count.should == 5 + @type.is(EndUserAction, :end_user_id, :action, 'login').count.should == 5 end end @@ -35,7 +35,7 @@ it "should be able to find users" do @type = EndUserActionSegmentType::RendererType @type.select_options.length.should == 1 - @type.is(EndUserAction, :renderer, '/editor/auth').count.should == 8 + @type.is(EndUserAction, :end_user_id, :renderer, '/editor/auth').count.should == 8 end end end diff --git a/spec/models/end_user_segment_type_spec.rb b/spec/models/end_user_segment_type_spec.rb index e9f33d8b..cf7a054e 100644 --- a/spec/models/end_user_segment_type_spec.rb +++ b/spec/models/end_user_segment_type_spec.rb @@ -14,8 +14,8 @@ end it "should return users using based on gender" do - @type.is(EndUser, :gender, 'm').count.should == 1 - @type.is(EndUser, :gender, 'f').count.should == 2 + @type.is(EndUser, :id, :gender, 'm').count.should == 1 + @type.is(EndUser, :id, :gender, 'f').count.should == 2 end end @@ -30,8 +30,8 @@ it "should return users using based on source" do @type.select_options.length.should == 2 - @type.is(EndUser, :source, 'import').count.should == 2 - @type.is(EndUser, :source, 'site').count.should == 1 + @type.is(EndUser, :id, :source, 'import').count.should == 2 + @type.is(EndUser, :id, :source, 'site').count.should == 1 end end @@ -46,8 +46,8 @@ it "should return users using based on lead_source" do @type.select_options.length.should == 2 - @type.is(EndUser, :lead_source, 'import').count.should == 2 - @type.is(EndUser, :lead_source, 'site').count.should == 1 + @type.is(EndUser, :id, :lead_source, 'import').count.should == 2 + @type.is(EndUser, :id, :lead_source, 'site').count.should == 1 end end end diff --git a/spec/models/end_user_tag_segment_field_spec.rb b/spec/models/end_user_tag_segment_field_spec.rb index 71200d1a..83254e61 100644 --- a/spec/models/end_user_tag_segment_field_spec.rb +++ b/spec/models/end_user_tag_segment_field_spec.rb @@ -24,7 +24,7 @@ it "should be able to find user by tag" do @type.select_options.length.should == 8 - @type.is(EndUserTag, :tag_id, 'One').count.should == 2 + @type.is(EndUserTag, :end_user_id, :tag_id, 'One').count.should == 2 end end end diff --git a/spec/models/user_segment/core_type_spec.rb b/spec/models/user_segment/core_type_spec.rb index 4f327349..c96386fd 100644 --- a/spec/models/user_segment/core_type_spec.rb +++ b/spec/models/user_segment/core_type_spec.rb @@ -2,7 +2,7 @@ describe UserSegment::CoreType do - reset_domain_tables :end_users + reset_domain_tables :end_users, :end_user_caches describe "DateTimeType" do before(:each) do diff --git a/spec/models/user_segment/filter_spec.rb b/spec/models/user_segment/filter_spec.rb index a4977736..c68beeed 100644 --- a/spec/models/user_segment/filter_spec.rb +++ b/spec/models/user_segment/filter_spec.rb @@ -91,11 +91,11 @@ @operations = UserSegment::Filter.new options = [ - ['not', {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}, {:field => 'user_level', :operation => 'is', :arguments => [1], :child => nil}], + ['not', {:field => 'created', :operation => 'since', :arguments => [3, 'days'], :child => nil}, {:field => 'user_level', :operation => 'is', :arguments => ['=', 1], :child => nil}], [nil, {:field => 'activated', :operation => 'is', :arguments => [true], :child => nil}] ] code = <<-CODE - not created.since(3, "days") + user_level.is(1) + not created.since(3, "days") + user_level.is("=", 1) activated.is(true) CODE @operations.parse(code).should be_true @@ -103,7 +103,7 @@ @operations.to_a.should == options @operations.end_user_ids.length.should == 1 @operations.end_user_ids.include?(@user6.id).should be_true - @operations.to_expr.should == "not created.since(3, \"days\") + user_level.is(1)\nactivated.is(true)" - @operations.to_builder.should == {:operator => 'not', :condition => 'or', :field => 'created', :operation => 'since', :argument0 => 3, :argument1 => 'days', :child => {:field => 'user_level', :operation => 'is', :argument0 => 1, :condition => 'with', :child => {:operator => nil, :field => 'activated', :operation => 'is', :argument0 => true}}} + @operations.to_expr.should == "not created.since(3, \"days\") + user_level.is(\"=\", 1)\nactivated.is(true)" + @operations.to_builder.should == {:operator => 'not', :condition => 'or', :field => 'created', :operation => 'since', :argument0 => 3, :argument1 => 'days', :child => {:field => 'user_level', :operation => 'is', :argument0 => '=', :argument1 => 1, :condition => 'with', :child => {:operator => nil, :field => 'activated', :operation => 'is', :argument0 => true}}} end end diff --git a/spec/models/user_subscription_entry_segment_field_spec.rb b/spec/models/user_subscription_entry_segment_field_spec.rb index ed90db52..d02c5f80 100644 --- a/spec/models/user_subscription_entry_segment_field_spec.rb +++ b/spec/models/user_subscription_entry_segment_field_spec.rb @@ -31,7 +31,7 @@ end it "should be able to find user from their subscriptions" do - @type.is(UserSubscriptionEntry, :user_subscription_id, @subscription3.id).count.should == 2 + @type.is(UserSubscriptionEntry, :end_user_id, :user_subscription_id, @subscription3.id).count.should == 2 end end end diff --git a/vendor/modules/user_profile/spec/models/user_profile_entry_spec.rb b/vendor/modules/user_profile/spec/models/user_profile_entry_spec.rb index cc9ee2a7..20a0d055 100644 --- a/vendor/modules/user_profile/spec/models/user_profile_entry_spec.rb +++ b/vendor/modules/user_profile/spec/models/user_profile_entry_spec.rb @@ -10,6 +10,10 @@ :user_classes => [ { 'id' => UserClass.default_user_class_id } ]) end + after do + SiteModule.destroy_all + end + it 'should create entries' do assert_difference "UserProfileEntry.count", 2 do EndUser.push_target('test@webiva.org') diff --git a/vendor/modules/user_profile/spec/models/user_profile_type_spec.rb b/vendor/modules/user_profile/spec/models/user_profile_type_spec.rb index e9f9bd18..ddcd0187 100644 --- a/vendor/modules/user_profile/spec/models/user_profile_type_spec.rb +++ b/vendor/modules/user_profile/spec/models/user_profile_type_spec.rb @@ -11,6 +11,10 @@ :user_classes => [ { 'id' => UserClass.default_user_class_id.to_s } ]) end + after do + SiteModule.destroy_all + end + specify {@prof_type.should be_valid} end From d68fbab82755a01872a48de950b07d07efb88a8c Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 7 Jun 2010 18:22:39 +0000 Subject: [PATCH 114/139] Added tests for sum, max, min, average and CountType. Fix for the avg funciont in mysql. --- app/models/end_user_tag_segment_field.rb | 11 ++- app/models/user_segment/core_type.rb | 2 +- .../members/_user_segments_table.html.erb | 2 +- spec/models/user_segment/core_type_spec.rb | 75 +++++++++++++++++-- 4 files changed, 82 insertions(+), 8 deletions(-) diff --git a/app/models/end_user_tag_segment_field.rb b/app/models/end_user_tag_segment_field.rb index 49001085..47f88543 100644 --- a/app/models/end_user_tag_segment_field.rb +++ b/app/models/end_user_tag_segment_field.rb @@ -23,9 +23,18 @@ def self.is(cls, group_field, field, name) end register_field :tag, EndUserTagSegmentField::EndUserTagType, :field => :tag_id, :name => 'Tag', :sortable => true, :display_field => :tag + register_field :num_tags, UserSegment::CoreType::CountType, :field => :end_user_id, :name => '# Tags', :display_method => 'count', :sort_method => 'count', :sortable => true def self.sort_scope(order_by, direction) - EndUserTag.scoped :joins => :tag, :order => "tags.name #{direction}" + info = UserSegment::FieldHandler.sortable_fields[order_by.to_sym] + + if order_by.to_sym == :num_tags + sort_method = info[:sort_method] + field = info[:field] + EndUserTag.scoped(:select => "end_user_id, #{sort_method}(#{field}) as #{field}_#{sort_method}", :group => :end_user_id, :order => "#{field}_#{sort_method} #{direction}") + else + EndUserTag.scoped :joins => :tag, :order => "tags.name #{direction}" + end end def self.get_handler_data(ids, fields) diff --git a/app/models/user_segment/core_type.rb b/app/models/user_segment/core_type.rb index e9108252..8a37817b 100644 --- a/app/models/user_segment/core_type.rb +++ b/app/models/user_segment/core_type.rb @@ -50,7 +50,7 @@ def self.sum(cls, group_field, field, operator, value) register_operation :average, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]], :complex => true def self.average(cls, group_field, field, operator, value) - cls.scoped(:select => "#{field}, AVERAGE(#{field}) as #{field}_average", :group => group_field, :having => "#{field}_average #{operator} #{value}") + cls.scoped(:select => "#{field}, AVG(#{field}) as #{field}_average", :group => group_field, :having => "#{field}_average #{operator} #{value}") end register_operation :min, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]], :complex => true diff --git a/app/views/members/_user_segments_table.html.erb b/app/views/members/_user_segments_table.html.erb index 1379ec54..e406a818 100644 --- a/app/views/members/_user_segments_table.html.erb +++ b/app/views/members/_user_segments_table.html.erb @@ -36,6 +36,6 @@ refresh_table = false <% if refresh_table -%> <% end -%> diff --git a/spec/models/user_segment/core_type_spec.rb b/spec/models/user_segment/core_type_spec.rb index c96386fd..3847c835 100644 --- a/spec/models/user_segment/core_type_spec.rb +++ b/spec/models/user_segment/core_type_spec.rb @@ -2,7 +2,7 @@ describe UserSegment::CoreType do - reset_domain_tables :end_users, :end_user_caches + reset_domain_tables :end_users, :end_user_caches, :end_user_actions describe "DateTimeType" do before(:each) do @@ -34,10 +34,22 @@ describe "NumberType" do before(:each) do - EndUser.push_target('test1@test.dev', :user_level => 1) - EndUser.push_target('test2@test.dev', :user_level => 2) - EndUser.push_target('test3@test.dev', :user_level => 3) - EndUser.push_target('test4@test.dev', :user_level => 3) + @user1 = EndUser.push_target('test1@test.dev', :user_level => 1) + @user2 = EndUser.push_target('test2@test.dev', :user_level => 2) + @user3 = EndUser.push_target('test3@test.dev', :user_level => 3) + @user4 = EndUser.push_target('test4@test.dev', :user_level => 3) + + EndUserAction.create :end_user_id => @user1.id, :level => 3, :renderer => 'editor/auth', :action => 'login' + EndUserAction.create :end_user_id => @user1.id, :level => 4, :renderer => 'editor/auth', :action => 'login' + EndUserAction.create :end_user_id => @user1.id, :level => 2, :renderer => 'editor/auth', :action => 'login' + + EndUserAction.create :end_user_id => @user2.id, :level => 3, :renderer => 'editor/auth', :action => 'login' + EndUserAction.create :end_user_id => @user2.id, :level => 2, :renderer => 'editor/auth', :action => 'login' + + EndUserAction.create :end_user_id => @user3.id, :level => 1, :renderer => 'editor/auth', :action => 'login' + EndUserAction.create :end_user_id => @user3.id, :level => 1, :renderer => 'editor/auth', :action => 'login' + + EndUserAction.create :end_user_id => @user4.id, :level => 3, :renderer => 'editor/auth', :action => 'login' @type = UserSegment::CoreType::NumberType end @@ -72,6 +84,59 @@ @type.is(EndUser, :id, :user_level, '=', 3).count.should == 2 @type.is(EndUser, :id, :user_level, '=', 3).count.should == 2 end + + it "should be able to find users based on the sum" do + @type.sum(EndUserAction, :end_user_id, :level, '>', 3).find(:all).size.should == 2 + @type.sum(EndUserAction, :end_user_id, :level, '>=', 3).find(:all).size.should == 3 + @type.sum(EndUserAction, :end_user_id, :level, '<', 3).find(:all).size.should == 1 + end + + it "should be able to find users based on the max" do + @type.max(EndUserAction, :end_user_id, :level, '>', 3).find(:all).size.should == 1 + @type.max(EndUserAction, :end_user_id, :level, '>=', 3).find(:all).size.should == 3 + @type.max(EndUserAction, :end_user_id, :level, '<', 3).find(:all).size.should == 1 + end + + it "should be able to find users based on the min" do + @type.min(EndUserAction, :end_user_id, :level, '>', 3).find(:all).size.should == 0 + @type.min(EndUserAction, :end_user_id, :level, '>=', 3).find(:all).size.should == 1 + @type.min(EndUserAction, :end_user_id, :level, '<', 3).find(:all).size.should == 3 + end + + it "should be able to find users based on the average" do + @type.average(EndUserAction, :end_user_id, :level, '>', 3).find(:all).size.should == 0 + @type.average(EndUserAction, :end_user_id, :level, '>=', 3).find(:all).size.should == 2 + @type.average(EndUserAction, :end_user_id, :level, '<', 3).find(:all).size.should == 2 + end + end + + describe "CountType" do + before(:each) do + @user1 = EndUser.push_target('test1@test.dev', :user_level => 1) + @user2 = EndUser.push_target('test2@test.dev', :user_level => 2) + @user3 = EndUser.push_target('test3@test.dev', :user_level => 3) + @user4 = EndUser.push_target('test4@test.dev', :user_level => 3) + + EndUserAction.create :end_user_id => @user1.id, :level => 3, :renderer => 'editor/auth', :action => 'login' + EndUserAction.create :end_user_id => @user1.id, :level => 4, :renderer => 'editor/auth', :action => 'login' + EndUserAction.create :end_user_id => @user1.id, :level => 2, :renderer => 'editor/auth', :action => 'login' + + EndUserAction.create :end_user_id => @user2.id, :level => 3, :renderer => 'editor/auth', :action => 'login' + EndUserAction.create :end_user_id => @user2.id, :level => 2, :renderer => 'editor/auth', :action => 'login' + + EndUserAction.create :end_user_id => @user3.id, :level => 1, :renderer => 'editor/auth', :action => 'login' + EndUserAction.create :end_user_id => @user3.id, :level => 1, :renderer => 'editor/auth', :action => 'login' + + EndUserAction.create :end_user_id => @user4.id, :level => 3, :renderer => 'editor/auth', :action => 'login' + + @type = UserSegment::CoreType::CountType + end + + it "should return users using count" do + @type.count(EndUserAction, :end_user_id, :end_user_id, '>', 2).find(:all).size.should == 1 + @type.count(EndUserAction, :end_user_id, :end_user_id, '>=', 2).find(:all).size.should == 3 + @type.count(EndUserAction, :end_user_id, :end_user_id, '=', 1).find(:all).size.should == 1 + end end describe "StringType" do From c68e6b7469c572ba149f2690216deef25b2003c2 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 7 Jun 2010 19:32:28 +0000 Subject: [PATCH 115/139] Added test for field output. --- app/models/user_segment/field.rb | 5 ---- spec/models/user_segment/field_spec.rb | 15 ++++++++++++ spec/models/user_segment/field_type_spec.rb | 27 ++++++++++++++++----- 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index 12129794..af0b453b 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -55,7 +55,6 @@ def validate while c if c.complex_operation if is_complex - # error self.add_error(:complex, 'too many') end is_complex = true @@ -180,8 +179,4 @@ def to_builder(opts={}) end options end - - def field_output(end_user, handler_data) - self.handler_class.field_output(end_user, handler_data, self.field.to_sym) - end end diff --git a/spec/models/user_segment/field_spec.rb b/spec/models/user_segment/field_spec.rb index 681abf27..a55702e3 100644 --- a/spec/models/user_segment/field_spec.rb +++ b/spec/models/user_segment/field_spec.rb @@ -16,6 +16,21 @@ @field = UserSegment::Field.new :field => 'created', :operation => 'invalid_operation', :arguments => [1, 'days'] @field.valid?.should be_false + + @field = UserSegment::Field.new :field => 'created', :operation => nil, :arguments => [1, 'days'] + @field.valid?.should be_false + + @field = UserSegment::Field.new :field => 'created', :operation => 'before', :arguments => [1, 'days'], :child => {:field => 'registered', :operation => 'is', :arguments => [true]} + @field.valid?.should be_true + + @field = UserSegment::Field.new :field => 'user_level', :operation => 'sum', :arguments => ['>', 1] + @field.valid?.should be_true + + @field = UserSegment::Field.new :field => 'user_level', :operation => 'sum', :arguments => ['<', 2] + @field.valid?.should be_true + + @field = UserSegment::Field.new :field => 'user_level', :operation => 'sum', :arguments => ['>', 1], :child => {:field => 'user_level', :operation => 'sum', :arguments => ['<', 2]} + @field.valid?.should be_false end it "should be able to use handler" do diff --git a/spec/models/user_segment/field_type_spec.rb b/spec/models/user_segment/field_type_spec.rb index 2e0f71bd..9b77e0d1 100644 --- a/spec/models/user_segment/field_type_spec.rb +++ b/spec/models/user_segment/field_type_spec.rb @@ -2,7 +2,7 @@ describe UserSegment::FieldType do - reset_domain_tables :tags + reset_domain_tables :tags, :end_users, :end_user_tags it "should convert value to integer" do UserSegment::FieldType.convert_to("0", :integer).should == 0 @@ -103,10 +103,25 @@ end it "should support multiple option types" do - UserSegment::FieldType::convert_to('day', :option, :options => ['day', 'days', 'week', 'weeks']).should == 'day' - UserSegment::FieldType::convert_to('day', :option, :options => [['Day', 'day'], ['Days', 'days'], ['Week', 'week'], ['Weeks', 'weeks']]).should == 'day' - UserSegment::FieldType::convert_to(3, :option, :options => [1, 2, 4, 5, 3]).should == 3 - UserSegment::FieldType::convert_to(false, :option, :options => [true, false]).should == false - UserSegment::FieldType::convert_to(nil, :option, :options => [true, false]).should == nil + UserSegment::FieldType.convert_to('day', :option, :options => ['day', 'days', 'week', 'weeks']).should == 'day' + UserSegment::FieldType.convert_to('day', :option, :options => [['Day', 'day'], ['Days', 'days'], ['Week', 'week'], ['Weeks', 'weeks']]).should == 'day' + UserSegment::FieldType.convert_to(3, :option, :options => [1, 2, 4, 5, 3]).should == 3 + UserSegment::FieldType.convert_to(false, :option, :options => [true, false]).should == false + UserSegment::FieldType.convert_to(nil, :option, :options => [true, false]).should == nil + end + + it "should be able to output symble types" do + @user1 = EndUser.push_target('test1@test.dev', :first_name => 'First', :last_name => 'Last') + @user1.tag 'one' + @user1.tag 'two' + @user1.tag 'three' + @user1.tag 'four' + + UserSegment::FieldType.field_output(@user1, nil, :last_name).should == 'Last' + UserSegment::FieldType.field_output(@user1, nil, 'last_name').should be_nil + + handler_data = @user1.end_user_tags + + UserSegment::FieldType.field_output(@user1, {@user1.id => handler_data}, :num_tags).should == 4 end end From ee44d83eb9d9577feef58659ab1d11cab6465cb9 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 7 Jun 2010 19:46:40 +0000 Subject: [PATCH 116/139] Added a test for a bad operation on a field. --- spec/models/user_segment/operation_builder_spec.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spec/models/user_segment/operation_builder_spec.rb b/spec/models/user_segment/operation_builder_spec.rb index 57c571c7..0dd794e6 100644 --- a/spec/models/user_segment/operation_builder_spec.rb +++ b/spec/models/user_segment/operation_builder_spec.rb @@ -19,6 +19,14 @@ def segment build(:field => 'email', :operation => 'is', :argument0 => 'test@test.dev').valid?.should be_true segment.valid?.should be_true + build(:field => 'email', :argument0 => 'test@test.dev').valid?.should be_true + + build(:field => 'num_tags', :operation => 'count', :argument0 => '>', :argument1 => 1).valid?.should be_true + build(:field => 'num_tags', :operation => 'count', :argument0 => '>', :argument1 => 1, :condition => 'and').valid?.should be_false + build(:field => 'num_tags', :operation => 'count', :argument0 => '>', :argument1 => 1, :condition => 'and', :child => {:field => 'num_tags', :operation => 'count', :argument0 => '<', :argument1 => 3}).valid?.should be_false + build(:field => 'num_tags', :operation => 'count', :argument0 => '>', :argument1 => 1, :condition => 'with', :child => {:field => 'num_tags', :operation => 'count', :argument0 => '<', :argument1 => 3}).valid?.should be_true + build(:field => 'num_tags', :operation => 'count', :argument0 => '>', :argument1 => 1, :condition => 'with', :child => {:field => 'num_tags', :argument0 => '<', :argument1 => 3}).valid?.should be_true + # if the field is invalid the builder is invalid build(:field => 'invalid_email_field', :operation => 'is', :argument0 => 'test@test.dev').valid?.should be_false From b2d4e25d7684616472989347de0efa5b27fd6a77 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 7 Jun 2010 20:38:52 +0000 Subject: [PATCH 117/139] Adding tests for sortable fields and field output. --- app/models/end_user_action_segment_field.rb | 7 +++ .../end_user_action_segment_field_spec.rb | 53 +++++++++++++++++++ spec/models/end_user_segment_field_spec.rb | 28 ++++++++++ .../models/end_user_tag_segment_field_spec.rb | 49 +++++++++++++++++ 4 files changed, 137 insertions(+) diff --git a/app/models/end_user_action_segment_field.rb b/app/models/end_user_action_segment_field.rb index 78f25450..3e9de663 100644 --- a/app/models/end_user_action_segment_field.rb +++ b/app/models/end_user_action_segment_field.rb @@ -8,6 +8,7 @@ def self.user_segment_fields_handler_info } end + register_field :num_actions, UserSegment::CoreType::CountType, :field => :end_user_id, :name => '# Actions', :display_method => 'count', :sort_method => 'count', :sortable => true register_field :user_action, EndUserActionSegmentType::UserActionType, :field => [:renderer, :action], :name => 'User Actions', :display_field => :description, :sortable => true, :display_field => :description register_field :action, EndUserActionSegmentType::ActionType, :name => 'User Actions: Action', :sortable => true register_field :renderer, EndUserActionSegmentType::RendererType, :name => 'User Actions: Renderer', :sortable => true @@ -15,8 +16,14 @@ def self.user_segment_fields_handler_info register_field :occurred, UserSegment::CoreType::DateTimeType, :field => :action_at, :name => 'User Actions: Occurred', :sortable => true def self.sort_scope(order_by, direction) + info = UserSegment::FieldHandler.sortable_fields[order_by.to_sym] + if order_by.to_sym == :user_action EndUserAction.scoped :order => "renderer #{direction}, action #{direction}" + elsif order_by.to_sym == :num_actions + sort_method = info[:sort_method] + field = info[:field] + EndUserAction.scoped(:select => "end_user_id, #{sort_method}(#{field}) as #{field}_#{sort_method}", :group => :end_user_id, :order => "#{field}_#{sort_method} #{direction}") else field = self.user_segment_fields[order_by.to_sym][:field] EndUserAction.scoped :order => "#{field} #{direction}" diff --git a/spec/models/end_user_action_segment_field_spec.rb b/spec/models/end_user_action_segment_field_spec.rb index 1166cb74..4f5b9b83 100644 --- a/spec/models/end_user_action_segment_field_spec.rb +++ b/spec/models/end_user_action_segment_field_spec.rb @@ -2,6 +2,8 @@ describe EndUserActionSegmentField do + reset_domain_tables :end_users, :end_user_actions, :user_segments, :user_segment_caches + it "should only have valid EndUserAction fields" do obj = EndUserActionSegmentField.user_segment_fields_handler_info[:domain_model_class].new EndUserActionSegmentField.user_segment_fields.each do |key, value| @@ -12,4 +14,55 @@ end end end + + it "has handler_data" do + @user1 = EndUser.push_target('test1@test.dev', :first_name => 'First') + @user2 = EndUser.push_target('test2@test.dev', :last_name => 'Last') + + EndUserAction.create :end_user_id => @user1.id, :level => 3, :renderer => 'editor/auth', :action => 'login' + EndUserAction.create :end_user_id => @user2.id, :level => 3, :renderer => 'editor/auth', :action => 'login' + + EndUserActionSegmentField.get_handler_data([@user1.id, @user2.id], [:renderer, :action]).size.should == 2 + end + + it "can output field data" do + @user1 = EndUser.push_target('test1@test.dev', :first_name => 'First') + @user2 = EndUser.push_target('test2@test.dev', :last_name => 'Last') + EndUserAction.create :end_user_id => @user1.id, :level => 3, :renderer => 'editor/auth', :action => 'login' + EndUserAction.create :end_user_id => @user1.id, :level => 3, :renderer => 'editor/auth', :action => 'login' + EndUserAction.create :end_user_id => @user2.id, :level => 3, :renderer => 'editor/auth', :action => 'login' + + handler_data = EndUserActionSegmentField.get_handler_data([@user1.id, @user2.id], [:renderer, :action]) + EndUserActionSegmentField.field_output(@user1, handler_data, :num_actions).should == 2 + + EndUserActionSegmentField.user_segment_fields.each do |key, value| + next if value[:search_only] + EndUserActionSegmentField.field_output(@user1, handler_data, key) + end + end + + it "should be able to sort on sortable fields" do + @user1 = EndUser.push_target('test1@test.dev', :first_name => 'First') + @user2 = EndUser.push_target('test2@test.dev', :last_name => 'Last') + + EndUserAction.create :end_user_id => @user1.id, :level => 3, :renderer => 'editor/auth', :action => 'login' + EndUserAction.create :end_user_id => @user1.id, :level => 3, :renderer => 'editor/auth', :action => 'login' + EndUserAction.create :end_user_id => @user2.id, :level => 3, :renderer => 'editor/auth', :action => 'login' + + ids = [@user1.id, @user2.id] + seg = UserSegment.create :name => 'Test', :segment_type => 'custom' + seg.id.should_not be_nil + seg.add_ids ids + + EndUserActionSegmentField.user_segment_fields.each do |key, value| + next unless value[:sortable] + scope = EndUserActionSegmentField.sort_scope(key.to_s, 'DESC') + scope.should_not be_nil + + seg.order_by = key.to_s + seg.sort_ids(ids).should be_true + seg.status.should == 'finished' + seg.end_user_ids.size.should == 2 + end + end end diff --git a/spec/models/end_user_segment_field_spec.rb b/spec/models/end_user_segment_field_spec.rb index 6ab9d198..bde9606a 100644 --- a/spec/models/end_user_segment_field_spec.rb +++ b/spec/models/end_user_segment_field_spec.rb @@ -1,10 +1,38 @@ require File.dirname(__FILE__) + "/../spec_helper" describe EndUserSegmentField do + reset_domain_tables :end_users + it "should only have valid EndUser fields" do obj = EndUserSegmentField.user_segment_fields_handler_info[:domain_model_class].new EndUserSegmentField.user_segment_fields.each do |key, value| obj.has_attribute?(value[:field]).should be_true end end + + it "has no handler_data" do + @user1 = EndUser.push_target('test1@test.dev', :first_name => 'First') + @user2 = EndUser.push_target('test2@test.dev', :last_name => 'Last') + EndUserSegmentField.get_handler_data([@user1.id, @user2.id], [:first_name, :last_name]).should be_nil + end + + it "can output field data" do + @user1 = EndUser.push_target('test1@test.dev', :first_name => 'First') + @user2 = EndUser.push_target('test2@test.dev', :last_name => 'Last') + EndUserSegmentField.field_output(@user1, nil, :first_name).should == 'First' + + EndUserSegmentField.user_segment_fields.each do |key, value| + next if value[:search_only] + EndUserSegmentField.field_output(@user1, nil, key) + end + end + + it "should be able to sort on sortable fields" do + @user1 = EndUser.push_target('test1@test.dev', :first_name => 'First') + @user2 = EndUser.push_target('test2@test.dev', :last_name => 'Last') + EndUserSegmentField.user_segment_fields.each do |key, value| + next unless value[:sortable] + EndUserSegmentField.sort_scope(key, 'DESC').find(:all).size.should == 2 + end + end end diff --git a/spec/models/end_user_tag_segment_field_spec.rb b/spec/models/end_user_tag_segment_field_spec.rb index 83254e61..e467cfa8 100644 --- a/spec/models/end_user_tag_segment_field_spec.rb +++ b/spec/models/end_user_tag_segment_field_spec.rb @@ -1,6 +1,8 @@ require File.dirname(__FILE__) + "/../spec_helper" describe EndUserTagSegmentField do + reset_domain_tables :end_users, :tags, :end_user_tags, :user_segments, :user_segment_caches + it "should only have valid EndUser fields" do obj = EndUserTagSegmentField.user_segment_fields_handler_info[:domain_model_class].new EndUserTagSegmentField.user_segment_fields.each do |key, value| @@ -27,4 +29,51 @@ @type.is(EndUserTag, :end_user_id, :tag_id, 'One').count.should == 2 end end + + it "has handler_data" do + @user1 = EndUser.push_target('test1@test.dev', :first_name => 'First') + @user2 = EndUser.push_target('test2@test.dev', :last_name => 'Last') + @user1.tag 'one,two,three' + @user2.tag 'one' + + EndUserTagSegmentField.get_handler_data([@user1.id, @user2.id], [:tag]).size.should == 2 + end + + it "can output field data" do + @user1 = EndUser.push_target('test1@test.dev', :first_name => 'First') + @user2 = EndUser.push_target('test2@test.dev', :last_name => 'Last') + @user1.tag 'one,two,three' + @user2.tag 'one' + + handler_data = EndUserTagSegmentField.get_handler_data([@user1.id, @user2.id], [:num_tags, :tag]) + EndUserTagSegmentField.field_output(@user1, handler_data, :num_tags).should == 3 + + EndUserTagSegmentField.user_segment_fields.each do |key, value| + next if value[:search_only] + EndUserTagSegmentField.field_output(@user1, handler_data, key) + end + end + + it "should be able to sort on sortable fields" do + @user1 = EndUser.push_target('test1@test.dev', :first_name => 'First') + @user2 = EndUser.push_target('test2@test.dev', :last_name => 'Last') + @user1.tag 'one,two,three' + @user2.tag 'one' + + ids = [@user1.id, @user2.id] + seg = UserSegment.create :name => 'Test', :segment_type => 'custom' + seg.id.should_not be_nil + seg.add_ids ids + + EndUserTagSegmentField.user_segment_fields.each do |key, value| + next unless value[:sortable] + scope = EndUserTagSegmentField.sort_scope(key.to_s, 'DESC') + scope.should_not be_nil + + seg.order_by = key.to_s + seg.sort_ids(ids).should be_true + seg.status.should == 'finished' + seg.end_user_ids.size.should == 2 + end + end end From 51d3c5c3bcae1c7ea946f46877471ec659519c22 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 7 Jun 2010 21:04:46 +0000 Subject: [PATCH 118/139] test user subscript segment fields. --- .../user_subscription_entry_segment_field.rb | 11 +++- ...r_subscription_entry_segment_field_spec.rb | 57 +++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/app/models/user_subscription_entry_segment_field.rb b/app/models/user_subscription_entry_segment_field.rb index 48aa0ffb..fa49dbce 100644 --- a/app/models/user_subscription_entry_segment_field.rb +++ b/app/models/user_subscription_entry_segment_field.rb @@ -16,8 +16,15 @@ def self.is(cls, group_field, field, id) end end - register_field :num_subscription, UserSegment::CoreType::CountType, :field => :end_user_id, :name => '# Subscriptions', :display_method => 'count' - register_field :user_subscription_id, UserSubscriptionEntrySegmentField::UserSubscriptionType, :name => 'User Subscription' + register_field :num_subscriptions, UserSegment::CoreType::CountType, :field => :end_user_id, :name => '# Subscriptions', :display_method => 'count', :sort_method => 'count', :sortable => true + register_field :user_subscription_id, UserSubscriptionEntrySegmentField::UserSubscriptionType, :name => 'User Subscription', :display_field => :user_subscription + + def self.sort_scope(order_by, direction) + info = UserSegment::FieldHandler.sortable_fields[order_by.to_sym] + sort_method = info[:sort_method] + field = info[:field] + UserSubscriptionEntry.scoped(:select => "end_user_id, #{sort_method}(#{field}) as #{field}_#{sort_method}", :group => :end_user_id, :order => "#{field}_#{sort_method} #{direction}") + end def self.field_heading(field) self.user_segment_fields[field][:name] diff --git a/spec/models/user_subscription_entry_segment_field_spec.rb b/spec/models/user_subscription_entry_segment_field_spec.rb index d02c5f80..a4fa2242 100644 --- a/spec/models/user_subscription_entry_segment_field_spec.rb +++ b/spec/models/user_subscription_entry_segment_field_spec.rb @@ -1,6 +1,8 @@ require File.dirname(__FILE__) + "/../spec_helper" describe UserSubscriptionEntrySegmentField do + reset_domain_tables :end_users, :user_subscriptions, :user_subscription_entries, :user_segments, :user_segment_caches + it "should only have valid EndUser fields" do obj = UserSubscriptionEntrySegmentField.user_segment_fields_handler_info[:domain_model_class].new UserSubscriptionEntrySegmentField.user_segment_fields.each do |key, value| @@ -34,4 +36,59 @@ @type.is(UserSubscriptionEntry, :end_user_id, :user_subscription_id, @subscription3.id).count.should == 2 end end + + it "has handler_data" do + @user1 = EndUser.push_target('test1@test.dev', :first_name => 'First') + @user2 = EndUser.push_target('test2@test.dev', :last_name => 'Last') + @subscription1 = UserSubscription.create :name => 'Test1' + @subscription2 = UserSubscription.create :name => 'Test2' + UserSubscriptionEntry.create :user_subscription_id => @subscription1.id, :end_user_id => @user1.id + UserSubscriptionEntry.create :user_subscription_id => @subscription2.id, :end_user_id => @user2.id + + UserSubscriptionEntrySegmentField.get_handler_data([@user1.id, @user2.id], [:tag]).size.should == 2 + end + + it "can output field data" do + @user1 = EndUser.push_target('test1@test.dev', :first_name => 'First') + @user2 = EndUser.push_target('test2@test.dev', :last_name => 'Last') + @subscription1 = UserSubscription.create :name => 'Test1' + @subscription2 = UserSubscription.create :name => 'Test2' + UserSubscriptionEntry.create :user_subscription_id => @subscription1.id, :end_user_id => @user1.id + UserSubscriptionEntry.create :user_subscription_id => @subscription2.id, :end_user_id => @user1.id + UserSubscriptionEntry.create :user_subscription_id => @subscription2.id, :end_user_id => @user2.id + + handler_data = UserSubscriptionEntrySegmentField.get_handler_data([@user1.id, @user2.id], [:num_subscriptions, :user_subscription_id]) + UserSubscriptionEntrySegmentField.field_output(@user1, handler_data, :num_subscriptions).should == 2 + + UserSubscriptionEntrySegmentField.user_segment_fields.each do |key, value| + next if value[:search_only] + UserSubscriptionEntrySegmentField.field_output(@user1, handler_data, key) + end + end + + it "should be able to sort on sortable fields" do + @user1 = EndUser.push_target('test1@test.dev', :first_name => 'First') + @user2 = EndUser.push_target('test2@test.dev', :last_name => 'Last') + @subscription1 = UserSubscription.create :name => 'Test1' + @subscription2 = UserSubscription.create :name => 'Test2' + UserSubscriptionEntry.create :user_subscription_id => @subscription1.id, :end_user_id => @user1.id + UserSubscriptionEntry.create :user_subscription_id => @subscription2.id, :end_user_id => @user1.id + UserSubscriptionEntry.create :user_subscription_id => @subscription2.id, :end_user_id => @user2.id + + ids = [@user1.id, @user2.id] + seg = UserSegment.create :name => 'Test', :segment_type => 'custom' + seg.id.should_not be_nil + seg.add_ids ids + + UserSubscriptionEntrySegmentField.user_segment_fields.each do |key, value| + next unless value[:sortable] + scope = UserSubscriptionEntrySegmentField.sort_scope(key.to_s, 'DESC') + scope.should_not be_nil + + seg.order_by = key.to_s + seg.sort_ids(ids).should be_true + seg.status.should == 'finished' + seg.end_user_ids.size.should == 2 + end + end end From a1e6748eb6e3c9870a17c7517c2f197733f85a73 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 8 Jun 2010 13:46:35 +0000 Subject: [PATCH 119/139] Make sure model responds to display field. --- spec/models/end_user_action_segment_field_spec.rb | 1 + spec/models/end_user_cache_segment_field_spec.rb | 1 + spec/models/end_user_segment_field_spec.rb | 1 + spec/models/end_user_tag_segment_field_spec.rb | 1 + spec/models/user_subscription_entry_segment_field_spec.rb | 1 + 5 files changed, 5 insertions(+) diff --git a/spec/models/end_user_action_segment_field_spec.rb b/spec/models/end_user_action_segment_field_spec.rb index 4f5b9b83..4afbeddd 100644 --- a/spec/models/end_user_action_segment_field_spec.rb +++ b/spec/models/end_user_action_segment_field_spec.rb @@ -12,6 +12,7 @@ else obj.has_attribute?(value[:field]).should be_true end + obj.respond_to?(value[:display_field]).should be_true end end diff --git a/spec/models/end_user_cache_segment_field_spec.rb b/spec/models/end_user_cache_segment_field_spec.rb index ac420edf..1f682145 100644 --- a/spec/models/end_user_cache_segment_field_spec.rb +++ b/spec/models/end_user_cache_segment_field_spec.rb @@ -5,6 +5,7 @@ obj = EndUserCacheSegmentField.user_segment_fields_handler_info[:domain_model_class].new EndUserCacheSegmentField.user_segment_fields.each do |key, value| obj.has_attribute?(value[:field]).should be_true + obj.respond_to?(value[:display_field]).should be_true end end end diff --git a/spec/models/end_user_segment_field_spec.rb b/spec/models/end_user_segment_field_spec.rb index bde9606a..67d51b84 100644 --- a/spec/models/end_user_segment_field_spec.rb +++ b/spec/models/end_user_segment_field_spec.rb @@ -7,6 +7,7 @@ obj = EndUserSegmentField.user_segment_fields_handler_info[:domain_model_class].new EndUserSegmentField.user_segment_fields.each do |key, value| obj.has_attribute?(value[:field]).should be_true + obj.respond_to?(value[:display_field]).should be_true end end diff --git a/spec/models/end_user_tag_segment_field_spec.rb b/spec/models/end_user_tag_segment_field_spec.rb index e467cfa8..886b27ef 100644 --- a/spec/models/end_user_tag_segment_field_spec.rb +++ b/spec/models/end_user_tag_segment_field_spec.rb @@ -7,6 +7,7 @@ obj = EndUserTagSegmentField.user_segment_fields_handler_info[:domain_model_class].new EndUserTagSegmentField.user_segment_fields.each do |key, value| obj.has_attribute?(value[:field]).should be_true + obj.respond_to?(value[:display_field]).should be_true end end diff --git a/spec/models/user_subscription_entry_segment_field_spec.rb b/spec/models/user_subscription_entry_segment_field_spec.rb index a4fa2242..a42ebd95 100644 --- a/spec/models/user_subscription_entry_segment_field_spec.rb +++ b/spec/models/user_subscription_entry_segment_field_spec.rb @@ -7,6 +7,7 @@ obj = UserSubscriptionEntrySegmentField.user_segment_fields_handler_info[:domain_model_class].new UserSubscriptionEntrySegmentField.user_segment_fields.each do |key, value| obj.has_attribute?(value[:field]).should be_true + obj.respond_to?(value[:display_field]).should be_true end end From 2580f74a042f9600ce45f5764d080b9330df4969 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 8 Jun 2010 14:40:25 +0000 Subject: [PATCH 120/139] Download all additional fields. --- .../end_user_import_extension.rb | 21 +++++++++-- app/models/user_segment.rb | 6 ++++ app/workers/member_export_worker.rb | 35 +++++++++++++++---- 3 files changed, 54 insertions(+), 8 deletions(-) diff --git a/app/models/model_extension/end_user_import_extension.rb b/app/models/model_extension/end_user_import_extension.rb index d2bb95b2..b22aeb65 100644 --- a/app/models/model_extension/end_user_import_extension.rb +++ b/app/models/model_extension/end_user_import_extension.rb @@ -37,17 +37,34 @@ def export_csv(writer,options = {}) #:nodoc: end if options[:header] - writer << fields.collect do |fld| + headings = fields.collect do |fld| fld[1] end + + if options[:fields] && options[:handlers_data] + headings = headings + options[:fields].collect do |fld| + info = UserSegment::FieldHandler.display_fields[fld.to_sym] + info[:handler].field_heading(fld.to_sym) + end + end + writer << headings end - writer << fields.collect do |fld| + data = fields.collect do |fld| if fld[0] self.send(fld[0]) else fld[2] end end + + if options[:fields] && options[:handlers_data] + data = data + options[:fields].collect do |fld| + info = UserSegment::FieldHandler.display_fields[fld.to_sym] + info[:handler].field_output(self, options[:handlers_data][info[:handler].to_s], fld.to_sym) + end + end + + writer << data end diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 6a2b5ee1..85df6711 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -195,6 +195,12 @@ def find(opts={}, &block) nil end + def find_in_batches(opts={}, &block) + self.user_segment_caches.each do |segement| + segement.find_in_batches(opts, &block) + end + end + def paginate(page=1, args={}) args = args.clone.symbolize_keys! window_size =args.delete(:window) || 2 diff --git a/app/workers/member_export_worker.rb b/app/workers/member_export_worker.rb index 1cd118b0..11b41c01 100644 --- a/app/workers/member_export_worker.rb +++ b/app/workers/member_export_worker.rb @@ -27,25 +27,48 @@ def do_work(args) @segment = UserSegment.find_by_id args[:user_segment_id] + @fields = [] + if @segment && @segment.fields + @fields = @segment.fields + else MembersController.module_options && MembersController.module_options.fields + @fields = MembersController.module_options.fields + end + + @default_exported_fields = ['email', 'first_name', 'last_name', 'language', 'dob', 'gender', 'user_level', 'source'] + + @fields.reject! do |field| + info = UserSegment::FieldHandler.display_fields[field.to_sym] + info.nil? || (info[:handler] == EndUserSegmentField && @default_exported_fields.include?(info[:display_field].to_s)) + end + + idx = 0 CSV.open(filename,'w') do |writer| if @segment - @segment.each_with_index do |user,idx| - user.export_csv(writer, :header => idx == 0, - :include => args[:export_options]) + @segment.find_in_batches do |users| + @handlers_data = UserSegment.get_handlers_data(users.collect(&:id), @fields) + users.each do |user| + user.export_csv(writer, :header => idx == 0, + :include => args[:export_options], + :handlers_data => @handlers_data, + :fields => @fields) + idx = idx.succ + end end else - idx = 0 EndUser.find_in_batches(:conditions => {:client_user_id => nil}) do |users| + @handlers_data = UserSegment.get_handlers_data(users.collect(&:id), @fields) users.each do |user| user.export_csv(writer, :header => idx == 0, - :include => args[:export_options]) + :include => args[:export_options], + :handlers_data => @handlers_data, + :fields => @fields) idx = idx.succ end end end end - results[:entries] = @segment ? @segment.last_count : EndUser.count(:conditions => {:client_user_id => nil}) + results[:entries] = idx results[:type] = 'csv' results[:completed] = 1 From 32594f9b92a58aeb7d80eb0f3ae7abb251535eb2 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 8 Jun 2010 17:50:56 +0000 Subject: [PATCH 121/139] Added some rdoc. Can set a default scope for fields. --- app/models/user_segment.rb | 77 ++++++++++++++++++++---- app/models/user_segment/field.rb | 22 ++++++- app/models/user_segment/field_handler.rb | 56 ++++++++++++++++- app/models/user_segment/field_type.rb | 5 ++ app/models/user_segment_cache.rb | 8 ++- 5 files changed, 151 insertions(+), 17 deletions(-) diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 85df6711..7594b966 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -1,4 +1,14 @@ +=begin rdoc +A user segment is a stored list of user ids. There are 2 types of user segments. +A custom segment is a list of selected users. A filtered segment contains a +filter which is stored in the segment options. This filter is used to generate a +list of user ids to store. + +Ex: Setting the filter to registered.is(true) would store all the registered users +in a user segment. + +=end class UserSegment < DomainModel has_many :user_segment_caches, :order => 'position', :dependent => :delete_all, :class_name => 'UserSegmentCache' @@ -24,9 +34,11 @@ class UserSegment < DomainModel ['Adding', 'adding'], ['Removing', 'removing'], ['Sorting', 'sorting']] - + + # Determines if the segment is ready for use. def ready?; self.status == 'finished'; end + # A list of fields to display def fields self.read_attribute(:fields) || [] end @@ -36,10 +48,11 @@ def before_validation #:nodoc: self.order_direction = 'DESC' if self.order_direction.blank? end - def validate + def validate #:nodoc: self.errors.add(:segment_options_text, nil, :message => self.operations.failure_reason) if self.segment_options_text && self.segment_options.nil? end + # Returns the filter used to generate the segment. def operations return @filter if @filter @filter = UserSegment::Filter.new @@ -47,7 +60,7 @@ def operations @filter end - def segment_options_text=(text) + def segment_options_text=(text) #:nodoc: text = text.gsub("\r", '').strip self.should_refresh = self.segment_options_text != text self.write_attribute :segment_options_text, text @@ -61,30 +74,32 @@ def segment_options_text=(text) text end - def order_by=(order) + def order_by=(order) #:nodoc: self.should_refresh = self.order_by != order self.write_attribute :order_by, order order end - def order_direction=(direction) + def order_direction=(direction) #:nodoc: self.should_refresh = self.order_direction != direction self.write_attribute :order_direction, direction direction end - def should_refresh + def should_refresh #:nodoc: @should_refresh end - def should_refresh=(refresh) + def should_refresh=(refresh) #:nodoc: @should_refresh ||= refresh end + # Determines whether or not to refresh the segment based on changes to the model. def should_refresh? self.should_refresh end + # Refreshes the segment. def refresh if self.status == 'new' || self.ready? self.status = 'refreshing' @@ -102,6 +117,7 @@ def refresh end end + # Use the filter to store a list of user ids. def cache_ids(opts={}) self.status = 'calculating' self.save @@ -109,6 +125,7 @@ def cache_ids(opts={}) self.sort_ids self.operations.end_user_ids end + # Adds the user ids to the segment. def add_ids(ids) self.status = 'adding' self.save @@ -117,6 +134,7 @@ def add_ids(ids) self.sort_ids ids end + # Removes the user ids from the segment. def remove_ids(ids) self.status = 'removing' self.save @@ -126,6 +144,7 @@ def remove_ids(ids) self.sort_ids ids end + # Sort the user ids based on the order_by and order_direction. def sort_ids(ids) self.status = 'sorting' self.save @@ -160,18 +179,25 @@ def sort_ids(ids) self.save end + # Returns all the user ids. def end_user_ids self.user_segment_caches.inject([]) do |ids, segement| ids + segement.id_list end end + # Loops through each user in the segment. + # + # yields user def each(opts={}, &block) self.user_segment_caches.each do |segement| segement.each opts, &block end end + # Loops through each user collecting data specified by the block. + # + # yeilds user def collect(opts={}, &block) data = [] self.user_segment_caches.each do |segement| @@ -180,6 +206,9 @@ def collect(opts={}, &block) data end + # Loops through each user in the segment. + # + # yields user, idx def each_with_index(opts={}, &block) idx = 0 self.user_segment_caches.each do |segement| @@ -187,6 +216,7 @@ def each_with_index(opts={}, &block) end end + # Finds a specific user in the segment. def find(opts={}, &block) self.user_segment_caches.each do |segement| user = segement.find opts, &block @@ -195,12 +225,17 @@ def find(opts={}, &block) nil end + # Loops through batches of users. Useful when pulling additional user data from other models. + # + # yields users def find_in_batches(opts={}, &block) self.user_segment_caches.each do |segement| segement.find_in_batches(opts, &block) end end + # Used to paginate a list of users, returns the same pagination hash as DomainModel.paginate + # and a list of users def paginate(page=1, args={}) args = args.clone.symbolize_keys! window_size =args.delete(:window) || 2 @@ -231,6 +266,21 @@ def paginate(page=1, args={}) }, items ] end + # Returns the offset of the last user found and the list of users + # + # Search criteria can be specified in 2 ways. + # + # Using a condition + # args = {:conditions => ["created_at > ? ", 7.days.ago]} + # + # Using a scope + # args = {:scope => EndUserCache.search('pascal'), :end_user_field => :end_user_id} + # + # Specifying a scope can be useful. It allows you to search for users in another model from a segment. + # + # args[:offset] is the index of first user to search + # + # args[:limit] is the maximum number of users to return def search(args={}) args = args.clone.symbolize_keys! @@ -261,22 +311,26 @@ def search(args={}) return [offset, users] end - def before_create + def before_create #:nodoc: self.status = 'new' end + # Returns a list of display fields def self.fields_options(opts={}) UserSegment::FieldHandler.display_fields(opts).collect { |field, info| [info[:handler].field_heading(field), field.to_s] }.sort { |a, b| a[0] <=> b[0] } end + # Returns a list of sortable fields def self.order_by_options(opts={}) UserSegment::FieldHandler.sortable_fields(opts).collect { |field, info| [info[:handler].field_heading(field), field.to_s] }.sort { |a, b| a[0] <=> b[0] } end + # Returns the text version of the filter def to_expr self.operations.to_expr end + # Returns the hash used to setup the UserSegment::OperaionBuilder def to_builder self.operations.to_builder end @@ -295,6 +349,7 @@ def after_save #:nodoc:all end end + # Creates a copy of the segment. def self.create_copy(id) segment_to_copy = UserSegment.find_by_id(id) return nil unless segment_to_copy @@ -307,6 +362,7 @@ def self.create_copy(id) @segment end + # Returns the name of the segment with its type. def list_name if self.segment_type == 'filtered' self.name + ' (Filtered)' @@ -315,10 +371,7 @@ def list_name end end - def self.segment_fields(fields) - fields.collect { |field| UserSegment::Field.new :field => field } - end - + # Returns the data required to output the fields value. def self.get_handlers_data(ids, fields) handlers = {} fields.each do |field| diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index af0b453b..bf22d566 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -78,10 +78,24 @@ def end_user_ids(ids=nil) scope.find(:all).collect &self.end_user_field end + def get_default_scope + scope = self.handler_class.user_segment_fields[self.field.to_sym][:scope] + if scope + if scope.is_a?(Hash) + self.domain_model_class.scoped scope + elsif scope.is_a?(Proc) + scope.call + elsif scope.is_a?(ActiveRecord::NamedScope::Scope) + scope + end + else + self.domain_model_class + end + end + def get_scope(scope=nil) return @scope if @scope - scope ||= self.domain_model_class - @scope = self.type_class.send(self.operation, scope, self.end_user_field, self.model_field, *self.converted_arguments) + @scope = self.type_class.send(self.operation, self.get_default_scope, self.end_user_field, self.model_field, *self.converted_arguments) @scope = self.child_field.get_scope(@scope) if self.child_field @scope end @@ -124,6 +138,10 @@ def model_field self.handler_class.user_segment_fields[self.field.to_sym][:field] if self.handler_class end + def default_scope + self.handler_class.user_segment_fields[self.field.to_sym][:scope] if self.handler_class + end + def handler @handler ||= UserSegment::FieldHandler.handlers.find { |info| info[:class].has_field?(self.field) } unless self.field.blank? end diff --git a/app/models/user_segment/field_handler.rb b/app/models/user_segment/field_handler.rb index e3e96891..2e10cec4 100644 --- a/app/models/user_segment/field_handler.rb +++ b/app/models/user_segment/field_handler.rb @@ -1,13 +1,61 @@ +=begin rdoc +A user segment field handler is used to create a handler for :user_segment :fields. +Basically it is a container for all the fields that can be queried agains a DomainModel. + +from EndUserSegmentField: + + def self.user_segment_fields_handler_info + { + :name => 'User Fields', + :domain_model_class => EndUser, + :end_user_field => :id + } + end + +The handler info must contain the :domain_model_class. +The :end_user_field by default is assumed to be :end_user_id. + +=end class UserSegment::FieldHandler include HandlerActions + # A hash containing all the registered fields. def self.user_segment_fields; {}; end + # Where or not the field exists in the handler. def self.has_field?(field) self.user_segment_fields[field.to_sym] ? true : false end - + + # Used to register fields for the segment filter. + # + # field is the name of the filter field. + # + # type is the UserSegment::FieldType of the field + # + # options + # + # [:name] + # the display name of the field, by default humanizes the field + # [:field] + # the actual field in the model, by default uses field + # [:display_field] + # the field in the model to display, by default uses field + # [:search_only] + # when set to true the field is not available is the UserSegment::FieldHandler.display_fields + # [:display_method] + # default method used to transform the handler data into output + # [:display_methods] + # an optional array of methods for display the fields data + # [:sortable] + # when set to true the field is available is the UserSegment::FieldHandler.sortable_fields + # [:sort_method] + # default method used when sorting on this field + # [:sort_methods] + # an optional array of methods for sorting on this field + # [:scope] + # an optional scope or set of conditions to be applied to the field. def self.register_field(field, type, options={}) fields = self.user_segment_fields @@ -22,6 +70,7 @@ def self.register_field(field, type, options={}) end end + # An array of all the :user_segment :fields handlers info. def self.handlers ([ self.get_handler_info(:user_segment, :fields, 'end_user_segment_field'), self.get_handler_info(:user_segment, :fields, 'end_user_action_segment_field'), @@ -29,6 +78,7 @@ def self.handlers self.get_handler_info(:user_segment, :fields)).uniq end + # A hash of all the fields that can be sorted on def self.sortable_fields(opts={}) key = 'user_segment_sortable_fields_' + opts.to_s return DataCache.local_cache(key) if DataCache.local_cache(key) @@ -54,6 +104,7 @@ def self.sortable_fields(opts={}) DataCache.put_local_cache(key, fields) end + # A hash of all the fields that can be displayed def self.display_fields(opts={}) key = 'user_segment_display_fields_' + opts.to_s return DataCache.local_cache(key) if DataCache.local_cache(key) @@ -78,8 +129,9 @@ def self.display_fields(opts={}) DataCache.put_local_cache(key, fields) end + # A default method for all handlers to display the heading def self.field_heading(field) - info = self.display_fields[field] + info = self.display_fields[field.to_sym] return '' unless info info[:name] end diff --git a/app/models/user_segment/field_type.rb b/app/models/user_segment/field_type.rb index 47390a58..eaa678bf 100644 --- a/app/models/user_segment/field_type.rb +++ b/app/models/user_segment/field_type.rb @@ -1,4 +1,9 @@ +=begin rdoc +A user segment field type creates the scopes that the used segment filter. +The type determines the operations/functions availble to a field. + +=end class UserSegment::FieldType def self.user_segment_field_type_operations; {}; end diff --git a/app/models/user_segment_cache.rb b/app/models/user_segment_cache.rb index fcec8509..1d95bf94 100644 --- a/app/models/user_segment_cache.rb +++ b/app/models/user_segment_cache.rb @@ -1,4 +1,10 @@ +=begin rdoc +A user segment cache is used to store the list of user ids. + +Should not be used directly. Instead use UserSegment methods. + +=end class UserSegmentCache < DomainModel SIZE = 25000 DEFAULT_BATCH_SIZE = 1000 @@ -9,7 +15,7 @@ class UserSegmentCache < DomainModel validates_presence_of :user_segment_id - def before_create + def before_create #:nodoc: self.created_at = Time.now unless self.created_at end From edb3ab8134ca16f11d9108bf7091a29f909ac123 Mon Sep 17 00:00:00 2001 From: Pascal Rettig Date: Tue, 8 Jun 2010 14:16:21 -0400 Subject: [PATCH 122/139] Partial fix for generate from blog post --- vendor/modules/blog/app/controllers/blog/manage_controller.rb | 4 ++-- .../blog/app/views/blog/manage/generate_mail_generate.rjs | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/vendor/modules/blog/app/controllers/blog/manage_controller.rb b/vendor/modules/blog/app/controllers/blog/manage_controller.rb index 65ab4907..d8c5eef3 100644 --- a/vendor/modules/blog/app/controllers/blog/manage_controller.rb +++ b/vendor/modules/blog/app/controllers/blog/manage_controller.rb @@ -6,7 +6,7 @@ class Blog::ManageController < ModuleController permit 'blog_config', :only => [ :configure, :delete ] - before_filter :check_view_permission, :except => [ :configure, :delete, :display_blog_list_table, :list ] + before_filter :check_view_permission, :except => [ :configure, :delete, :display_blog_list_table, :list, :generate_mail, :generate_mail_generate ] component_info 'Blog' @@ -56,7 +56,7 @@ def generate_mail end def generate_mail_generate - @post = @blog.blog_posts.find(params[:post_id]) + @post = Blog::BlogPost.find(params[:post_id]) @align = params[:opts][:align] == 'left' ? 'left' : 'right' @padding = params[:opts][:align] == 'left' ? 'padding:0 10px 10px 0;' : 'padding:0 0 10px 0px;' diff --git a/vendor/modules/blog/app/views/blog/manage/generate_mail_generate.rjs b/vendor/modules/blog/app/views/blog/manage/generate_mail_generate.rjs index c5412e09..e672fe1b 100644 --- a/vendor/modules/blog/app/views/blog/manage/generate_mail_generate.rjs +++ b/vendor/modules/blog/app/views/blog/manage/generate_mail_generate.rjs @@ -1,3 +1,2 @@ - page << "TemplateEditor.addContent('#{jh @post_content}')" From f8642f5a6e26fe70374af034f4683261e7a51710 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 8 Jun 2010 18:20:21 +0000 Subject: [PATCH 123/139] Some basic rdoc for registering a operation. --- app/models/user_segment/field_type.rb | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/app/models/user_segment/field_type.rb b/app/models/user_segment/field_type.rb index eaa678bf..30c10772 100644 --- a/app/models/user_segment/field_type.rb +++ b/app/models/user_segment/field_type.rb @@ -6,12 +6,32 @@ =end class UserSegment::FieldType + # A hash of all the operations for this type def self.user_segment_field_type_operations; {}; end + # Whether or not this type has the operation def self.has_operation?(operation) self.user_segment_field_type_operations[operation.to_sym] ? true : false end - + + # Registers operation to be applied to a field. + # + # name of the operation + # list of arguments required by the operation + # an argument is name, type, options + # Ex: [['Format', :option, {:options => [['Day', 'day'], ['Weeks', 'week'] ...], :description => 'ago'}] + # argument options + # [:options] + # An array of select options + # [:description] + # The description used in the filter builder + # [:class] + # When the argument is type :model. It uses this class to determine the select options. + # Additional options + # [:description] + # A brief description used when creating the help + # [:complex] + # When set to true this operation can not be combined with any other combined operation def self.register_operation(operation, args=[], options={}) operations = self.user_segment_field_type_operations @@ -93,16 +113,19 @@ def self.convert_to(value, type, opts={}) nil end + # An array of the model options def self.model_options(opts={}) opts[:class].select_options end + # An array of the arguments converted to their correct types def self.convert_arguments(arguments, types, options) (0..arguments.length-1).collect do |idx| self.convert_to(arguments[idx], types[idx], options[idx]) end end + # A default method for displaying the data of a field def self.field_output(mdl, handler_data, field) info = UserSegment::FieldHandler.display_fields[field] return nil unless info From e230fb08f0520d35f5ffaba741fff1abf8269bf5 Mon Sep 17 00:00:00 2001 From: Pascal Rettig Date: Tue, 8 Jun 2010 14:28:57 -0400 Subject: [PATCH 124/139] Content node fixes --- app/models/content_node.rb | 1 + .../feed/app/controllers/feed/rss_renderer.rb | 12 ++++++++---- .../feed/app/models/feed/content_node_rss_handler.rb | 6 +++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/models/content_node.rb b/app/models/content_node.rb index a3de6a55..09cc7722 100644 --- a/app/models/content_node.rb +++ b/app/models/content_node.rb @@ -184,6 +184,7 @@ def generate_content_values!(type_preload = nil,force=false) def link(type_preload = nil) type_preload ||= self.content_type + return "#" unless type_preload node ? (self.content_url_override || type_preload.content_link(node)) : '' end diff --git a/vendor/modules/feed/app/controllers/feed/rss_renderer.rb b/vendor/modules/feed/app/controllers/feed/rss_renderer.rb index 411c7c8a..82979486 100644 --- a/vendor/modules/feed/app/controllers/feed/rss_renderer.rb +++ b/vendor/modules/feed/app/controllers/feed/rss_renderer.rb @@ -137,15 +137,19 @@ def rss_auto_discovery @options = paragraph.data || {} if !@options[:module_node_id].blank? && @options[:module_node_id].to_i > 0 - @nodes = [ SiteNode.find_by_id(@options[:module_node_id]) ] + @nodes = [ SiteNode.find_by_id(@options[:module_node_id]) ].compact else @nodes = SiteNode.find(:all,:conditions => ['node_type = "M" AND module_name = "/feed/rss"' ],:include => :page_modifier) end output = @nodes.collect do |nd| - nd.page_modifier.modifier_data ||= {} - "" - end.join("\n") + if nd.page_modifier + nd.page_modifier.modifier_data ||= {} + "" + else + nil + end + end.compact.join("\n") include_in_head(output) render_paragraph :nothing => true diff --git a/vendor/modules/feed/app/models/feed/content_node_rss_handler.rb b/vendor/modules/feed/app/models/feed/content_node_rss_handler.rb index 194695a4..b98eedbe 100644 --- a/vendor/modules/feed/app/models/feed/content_node_rss_handler.rb +++ b/vendor/modules/feed/app/models/feed/content_node_rss_handler.rb @@ -28,7 +28,11 @@ def get_feed :link => Configuration.domain_link(node.link) } - categories = [node.content_type.type_description, node.content_type.content_name].collect { |c| c unless c.blank? }.compact + if node.content_type + categories = [node.content_type.type_description, node.content_type.content_name].collect { |c| c unless c.blank? }.compact + else + categories = [] + end item[:categories] = categories unless categories.empty? # unless node.content_type.content_name.blank? && node.content_type.type_description.blank? # item[:description] = "#{node.content_type.content_name} #{node.content_type.type_description}" From 1d0cf596855a485c0e647e931091c1c5a5fa1ab5 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 8 Jun 2010 18:33:32 +0000 Subject: [PATCH 125/139] Fix, defautl scoped must be scoped around any existings scope. Important when combining scopes. --- app/models/user_segment/field.rb | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index bf22d566..4fcbd8b7 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -78,24 +78,16 @@ def end_user_ids(ids=nil) scope.find(:all).collect &self.end_user_field end - def get_default_scope - scope = self.handler_class.user_segment_fields[self.field.to_sym][:scope] - if scope - if scope.is_a?(Hash) - self.domain_model_class.scoped scope - elsif scope.is_a?(Proc) - scope.call - elsif scope.is_a?(ActiveRecord::NamedScope::Scope) - scope - end - else - self.domain_model_class - end + def get_default_scope(scope=nil) + scope ||= self.domain_model_class + base_scope = self.handler_class.user_segment_fields[self.field.to_sym][:scope] + scope.scoped base_scope if base_scope + scope end def get_scope(scope=nil) return @scope if @scope - @scope = self.type_class.send(self.operation, self.get_default_scope, self.end_user_field, self.model_field, *self.converted_arguments) + @scope = self.type_class.send(self.operation, self.get_default_scope(scope), self.end_user_field, self.model_field, *self.converted_arguments) @scope = self.child_field.get_scope(@scope) if self.child_field @scope end From bf89d87adff231448a75223e16cb2883d230193a Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 8 Jun 2010 19:23:08 +0000 Subject: [PATCH 126/139] Can edit the segment filter on the index page. --- app/controllers/members_controller.rb | 15 ++++++++ .../members/_edit_segment_filter.html.erb | 22 +++++++++++ app/views/members/index.rhtml | 37 ++++++++++++++++--- app/views/members/refresh_segment_status.rjs | 1 + 4 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 app/views/members/_edit_segment_filter.html.erb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 42458e59..daebdc8e 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -320,6 +320,21 @@ def edit_segment end end + def edit_segment_filter + @segment = UserSegment.find params[:path][0] + + if request.post? && params[:segment] + return redirect_to :action => 'index', :path => @segment.id unless params[:commit] + + if @segment.update_attributes params[:segment] + @segment.refresh if @segment.should_refresh? + render :partial => 'refresh_segment' + end + else + render :partial => 'edit_segment_filter' + end + end + def copy_segment segment_to_copy = UserSegment.find params[:path][0] diff --git a/app/views/members/_edit_segment_filter.html.erb b/app/views/members/_edit_segment_filter.html.erb new file mode 100644 index 00000000..62895b53 --- /dev/null +++ b/app/views/members/_edit_segment_filter.html.erb @@ -0,0 +1,22 @@ +
                + +<% admin_form_for :segment, @segment, :html => {:onsubmit => 'MemberEditor.updateUserList(this); return false;'} do |f| -%> +<%= f.select :order_by, UserSegment.order_by_options %> +<%= f.radio_buttons :order_direction, UserSegment.order_direction_select_options %> + <% if @segment.segment_type == 'filtered' -%> + <% f.custom_field 'Filter' do %> + + +
                + <%= "
                #{f.output_error_message('Filter', :segment_options_text)}
                " if @segment.errors[:segment_options_text] %> + <%= text_area_tag 'segment[segment_options_text]', @segment.segment_options_text, :rows => 8, :style => 'width:400px;' %> +
                + + <% end %> + <% end -%> + +<%= f.spacer %> +<%= f.cancel_submit_buttons 'Cancel', (@segment.id ? 'Save' : 'Create') %> +<% end -%> + +
                diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index 4a8817d6..b31b06db 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -84,8 +84,7 @@ }, updateSegment: function(params) { - - ActiveTable.refresh("email_targets_table","<%= url_for :action => 'display_targets_table' %>",'targets_table',params); + ActiveTable.refresh("email_targets_table","<%= url_for :action => 'display_targets_table', :path => @segment ? @segment.id : nil %>",'targets_table',params); }, tableAction: function(action,params) { @@ -114,10 +113,31 @@ SCMS.remoteOverlay("<%= url_for :action => 'refresh_segment', :path => @segment ? @segment.id : nil %>"); }, + editUserList: function() { + SCMS.remoteOverlay("<%= url_for :action => 'edit_segment_filter', :path => @segment ? @segment.id : nil %>"); + }, + + updateUserList: function(frm) { + SCMS.updateOverlay("<%= url_for :action => 'edit_segment_filter', :path => @segment ? @segment.id : nil %>", Form.serialize(frm)); + }, + refreshUserListStatus: function() { <%= remote_function :url => url_for(:action => 'refresh_segment_status', :path => @segment ? @segment.id : nil) %>; } } + + UserSegment = { + appendOptionsText: function(expr) { + if($('segment_segment_options_text').value != '') { + $('segment_segment_options_text').value += "\n"; + } + $('segment_segment_options_text').value += expr; + }, + + replaceOptionsText: function(expr) { + $('segment_segment_options_text').value = expr; + } + } <% action_panel :handler => 'members' do |p| -%> @@ -131,17 +151,22 @@
                -
                +
                <%= form_tag %> <% if @segment && @segment.last_ran_at -%> - Refresh | Edit + Refresh + <% if @segment.segment_type == 'filtered' -%> + | Edit Filter + <% end -%> + | Edit <% else -%> Edit <% end -%> -<%= select_tag :user_segment_id, options_for_select([['Everyone', nil]] + @segmentations.collect { |seg| [seg.list_name, seg.id] }, (@segment ? @segment.id : nil)), :onchange => 'MemberEditor.changeSegments();', :id => 'user_segments_user_segment_id', :style => 'width:200px;' %> +<%= select_tag :user_segment_id, options_for_select([['Everyone', nil]] + @segmentations.collect { |seg| [seg.list_name, seg.id] }, (@segment ? @segment.id : nil)), :onchange => 'MemberEditor.changeSegments();', :id => 'user_segments_user_segment_id', :style => 'width:400px;' %>
                <% if @segment && @segment.last_ran_at -%> -<%= 'updated on %s' / @segment.last_ran_at.strftime(DEFAULT_DATETIME_FORMAT.t) %> +<%= "%d users found," / @segment.last_count %> +<%= 'last updated on %s' / @segment.last_ran_at.strftime(DEFAULT_DATETIME_FORMAT.t) %>
                <% end -%> Create a User List diff --git a/app/views/members/refresh_segment_status.rjs b/app/views/members/refresh_segment_status.rjs index a3383b47..b5682f46 100644 --- a/app/views/members/refresh_segment_status.rjs +++ b/app/views/members/refresh_segment_status.rjs @@ -1,5 +1,6 @@ if @segment.ready? page << 'SCMS.closeOverlay();' + page << 'MemberEditor.updateSegment();' else page << 'setTimeout(MemberEditor.refreshUserListStatus, 1000);' end From d1b9c5952f1007e9f625edce22ce225d6cbfd805 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 8 Jun 2010 19:24:24 +0000 Subject: [PATCH 127/139] refresh the list before closing overlay. --- app/views/members/refresh_segment_status.rjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/members/refresh_segment_status.rjs b/app/views/members/refresh_segment_status.rjs index b5682f46..c81946e7 100644 --- a/app/views/members/refresh_segment_status.rjs +++ b/app/views/members/refresh_segment_status.rjs @@ -1,6 +1,6 @@ if @segment.ready? - page << 'SCMS.closeOverlay();' page << 'MemberEditor.updateSegment();' + page << 'SCMS.closeOverlay();' else page << 'setTimeout(MemberEditor.refreshUserListStatus, 1000);' end From 09cc9f8db27c54620ef360958a92727c2e25c077 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 8 Jun 2010 19:30:23 +0000 Subject: [PATCH 128/139] Update the segment info when refreshing the segment. --- app/views/members/index.rhtml | 5 +++-- app/views/members/refresh_segment_status.rjs | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index b31b06db..ed09dc67 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -165,8 +165,9 @@ <%= select_tag :user_segment_id, options_for_select([['Everyone', nil]] + @segmentations.collect { |seg| [seg.list_name, seg.id] }, (@segment ? @segment.id : nil)), :onchange => 'MemberEditor.changeSegments();', :id => 'user_segments_user_segment_id', :style => 'width:400px;' %>
                <% if @segment && @segment.last_ran_at -%> -<%= "%d users found," / @segment.last_count %> -<%= 'last updated on %s' / @segment.last_ran_at.strftime(DEFAULT_DATETIME_FORMAT.t) %> + +<%= "%d users found, " / @segment.last_count %><%= 'last updated on %s' / @segment.last_ran_at.strftime(DEFAULT_DATETIME_FORMAT.t) %> +
                <% end -%> Create a User List diff --git a/app/views/members/refresh_segment_status.rjs b/app/views/members/refresh_segment_status.rjs index c81946e7..411d2354 100644 --- a/app/views/members/refresh_segment_status.rjs +++ b/app/views/members/refresh_segment_status.rjs @@ -1,4 +1,5 @@ if @segment.ready? + page.replace_html 'user_segment_info', ("%d users found, " / @segment.last_count) + ('last updated on %s' / @segment.last_ran_at.strftime(DEFAULT_DATETIME_FORMAT.t)) page << 'MemberEditor.updateSegment();' page << 'SCMS.closeOverlay();' else From e44d70fee91a7661eff3a553bc31475962a50f31 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 9 Jun 2010 14:58:48 +0000 Subject: [PATCH 129/139] Fix, wasn't returning the correct field from aggregate types --- app/models/user_segment/core_type.rb | 10 +++++----- app/views/members/_user_segments_table.html.erb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/user_segment/core_type.rb b/app/models/user_segment/core_type.rb index 8a37817b..867a7a63 100644 --- a/app/models/user_segment/core_type.rb +++ b/app/models/user_segment/core_type.rb @@ -44,25 +44,25 @@ def self.is(cls, group_field, field, operator, value) register_operation :sum, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]], :complex => true def self.sum(cls, group_field, field, operator, value) - cls.scoped(:select => "#{field}, SUM(#{field}) as #{field}_sum", :group => group_field, :having => "#{field}_sum #{operator} #{value}") + cls.scoped(:select => "#{group_field}, SUM(#{field}) as #{field}_sum", :group => group_field, :having => "#{field}_sum #{operator} #{value}") end register_operation :average, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]], :complex => true def self.average(cls, group_field, field, operator, value) - cls.scoped(:select => "#{field}, AVG(#{field}) as #{field}_average", :group => group_field, :having => "#{field}_average #{operator} #{value}") + cls.scoped(:select => "#{group_field}, AVG(#{field}) as #{field}_average", :group => group_field, :having => "#{field}_average #{operator} #{value}") end register_operation :min, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]], :complex => true def self.min(cls, group_field, field, operator, value) - cls.scoped(:select => "#{field}, MIN(#{field}) as #{field}_min", :group => group_field, :having => "#{field}_min #{operator} #{value}") + cls.scoped(:select => "#{group_field}, MIN(#{field}) as #{field}_min", :group => group_field, :having => "#{field}_min #{operator} #{value}") end register_operation :max, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]], :complex => true def self.max(cls, group_field, field, operator, value) - cls.scoped(:select => "#{field}, MAX(#{field}) as #{field}_max", :group => group_field, :having => "#{field}_max #{operator} #{value}") + cls.scoped(:select => "#{group_field}, MAX(#{field}) as #{field}_max", :group => group_field, :having => "#{field}_max #{operator} #{value}") end end @@ -70,7 +70,7 @@ class CountType < UserSegment::FieldType register_operation :count, [['Operator', :option, {:options => UserSegment::CoreType.number_type_operators}], ['Value', :integer]], :complex => true def self.count(cls, group_field, field, operator, value) - cls.scoped(:select => "#{field}, COUNT(#{field}) as #{field}_count", :group => group_field, :having => "#{field}_count #{operator} #{value}") + cls.scoped(:select => "#{group_field}, COUNT(#{field}) as #{field}_count", :group => group_field, :having => "#{field}_count #{operator} #{value}") end end diff --git a/app/views/members/_user_segments_table.html.erb b/app/views/members/_user_segments_table.html.erb index e406a818..17964c2e 100644 --- a/app/views/members/_user_segments_table.html.erb +++ b/app/views/members/_user_segments_table.html.erb @@ -36,6 +36,6 @@ refresh_table = false <% if refresh_table -%> <% end -%> From 3015f102149e105624161767f51cb5322878f42d Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 9 Jun 2010 15:11:08 +0000 Subject: [PATCH 130/139] Fix, wasn't setting the default scope for the filter. --- app/models/user_segment/field.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index 4fcbd8b7..a79d9a6a 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -81,7 +81,7 @@ def end_user_ids(ids=nil) def get_default_scope(scope=nil) scope ||= self.domain_model_class base_scope = self.handler_class.user_segment_fields[self.field.to_sym][:scope] - scope.scoped base_scope if base_scope + scope = scope.scoped base_scope if base_scope scope end From adde5718d14c80c3152f8f4bcaabda5971f938cb Mon Sep 17 00:00:00 2001 From: Pascal Rettig Date: Wed, 9 Jun 2010 11:27:38 -0400 Subject: [PATCH 131/139] fixed returned scope to include base scope --- app/models/user_segment/field.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index 4fcbd8b7..a79d9a6a 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -81,7 +81,7 @@ def end_user_ids(ids=nil) def get_default_scope(scope=nil) scope ||= self.domain_model_class base_scope = self.handler_class.user_segment_fields[self.field.to_sym][:scope] - scope.scoped base_scope if base_scope + scope = scope.scoped base_scope if base_scope scope end From 3cca489c0e17da8868de1eac4259f62e55692657 Mon Sep 17 00:00:00 2001 From: Pascal Rettig Date: Wed, 9 Jun 2010 12:34:12 -0400 Subject: [PATCH 132/139] Modified user table and view, edit to link back to current list --- app/controllers/members_controller.rb | 36 +++++++++++++++++++++----- app/views/members/_targets_table.rhtml | 11 ++++---- app/views/members/view.rhtml | 2 +- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index daebdc8e..bb1fe323 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -439,15 +439,26 @@ def create end def edit - cms_page_path ['People'],'Edit Contact' + @segment = UserSegment.find_by_id(params[:path][1]) unless params[:path][1].blank? + + display_user_actions_table(false) + + if @segment + cms_page_path [ 'People', + ["%s",url_for(:action => 'index',:path => [ @segment.id ]),@segment.name] + ],['Edit %s',nil,@user.name.to_s.strip.blank? ? @user.email : @user.name ] + else + cms_page_path ['People'],'Edit Contact' + end + user_id = params[:path][0] @user = EndUser.find(user_id) if @user.client_user_id || (@user.user_class.editor? && !myself.has_role?('editor_editors')) - redirect_to :action => 'index' + redirect_to :action => 'index', :path => @segment ? [ @segment.id ] : nil return end @@ -458,7 +469,8 @@ def edit # Don't let user class be upgrade to editor if the user can edit those if @user.user_class.editor? && !myself.has_role?('editor_editors') - redirect_to :action => 'index' + redirect_to :action => 'index', :path => @segment ? [ @segment.id ] : nil + return end @@ -489,11 +501,13 @@ def edit @user.action('/members/edit',:admin_user_id => myself.id, :level => 0) update_subscriptions(@user,params[:subscription]) flash[:notice] = 'Saved User: "%s" ' / (@user.email.blank? ? @user.name : @user.email) - redirect_to :action =>'index' + redirect_to :action =>'index', :path => @segment ? [ @segment.id ] : nil + return end else - redirect_to :action =>'index' + redirect_to :action =>'index', :path => @segment ? [ @segment.id ] : nil + return end end @@ -536,9 +550,17 @@ def display_user_actions_table(display=true) def view @user = EndUser.find(params[:path][0]) + @segment = UserSegment.find_by_id(params[:path][1]) unless params[:path][1].blank? + display_user_actions_table(false) - - cms_page_path [ 'People'],['%s',nil,@user.name.to_s.strip.blank? ? @user.email : @user.name ] + + if @segment + cms_page_path [ 'People', + ["%s",url_for(:action => 'index',:path => [ @segment.id ]),@segment.name] + ],['%s',nil,@user.name.to_s.strip.blank? ? @user.email : @user.name ] + else + cms_page_path [ 'People'],['%s',nil,@user.name.to_s.strip.blank? ? @user.email : @user.name ] + end handlers = get_handler_info(:members,:view) diff --git a/app/views/members/_targets_table.rhtml b/app/views/members/_targets_table.rhtml index 07f6a798..c73876a1 100644 --- a/app/views/members/_targets_table.rhtml +++ b/app/views/members/_targets_table.rhtml @@ -12,24 +12,25 @@ ], :more_actions => [['Delete Targets','delete','Delete the selected users?']], :update => 'targets_table' do |t| %> +<% user_url = url_for(:action => 'view', :path => [ t.id, @segment.id ]) %>
              > diff --git a/app/views/members/view.rhtml b/app/views/members/view.rhtml index 2d2f638c..48ec51cf 100644 --- a/app/views/members/view.rhtml +++ b/app/views/members/view.rhtml @@ -17,7 +17,7 @@ MemberViewer = { <% unless @user.client_user_id || (@user.user_class.editor? && !myself.has_role?('editor_editors')) %> <% action_panel do |p| -%> - <%= p.link 'Edit User',:icon => 'edit.gif',:action => 'edit', :path => @user %> + <%= p.link 'Edit User',:icon => 'edit.gif',:action => 'edit', :path => [ @user, @segment ? @segment.id : nil ].compact %> <%= p.link 'Login as User', { :icon => 'download.gif',:action => 'login', :path => @user }, :method => 'post' %> <% end -%>
              From 12bd4db4c1bba13a36a3c13fdd7fd8c7f044125d Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Wed, 9 Jun 2010 18:47:11 +0000 Subject: [PATCH 133/139] Can pass options to the wizard. Added lightblue , camp_box_steps, display_table to the admin framework css. --- app/helpers/cms_helper.rb | 15 ++- .../standard/stylesheets/admin_framework.css | 107 ++++++++++++++++++ 2 files changed, 116 insertions(+), 6 deletions(-) diff --git a/app/helpers/cms_helper.rb b/app/helpers/cms_helper.rb index c000a4c5..7d2510f4 100644 --- a/app/helpers/cms_helper.rb +++ b/app/helpers/cms_helper.rb @@ -762,27 +762,30 @@ def subpage_display(name,pages) end class WizardSteps - def initialize(wizard_step,wizard_max_step) + def initialize(wizard_step,wizard_max_step,opts={}) @wizard_step = wizard_step @wizard_max_step = wizard_max_step + @options = opts end def step(number,txt,url = {}) + tag = @options[:tag] || 'span' + css_class = @options[:class] || 'large_ajax_link_selected' if number == @wizard_step - "#{number}. #{txt}" + "<#{tag} class='#{css_class}'>#{txt}" elsif number <= @wizard_max_step - "#{number}. #{txt}" + "<#{tag}>#{txt}" else - "#{number}. #{txt}" + "<#{tag}>#{txt}" end end end - def wizard_steps(wizard_step,wizard_max_step) - yield WizardSteps.new(wizard_step,wizard_max_step) + def wizard_steps(wizard_step,wizard_max_step,opts={}) + yield WizardSteps.new(wizard_step,wizard_max_step,opts) end end diff --git a/public/themes/standard/stylesheets/admin_framework.css b/public/themes/standard/stylesheets/admin_framework.css index 867f7680..694d9f4c 100644 --- a/public/themes/standard/stylesheets/admin_framework.css +++ b/public/themes/standard/stylesheets/admin_framework.css @@ -26,6 +26,10 @@ h1.blue { } +h1.lightblue { + color:#a6cdda; +} + h2 { font-size:14px; color: #111111; @@ -49,6 +53,12 @@ h4 { } +span.description { + font-size: 11px; + font-weight: normal; + color: #777777; +} + .clearfix:after { content: "."; display: block; @@ -1435,6 +1445,40 @@ td.error { } +/* Campaign Box listing steps above a page */ + +.camp_steps_box { + margin:0; + padding:10px 0 10px 55px; + text-align:center; +} + + +.camp_steps_box td { + padding: 5px 15px 5px 15px; + text-align: center; + width: 180px; + color:#3b648c; + font-weight: bold; + font-size: 11px; + background-color:#c3e3e7; +} + +.camp_steps_box td a { + color:#3b648c; +} + +.camp_steps_box td.arrow { + text-align: center; + width: 30px; + color:#3b648c; + background-color:#fff; +} + +.camp_steps_box td.selected { + background-color:#f3e380; +} + ol.admin_list { @@ -2349,3 +2393,66 @@ background-color: #eeeeee; background-color: #ffffff; } +table.display_table { + border-width: 0; + border-spacing: 0; + border-style: none; + padding: 0; + margin: 0; +} + +table.display_table th { + background-color:#c3e3e7; + color:#3b648c; + text-align: left; + font-size: 12px; + padding:7px 0 7px 10px; +} + +table.display_table td { + border-width: 0; + border-spacing: 0; + border-style: none; + padding: 0; + margin: 0; + vertical-align: top; +} + +table.display_table td.separator { + font-size: 0; + border-left: 1px dotted #aaa; + width: 1px; +} + +table.display_table td.spacer { + font-size: 0; + width: 4px; +} + +table.display_table td.base { + background-color:#c3e3e7; + font-size: 0; + height: 10px; +} + +table.display_table td.title { + background-color:#eeeeee; + color:#3b648c; + font-weight: bold; + text-align: left; + font-size: 11px; + padding:5px 0 5px 10px; +} + +table.display_table td.label { + color:#3b648c; + font-weight: bold; + text-align: right; + font-size: 11px; + padding:3px; +} + +table.display_table td.field { + font-size: 11px; + padding:3px 0 3px 0; +} From 54e9bc1de1e8ec9cbadd073cacac6d154c9254ff Mon Sep 17 00:00:00 2001 From: Pascal Rettig Date: Thu, 10 Jun 2010 10:11:16 -0400 Subject: [PATCH 134/139] Fixed table links to view & editor w/ segment --- app/views/members/_targets_table.rhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/members/_targets_table.rhtml b/app/views/members/_targets_table.rhtml index c73876a1..ae1f3d83 100644 --- a/app/views/members/_targets_table.rhtml +++ b/app/views/members/_targets_table.rhtml @@ -12,13 +12,13 @@ ], :more_actions => [['Delete Targets','delete','Delete the selected users?']], :update => 'targets_table' do |t| %> -<% user_url = url_for(:action => 'view', :path => [ t.id, @segment.id ]) %> +<% user_url = url_for(:action => 'view', :path => [ t.id, @segment ? @segment.id : nil].compact) %> >
              <%= @builder.operation_argument_names[idx] %><%= builder.operation_argument_names[idx] %> - <% arg_options = @builder.operation_argument_options[idx] + <% arg_options = builder.operation_argument_options[idx] description = arg_options[:description] if arg_options[:options] -%> <%= f.select "argument#{idx}", arg_options[:options] %> - <% elsif @builder.operation_arguments[idx] == :boolean -%> + <% elsif builder.operation_arguments[idx] == :boolean -%> <%= f.yes_no "argument#{idx}" %> <% else -%> <%= f.text_field "argument#{idx}" %> diff --git a/app/views/members/_operation_form_child.html.erb b/app/views/members/_operation_form_child.html.erb new file mode 100644 index 00000000..b8ddddec --- /dev/null +++ b/app/views/members/_operation_form_child.html.erb @@ -0,0 +1,11 @@ + +<% cms_unstyled_fields_for form_id, builder do |f| -%> +
            • + <%= f.select :field, builder.field_options, {}, :onchange => 'OperationBuilder.updateOperations();', :style => 'width:200px;' %> +
              • + +
              +<%= render :partial => 'operation_form_operation', :locals => {:builder => builder, :form_id => form_id} %> +
              + +<% end -%> diff --git a/app/views/members/_operation_form_operation.html.erb b/app/views/members/_operation_form_operation.html.erb index e2df7520..089e3737 100644 --- a/app/views/members/_operation_form_operation.html.erb +++ b/app/views/members/_operation_form_operation.html.erb @@ -1,17 +1,27 @@ -<% cms_unstyled_fields_for :builder, @builder do |f| %> +<% cms_unstyled_fields_for form_id, builder do |f| %> -<% if @builder.operation_options.length == 1 -%> +<% if builder.operation_options.length == 1 -%> <%= f.hidden_field :operation %> <% else -%>
            • - <%= f.select :operation, @builder.operation_options, {}, :onchange => 'OperationBuilder.updateArguments();', :style => 'width:140px;' %> + <%= f.select :operation, builder.operation_options, {}, :onchange => 'OperationBuilder.updateOperations();', :style => 'width:140px;' %> function
              • <% end -%> -
            • -<%= render :partial => 'operation_form_arguments' %> +
            • +<%= render :partial => 'operation_form_arguments', :locals => {:form_id => form_id, :builder => builder} %>
              • +
            • +<%= f.select :condition, builder.condition_options, {}, :onchange => 'OperationBuilder.updateOperations();' %> +
              • + +<% unless builder.condition.blank? -%> +
              +<%= render :partial => 'operation_form_child', :locals => {:builder => builder.child_field, :form_id => "#{form_id}[child]"} %> +
              +<% end -%> + <% end %> From aab44aef43ee447642fb7f495dfa0acd8db3bceb Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Fri, 21 May 2010 21:18:22 +0000 Subject: [PATCH 058/139] Added end user action field types --- app/controllers/module_controller.rb | 1 + app/models/end_user_action_segment_field.rb | 2 +- app/models/end_user_action_segment_type.rb | 17 +++++++++++++++++ app/models/handler_actions.rb | 13 ++++++++----- app/models/user_segment/field_type.rb | 12 +++++++++++- 5 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 app/models/end_user_action_segment_type.rb diff --git a/app/controllers/module_controller.rb b/app/controllers/module_controller.rb index 202be008..a6eb0a04 100644 --- a/app/controllers/module_controller.rb +++ b/app/controllers/module_controller.rb @@ -78,6 +78,7 @@ def self.get_module_handlers def self.register_handler(component,handler,class_name,options={}) component = component.to_sym; handler = handler.to_sym + options[:handler] = handler handlers = self.get_module_handlers handlers[component] ||= {} handlers[component][handler] ||= [] diff --git a/app/models/end_user_action_segment_field.rb b/app/models/end_user_action_segment_field.rb index b6ef5df7..754fd96e 100644 --- a/app/models/end_user_action_segment_field.rb +++ b/app/models/end_user_action_segment_field.rb @@ -9,7 +9,7 @@ def self.user_segment_fields_handler_info end register_field :renderer, UserSegment::CoreType::StringType - register_field :action, UserSegment::CoreType::StringType + register_field :action, EndUserActionSegmentType::ActionType register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at register_field :occurred, UserSegment::CoreType::DateTimeType, :field => :action_at diff --git a/app/models/end_user_action_segment_type.rb b/app/models/end_user_action_segment_type.rb new file mode 100644 index 00000000..c1327bb0 --- /dev/null +++ b/app/models/end_user_action_segment_type.rb @@ -0,0 +1,17 @@ + +class EndUserActionSegmentType + + class ActionType < UserSegment::FieldType + include HandlerActions + + def self.action_options + self.get_handlers(:action).collect { |handler| [handler[1][:description], handler[1][:handler].to_s] } + end + + register_operation :is, [['Action', :option, {:options => EndUserActionSegmentType::ActionType.action_options}]] + + def self.is(cls, field, action) + cls.scoped(:conditions => ["#{field} = ?", action]) + end + end +end diff --git a/app/models/handler_actions.rb b/app/models/handler_actions.rb index ad73e01b..f1860c12 100644 --- a/app/models/handler_actions.rb +++ b/app/models/handler_actions.rb @@ -7,7 +7,7 @@ def self.append_features(base) #:nodoc: base.extend(ClassMethods) end - def get_handlers(component,handler,initialized=false) + def get_handlers(component,handler=nil,initialized=false) self.class.get_handlers(component,handler,initialized) end @@ -40,8 +40,7 @@ def get_handler_instance(component,handler_name,identifier,*initialize_args) module ClassMethods - def get_handlers(component,handler,initialized = false) - component = component.to_sym; handler = handler.to_sym + def get_handlers(component,handler=nil,initialized = false) handlers = DataCache.get_cached_container("Handlers","Active") unless initialized || RAILS_ENV != 'production' unless handlers mods = initialized ? SiteModule.initialized_modules_info : SiteModule.enabled_modules_info @@ -68,10 +67,14 @@ def get_handlers(component,handler,initialized = false) end DataCache.put_container("Handlers","Active",handlers) unless initialized || RAILS_ENV == 'development' end - return (handlers[component]||{})[handler] || [] + if handler + (handlers[component.to_sym]||{})[handler.to_sym] || [] + else + (handlers[component.to_sym] || {}).values.inject([]) { |a,b| a.concat(b) } + end end - + def get_handler_options(component,handler_name,initialized=false) handlers = get_handlers(component,handler_name,initialized) handlers.collect do |handler| diff --git a/app/models/user_segment/field_type.rb b/app/models/user_segment/field_type.rb index bd722608..b70b3e43 100644 --- a/app/models/user_segment/field_type.rb +++ b/app/models/user_segment/field_type.rb @@ -42,6 +42,8 @@ def self.register_operation(operation, args=[], options={}) # converts a string to the correct type # supported types are :integer, :float, :double, :date, :datetime, :option, :boolean def self.convert_to(value, type, opts={}) + return value if value.nil? + case type when :integer return value.to_i if value.is_a?(Integer) || value =~ /^\d+$/ @@ -56,7 +58,15 @@ def self.convert_to(value, type, opts={}) rescue end when :option - value = opts[:options].find { |o| o.downcase == value.downcase } + value = opts[:options].find do |o| + if o.is_a?(Array) + o[1].downcase == value.downcase + else + o.downcase == value.downcase + end + end + + return value[1] if value.is_a?(Array) return value if value when :boolean return value if value.is_a?(TrueClass) || value.is_a?(FalseClass) From 1ae73f7f95c46d243a0de6bba742a8a0cc18b33b Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 24 May 2010 16:49:29 +0000 Subject: [PATCH 059/139] Added new condition with for operation building. Created a new core type, match type for full text fields. Language changes, Segments are now Lists. --- app/controllers/content_controller.rb | 1 + app/controllers/members_controller.rb | 11 +++++---- app/models/end_user_action_segment_field.rb | 9 ++++---- app/models/end_user_action_segment_type.rb | 5 ++-- app/models/end_user_cache_segment_field.rb | 13 +++++++++++ app/models/user_segment/core_type.rb | 8 +++++++ app/models/user_segment/operation_builder.rb | 23 +++++++++++-------- app/views/members/_operation_form.html.erb | 5 ++-- .../members/_operation_form_child.html.erb | 8 ++++--- .../_operation_form_expression.html.erb | 4 ++-- .../_operation_form_operation.html.erb | 2 +- app/views/members/_segment_form.html.erb | 6 ++--- app/views/members/_targets_table.rhtml | 9 +++++--- app/views/members/index.rhtml | 6 ++--- 14 files changed, 73 insertions(+), 37 deletions(-) create mode 100644 app/models/end_user_cache_segment_field.rb diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb index 653e46f0..452612e7 100644 --- a/app/controllers/content_controller.rb +++ b/app/controllers/content_controller.rb @@ -28,6 +28,7 @@ class ContentController < ModuleController #:nodoc: all register_handler :user_segment, :fields, 'EndUserSegmentField' register_handler :user_segment, :fields, 'EndUserActionSegmentField' + register_handler :user_segment, :fields, 'EndUserCacheSegmentField' def index @content_models,@content_actions = CmsController.get_content_models_and_actions diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 6269f8bb..5163f909 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -8,7 +8,7 @@ class MembersController < CmsController # :nodoc: all cms_admin_paths "people", "People" => { :controller => '/members' }, - "List" => { :action => 'segments' } + "User Lists" => { :action => 'segments' } # need to include @@ -98,6 +98,7 @@ def handle_table_actions def email_targets_table_generate(opts,*find_options) @generated_active_table_columns = [ ActiveTable::IconHeader.new('check', :width => '16'), + ActiveTable::StaticHeader.new('', :width => '24'), ActiveTable::StaticHeader.new('Profile', :width => '70'), ActiveTable::StaticHeader.new('Image', :width => '70'), ActiveTable::StaticHeader.new('Name'), @@ -236,12 +237,12 @@ def validate end def segments - cms_page_path ['People'], 'List' + cms_page_path ['People'], 'User Lists' user_segments_table(false) end def create_segment - cms_page_path ['People', 'List'], 'Create a List' + cms_page_path ['People', 'User Lists'], 'Create a User List' @builder = UserSegment::OperationBuilder.new nil @@ -260,7 +261,7 @@ def create_segment def edit_segment @segment = UserSegment.find params[:path][0] - cms_page_path ['People', 'List'], '%s List' / @segment.name + cms_page_path ['People', 'User Lists'], '%s User List' / @segment.name @builder = UserSegment::OperationBuilder.new nil @@ -281,7 +282,7 @@ def edit_segment def copy_segment segment_to_copy = UserSegment.find params[:path][0] - cms_page_path ['People', 'List'], 'Copy %s List' / segment_to_copy.name + cms_page_path ['People', 'User Lists'], 'Copy %s User List' / segment_to_copy.name @builder = UserSegment::OperationBuilder.new nil diff --git a/app/models/end_user_action_segment_field.rb b/app/models/end_user_action_segment_field.rb index 754fd96e..da14e714 100644 --- a/app/models/end_user_action_segment_field.rb +++ b/app/models/end_user_action_segment_field.rb @@ -8,9 +8,10 @@ def self.user_segment_fields_handler_info } end - register_field :renderer, UserSegment::CoreType::StringType - register_field :action, EndUserActionSegmentType::ActionType - register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at - register_field :occurred, UserSegment::CoreType::DateTimeType, :field => :action_at + register_field :user_action, EndUserActionSegmentType::ActionType, :name => 'User Actions' + register_field :action, UserSegment::CoreType::StringType, :name => 'User Actions: Action' + register_field :renderer, UserSegment::CoreType::StringType, :name => 'User Actions: Renderer' + register_field :created, UserSegment::CoreType::DateTimeType, :field => :created_at, :name => 'User Actions: Created' + register_field :occurred, UserSegment::CoreType::DateTimeType, :field => :action_at, :name => 'User Actions: Occurred' end diff --git a/app/models/end_user_action_segment_type.rb b/app/models/end_user_action_segment_type.rb index c1327bb0..b986e178 100644 --- a/app/models/end_user_action_segment_type.rb +++ b/app/models/end_user_action_segment_type.rb @@ -10,8 +10,9 @@ def self.action_options register_operation :is, [['Action', :option, {:options => EndUserActionSegmentType::ActionType.action_options}]] - def self.is(cls, field, action) - cls.scoped(:conditions => ["#{field} = ?", action]) + def self.is(cls, field, path) + path = path.split('/') + cls.scoped(:conditions => ["renderer = ? and action = ?", path[0..-2].join('/'), path[-1]]) end end end diff --git a/app/models/end_user_cache_segment_field.rb b/app/models/end_user_cache_segment_field.rb new file mode 100644 index 00000000..e9e7cc64 --- /dev/null +++ b/app/models/end_user_cache_segment_field.rb @@ -0,0 +1,13 @@ + +class EndUserCacheSegmentField < UserSegment::FieldHandler + + def self.user_segment_fields_handler_info + { + :name => 'End User Cache Segment Fields', + :domain_model_class => EndUserCache + } + end + + register_field :cache, UserSegment::CoreType::MatchType, :field => :data, :name => 'User Caches: Cache' + +end diff --git a/app/models/user_segment/core_type.rb b/app/models/user_segment/core_type.rb index 0f50c01d..6431f640 100644 --- a/app/models/user_segment/core_type.rb +++ b/app/models/user_segment/core_type.rb @@ -89,4 +89,12 @@ def self.is(cls, field, string) cls.scoped(:conditions => ["#{field} = ?", string]) end end + + class MatchType < UserSegment::FieldType + register_operation :search, [['Query', :string]] + + def self.like(cls, field, query) + cls.scoped(:conditions => ["MATCH (#{field}) AGAINST (?)", query]) + end + end end diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb index 6a3eed12..8942e683 100644 --- a/app/models/user_segment/operation_builder.rb +++ b/app/models/user_segment/operation_builder.rb @@ -1,6 +1,6 @@ class UserSegment::OperationBuilder < HashModel - attributes :operator => nil, :field => nil, :operation => nil, :arguments => nil, :condition => nil + attributes :operator => nil, :field => nil, :operation => nil, :arguments => nil, :condition => nil, :parent => nil def strict?; true; end def arguments; @arguments ||= []; end @@ -10,7 +10,7 @@ def operator_options end def condition_options - [['', nil], ['And', 'and'], ['Or', 'or']] + [['', nil], ['And', 'and'], ['Or', 'or'], ['With', 'with']] end def validate @@ -23,6 +23,7 @@ def build(opts={}) self.field = opts[:field] self.operation = opts[:operation] self.condition = opts[:condition] + self.parent = opts[:parent] unless self.field.blank? unless self.operation_options.rassoc(self.operation) self.operation = self.operation_options[0][1] @@ -35,8 +36,10 @@ def build(opts={}) self.send("#{arg}=", opts[arg.to_sym]) if opts[arg.to_sym] end - if opts[:child] - self.child_field.build(opts[:child]) + if ! self.condition.blank? + parent = self.condition == 'and' ? self : nil + child = (opts[:child] || {}).merge(:parent => parent) + self.child_field.build(child) self.user_segment_field.child = self.child_field.user_segment_field.to_h if self.condition == 'and' end end @@ -45,18 +48,18 @@ def field_options return @field_options if @field_options @field_options = [] UserSegment::FieldHandler.handlers.each do |handler| - handler[:class].user_segment_fields.each do |field, values| - @field_options << [values[:name], field.to_s] unless @field_options.rassoc(field.to_s) + if self.parent.nil? || self.parent.user_segment_field.handler == handler + handler[:class].user_segment_fields.each do |field, values| + @field_options << [values[:name], field.to_s] unless @field_options.rassoc(field.to_s) + end end end - @field_options.sort! { |a, b| a[0] <=> b[0] } - @field_options + @field_options = [['Select a field', nil]] + @field_options.sort { |a, b| a[0] <=> b[0] } end def user_segment_field return @user_segment_field if @user_segment_field @user_segment_field = UserSegment::Field.new :field => self.field, :operation => self.operation, :arguments => self.arguments - @user_segment_field end def operation_options @@ -70,6 +73,7 @@ def operation_options end @operation_options.sort! { |a, b| a[0] <=> b[0] } + @operation_options end def operation_arguments @@ -105,6 +109,7 @@ def to_expr output += self.user_segment_field.to_expr(:nochild => 1) output += '.' + self.child_field.to_expr if self.condition == 'and' output += ' + ' + self.child_field.to_expr if self.condition == 'or' + output += "\n" + self.child_field.to_expr if self.condition == 'with' output end diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb index c1818ac7..1f5f17b7 100644 --- a/app/views/members/_operation_form.html.erb +++ b/app/views/members/_operation_form.html.erb @@ -16,12 +16,13 @@ OperationBuilder = { appendOptionsText: function(expr) { with(window.opener) { setTimeout(function(){UserSegment.appendOptionsText(expr);}, 1); } + setTimeout(function(){window.close();}, 1); } }
              -User List Syntax Builder +Rule Builder <% cms_unstyled_form_for :builder, @builder, :html => {:id => 'builder', :onsubmit => 'OperationBuilder.appendExpression(); return false;', :class => "admin_form"} do |f| -%>
              • @@ -43,7 +44,7 @@ OperationBuilder = {
              • -<%= f.cancel_submit_buttons 'Close', 'Add to Operations', {:onclick => 'window.close();'} %> +<%= f.cancel_submit_buttons 'Close', 'Add to Filter', {:onclick => 'window.close();'} %>
                • <% end -%> diff --git a/app/views/members/_operation_form_child.html.erb b/app/views/members/_operation_form_child.html.erb index b8ddddec..28ad8a8e 100644 --- a/app/views/members/_operation_form_child.html.erb +++ b/app/views/members/_operation_form_child.html.erb @@ -4,8 +4,10 @@ <%= f.select :field, builder.field_options, {}, :onchange => 'OperationBuilder.updateOperations();', :style => 'width:200px;' %> -
                -<%= render :partial => 'operation_form_operation', :locals => {:builder => builder, :form_id => form_id} %> -
                + <% if builder.operation_options.length > 0 -%> +
                + <%= render :partial => 'operation_form_operation', :locals => {:builder => builder, :form_id => form_id} %> +
                + <% end -%> <% end -%> diff --git a/app/views/members/_operation_form_expression.html.erb b/app/views/members/_operation_form_expression.html.erb index 76d09eca..33c4087d 100644 --- a/app/views/members/_operation_form_expression.html.erb +++ b/app/views/members/_operation_form_expression.html.erb @@ -1,5 +1,5 @@ <% cms_unstyled_fields_for :builder, @builder do |f| -%> -
                Snippet
                -<%= f.text_area_tag :expr, @builder.to_expr, :style => 'width:400px; height: 50px;', :readonly => true %> +
                Filter (readonly)
                +<%= f.text_area_tag :expr, @builder.to_expr, :style => 'width:400px; height: 100px;', :readonly => true, :wrap => 'off' %> <% end -%> diff --git a/app/views/members/_operation_form_operation.html.erb b/app/views/members/_operation_form_operation.html.erb index 089e3737..639b9153 100644 --- a/app/views/members/_operation_form_operation.html.erb +++ b/app/views/members/_operation_form_operation.html.erb @@ -14,7 +14,7 @@ <%= render :partial => 'operation_form_arguments', :locals => {:form_id => form_id, :builder => builder} %> -
              • +
              • <%= f.select :condition, builder.condition_options, {}, :onchange => 'OperationBuilder.updateOperations();' %>
                • diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb index 8d6aa47c..af483765 100644 --- a/app/views/members/_segment_form.html.erb +++ b/app/views/members/_segment_form.html.erb @@ -13,12 +13,12 @@ UserSegment = { <%= f.text_field :name %> <%= f.text_area :description, :rows => 3 %> <%= f.select :order_by, UserSegment.order_by_options %> -<%= f.check_boxes :main_page, [['display on people page', true]], :single => true %> +<%= f.check_boxes :main_page, [['add to quick select list', true]], :single => true %> <%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> <% f.custom_field '' do %> -Builder +Create a rule <% end %> -<%= f.text_area :segment_options_text, :rows => 8, :label => 'Operations' %> +<%= f.text_area :segment_options_text, :rows => 8, :style => 'width:400px;', :label => 'Filter' %> <%= f.spacer %> <%= f.cancel_submit_buttons 'Cancel', (@segment.id ? 'Save' : 'Create') %> <% end -%> diff --git a/app/views/members/_targets_table.rhtml b/app/views/members/_targets_table.rhtml index 996f021b..6ef6e9e5 100644 --- a/app/views/members/_targets_table.rhtml +++ b/app/views/members/_targets_table.rhtml @@ -12,18 +12,21 @@
              		<%= entry_checkbox 'user',t.id %> + <%= t.editor? ? '' : content_tag(:a, theme_image_tag('icons/actions/edit.gif'), {:href => url_for(:action => 'edit', :path => t.id)}) %> + <%= t.user_class ? t.user_class.name : '-' %> <%= image = t.image ? t.image.image_tag(:thumb) : 'No Image'.t - t.editor? ? image : content_tag(:a, image, {:href => url_for(:action => 'edit', :path => t.id)}) + t.editor? ? image : content_tag(:a, image, {:href => url_for(:action => 'view', :path => t.id)}) %> - <%= t.editor? ? h(t.name) : content_tag(:a, t.name, {:href => url_for(:action => 'edit', :path => t.id)}) %> + <%= t.editor? ? h(t.name) : content_tag(:a, t.name, {:href => url_for(:action => 'view', :path => t.id)}) %> <%= email = t.email.blank? ? 'No Email'.t : t.email - t.editor? ? h(email) : content_tag(:a, email, {:href => url_for(:action => 'edit', :path => t.id)}) + t.editor? ? h(email) : content_tag(:a, email, {:href => url_for(:action => 'view', :path => t.id)}) %>
              <%= builder.operation_argument_names[idx] %> - <% arg_options = builder.operation_argument_options[idx] + + <% + arg_options = builder.operation_argument_options[idx] description = arg_options[:description] - if arg_options[:options] -%> - <%= f.select "argument#{idx}", arg_options[:options] %> + %> + + <% if arg_options[:options] -%> + <%= arg_options[:form_field] == 'radio_buttons' ? f.radio_buttons("argument#{idx}", arg_options[:options]) : f.select("argument#{idx}", arg_options[:options]) %> <% elsif builder.operation_arguments[idx] == :boolean -%> <%= f.yes_no "argument#{idx}" %> <% else -%> From 315a5b07c7ec695aab4673be2890a608413803f7 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 24 May 2010 17:34:35 +0000 Subject: [PATCH 061/139] Added not checkbox for with condition. --- app/views/members/_operation_form_child.html.erb | 7 +++++++ app/views/members/_operation_form_operation.html.erb | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/views/members/_operation_form_child.html.erb b/app/views/members/_operation_form_child.html.erb index 28ad8a8e..530c1e26 100644 --- a/app/views/members/_operation_form_child.html.erb +++ b/app/views/members/_operation_form_child.html.erb @@ -1,5 +1,12 @@ <% cms_unstyled_fields_for form_id, builder do |f| -%> + +<% if condition == 'with' -%> +
            • + <%= f.check_boxes :operator, [['not', 'not']], :single => true, :separator => '' %> +
              • +<% end -%> +
            • <%= f.select :field, builder.field_options, {}, :onchange => 'OperationBuilder.updateOperations();', :style => 'width:200px;' %>
              • diff --git a/app/views/members/_operation_form_operation.html.erb b/app/views/members/_operation_form_operation.html.erb index 639b9153..0468b7dc 100644 --- a/app/views/members/_operation_form_operation.html.erb +++ b/app/views/members/_operation_form_operation.html.erb @@ -19,9 +19,7 @@ <% unless builder.condition.blank? -%> -
              -<%= render :partial => 'operation_form_child', :locals => {:builder => builder.child_field, :form_id => "#{form_id}[child]"} %> -
              +<%= render :partial => 'operation_form_child', :locals => {:builder => builder.child_field, :form_id => "#{form_id}[child]", :condition => builder.condition} %> <% end -%> <% end %> From d63637cfa74a34b356752d87174ee6996fe99ddd Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 24 May 2010 19:18:12 +0000 Subject: [PATCH 062/139] Can convert segments in to a builder hash model. --- app/controllers/members_controller.rb | 3 ++- app/models/user_segment/field.rb | 12 ++++++++++++ app/models/user_segment/operation.rb | 11 +++++++++++ app/models/user_segment/operation_builder.rb | 6 ++++++ app/models/user_segment/operations.rb | 12 ++++++++++++ 5 files changed, 43 insertions(+), 1 deletion(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index a84b97ba..de746992 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -308,7 +308,8 @@ def refresh_segment def builder cms_page_path ['People'], 'Operation Builder' - @builder = UserSegment::OperationBuilder.new nil + @segment = UserSegment.find_by_id params[:path][0] + @builder = @segment ? UserSegment::OperationBuilder.create_builder(@segment) : UserSegment::OperationBuilder.new(nil) if request.post? && params[:builder] @builder.build(params[:builder]) diff --git a/app/models/user_segment/field.rb b/app/models/user_segment/field.rb index 493a3895..e28bcc51 100644 --- a/app/models/user_segment/field.rb +++ b/app/models/user_segment/field.rb @@ -115,4 +115,16 @@ def to_expr(opts={}) output += '.' + self.child_field.to_expr if self.child && self.child_field && opts[:nochild].nil? output end + + def to_builder(opts={}) + options = self.to_h.slice(:field, :operation) + self.arguments.each_with_index { |arg, idx| options["argument#{idx}".to_sym] = arg } + if self.child_field + options[:condition] = 'and' + options[:child] = self.child_field.to_builder(opts) + else + options.merge!(opts) + end + options + end end diff --git a/app/models/user_segment/operation.rb b/app/models/user_segment/operation.rb index de6eebf4..6f559064 100644 --- a/app/models/user_segment/operation.rb +++ b/app/models/user_segment/operation.rb @@ -35,6 +35,17 @@ def end_user_ids(ids=nil) @end_user_ids end + def to_builder(opts={}) + options = nil + @fields.reverse.each do |fld| + options = fld.to_builder(opts) + opts[:condition] = 'or' + opts[:child] = options + end + options[:operator] = @operator + options + end + def to_a [@operator] + @fields.collect { |fld| fld.to_h } end diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb index 8942e683..22c1390b 100644 --- a/app/models/user_segment/operation_builder.rb +++ b/app/models/user_segment/operation_builder.rb @@ -116,4 +116,10 @@ def to_expr def child_field @child_field ||= UserSegment::OperationBuilder.new nil end + + def self.create_builder(user_segment) + builder = UserSegment::OperationBuilder.new nil + builder.build(user_segment.operations.to_builder) + builder + end end diff --git a/app/models/user_segment/operations.rb b/app/models/user_segment/operations.rb index 6f793965..07e8d2fd 100644 --- a/app/models/user_segment/operations.rb +++ b/app/models/user_segment/operations.rb @@ -43,6 +43,18 @@ def operations=(options) end end + def to_builder + return {} unless @operations + options = nil + opts = {} + @operations.reverse.each do |op| + options = op.to_builder(opts) + opts[:condition] = 'with' + opts[:child] = options + end + options + end + def to_a return [] unless @operations @operations.collect { |op| op.to_a } From a18efb1e2648490398afa1011bcedd064beefb6b Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 24 May 2010 19:42:33 +0000 Subject: [PATCH 063/139] Either create a filter or edit an existing one. --- app/views/members/_segment_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb index af483765..5ff090df 100644 --- a/app/views/members/_segment_form.html.erb +++ b/app/views/members/_segment_form.html.erb @@ -16,7 +16,7 @@ UserSegment = { <%= f.check_boxes :main_page, [['add to quick select list', true]], :single => true %> <%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> <% f.custom_field '' do %> -Create a rule +<%= @segment.id ? 'Edit filter'.t : 'Create a filter'.t %> <% end %> <%= f.text_area :segment_options_text, :rows => 8, :style => 'width:400px;', :label => 'Filter' %> <%= f.spacer %> From d045f49a3bd259139ec13295036b93d1bee647d6 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 24 May 2010 19:48:00 +0000 Subject: [PATCH 064/139] either updating the filter or added filter rules. --- app/views/members/_operation_form.html.erb | 4 ++-- app/views/members/_segment_form.html.erb | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/views/members/_operation_form.html.erb b/app/views/members/_operation_form.html.erb index fbbd6fcf..89bfbb89 100644 --- a/app/views/members/_operation_form.html.erb +++ b/app/views/members/_operation_form.html.erb @@ -15,7 +15,7 @@ OperationBuilder = { }, appendOptionsText: function(expr) { - with(window.opener) { setTimeout(function(){UserSegment.appendOptionsText(expr);}, 1); } + with(window.opener) { setTimeout(function(){UserSegment.<%= @segment ? 'replaceOptionsText' : 'appendOptionsText' %>(expr);}, 1); } setTimeout(function(){window.close();}, 1); } } @@ -46,7 +46,7 @@ OperationBuilder = {
            • -<%= f.cancel_submit_buttons 'Close', 'Add to Filter', {:onclick => 'window.close();'} %> +<%= f.cancel_submit_buttons 'Close', (@segment ? 'Update Filter' : 'Add to Filter'), {:onclick => 'window.close();'} %>
              • <% end -%> diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb index 5ff090df..7736ff61 100644 --- a/app/views/members/_segment_form.html.erb +++ b/app/views/members/_segment_form.html.erb @@ -5,6 +5,10 @@ UserSegment = { $('segment_segment_options_text').value += "\n"; } $('segment_segment_options_text').value += expr; + }, + + replaceOptionsText: function(expr) { + $('segment_segment_options_text').value = expr; } } From c6923df89a29ad1606ed928749b369149f5e5ff1 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 24 May 2010 20:47:40 +0000 Subject: [PATCH 065/139] Added default filters, fixed caching ids for all users. --- app/controllers/members_controller.rb | 2 ++ app/models/user_segment/operation.rb | 2 +- app/models/user_segment/operation_builder.rb | 16 +++++++++++++++ app/views/members/_segment_form.html.erb | 2 +- app/views/members/builder.html.erb | 21 +++++++++++++++++++- 5 files changed, 40 insertions(+), 3 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index de746992..f09425a9 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -310,6 +310,8 @@ def builder @segment = UserSegment.find_by_id params[:path][0] @builder = @segment ? UserSegment::OperationBuilder.create_builder(@segment) : UserSegment::OperationBuilder.new(nil) + @filter = params[:filter] + @builder.build(UserSegment::OperationBuilder.get_prebuilt_filter(@filter)) if @filter if request.post? && params[:builder] @builder.build(params[:builder]) diff --git a/app/models/user_segment/operation.rb b/app/models/user_segment/operation.rb index 6f559064..d8b4b00c 100644 --- a/app/models/user_segment/operation.rb +++ b/app/models/user_segment/operation.rb @@ -28,7 +28,7 @@ def end_user_ids(ids=nil) if ids @end_user_ids = ids - @end_user_ids else - @end_user_ids = EndUser.find(:all, :select => 'id', :conditions => ['id not in(?)', @end_user_ids]).collect &:id + @end_user_ids = (@end_user_ids.empty? ? EndUser.find(:all, :select => 'id') : EndUser.find(:all, :select => 'id', :conditions => ['id NOT IN(?)', @end_user_ids])).collect &:id end end diff --git a/app/models/user_segment/operation_builder.rb b/app/models/user_segment/operation_builder.rb index 22c1390b..7fea71c8 100644 --- a/app/models/user_segment/operation_builder.rb +++ b/app/models/user_segment/operation_builder.rb @@ -122,4 +122,20 @@ def self.create_builder(user_segment) builder.build(user_segment.operations.to_builder) builder end + + def self.prebuilt_filters + [ + ['New registered users in the last week', {:field => 'registered', :operation => 'is', :argument0 => true, :condition => 'and', :child => {:field => 'created', :operation => 'since', :argument0 => 1, :argument1 => 'week'}}], + ['Users that have not logged in the last 7 days', {:operator => 'not', :field => 'user_action', :operation => 'is', :argument0 => '/editor/auth/login', :condition => 'and', :child => {:field => 'occurred', :operation => 'since', :argument0 => 7, :argument1 => 'days'}}] + ] + end + + def self.prebuilt_filters_options + [['Custom', 'custom']] + self.prebuilt_filters.collect { |filter| [filter[0], filter[0].gsub(/[^a-zA-Z0-9]/, '').downcase] } + end + + def self.get_prebuilt_filter(filter) + value = self.prebuilt_filters.find { |f| f[0].gsub(/[^a-zA-Z0-9]/, '').downcase == filter } + value ? value[1] : {} + end end diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb index 7736ff61..17866eb9 100644 --- a/app/views/members/_segment_form.html.erb +++ b/app/views/members/_segment_form.html.erb @@ -20,7 +20,7 @@ UserSegment = { <%= f.check_boxes :main_page, [['add to quick select list', true]], :single => true %> <%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> <% f.custom_field '' do %> -<%= @segment.id ? 'Edit filter'.t : 'Create a filter'.t %> +<%= @segment.id ? 'Edit filter'.t : 'Create a filter'.t %> <% end %> <%= f.text_area :segment_options_text, :rows => 8, :style => 'width:400px;', :label => 'Filter' %> <%= f.spacer %> diff --git a/app/views/members/builder.html.erb b/app/views/members/builder.html.erb index 49c6cf10..41d3173f 100644 --- a/app/views/members/builder.html.erb +++ b/app/views/members/builder.html.erb @@ -1,3 +1,22 @@ -<%= render :partial => 'operation_form' %> +<% if @filter.nil? && @segment.nil? && @builder.field.nil? -%> + +
              +Rule Builder +<% form_tag do |f| -%> +
                +
              • Pre-built filters + <%= select_tag :filter, options_for_select(UserSegment::OperationBuilder.prebuilt_filters_options), :style => 'width:200px;' %> +
                • +
              • +<%= submit_tag 'Select' %> +
                • +
              + +<% end -%> + +
              +<% else -%> + <%= render :partial => 'operation_form' %> +<% end -%> From 172031feb704b452347b7362e03dc95041cf2e1a Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 25 May 2010 14:37:14 +0000 Subject: [PATCH 066/139] Changed wording and paths. --- app/controllers/members_controller.rb | 8 ++++---- app/views/members/segments.html.erb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 6f94d2f3..7b6a3c38 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -164,10 +164,10 @@ def display_targets_table(display = true) # Members editing def index - cms_page_path [], "People" - return redirect_to(:action => 'segments') if self.segment && ! self.segment.ready? + cms_page_path ["People"], self.segment ? self.segment.name : 'Everyone'.t + segmentations display_targets_table(false) @@ -260,7 +260,7 @@ def create_segment def edit_segment @segment = UserSegment.find params[:path][0] - cms_page_path ['People', 'User Lists'], '%s User List' / @segment.name + cms_page_path ['People', 'User Lists', [@segment.name, url_for(:action => 'index', :path => @segment.id)]], 'Edit List' @builder = UserSegment::OperationBuilder.new nil @@ -281,7 +281,7 @@ def edit_segment def copy_segment segment_to_copy = UserSegment.find params[:path][0] - cms_page_path ['People', 'User Lists'], 'Copy %s User List' / segment_to_copy.name + cms_page_path ['People', 'User Lists', [segment_to_copy.name, url_for(:action => 'index', :path => segment_to_copy.id)]], 'Copy List' @builder = UserSegment::OperationBuilder.new nil diff --git a/app/views/members/segments.html.erb b/app/views/members/segments.html.erb index 1860c61d..3ffece04 100644 --- a/app/views/members/segments.html.erb +++ b/app/views/members/segments.html.erb @@ -1,5 +1,5 @@ <% action_panel :handler => 'members' do |p| -%> - <%= p.link "Create a Segment",:icon => 'add.gif', :action => 'create_segment' %> + <%= p.link "Create a User List",:icon => 'add.gif', :action => 'create_segment' %> <% end -%>
              From 320810560d0a31215b22834d91cc779ec67997eb Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 25 May 2010 18:03:42 +0000 Subject: [PATCH 067/139] Added segment type to user segments. Added a custom segment type for picking individual users and storing them in a segment. --- app/controllers/members_controller.rb | 32 +++++++++--- app/models/user_segment.rb | 49 +++++++++++++++---- app/views/members/_add_users_form.html.erb | 41 ++++++++++++++++ app/views/members/_segment_form.html.erb | 12 +++-- app/views/members/_targets_table.rhtml | 8 ++- .../members/_user_segments_table.html.erb | 1 + app/views/members/index.rhtml | 13 +++++ db/migrate/20100511165552_user_segments.rb | 1 + 8 files changed, 135 insertions(+), 22 deletions(-) create mode 100644 app/views/members/_add_users_form.html.erb diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 7b6a3c38..17d4b8a7 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -89,6 +89,11 @@ def handle_table_actions update_users.each do |user| user.tag_names = '' if user end + when 'add_users' + custom_segment = UserSegment.find params[:user_segment_id] + custom_segment.add_ids params[:user].keys.collect { |uid| uid.to_i } + when 'remove_users' + self.segment.remove_ids(params[:user].keys.collect { |uid| uid.to_i }) if self.segment && self.segment.segment_type == 'custom' end end end @@ -178,6 +183,7 @@ def index [ hdr(:icon, 'check', :width => '16'), hdr(:icon, '', :width => '32'), :main_page, + :segment_type, :name, :description, :status, @@ -245,7 +251,7 @@ def create_segment @builder = UserSegment::OperationBuilder.new nil - @segment = UserSegment.new :main_page => true + @segment = UserSegment.new :main_page => true, :segment_type => 'filtered' if request.post? && params[:segment] return redirect_to :action => 'index' unless params[:commit] @@ -262,8 +268,6 @@ def edit_segment cms_page_path ['People', 'User Lists', [@segment.name, url_for(:action => 'index', :path => @segment.id)]], 'Edit List' - @builder = UserSegment::OperationBuilder.new nil - if request.post? && params[:segment] return redirect_to :action => 'index', :path => @segment.id unless params[:commit] @@ -283,9 +287,7 @@ def copy_segment cms_page_path ['People', 'User Lists', [segment_to_copy.name, url_for(:action => 'index', :path => segment_to_copy.id)]], 'Copy List' - @builder = UserSegment::OperationBuilder.new nil - - @segment = UserSegment.new segment_to_copy.attributes.symbolize_keys.slice(:name, :description, :fields, :main_page, :segment_options_text, :order_by) + @segment = UserSegment.new segment_to_copy.attributes.symbolize_keys.slice(:name, :description, :fields, :main_page, :segment_options_text, :order_by, :segment_type) @segment.name += ' (Copy)' unless request.post? if request.post? && params[:segment] @@ -301,6 +303,7 @@ def copy_segment def refresh_segment @segment = UserSegment.find params[:path][0] @segment.refresh + return redirect_to(:action => 'index', :path => @segment.id) if @segment.segment_type == 'custom' redirect_to :action => 'segments' end @@ -327,6 +330,21 @@ def update_builder return render :nothing => true unless params[:commit] end + def add_users_form + @segment = UserSegment.find params[:segment][:id] if params[:choice] == 'existing' + + unless @segment + @segment = UserSegment.new :main_page => true, :segment_type => 'custom' + + if request.post? && params[:segment] + @segment.update_attributes params[:segment] + end + end + + @segments = UserSegment.find(:all, :conditions => {:segment_type => 'custom'}, :order => 'name') + render :partial => 'add_users_form' + end + def create cms_page_path ['People'],'Create Contact' @@ -518,7 +536,7 @@ def remove_tags_form @existing_tags = [] @users.each do |usr| - if !usr.tag_cache.tags.blank? + if usr.tag_cache && !usr.tag_cache.tags.blank? @existing_tags += usr.tag_cache.tags.split(",") end end diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 04885cdb..3a63e68c 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -6,7 +6,7 @@ class UserSegment < DomainModel serialize :fields validates_presence_of :name - validates_presence_of :segment_options + validates_presence_of :segment_type def ready?; self.status == 'finished'; end @@ -15,7 +15,10 @@ def fields end def validate - self.errors.add(:segment_options_text, 'is invalid') if self.segment_options_text && self.segment_options.nil? + if self.segment_type == 'filtered' + self.errors.add(:segment_options_text, 'is invalid') if self.segment_options_text && self.segment_options.nil? + self.errors.add(:segment_options, 'is missing') if self.segment_options.nil? + end end def operations @@ -50,10 +53,14 @@ def refresh self.status = 'refreshing' self.save - if EndUser.count < 50000 - self.cache_ids - else - self.run_worker(:cache_ids) + if self.segment_type == 'filtered' + if EndUser.count < 50000 + self.cache_ids + else + self.run_worker(:cache_ids) + end + elsif self.segment_type == 'custom' + self.add_ids [] end end end @@ -62,13 +69,37 @@ def cache_ids(opts={}) self.status = 'calculating' self.save + self.sort_ids self.operations.end_user_ids + end + + def add_ids(ids) + self.status = 'adding' + self.save + + ids = (self.end_user_ids + ids).uniq + self.sort_ids ids + end + + def remove_ids(ids) + self.status = 'removing' + self.save + + ids = (self.end_user_ids - ids).uniq + + self.sort_ids ids + end + + def sort_ids(ids) + self.status = 'sorting' + self.save + self.user_segment_caches.delete_all self.order_by = 'created_at DESC' unless self.order_by - ids = EndUser.find(:all, :select => 'id', :conditions => {:id => self.operations.end_user_ids, :client_user_id => nil}, :order => self.order_by).collect &:id + ids = EndUser.find(:all, :select => 'id', :conditions => {:id => ids, :client_user_id => nil}, :order => self.order_by).collect &:id - num_segements = (self.operations.end_user_ids.length / UserSegmentCache::SIZE) - num_segements = num_segements + 1 if (self.operations.end_user_ids.length % UserSegmentCache::SIZE) > 0 + num_segements = (ids.length / UserSegmentCache::SIZE) + num_segements = num_segements + 1 if (ids.length % UserSegmentCache::SIZE) > 0 (0..num_segements-1).each do |idx| start = idx * UserSegmentCache::SIZE diff --git a/app/views/members/_add_users_form.html.erb b/app/views/members/_add_users_form.html.erb new file mode 100644 index 00000000..bb3fb0d8 --- /dev/null +++ b/app/views/members/_add_users_form.html.erb @@ -0,0 +1,41 @@ +
              +<% if @segment.id -%> + +<% end -%> + +

              Add Users to List

              +<% cms_unstyled_form_for :segment, @segment, :html => {:id => 'user_segment_form', :onsubmit => 'MemberEditor.addUsersToListSubmit(this); return false;', :class => "admin_form"} do |f| -%> +
                +<% if @segments.size > 0 -%> +
              • + +
                • + +
              • +<%= f.select :id, options_for_select(@segments.collect { |s| [s.name, s.id]}) %> +
                • + +
              • + +
                • + +<% else -%> +<%= hidden_field_tag 'choice', 'new' %> +<% end -%> + +
              • +Name <%= f.text_field :name %> +
                • +
              • +Order By <%= f.select :order_by, UserSegment.order_by_options %> +
                • + +
              • +<%= f.cancel_submit_buttons 'Close', 'Submit', {:onclick => 'SCMS.closeOverlay();'} %> +
                • +
              +<% end -%> + +
              diff --git a/app/views/members/_segment_form.html.erb b/app/views/members/_segment_form.html.erb index 17866eb9..441162bc 100644 --- a/app/views/members/_segment_form.html.erb +++ b/app/views/members/_segment_form.html.erb @@ -19,10 +19,14 @@ UserSegment = { <%= f.select :order_by, UserSegment.order_by_options %> <%= f.check_boxes :main_page, [['add to quick select list', true]], :single => true %> <%= f.ordered_array :fields, UserSegment.fields_options, :label => 'Fields to Display' %> -<% f.custom_field '' do %> -<%= @segment.id ? 'Edit filter'.t : 'Create a filter'.t %> -<% end %> -<%= f.text_area :segment_options_text, :rows => 8, :style => 'width:400px;', :label => 'Filter' %> + + <% if @segment.segment_type == 'filtered' -%> + <% f.custom_field '' do %> + <%= @segment.id ? 'Edit filter'.t : 'Create a filter'.t %> + <% end %> + <%= f.text_area :segment_options_text, :rows => 8, :style => 'width:400px;', :label => 'Filter' %> + <% end -%> + <%= f.spacer %> <%= f.cancel_submit_buttons 'Cancel', (@segment.id ? 'Save' : 'Create') %> <% end -%> diff --git a/app/views/members/_targets_table.rhtml b/app/views/members/_targets_table.rhtml index 6ef6e9e5..3114625f 100644 --- a/app/views/members/_targets_table.rhtml +++ b/app/views/members/_targets_table.rhtml @@ -1,10 +1,14 @@ -<% active_table_for :email_targets_table, @active_table_output, +<% + segment_action = @segment && @segment.segment_type == 'custom' ? ['Remove Users from List', 'remove_users'] : ['Add Users to List','js','MemberEditor.addUsersToList();'] + + active_table_for :email_targets_table, @active_table_output, :refresh_url => url_for(:action => 'display_targets_table', :path => @segment ? @segment.id : nil, :terms => @search.terms, :offsets => @search.offsets.empty? ? nil : @search.offsets), :class => 'active_table', :width => '100%', :next => @search.user_segment && @search.terms ? 'more' : '>', :actions => [['Add Tags','js','MemberEditor.addTags();'], - ['Remove Tags','js','MemberEditor.removeTags();'] + ['Remove Tags','js','MemberEditor.removeTags();'], + segment_action ], :more_actions => [['Delete Targets','delete','Delete the selected users?']], :update => 'targets_table' do |t| %> diff --git a/app/views/members/_user_segments_table.html.erb b/app/views/members/_user_segments_table.html.erb index cab71e2f..d3ccf37c 100644 --- a/app/views/members/_user_segments_table.html.erb +++ b/app/views/members/_user_segments_table.html.erb @@ -11,6 +11,7 @@ <% end -%>               		<%= t.main_page ? 'Yes'.t : 'No'.t %><%= t.segment_type %> <% if t.ready? -%> <%= h t.name %> diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index 4810fbf8..2c423c52 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -95,6 +95,19 @@ changeSegments: function() { id = $('user_segments_user_segment_id').value; window.location = id ? "/website/members/index/" + id : "/website/members" + }, + + addUsersToList: function() { + SCMS.remoteOverlay("<%= url_for :action => 'add_users_form' %>"); + }, + + addUsersToListSubmit: function(frm) { + SCMS.updateOverlay("<%= url_for :action => 'add_users_form' %>", Form.serialize(frm)); + }, + + addUsersToListTableAction: function(id) { + this.tableAction('add_users', "user_segment_id=" + id); + SCMS.closeOverlay(); } } diff --git a/db/migrate/20100511165552_user_segments.rb b/db/migrate/20100511165552_user_segments.rb index 7cbe448f..4285c441 100644 --- a/db/migrate/20100511165552_user_segments.rb +++ b/db/migrate/20100511165552_user_segments.rb @@ -3,6 +3,7 @@ def self.up create_table :user_segments, :force => true do |t| t.string :name t.text :description + t.string :segment_type t.string :status t.boolean :main_page t.datetime :last_ran_at From 2c7447d44278f749ef894b2490dcf83ea617991e Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Tue, 25 May 2010 18:54:36 +0000 Subject: [PATCH 068/139] Export segments. --- app/controllers/member_export_controller.rb | 32 ++++++++++----------- app/views/member_export/index.rhtml | 21 +++++++------- app/views/members/index.rhtml | 2 +- app/workers/member_export_worker.rb | 26 +++++++++++------ 4 files changed, 45 insertions(+), 36 deletions(-) diff --git a/app/controllers/member_export_controller.rb b/app/controllers/member_export_controller.rb index caf813ee..e5b63af9 100644 --- a/app/controllers/member_export_controller.rb +++ b/app/controllers/member_export_controller.rb @@ -3,12 +3,12 @@ class MemberExportController < CmsController # :nodoc: all layout 'manage' permit 'editor_members' - - def index - cms_page_info([ [ 'E-marketing', url_for(:controller => 'emarketing') ], - [ 'Email Targets', url_for(:controller =>'members', :refresh => 1 ) ], - 'Member Download' ], 'e_marketing' ) - + + cms_admin_paths "people", + "People" => { :controller => '/members' }, + "User Lists" => { :controller => '/members', :action => 'segments' } + + def index @export = DefaultsHashObject.new(:download => 'all') @include_options = [ [ 'Home Address','home' ], @@ -18,23 +18,21 @@ def index ['Tags','tags'] ] - @segment= session[:et] - session[:members_table_segment] ||= {} + @segment = UserSegment.find_by_id params[:path][0] - current_segment = MarketSegment.new(:segment_type => 'members',:options => session[:members_table_segment]) + cms_page_path ["People", [@segment ? @segment.name : 'Everyone'.t, url_for(:controller => 'members', :action => 'index', :path => @segment ? @segment.id : nil)]], 'Export Users' - @member_count = current_segment.target_count - + @member_count = @segment ? @segment.last_count : EndUser.count(:conditions => {:client_user_id => nil}) end def generate_file - session[:members_table_segment] ||= {} - - - worker_key = MemberExportWorker.async_do_work( :domain_id => DomainModel.active_domain_id, + @segment = UserSegment.find_by_id params[:path][0] + + worker_key = MemberExportWorker.async_do_work( :domain_id => DomainModel.active_domain_id, :export_options => (params[:export] || {})[:include], - :export_segmentation => session[:members_table_segment] - ) + :user_segment_id => @segment ? @segment.id : nil + ) + session[:member_download_worker_key] = worker_key render :nothing => true diff --git a/app/views/member_export/index.rhtml b/app/views/member_export/index.rhtml index 01f985fe..6f601f0f 100644 --- a/app/views/member_export/index.rhtml +++ b/app/views/member_export/index.rhtml @@ -1,3 +1,7 @@ +<% + segment_id = @segment ? @segment.id : nil +-%> + +
              +

              <%= "Exporting ".t %><%= sprintf("%d members".t,@member_count.to_i) %>

              + <% cms_form_for :export, @export, :html => { :onsubmit => 'Exporter.generate(); return false;', :id => 'export_form' } do |f| %> <%= f.check_boxes :include, @include_options, :vertical => true, :separator => '
              ', :label => 'Include in export' %>
              t.id %>'><%= h t.name %> <%= t.subscription_cnt %><%= h truncate(t.description,40) %><%= h truncate(t.description, :length => 40) %>
              -
              +
              <%= "Example: Red, Blue".t %>
              <%= "Existing Tags".t %> - <%= "Click to add a tag".t %>

              - <% cloud = [] - EndUser.cloud(EndUser.tags_count(:order => 'count DESC'), %w(12 14 16 18 20)) do |tg, font_size| - cloud << [tg,font_size] - end - %> - <% cloud.each do |tag| %> - <%= h tag[0] %> - + <% EndUser.tag_cloud(%w(12 14 16 18 20)).each do |tag| %> + <%= h tag[:name] %> <% end -%> -

              <%= entry_checkbox 'user_segments',t.id %> <% if t.ready? -%> @@ -18,12 +24,18 @@ <% end -%> <%= t.main_page ? 'Yes'.t : 'No'.t %><%= t.segment_type %><%= t.segment_type_display %> <%= h(t.description ? t.description : '') %><%= t.status %><%= t.status_display %> <%= t.last_count %> <%= t.last_ran_at.strftime(DEFAULT_DATETIME_FORMAT.t) if t.last_ran_at %> <%= t.created_at.strftime(DEFAULT_DATETIME_FORMAT.t) %> <%= t.updated_at.strftime(DEFAULT_DATETIME_FORMAT.t) %>
              #{value.name}#{value.strftime(DEFAULT_DATETIME_FORMAT.t)}-#{value}#{value}#{value}
              <%= entry_checkbox 'user',t.id %> - <%= t.editor? ? '' : content_tag(:a, theme_image_tag('icons/actions/edit.gif'), {:href => url_for(:action => 'edit', :path => t.id)}) %> + <%= t.editor? ? '' : link_to(theme_image_tag('icons/actions/edit.gif'), :action => 'edit', :path => [ t.id, @segment.id ]) %> - <%= image = t.image ? t.image.image_tag(:thumb) : 'No Image'.t - t.editor? ? image : content_tag(:a, image, {:href => url_for(:action => 'view', :path => t.id)}) + <%= image = t.image ? t.image.image_tag(:icon) : '' + t.editor? ? image : link_to(image,user_url) %> - <%= t.editor? ? h(t.name) : content_tag(:a, t.name, {:href => url_for(:action => 'view', :path => t.id)}) %> + <%= t.editor? ? h(t.name) : link_to(t.name, user_url) %> <%= email = t.email.blank? ? 'No Email'.t : t.email - t.editor? ? h(email) : content_tag(:a, email, {:href => url_for(:action => 'view', :path => t.id)}) + t.editor? ? h(email) : link_to(email, user_url) %>
              <%= entry_checkbox 'user',t.id %> - <%= t.editor? ? '' : link_to(theme_image_tag('icons/actions/edit.gif'), :action => 'edit', :path => [ t.id, @segment.id ]) %> + <%= t.editor? ? '' : link_to(theme_image_tag('icons/actions/edit.gif'), :action => 'edit', :path => [ t.id, @segment ? @segment.id : nil ].compact) %> <%= image = t.image ? t.image.image_tag(:icon) : '' From 1756b233921187f4cb7af4de6602b925fe8f4563 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Thu, 10 Jun 2010 16:05:48 +0000 Subject: [PATCH 135/139] Can reorder segments by clicking on the field headings. Fix for field_heading. --- app/controllers/members_controller.rb | 58 ++++++++++++++++++++---- app/models/user_segment.rb | 37 +++++++++++++-- app/models/user_segment/field_handler.rb | 1 + app/views/members/_targets_table.rhtml | 8 +++- app/views/members/index.rhtml | 5 ++ lib/active_table.rb | 55 +++++++++++++++++++++- 6 files changed, 150 insertions(+), 14 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index daebdc8e..690897b5 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -43,8 +43,7 @@ def find_end_users(opts={}) pages, users = self.segment.paginate self.search.page, :per_page => 25, :include => opts[:include] users else - opts = opts.merge(self.class.module_options.order_options) - EndUser.find(:all, :conditions => 'client_user_id IS NULL', :offset => opts[:offset], :limit => opts[:limit], :order => opts[:order], :include => opts[:include]) + EndUser.find(:all, :conditions => 'client_user_id IS NULL', :offset => opts[:offset], :limit => opts[:limit], :order => self.class.module_options.order(opts), :include => opts[:include]) end end @@ -109,26 +108,51 @@ def email_targets_table_columns(opts={}) ActiveTable::StaticHeader.new('', :width => '24'), ActiveTable::StaticHeader.new('Image', :width => '70'), ActiveTable::StaticHeader.new('Name'), - ActiveTable::StaticHeader.new('Email') + ActiveTable::OrderHeader.new('email') ] @fields = [] + end_user_only = true if self.segment && self.segment.fields @fields = self.segment.fields + end_user_only = false else self.class.module_options && self.class.module_options.fields @fields = self.class.module_options.fields + end_user_only = true end @fields.each do |field| info = UserSegment::FieldHandler.display_fields[field.to_sym] - @email_targets_table_columns << ActiveTable::StaticHeader.new(field, :label => info[:handler].field_heading(field.to_sym)) if info + if info + if UserSegment::FieldHandler.sortable_fields(:end_user_only => end_user_only)[field.to_sym] + @email_targets_table_columns << ActiveTable::OrderHeader.new(field, :label => info[:handler].field_heading(field.to_sym)) + else + @email_targets_table_columns << ActiveTable::StaticHeader.new(field, :label => info[:handler].field_heading(field.to_sym)) + end + end end @email_targets_table_columns end + def email_targets_table_name + if self.segment + "end_users_segment_#{self.segment.id}" + else + 'end_users' + end + end + def email_targets_table_generate(opts,*find_options) - active_table_generate('end_users', EndUser, self.email_targets_table_columns, {:count_callback => 'count_end_users', :find_callback => 'find_end_users'}, opts, *find_options) + active_table_generate(self.email_targets_table_name, EndUser, self.email_targets_table_columns, {:count_callback => 'count_end_users', :find_callback => 'find_end_users'}, opts, *find_options) + end + + def email_targets_table_order(opts) + active_table_order(self.email_targets_table_name, self.email_targets_table_columns, opts) + end + + def email_targets_table_set_order(order) + active_table_set_order(self.email_targets_table_name, self.email_targets_table_columns, order) end def user_segment_type_select_options @@ -235,6 +259,7 @@ def options if request.post? && @options.valid? if params[:commit] Configuration.set_config_model(@options) + self.email_targets_table_set_order @options.order flash[:notice] = "Updated Everyone options".t end redirect_to :action => 'index' @@ -263,11 +288,18 @@ def validate end end - def order_options - info = UserSegment::FieldHandler.sortable_fields(:end_user_only => true)[self.order_by.to_sym] + def order(opts={}) + field = self.order_by + direction = self.order_direction + if opts[:order] + field, direction = opts[:order].split(' ') + end + direction = 'ASC' unless direction + + info = UserSegment::FieldHandler.sortable_fields(:end_user_only => true)[field.to_sym] return {:order => 'created_at DESC'} unless info field = info[:field] - {:order => "#{field} #{self.order_direction}"} + "#{field} #{direction}" end def fields_options @@ -310,6 +342,8 @@ def edit_segment return redirect_to :action => 'index', :path => @segment.id unless params[:commit] if @segment.update_attributes params[:segment] + self.email_targets_table_set_order @segment.order + if @segment.should_refresh? @segment.refresh redirect_to :action => 'segments' @@ -327,6 +361,8 @@ def edit_segment_filter return redirect_to :action => 'index', :path => @segment.id unless params[:commit] if @segment.update_attributes params[:segment] + self.email_targets_table_set_order @segment.order + @segment.refresh if @segment.should_refresh? render :partial => 'refresh_segment' end @@ -359,6 +395,12 @@ def refresh_segment render :partial => 'refresh_segment' end + def sort_segment + @segment = UserSegment.find params[:path][0] + @segment.resort email_targets_table_order(params) + render :partial => 'refresh_segment' + end + def refresh_segment_status @segment = UserSegment.find params[:path][0] end diff --git a/app/models/user_segment.rb b/app/models/user_segment.rb index 7594b966..00667603 100644 --- a/app/models/user_segment.rb +++ b/app/models/user_segment.rb @@ -50,6 +50,8 @@ def before_validation #:nodoc: def validate #:nodoc: self.errors.add(:segment_options_text, nil, :message => self.operations.failure_reason) if self.segment_options_text && self.segment_options.nil? + self.errors.add(:order_by, 'is invalid') unless self.class.order_by_options.rassoc(self.order_by) + self.errors.add(:order_direction, 'is invalid') unless self.class.order_direction_options_hash[self.order_direction] end # Returns the filter used to generate the segment. @@ -86,6 +88,14 @@ def order_direction=(direction) #:nodoc: direction end + def order + if self.order_direction == 'ASC' + self.order_by + else + "#{self.order_by} DESC" + end + end + def should_refresh #:nodoc: @should_refresh end @@ -117,6 +127,27 @@ def refresh end end + def resort(order) + field, direction = order.to_s.split(' ') + direction = 'ASC' if direction.blank? + self.order_by = field + self.order_direction = direction + if self.save + if self.should_refresh? + if self.last_count < 50000 + self.sort + else + self.run_worker(:sort) + end + end + end + end + + # Sorts the ids + def sort(opts={}) + self.sort_ids(self.end_user_ids, :sort_only => true) + end + # Use the filter to store a list of user ids. def cache_ids(opts={}) self.status = 'calculating' @@ -145,7 +176,7 @@ def remove_ids(ids) end # Sort the user ids based on the order_by and order_direction. - def sort_ids(ids) + def sort_ids(ids, opts={}) self.status = 'sorting' self.save @@ -174,8 +205,8 @@ def sort_ids(ids) end self.status = 'finished' - self.last_ran_at = Time.now - self.last_count = ids.length + self.last_ran_at = Time.now unless opts[:sort_only] + self.last_count = ids.length unless opts[:sort_only] self.save end diff --git a/app/models/user_segment/field_handler.rb b/app/models/user_segment/field_handler.rb index 2e10cec4..e5bbd41c 100644 --- a/app/models/user_segment/field_handler.rb +++ b/app/models/user_segment/field_handler.rb @@ -132,6 +132,7 @@ def self.display_fields(opts={}) # A default method for all handlers to display the heading def self.field_heading(field) info = self.display_fields[field.to_sym] + info = self.sortable_fields[field.to_sym] unless info return '' unless info info[:name] end diff --git a/app/views/members/_targets_table.rhtml b/app/views/members/_targets_table.rhtml index 07f6a798..c12a7bff 100644 --- a/app/views/members/_targets_table.rhtml +++ b/app/views/members/_targets_table.rhtml @@ -20,8 +20,12 @@ <%= t.editor? ? '' : content_tag(:a, theme_image_tag('icons/actions/edit.gif'), {:href => url_for(:action => 'edit', :path => t.id)}) %> - <%= image = t.image ? t.image.image_tag(:thumb) : 'No Image'.t - t.editor? ? image : content_tag(:a, image, {:href => url_for(:action => 'view', :path => t.id)}) + <%= image = t.image ? t.image.image_tag(:thumb) : nil + if image + t.editor? ? image : content_tag(:a, image, {:href => url_for(:action => 'view', :path => t.id)}) + else + '-' + end %> diff --git a/app/views/members/index.rhtml b/app/views/members/index.rhtml index ed09dc67..621e45e6 100644 --- a/app/views/members/index.rhtml +++ b/app/views/members/index.rhtml @@ -1,4 +1,9 @@