fat_free_crm 0.13.4 → 0.13.5

data/config/locales/zh-CN_ransack.yml

@@ -0,0 +1,91 @@
+---
+zh-CN:
+  ransack:
+    search: 搜索
+    predicate: predicate
+    and: 和
+    or: 或
+    any: 任何
+    all: 所有
+    combinator: 组合器
+    attribute: 属性
+    value: 值
+    condition: 条件
+    sort: 排序
+    asc: 升序
+    desc: 降序
+    submit: 搜索
+    add_group: 增加过滤器组
+    group_first: Show results where %{combinator} of the following match
+    group_rest: ! '...and where %{combinator} of the following match'
+    add_condition: 增加一个过滤器
+    remove_condition: 移除过滤器
+    predicates:
+      eq: 等于
+      eq_any: 等于任何
+      eq_all: 等于所有
+      not_eq: 不等于
+      not_eq_any: 不等于任何
+      not_eq_all: 不等于所有
+      matches: 匹配
+      matches_any: 匹配任何
+      matches_all: 匹配所有
+      does_not_match: 不匹配
+      does_not_match_any: 不匹配任何
+      does_not_match_all: 不匹配所有
+      lt: 少于
+      lt_any: 少于任何
+      lt_all: 少于所有
+      lteq: 少于或等于
+      lteq_any: 少于或等于任何
+      lteq_all: 少于或等于所有
+      gt: 大于
+      gt_any: 大于任何
+      gt_all: 大于所有
+      gteq: 大于或者等于
+      gteq_any: 大于或者等于任何
+      gteq_all: 大于或者等于所有
+      in: 包含于
+      in_any: 包含于任何
+      in_all: 包含于所有
+      not_in: 不包含于
+      not_in_any: 不包含于任何
+      not_in_all: 不包含于所有
+      cont: 包含
+      cont_any: 包含任何
+      cont_all: 包含所有
+      not_cont: 不包含
+      not_cont_any: 不包含任何
+      not_cont_all: 不包含所有
+      start: 开始于
+      start_any: 开始于任何
+      start_all: 开始于所有
+      not_start: 不开始于
+      not_start_any: 不开始于任何
+      not_start_all: 不开始于所有
+      end: 结束于
+      end_any: 结束于任何
+      end_all: 结束于所有
+      not_end: 不结束于
+      not_end_any: 不结束于任何
+      not_end_all: 不结束于所有
+      'true': 为 true
+      'false': 为 false
+      present: is present
+      blank: 为空
+      'null': 为 null
+      not_null: 不为 null
+      alt:
+        date:
+          lt: 在之前
+          lt_any: 在任何之前
+          lt_all: 在所有之前
+          lteq: is before or on
+          lteq_any: is before or on any
+          lteq_all: is before or on all
+          gt: 在之后
+          gt_any: 在任何之后
+          gt_all: 在所有之后
+          gteq: is after or on
+          gteq_any: is after or on any
+          gteq_all: is after or on all

data/config/settings.default.yml

@@ -63,15 +63,16 @@
 
 
 # Settings for outgoing email (SMTP)
+# Uncomment to set up for your specific mailer
 #------------------------------------------------------------------------------
-:smtp:
-  :address                    : ""        # e.g. smtp.gmail.com
-  :from                       : ""        # e.g. no-reply@your-domain.com
-  :enable_starttls_auto       : true      # true/false
-  :port                       : ""        # e.g. 587
-  :authentication             : :plain
-  :user_name                  : ""
-  :password                   : ""
+#:smtp:
+  #:address                    : ""        # e.g. smtp.gmail.com
+  #:from                       : ""        # e.g. no-reply@your-domain.com
+  #:enable_starttls_auto       : true
+  #:port                       : "587"
+  #:authentication             : :plain
+  #:user_name                  : ""
+  #:password                   : ""
 
 # Settings for the Email dropbox (IMAP)
 # - Connection settings for the IMAP account, server and folders.

data/db/demo/field_groups.yml

@@ -0,0 +1,14 @@
+<%
+  require "ffaker"
+  puts "Loading field_groups..."
+
+  klasses = %w(Contact Account Campaign Opportunity Lead)
+
+  for i in (1..klasses.size) do
+%>
+field_group_<%= i %>:
+  id          : <%= i %>
+  klass_name  : <%= klasses[i-1] %>
+  name        : "Extra"
+  position    : 1
+<% end %>

data/db/migrate/20140916011927_add_created_at_index_on_versions.rb

@@ -0,0 +1,5 @@
+class AddCreatedAtIndexOnVersions < ActiveRecord::Migration
+  def change
+    add_index :versions, :created_at
+  end
+end

data/db/migrate/20140916012922_add_indexes_to_model_associations.rb

@@ -0,0 +1,6 @@
+class AddIndexesToModelAssociations < ActiveRecord::Migration
+  def change
+    add_index :contact_opportunities, [:contact_id, :opportunity_id]
+    add_index :account_opportunities, [:account_id, :opportunity_id]
+  end
+end

data/db/migrate/20141126031837_increase_email_to254_chars.rb

@@ -0,0 +1,21 @@
+class IncreaseEmailTo254Chars < ActiveRecord::Migration
+  def up
+    change_column :accounts, :email, :string, :limit => 254
+    change_column :contacts, :email, :string, :limit => 254
+    change_column :contacts, :alt_email, :string, :limit => 254
+    change_column :leads, :email, :string, :limit => 254
+    change_column :leads, :alt_email, :string, :limit => 254
+    change_column :users, :email, :string, :limit => 254
+    change_column :users, :alt_email, :string, :limit => 254
+  end
+
+  def down
+    change_column :accounts, :email, :string, :limit => 64
+    change_column :contacts, :email, :string, :limit => 64
+    change_column :contacts, :alt_email, :string, :limit => 64
+    change_column :leads, :email, :string, :limit => 64
+    change_column :leads, :alt_email, :string, :limit => 64
+    change_column :users, :email, :string, :limit => 64
+    change_column :users, :alt_email, :string, :limit => 64
+  end
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20131207033244) do
+ActiveRecord::Schema.define(:version => 20141126031837) do
 
   create_table "account_contacts", :force => true do |t|
     t.integer  "account_id"
@@ -29,21 +29,23 @@ ActiveRecord::Schema.define(:version => 20131207033244) do
     t.datetime "updated_at",     :null => false
   end
 
+  add_index "account_opportunities", ["account_id", "opportunity_id"], :name => "index_account_opportunities_on_account_id_and_opportunity_id"
+
   create_table "accounts", :force => true do |t|
     t.integer  "user_id"
     t.integer  "assigned_to"
-    t.string   "name",             :limit => 64, :default => "",       :null => false
-    t.string   "access",           :limit => 8,  :default => "Public"
+    t.string   "name",             :limit => 64,  :default => "",       :null => false
+    t.string   "access",           :limit => 8,   :default => "Public"
     t.string   "website",          :limit => 64
     t.string   "toll_free_phone",  :limit => 32
     t.string   "phone",            :limit => 32
     t.string   "fax",              :limit => 32
     t.datetime "deleted_at"
-    t.datetime "created_at",                                           :null => false
-    t.datetime "updated_at",                                           :null => false
-    t.string   "email",            :limit => 64
+    t.datetime "created_at",                                            :null => false
+    t.datetime "updated_at",                                            :null => false
+    t.string   "email",            :limit => 254
     t.string   "background_info"
-    t.integer  "rating",                         :default => 0,        :null => false
+    t.integer  "rating",                          :default => 0,        :null => false
     t.string   "category",         :limit => 32
     t.text     "subscribed_users"
   end
@@ -141,6 +143,8 @@ ActiveRecord::Schema.define(:version => 20131207033244) do
     t.datetime "updated_at",                   :null => false
   end
 
+  add_index "contact_opportunities", ["contact_id", "opportunity_id"], :name => "index_contact_opportunities_on_contact_id_and_opportunity_id"
+
   create_table "contacts", :force => true do |t|
     t.integer  "user_id"
     t.integer  "lead_id"
@@ -152,8 +156,8 @@ ActiveRecord::Schema.define(:version => 20131207033244) do
     t.string   "title",            :limit => 64
     t.string   "department",       :limit => 64
     t.string   "source",           :limit => 32
-    t.string   "email",            :limit => 64
-    t.string   "alt_email",        :limit => 64
+    t.string   "email",            :limit => 254
+    t.string   "alt_email",        :limit => 254
     t.string   "phone",            :limit => 32
     t.string   "mobile",           :limit => 32
     t.string   "fax",              :limit => 32
@@ -256,8 +260,8 @@ ActiveRecord::Schema.define(:version => 20131207033244) do
     t.string   "source",           :limit => 32
     t.string   "status",           :limit => 32
     t.string   "referred_by",      :limit => 64
-    t.string   "email",            :limit => 64
-    t.string   "alt_email",        :limit => 64
+    t.string   "email",            :limit => 254
+    t.string   "alt_email",        :limit => 254
     t.string   "phone",            :limit => 32
     t.string   "mobile",           :limit => 32
     t.string   "blog",             :limit => 128
@@ -391,33 +395,33 @@ ActiveRecord::Schema.define(:version => 20131207033244) do
   add_index "tasks", ["user_id", "name", "deleted_at"], :name => "index_tasks_on_user_id_and_name_and_deleted_at", :unique => true
 
   create_table "users", :force => true do |t|
-    t.string   "username",            :limit => 32, :default => "",    :null => false
-    t.string   "email",               :limit => 64, :default => "",    :null => false
+    t.string   "username",            :limit => 32,  :default => "",    :null => false
+    t.string   "email",               :limit => 254, :default => "",    :null => false
     t.string   "first_name",          :limit => 32
     t.string   "last_name",           :limit => 32
     t.string   "title",               :limit => 64
     t.string   "company",             :limit => 64
-    t.string   "alt_email",           :limit => 64
+    t.string   "alt_email",           :limit => 254
     t.string   "phone",               :limit => 32
     t.string   "mobile",              :limit => 32
     t.string   "aim",                 :limit => 32
     t.string   "yahoo",               :limit => 32
     t.string   "google",              :limit => 32
     t.string   "skype",               :limit => 32
-    t.string   "password_hash",                     :default => "",    :null => false
-    t.string   "password_salt",                     :default => "",    :null => false
-    t.string   "persistence_token",                 :default => "",    :null => false
-    t.string   "perishable_token",                  :default => "",    :null => false
+    t.string   "password_hash",                      :default => "",    :null => false
+    t.string   "password_salt",                      :default => "",    :null => false
+    t.string   "persistence_token",                  :default => "",    :null => false
+    t.string   "perishable_token",                   :default => "",    :null => false
     t.datetime "last_request_at"
     t.datetime "last_login_at"
     t.datetime "current_login_at"
     t.string   "last_login_ip"
     t.string   "current_login_ip"
-    t.integer  "login_count",                       :default => 0,     :null => false
+    t.integer  "login_count",                        :default => 0,     :null => false
     t.datetime "deleted_at"
-    t.datetime "created_at",                                           :null => false
-    t.datetime "updated_at",                                           :null => false
-    t.boolean  "admin",                             :default => false, :null => false
+    t.datetime "created_at",                                            :null => false
+    t.datetime "updated_at",                                            :null => false
+    t.boolean  "admin",                              :default => false, :null => false
     t.datetime "suspended_at"
     t.string   "single_access_token"
   end
@@ -440,6 +444,7 @@ ActiveRecord::Schema.define(:version => 20131207033244) do
     t.string   "related_type"
   end
 
+  add_index "versions", ["created_at"], :name => "index_versions_on_created_at"
   add_index "versions", ["item_type", "item_id"], :name => "index_versions_on_item_type_and_item_id"
   add_index "versions", ["whodunnit"], :name => "index_versions_on_whodunnit"
 

data/fig.yml

@@ -0,0 +1,13 @@
+web:
+  build: .
+  user: app
+  command: "bundle exec rails server"
+  links:
+    - db
+  ports:
+    - "3000:3000"
+
+db:
+  image: postgres
+  ports:
+    - "5432"

data/lib/fat_free_crm/callback.rb

@@ -28,9 +28,9 @@ module FatFreeCRM
     # Invokes the hook named :method and captures its output.
     #--------------------------------------------------------------------------
     def self.hook(method, caller, context = {})
-      str = ""
+      str = "".html_safe
       responder(method).map do |m|
-        str << m.send(method, caller, context)
+        str << m.send(method, caller, context) if m.respond_to?(method)
       end
       str
     end
@@ -98,7 +98,7 @@ module FatFreeCRM
         is_view_hook = caller.is_haml?
 
         # If a block was given, hooks are able to replace, append or prepend view content.
-        if block_given? and is_view_hook
+        if is_view_hook
           hooks = FatFreeCRM::Callback.view_hook(method, caller, context)
           # Add content to the view in the following order:
           # -- before
@@ -108,7 +108,12 @@ module FatFreeCRM
           hooks[:before].each{|data| view_data << data }
           # Only render the original view block if there are no pending :replace operations
           if hooks[:replace].empty?
-            view_data << capture(&block)
+            view_data << if block_given?
+                capture(&block)
+              else
+                # legacy view hooks
+                FatFreeCRM::Callback.hook(method, caller, context)
+              end
           else
             hooks[:replace].each{|data| view_data << data }
           end

data/lib/fat_free_crm/gem_dependencies.rb

@@ -28,6 +28,7 @@ require 'premailer'
 require 'nokogiri'
 require 'font-awesome-rails'
 require 'thor'
+require 'rails_autolink'
 
 # Load redcloth if available (for textile markup in emails)
 begin

data/lib/fat_free_crm/version.rb

@@ -7,7 +7,7 @@ module FatFreeCRM
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 13
-    TINY  = 4
+    TINY  = 5
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/spec/factories/user_factories.rb

@@ -19,10 +19,10 @@ FactoryGirl.define do
     google              nil
     skype               nil
     admin               false
-    password_hash       "56d91c9f1a9c549304768982fd4e2d8bc2700b403b4524c0f14136dbbe2ce4cd923156ad69f9acce8305dba4e63faa884e61fb7a256cf8f5fc7c2ce176e68e8f"
-    password_salt       "ce6e0200c96f4dd326b91f3967115a31421a0e7dcddc9ffb63a77f598a9fcb5326fe532dbd9836a2446e46840d398fa32c81f8f4da1a0fcfe931989e9639a013"
-    persistence_token   "d7cdeffd3625f7cb265b21126b85da7c930d47c4a708365c20eb857560055a6b57c9775becb8a957dfdb46df8aee17eb120a011b380e9cc0882f9dfaa2b7ba26"
-    perishable_token    "TarXlrOPfaokNOzls2U8"
+    password_hash       { SecureRandom.hex(64) }
+    password_salt       { SecureRandom.hex(64) }
+    persistence_token   { SecureRandom.hex(64) }
+    perishable_token    { SecureRandom.hex(10) }
     single_access_token nil
     last_request_at     { FactoryGirl.generate(:time) }
     current_login_at    { FactoryGirl.generate(:time) }

data/spec/models/users/user_spec.rb

@@ -223,4 +223,17 @@ describe User do
     end
 
   end
+
+  describe "text_search" do
+
+    it "should find user by email" do
+      create(:user, email: 'no-reply@example.com')
+      user = create(:user, email: 'test@example.com')
+      search = User.text_search('test')
+      expect(search.size).to eql(1)
+      expect(search.first).to eql(user)
+    end
+
+  end
+
 end

data/spec/views/admin/users/create.js.haml_spec.rb

@@ -18,8 +18,6 @@ describe "admin/users/create" do
 
     it "should hide [Create User] form and insert user partial" do
       render
-
-      rendered.should include(@user.full_name)
       rendered.should include(@user.username)
       rendered.should include(%Q/$('#user_#{@user.id}').effect("highlight"/)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_free_crm
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.13.5
 platform: ruby
 authors:
 - Michael Dvorkin
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -417,10 +417,12 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".teatro.yml"
 - ".travis.yml"
 - CHANGELOG
 - CONTRIBUTORS
 - Capfile
+- Dockerfile
 - Gemfile
 - Gemfile.ci
 - Gemfile.lock
@@ -898,6 +900,7 @@ files:
 - config/boot.rb
 - config/database.mysql.mac.yml
 - config/database.mysql.yml
+- config/database.postgres.docker.yml
 - config/database.postgres.yml
 - config/database.sqlite.yml
 - config/deploy.example.rb
@@ -928,6 +931,7 @@ files:
 - config/locales/de_ransack.yml
 - config/locales/en-GB.yml
 - config/locales/en-GB_fat_free_crm.yml
+- config/locales/en-GB_ransack.yml
 - config/locales/en-US.yml
 - config/locales/en-US_fat_free_crm.yml
 - config/locales/en-US_ransack.yml
@@ -941,6 +945,7 @@ files:
 - config/locales/it_fat_free_crm.yml
 - config/locales/ja.yml
 - config/locales/ja_fat_free_crm.yml
+- config/locales/ja_ransack.yml
 - config/locales/pl.yml
 - config/locales/pl_fat_free_crm.yml
 - config/locales/pt-BR.yml
@@ -953,6 +958,7 @@ files:
 - config/locales/th_fat_free_crm.yml
 - config/locales/zh-CN.yml
 - config/locales/zh-CN_fat_free_crm.yml
+- config/locales/zh-CN_ransack.yml
 - config/routes.rb
 - config/settings.default.yml
 - config/unicorn.rb
@@ -968,6 +974,7 @@ files:
 - db/demo/contact_opportunities.yml
 - db/demo/contacts.yml
 - db/demo/emails.yml
+- db/demo/field_groups.yml
 - db/demo/leads.yml
 - db/demo/opportunities.yml
 - db/demo/permissions.yml
@@ -1031,10 +1038,14 @@ files:
 - db/migrate/20121003063155_add_settings_to_custom_fields.rb
 - db/migrate/20121221033947_fix_country_mapping.rb
 - db/migrate/20131207033244_add_user_id_to_lists.rb
+- db/migrate/20140916011927_add_created_at_index_on_versions.rb
+- db/migrate/20140916012922_add_indexes_to_model_associations.rb
+- db/migrate/20141126031837_increase_email_to254_chars.rb
 - db/schema.rb
 - db/seeds.rb
 - db/seeds/fields.rb
 - fat_free_crm.gemspec
+- fig.yml
 - lib/country_select.rb
 - lib/development_tasks/gem.rake
 - lib/development_tasks/license.rake
@@ -1426,7 +1437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Fat Free CRM