fat_free_crm 0.11.0 → 0.11.1

data/spec/factories/shared_factories.rb

@@ -1,17 +1,14 @@
 FactoryGirl.define do
-  factory :activity do
-    user                
-    subject             { raise "Please specify :subject for the activity" }
-    action              nil
-    info                nil
-    private             false
-    updated_at          { FactoryGirl.generate(:time) }
+  factory :version do
+    whodunnit           ""
+    item                { raise "Please specify :item for the version" }
+    event               "create"
     created_at          { FactoryGirl.generate(:time) }
   end
 
 
   factory :comment do
-    user                
+    user
     commentable         { raise "Please specify :commentable for the comment" }
     title               { FactoryGirl.generate(:title) }
     private             false
@@ -24,7 +21,7 @@ FactoryGirl.define do
 
   factory :email do
     imap_message_id     { "%08x" % rand(0xFFFFFFFF) }
-    user                
+    user
     mediator            { raise "Please specify :mediator for the email" }
     sent_from           { Faker::Internet.email }
     sent_to             { Faker::Internet.email }
@@ -59,7 +56,7 @@ FactoryGirl.define do
 
 
   factory :avatar do
-    user                
+    user
     entity              { raise "Please specify :entity for the avatar" }
     image_file_size     nil
     image_file_name     nil
@@ -67,4 +64,4 @@ FactoryGirl.define do
     updated_at          { FactoryGirl.generate(:time) }
     created_at          { FactoryGirl.generate(:time) }
   end
-end
+end

data/spec/lib/dropbox_spec.rb

@@ -6,6 +6,7 @@ require "fat_free_crm/dropbox"
 describe "IMAP Dropbox" do
   before(:each) do
     @crawler = FatFreeCRM::Dropbox.new
+    @crawler.stub!("expunge!").and_return(true)
   end
 
   def mock_imap

data/spec/models/polymorphic/version_spec.rb

@@ -0,0 +1,247 @@
+# == Schema Information
+#
+# Table name: versions
+#
+#  id           :integer         not null, primary key
+#  user_id      :integer
+#  item_id   :integer
+#  item_type :string(255)
+#  event       :string(32)      default("create")
+#  info         :string(255)     default("")
+#  private      :boolean         default(FALSE)
+#  created_at   :datetime
+#  updated_at   :datetime
+#
+
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Version do
+
+  before do
+    login
+    PaperTrail.whodunnit = @current_user.id.to_s
+  end
+
+  it "should create a new instance given valid attributes" do
+    FactoryGirl.create(:version, :whodunnit => PaperTrail.whodunnit, :item => FactoryGirl.create(:lead))
+  end
+
+  describe "with multiple version records" do
+    before do
+      @lead = FactoryGirl.create(:lead)
+
+      %w(create destroy update view).each do |event|
+        FactoryGirl.create(:version, :event => event, :item => @lead, :whodunnit => PaperTrail.whodunnit)
+        FactoryGirl.create(:version, :event => event, :item => @lead, :whodunnit => "1")
+      end
+    end
+
+    it "should select all versions except one" do
+      @versions = Version.for(@current_user).exclude_events(:view)
+      @versions.map(&:event).should == %w(create destroy update)
+    end
+
+    it "should select all versions except many" do
+      @versions = Version.for(@current_user).exclude_events(:create, :update, :destroy)
+      @versions.map(&:event).should == %w(view)
+    end
+
+    it "should select one requested version" do
+      @versions = Version.for(@current_user).include_events(:destroy)
+      @versions.map(&:event).should == %w(destroy)
+    end
+
+    it "should select many requested versions" do
+      @versions = Version.for(@current_user).include_events(:create, :update)
+      @versions.map(&:event).sort.should == %w(create update)
+    end
+
+    it "should select versions for given user" do
+      @versions = Version.for(@current_user)
+      @versions.map(&:event).sort.should == %w(create destroy update view)
+    end
+  end
+
+  %w(account campaign contact lead opportunity task).each do |item|
+    describe "Create, update, and delete (#{item})" do
+      before :each do
+        PaperTrail.enabled = true
+        @item = FactoryGirl.create(item.to_sym, :user => @current_user)
+        @conditions = {:item_id => @item.id, :item_type => @item.class.name, :whodunnit => PaperTrail.whodunnit}
+      end
+
+      it "should add a version when creating new #{item}" do
+        @version = Version.where(@conditions.merge(:event => 'create')).first
+        @version.should_not == nil
+      end
+
+      it "should add a version when updating existing #{item}" do
+        if @item.respond_to?(:full_name)
+          @item.update_attributes(:first_name => "Billy", :last_name => "Bones")
+        else
+          @item.update_attributes(:name => "Billy Bones")
+        end
+        @version = Version.where(@conditions.merge(:event => 'update')).first
+
+        @version.should_not == nil
+      end
+
+      it "should add a version when deleting #{item}" do
+        @item.destroy
+        @version = Version.where(@conditions.merge(:event => 'destroy')).first
+
+        @version.should_not == nil
+      end
+
+      it "should add a version when commenting on a #{item}" do
+        @comment = FactoryGirl.create(:comment, :commentable => @item, :user => @current_user)
+
+        @version = Version.where({:related_id => @item.id, :related_type => @item.class.name, :whodunnit => PaperTrail.whodunnit, :event => 'create'}).first
+        @version.should_not == nil
+      end
+    end
+  end
+
+  describe "Recently viewed items (task)" do
+    before do
+      PaperTrail.enabled = true
+      @task = FactoryGirl.create(:task)
+      @conditions = {:item_id => @task.id, :item_type => @task.class.name}
+    end
+
+    it "creating a new task should not add it to recently viewed items list" do
+      @versions = Version.where(@conditions)
+
+      @versions.map(&:event).should == %w(create) # but not view
+    end
+
+    it "updating a new task should not add it to recently viewed items list" do
+      @task.update_attribute(:updated_at, 1.second.ago)
+      @versions = Version.where(@conditions)
+
+      @versions.map(&:event).sort.should == %w(create update) # but not view
+    end
+  end
+
+  describe "Action refinements for task updates" do
+    before do
+      @task = FactoryGirl.create(:task, :user => @current_user)
+      @conditions = {:item_id => @task.id, :item_type => @task.class.name, :whodunnit => PaperTrail.whodunnit}
+    end
+
+    it "should create 'completed' task event" do
+      @task.update_attribute(:completed_at, 1.second.ago)
+      @versions = Version.where(@conditions)
+
+      @versions.map(&:event).sort.should == %w(complete)
+    end
+
+    it "should create 'reassigned' task event" do
+      @task.update_attribute(:assigned_to, @current_user.id + 1)
+      @versions = Version.where(@conditions)
+
+      @versions.map(&:event).sort.should == %w(reassign)
+    end
+
+    it "should create 'rescheduled' task event" do
+      @task.update_attribute(:bucket, "due_tomorrow") # FactoryGirl creates :due_asap task
+      @versions = Version.where(@conditions)
+
+      @versions.map(&:event).sort.should == %w(reschedule)
+    end
+  end
+
+  describe "Rejecting a lead" do
+    before do
+      @lead = FactoryGirl.create(:lead, :user => @current_user, :status => "new")
+      @conditions = {:item_id => @lead.id, :item_type => @lead.class.name, :whodunnit => PaperTrail.whodunnit}
+    end
+
+    it "should create 'rejected' lead event" do
+      @lead.update_attribute(:status, "rejected")
+      @versions = Version.where(@conditions)
+
+      @versions.map(&:event).sort.should == %w(reject)
+    end
+  end
+
+  describe "Permissions" do
+    before do
+      @user = FactoryGirl.create(:user)
+      Version.delete_all
+      PaperTrail.enabled = true
+    end
+
+    it "should not show the create/update versions if the item is private" do
+      @item = FactoryGirl.create(:account, :user => @current_user, :access => "Private")
+      @item.update_attribute(:updated_at,  1.second.ago)
+
+      @versions = Version.where({:item_id => @item.id, :item_type => @item.class.name})
+      @versions.map(&:event).sort.should == %w(create update)
+      @versions = Version.latest.visible_to(@user)
+      @versions.should == []
+    end
+
+    it "should not show the destroy version if the item is private" do
+      @item = FactoryGirl.create(:account, :user => @current_user, :access => "Private")
+      @item.destroy
+
+      @versions = Version.where({:item_id => @item.id, :item_type => @item.class.name})
+      @versions.map(&:event).sort.should == %w(create destroy)
+      @versions = Version.latest.visible_to(@user)
+      @versions.should == []
+    end
+
+    it "should not show create/update versions if the item was not shared with the user" do
+      @item = FactoryGirl.create(:account,
+        :user => @current_user,
+        :access => "Shared",
+        :permissions => [ FactoryGirl.build(:permission, :user => @current_user, :asset => @item) ]
+      )
+      @item.update_attribute(:updated_at, 1.second.ago)
+
+      @versions = Version.where({:item_id => @item.id, :item_type => @item.class.name})
+      @versions.map(&:event).sort.should == %w(create update)
+      @versions = Version.latest.visible_to(@user)
+      @versions.should == []
+    end
+
+    it "should not show the destroy version if the item was not shared with the user" do
+      @item = FactoryGirl.create(:account,
+        :user => @current_user,
+        :access => "Shared",
+        :permissions => [ FactoryGirl.build(:permission, :user => @current_user, :asset => @item) ]
+      )
+      @item.destroy
+
+      @versions = Version.where({:item_id => @item.id, :item_type => @item.class.name})
+      @versions.map(&:event).sort.should == %w(create destroy)
+      @versions = Version.latest.visible_to(@user)
+      @versions.should == []
+    end
+
+    it "should show create/update versions if the item was shared with the user" do
+      @item = FactoryGirl.create(:account,
+        :user => @current_user,
+        :access => "Shared",
+        :permissions => [ FactoryGirl.build(:permission, :user => @user, :asset => @item) ]
+      )
+      @item.update_attribute(:updated_at, 1.second.ago)
+
+      @versions = Version.where({:item_id => @item.id, :item_type => @item.class.name})
+      @versions.map(&:event).sort.should == %w(create update)
+      @versions = Version.latest.visible_to(@user)
+      @versions.map(&:event).sort.should == %w(create update)
+    end
+  end
+
+  describe "Exportable" do
+    before do
+      FactoryGirl.create(:version, :whodunnit => FactoryGirl.create(:user).id, :item => FactoryGirl.create(:account))
+      FactoryGirl.create(:version, :whodunnit => FactoryGirl.create(:user, :first_name => nil, :last_name => nil).id, :item => FactoryGirl.create(:account))
+    end
+    it_should_behave_like("exportable") do
+      let(:exported) { Version.all }
+    end
+  end
+end

data/spec/models/users/user_spec.rb

@@ -89,15 +89,6 @@ describe User do
       @user.destroyed?.should == true
     end
 
-    it "once the user gets deleted all her activity records must be deleted too" do
-      login
-      FactoryGirl.create(:activity, :user => @user, :subject => FactoryGirl.create(:account))
-      FactoryGirl.create(:activity, :user => @user, :subject => FactoryGirl.create(:contact))
-      @user.activities.count.should == 2
-      @user.destroy
-      @user.activities.count.should == 0
-    end
-
     it "once the user gets deleted all her permissions must be deleted too" do
       FactoryGirl.create(:permission, :user => @user, :asset => FactoryGirl.create(:account))
       FactoryGirl.create(:permission, :user => @user, :asset => FactoryGirl.create(:contact))

data/spec/spec_helper.rb

@@ -54,6 +54,10 @@ Spork.prefork do
     config.include(SharedControllerSpecs, :type => :controller)
     config.include(SharedModelSpecs,      :type => :model)
 
+    config.before(:each) do
+      PaperTrail.enabled = false
+    end
+
     config.before(:each, :type => :view) do
       I18n.locale = 'en-US'
     end

data/spec/views/home/index.haml_spec.rb

@@ -8,7 +8,7 @@ describe "/home/index" do
   end
 
   it "should render list of activities if it's not empty" do
-    assign(:activities, [ FactoryGirl.create(:activity, :action => "updated", :subject => FactoryGirl.create(:account)) ])
+    assign(:activities, [ FactoryGirl.create(:version, :event => "update", :item => FactoryGirl.create(:account)) ])
 
     render
     view.should render_template(:partial => "_activity")

data/spec/views/home/index.rjs_spec.rb

@@ -8,12 +8,12 @@ describe "/home/index" do
   end
 
   it "should render [activity] template with @activities collection" do
-    assign(:activities, [ FactoryGirl.create(:activity, :id => 42, :action => "updated", :subject => FactoryGirl.create(:account)) ])
+    assign(:activities, [ FactoryGirl.create(:version, :id => 42, :event => "update", :item => FactoryGirl.create(:account), :whodunnit => @current_user.id.to_s) ])
 
     render :template => 'home/index', :formats => [:js]
-    
+
     rendered.should have_rjs("activities") do |rjs|
-      with_tag("li[id=activity_42]")
+      with_tag("li[id=version_42]")
     end
   end
 
@@ -21,7 +21,7 @@ describe "/home/index" do
     assign(:activities, [])
 
     render :template => 'home/index', :formats => [:js]
-    
+
     rendered.should have_rjs("activities")
     rendered.should include("No activity records found.")
   end

data/spec/views/tasks/new.rjs_spec.rb

@@ -18,8 +18,8 @@ describe "/tasks/new" do
   end
 
   describe "new task" do
-    before(:all) { @task_with_time = Setting.task_calendar_with_time }
-    after(:all) { Setting.task_calendar_with_time = @task_with_time }
+    before { @task_with_time = Setting.task_calendar_with_time }
+    after  { Setting.task_calendar_with_time = @task_with_time }
 
     it "create: should render [new] template into :create_task div" do
       params[:cancel] = nil

data/vendor/assets/javascripts/calendar_date_select/format_french.js

@@ -0,0 +1,24 @@
+// French Format: 31/12/2000 à 23:00
+// Thanks, Materazzi!
+
+Date.prototype.toFormattedString = function(include_time){
+  str = this.getDate() + "/" + (this.getMonth() + 1) + "/" + this.getFullYear();
+  if (include_time) { str += " à " + this.getHours() + ":" + this.getPaddedMinutes() }
+  return str;
+}
+
+Date.parseFormattedString = function (string) {
+  var regexp = '([0-9]{1,2})/(([0-9]{1,2})/(([0-9]{4})( ?à? ([0-9]{1,2}):([0-9]{2})? *)?)?)?';
+  var d = string.match(new RegExp(regexp, "i"));
+  if (d==null) return Date.parse(string); // at least give javascript a crack at it.
+  var offset = 0;
+  var date = new Date(d[5], 0, 1);
+  if (d[3]) { date.setMonth(d[3] - 1); }
+  if (d[5]) { date.setDate(d[1]); }
+  if (d[7]) {
+    date.setHours(parseInt(d[7], 10));    
+  }
+  if (d[8]) { date.setMinutes(d[8]); }
+  if (d[10]) { date.setSeconds(d[10]); }
+  return date;
+}

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: fat_free_crm
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
   prerelease: 
 platform: ruby
 authors:
 - Michael Dvorkin
-- Nathan Broadbent
 - Ben Tillman
+- Nathan Broadbent
 - Stephen Kenworthy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-10 00:00:00.000000000Z
+date: 2012-03-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &76899560 !ruby/object:Gem::Requirement
+  requirement: &23503020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *76899560
+  version_requirements: *23503020
 - !ruby/object:Gem::Dependency
   name: prototype-rails
-  requirement: &76899350 !ruby/object:Gem::Requirement
+  requirement: &23502600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76899350
+  version_requirements: *23502600
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &76899120 !ruby/object:Gem::Requirement
+  requirement: &23502140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,21 +46,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76899120
+  version_requirements: *23502140
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &76898870 !ruby/object:Gem::Requirement
+  requirement: &23501640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *76898870
+  version_requirements: *23501640
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &76898610 !ruby/object:Gem::Requirement
+  requirement: &23501120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,21 +68,21 @@ dependencies:
         version: 3.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *76898610
+  version_requirements: *23501120
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &76898360 !ruby/object:Gem::Requirement
+  requirement: &23500660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *76898360
+  version_requirements: *23500660
 - !ruby/object:Gem::Dependency
   name: paper_trail
-  requirement: &76898170 !ruby/object:Gem::Requirement
+  requirement: &23500280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76898170
+  version_requirements: *23500280
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &76897890 !ruby/object:Gem::Requirement
+  requirement: &23499740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +101,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76897890
+  version_requirements: *23499740
 - !ruby/object:Gem::Dependency
   name: acts_as_commentable
-  requirement: &76897630 !ruby/object:Gem::Requirement
+  requirement: &23499220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -112,10 +112,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *76897630
+  version_requirements: *23499220
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &76897400 !ruby/object:Gem::Requirement
+  requirement: &23498760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -123,10 +123,32 @@ dependencies:
         version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *76897400
+  version_requirements: *23498760
+- !ruby/object:Gem::Dependency
+  name: responds_to_parent
+  requirement: &23498380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *23498380
+- !ruby/object:Gem::Dependency
+  name: dynamic_form
+  requirement: &23497920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *23497920
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &76897150 !ruby/object:Gem::Requirement
+  requirement: &23492000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,10 +156,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *76897150
+  version_requirements: *23492000
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &76896910 !ruby/object:Gem::Requirement
+  requirement: &23491480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -145,10 +167,10 @@ dependencies:
         version: 3.1.15
   type: :runtime
   prerelease: false
-  version_requirements: *76896910
+  version_requirements: *23491480
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &76896670 !ruby/object:Gem::Requirement
+  requirement: &23490940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -156,10 +178,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *76896670
+  version_requirements: *23490940
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &76896440 !ruby/object:Gem::Requirement
+  requirement: &23490480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,10 +189,10 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *76896440
+  version_requirements: *23490480
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &76896240 !ruby/object:Gem::Requirement
+  requirement: &23490080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -178,10 +200,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76896240
+  version_requirements: *23490080
 - !ruby/object:Gem::Dependency
   name: chosen-rails
-  requirement: &76896000 !ruby/object:Gem::Requirement
+  requirement: &23489560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -189,10 +211,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76896000
+  version_requirements: *23489560
 - !ruby/object:Gem::Dependency
   name: ajax-chosen-rails
-  requirement: &76895750 !ruby/object:Gem::Requirement
+  requirement: &23489060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -200,10 +222,21 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *76895750
+  version_requirements: *23489060
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &76895530 !ruby/object:Gem::Requirement
+  requirement: &23488620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *23488620
+- !ruby/object:Gem::Dependency
+  name: cancan
+  requirement: &23488080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -211,10 +244,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76895530
+  version_requirements: *23488080
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &76895240 !ruby/object:Gem::Requirement
+  requirement: &23487560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -222,10 +255,10 @@ dependencies:
         version: 2.8.1
   type: :development
   prerelease: false
-  version_requirements: *76895240
+  version_requirements: *23487560
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &76895010 !ruby/object:Gem::Requirement
+  requirement: &23487080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -233,10 +266,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76895010
+  version_requirements: *23487080
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &76894780 !ruby/object:Gem::Requirement
+  requirement: &23486620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -244,10 +277,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76894780
+  version_requirements: *23486620
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &76894560 !ruby/object:Gem::Requirement
+  requirement: &23486180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -255,10 +288,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76894560
+  version_requirements: *23486180
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &76894350 !ruby/object:Gem::Requirement
+  requirement: &23485740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -266,10 +299,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76894350
+  version_requirements: *23485740
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &76894130 !ruby/object:Gem::Requirement
+  requirement: &23485320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -277,10 +310,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76894130
+  version_requirements: *23485320
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &76893910 !ruby/object:Gem::Requirement
+  requirement: &23484900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -288,10 +321,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76893910
+  version_requirements: *23484900
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &76893690 !ruby/object:Gem::Requirement
+  requirement: &23484480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -299,10 +332,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76893690
+  version_requirements: *23484480
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &76893430 !ruby/object:Gem::Requirement
+  requirement: &23477680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -310,11 +343,23 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *76893430
+  version_requirements: *23477680
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: &23477160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: *23477160
 description: An open source, Ruby on Rails customer relationship management platform
 email:
 - mike@fatfreecrm.com
 - nathan@fatfreecrm.com
+- warp@fatfreecrm.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -376,7 +421,6 @@ files:
 - app/assets/stylesheets/print.css.scss
 - app/assets/stylesheets/rails.scss
 - app/assets/stylesheets/safari.scss
-- app/controllers/accounts_controller.rb
 - app/controllers/admin/application_controller.rb
 - app/controllers/admin/field_groups_controller.rb
 - app/controllers/admin/fields_controller.rb
@@ -386,17 +430,18 @@ files:
 - app/controllers/admin/users_controller.rb
 - app/controllers/application_controller.rb
 - app/controllers/authentications_controller.rb
-- app/controllers/base_controller.rb
-- app/controllers/campaigns_controller.rb
 - app/controllers/comments_controller.rb
-- app/controllers/contacts_controller.rb
 - app/controllers/emails_controller.rb
+- app/controllers/entities/accounts_controller.rb
+- app/controllers/entities/campaigns_controller.rb
+- app/controllers/entities/contacts_controller.rb
+- app/controllers/entities/leads_controller.rb
+- app/controllers/entities/opportunities_controller.rb
+- app/controllers/entities/tasks_controller.rb
+- app/controllers/entities_controller.rb
 - app/controllers/home_controller.rb
-- app/controllers/leads_controller.rb
 - app/controllers/lists_controller.rb
-- app/controllers/opportunities_controller.rb
 - app/controllers/passwords_controller.rb
-- app/controllers/tasks_controller.rb
 - app/controllers/users_controller.rb
 - app/helpers/accounts_helper.rb
 - app/helpers/addresses_helper.rb
@@ -424,23 +469,24 @@ files:
 - app/helpers/users_helper.rb
 - app/inputs/date_time_input.rb
 - app/inputs/text_input.rb
-- app/models/base/account.rb
-- app/models/base/account_contact.rb
-- app/models/base/account_opportunity.rb
-- app/models/base/campaign.rb
-- app/models/base/contact.rb
-- app/models/base/contact_opportunity.rb
-- app/models/base/lead.rb
-- app/models/base/opportunity.rb
-- app/models/base/task.rb
+- app/models/entities/account.rb
+- app/models/entities/account_contact.rb
+- app/models/entities/account_opportunity.rb
+- app/models/entities/campaign.rb
+- app/models/entities/contact.rb
+- app/models/entities/contact_opportunity.rb
+- app/models/entities/lead.rb
+- app/models/entities/opportunity.rb
+- app/models/entities/task.rb
 - app/models/fields/core_field.rb
 - app/models/fields/custom_field.rb
 - app/models/fields/field.rb
 - app/models/fields/field_group.rb
 - app/models/list.rb
 - app/models/mailers/notifier.rb
-- app/models/observers/activity_observer.rb
-- app/models/polymorphic/activity.rb
+- app/models/observers/lead_observer.rb
+- app/models/observers/opportunity_observer.rb
+- app/models/observers/task_observer.rb
 - app/models/polymorphic/address.rb
 - app/models/polymorphic/avatar.rb
 - app/models/polymorphic/comment.rb
@@ -448,6 +494,7 @@ files:
 - app/models/polymorphic/tag.rb
 - app/models/polymorphic/tagging.rb
 - app/models/setting.rb
+- app/models/users/ability.rb
 - app/models/users/authentication.rb
 - app/models/users/permission.rb
 - app/models/users/preference.rb
@@ -461,14 +508,12 @@ files:
 - app/views/accounts/_sidebar_index.html.haml
 - app/views/accounts/_sidebar_show.html.haml
 - app/views/accounts/_top_section.html.haml
-- app/views/accounts/contacts.js.rjs
 - app/views/accounts/create.js.rjs
 - app/views/accounts/destroy.js.rjs
 - app/views/accounts/edit.js.rjs
 - app/views/accounts/index.html.haml
 - app/views/accounts/index.js.rjs
 - app/views/accounts/new.js.rjs
-- app/views/accounts/opportunities.js.rjs
 - app/views/accounts/options.js.rjs
 - app/views/accounts/show.html.haml
 - app/views/accounts/update.js.rjs
@@ -533,11 +578,6 @@ files:
 - app/views/admin/users/suspend.js.rjs
 - app/views/admin/users/update.js.rjs
 - app/views/authentications/new.html.haml
-- app/views/base/_advanced_search.html.haml
-- app/views/base/_condition_fields.html.haml
-- app/views/base/_grouping_fields.html.haml
-- app/views/base/_sort_fields.html.haml
-- app/views/base/advanced_search.js.rjs
 - app/views/campaigns/_campaign.html.haml
 - app/views/campaigns/_edit.html.haml
 - app/views/campaigns/_metrics.html.haml
@@ -554,9 +594,7 @@ files:
 - app/views/campaigns/edit.js.rjs
 - app/views/campaigns/index.html.haml
 - app/views/campaigns/index.js.rjs
-- app/views/campaigns/leads.js.rjs
 - app/views/campaigns/new.js.rjs
-- app/views/campaigns/opportunities.js.rjs
 - app/views/campaigns/options.js.rjs
 - app/views/campaigns/show.html.haml
 - app/views/campaigns/update.js.rjs
@@ -569,6 +607,7 @@ files:
 - app/views/comments/new.js.rjs
 - app/views/comments/update.js.rjs
 - app/views/contacts/_contact.html.haml
+- app/views/contacts/_contacts.html.haml
 - app/views/contacts/_edit.html.haml
 - app/views/contacts/_extra.html.haml
 - app/views/contacts/_new.html.haml
@@ -584,20 +623,28 @@ files:
 - app/views/contacts/index.html.haml
 - app/views/contacts/index.js.rjs
 - app/views/contacts/new.js.rjs
-- app/views/contacts/opportunities.js.rjs
 - app/views/contacts/options.js.rjs
 - app/views/contacts/show.html.haml
 - app/views/contacts/update.js.rjs
 - app/views/emails/_email.html.haml
 - app/views/emails/destroy.js.rjs
+- app/views/entities/_advanced_search.html.haml
+- app/views/entities/_condition_fields.html.haml
+- app/views/entities/_grouping_fields.html.haml
+- app/views/entities/_sort_fields.html.haml
+- app/views/entities/advanced_search.js.rjs
+- app/views/entities/contacts.js.rjs
+- app/views/entities/leads.js.rjs
+- app/views/entities/opportunities.js.rjs
+- app/views/entities/versions.js.rjs
 - app/views/fields/_group.html.haml
 - app/views/fields/_groups.html.haml
 - app/views/fields/_sidebar_show.html.haml
 - app/views/fields/group.js.rjs
-- app/views/home/_actions_menu.html.haml
 - app/views/home/_activity.html.haml
 - app/views/home/_assets_menu.html.haml
 - app/views/home/_duration_menu.html.haml
+- app/views/home/_events_menu.html.haml
 - app/views/home/_options.html.haml
 - app/views/home/_users_menu.html.haml
 - app/views/home/index.atom.builder
@@ -621,6 +668,7 @@ files:
 - app/views/leads/_convert_permissions.html.haml
 - app/views/leads/_edit.html.haml
 - app/views/leads/_lead.html.haml
+- app/views/leads/_leads.html.haml
 - app/views/leads/_new.html.haml
 - app/views/leads/_opportunity.html.haml
 - app/views/leads/_options.html.haml
@@ -648,6 +696,7 @@ files:
 - app/views/notifier/password_reset_instructions.html.haml
 - app/views/opportunities/_edit.html.haml
 - app/views/opportunities/_new.html.haml
+- app/views/opportunities/_opportunities.html.haml
 - app/views/opportunities/_opportunity.html.haml
 - app/views/opportunities/_options.html.haml
 - app/views/opportunities/_permissions.html.haml
@@ -701,6 +750,7 @@ files:
 - app/views/tasks/_related.html.haml
 - app/views/tasks/_selector.html.haml
 - app/views/tasks/_sidebar_index.html.haml
+- app/views/tasks/_tasks.html.haml
 - app/views/tasks/_title.html.haml
 - app/views/tasks/_top_section.html.haml
 - app/views/tasks/complete.js.rjs
@@ -727,6 +777,7 @@ files:
 - app/views/users/update.js.rjs
 - app/views/users/upload_avatar.js.rjs
 - app/views/versions/_version.html.haml
+- app/views/versions/_versions.html.haml
 - config.ru
 - config/application.rb
 - config/boot.rb
@@ -744,6 +795,7 @@ files:
 - config/initializers/mime_types.rb
 - config/initializers/paginate_arrays.rb
 - config/initializers/paper_trail.rb
+- config/initializers/relative_url_root.rb
 - config/initializers/sass.rb
 - config/initializers/secret_token.rb
 - config/initializers/simple_form.rb
@@ -841,31 +893,16 @@ files:
 - db/migrate/20120216042541_is_paranoid_to_paper_trail.rb
 - db/migrate/20120220233724_add_versions_object_changes.rb
 - db/migrate/20120224073107_remove_default_value_and_clear_settings.rb
+- db/migrate/20120309070209_add_versions_related.rb
+- db/migrate/20120316045804_activities_to_versions.rb
 - db/schema.rb
 - db/seeds.rb
 - db/seeds/fields.rb
 - fat_free_crm.gemspec
-- lib/country_select/MIT-LICENSE
-- lib/country_select/README
-- lib/country_select/init.rb
-- lib/country_select/install.rb
-- lib/country_select/lib/country_select.rb
-- lib/country_select/uninstall.rb
 - lib/development_tasks/gem.rake
 - lib/development_tasks/license.rake
 - lib/development_tasks/rdoc.rake
 - lib/development_tasks/rspec.rake
-- lib/dynamic_form/MIT-LICENSE
-- lib/dynamic_form/README
-- lib/dynamic_form/Rakefile
-- lib/dynamic_form/dynamic_form.gemspec
-- lib/dynamic_form/init.rb
-- lib/dynamic_form/lib/action_view/helpers/dynamic_form.rb
-- lib/dynamic_form/lib/action_view/locale/en-US.yml
-- lib/dynamic_form/lib/dynamic_form.rb
-- lib/dynamic_form/test/dynamic_form_i18n_test.rb
-- lib/dynamic_form/test/dynamic_form_test.rb
-- lib/dynamic_form/test/test_helper.rb
 - lib/fat_free_crm.rb
 - lib/fat_free_crm/callback.rb
 - lib/fat_free_crm/core_ext.rb
@@ -898,25 +935,22 @@ files:
 - lib/fat_free_crm/syck_yaml.rb
 - lib/fat_free_crm/tabs.rb
 - lib/fat_free_crm/version.rb
-- lib/gravatar_image_tag/Gemfile
-- lib/gravatar_image_tag/README.textile
-- lib/gravatar_image_tag/ROADMAP.textile
-- lib/gravatar_image_tag/Rakefile
-- lib/gravatar_image_tag/VERSION
-- lib/gravatar_image_tag/gravatar_image_tag.gemspec
-- lib/gravatar_image_tag/init.rb
-- lib/gravatar_image_tag/lib/gravatar_image_tag.rb
-- lib/gravatar_image_tag/spec/gravatar_image_tag_spec.rb
-- lib/gravatar_image_tag/spec/test_helper.rb
-- lib/responds_to_parent/MIT-LICENSE
-- lib/responds_to_parent/README
-- lib/responds_to_parent/Rakefile
-- lib/responds_to_parent/init.rb
-- lib/responds_to_parent/install.rb
-- lib/responds_to_parent/lib/responds_to_parent.rb
-- lib/responds_to_parent/test/responds_to_parent_test.rb
-- lib/responds_to_parent/test/test_helper.rb
-- lib/responds_to_parent/uninstall.rb
+- lib/plugins/country_select/MIT-LICENSE
+- lib/plugins/country_select/README
+- lib/plugins/country_select/init.rb
+- lib/plugins/country_select/install.rb
+- lib/plugins/country_select/lib/country_select.rb
+- lib/plugins/country_select/uninstall.rb
+- lib/plugins/gravatar_image_tag/Gemfile
+- lib/plugins/gravatar_image_tag/README.textile
+- lib/plugins/gravatar_image_tag/ROADMAP.textile
+- lib/plugins/gravatar_image_tag/Rakefile
+- lib/plugins/gravatar_image_tag/VERSION
+- lib/plugins/gravatar_image_tag/gravatar_image_tag.gemspec
+- lib/plugins/gravatar_image_tag/init.rb
+- lib/plugins/gravatar_image_tag/lib/gravatar_image_tag.rb
+- lib/plugins/gravatar_image_tag/spec/gravatar_image_tag_spec.rb
+- lib/plugins/gravatar_image_tag/spec/test_helper.rb
 - lib/tasks/.gitkeep
 - lib/tasks/.gitkeep~master
 - lib/tasks/demo.rake
@@ -996,11 +1030,11 @@ files:
 - spec/models/fields/field_group_spec.rb
 - spec/models/fields/field_spec.rb
 - spec/models/list_spec.rb
-- spec/models/polymorphic/activity_spec.rb
 - spec/models/polymorphic/address_spec.rb
 - spec/models/polymorphic/avatar_spec.rb
 - spec/models/polymorphic/comment_spec.rb
 - spec/models/polymorphic/email_spec.rb
+- spec/models/polymorphic/version_spec.rb
 - spec/models/setting_spec.rb
 - spec/models/users/authentication_spec.rb
 - spec/models/users/permission_spec.rb
@@ -1137,6 +1171,7 @@ files:
 - vendor/assets/javascripts/calendar_date_select/format_euro_24hr.js
 - vendor/assets/javascripts/calendar_date_select/format_euro_24hr_ymd.js
 - vendor/assets/javascripts/calendar_date_select/format_finnish.js
+- vendor/assets/javascripts/calendar_date_select/format_french.js
 - vendor/assets/javascripts/calendar_date_select/format_hyphen_ampm.js
 - vendor/assets/javascripts/calendar_date_select/format_iso_date.js
 - vendor/assets/javascripts/calendar_date_select/format_italian.js
@@ -1181,15 +1216,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -109531187312954119
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -109531187312954119
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Fat Free CRM