Make sure segment fields exists. Test segment types.

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'
 

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

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

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

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

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

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

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