fat_free_crm 0.12.3 → 0.13.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjExMTQ1NmMzMTliZTRkMjM5ZjdmMjM0MjJlZmMyNTI4NmMzYzYwZA==
-  data.tar.gz: !binary |-
-    YTNhYTM2YTU5YmRiYzI3MGMwNmNlN2M0NzAxODAxNGZmM2ZjYzZmMQ==
+SHA1:
+  metadata.gz: b730c5c2d600766afc3d141b7b3a27320d266cb0
+  data.tar.gz: 3184062c0cbfb30233ed2a72a6ef9bd0fad3bd6b
 SHA512:
-  metadata.gz: !binary |-
-    YTJlZTcyMDlhMTg3NmRlMTA4OGYzN2RiMmIyYjQzYTYwNjcwYTNlMWU3YmEw
-    MTcxNzdjZTJlNzQ1ODA0YjVlZjY5MTcyYTMxOGM2NTI1Y2VhMTc4YjAwM2Yy
-    MGRiZGM1ZDhkZjQxZjIyNWM0MzMxMmU0YTUzNDU4MWIyMDI2MWI=
-  data.tar.gz: !binary |-
-    YmRiOTMzYjRmMWJlZmM0MmVlODViODNmY2ZmMGM4Y2RmMDVlMTkzMTIyYTgz
-    MWI0NWNkMTUyNDRiZTc1ODEyYWNkMWMwOWZhZGMxZGJmYjk5NjIwMGVmYzM3
-    YjhjMGJjYTM0N2FiMDEwMjQ0NTI2NmIxZDdjOTUxMmI2ZGM0MTQ=
+  metadata.gz: 0c3361fee7c5d1de8f15c32782a0b11b5a4f327b2a778f70106bbceaf25557267ca61e9caaee52a5d182b1c0da9d2773d885fe3776881607ce8f36bdf1f25b8a
+  data.tar.gz: 55808fc5ea278a591c7396ec21c12f400d459acacd482cd73ad1b98105e85ff1951ec68a3d7930b6a1de0f00b6c96d70c0902816fce23ddb9c048026b2505e3d

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 1.9.2
+  - 2.0.0
 
 env:
   - DB=mysql
@@ -10,16 +10,6 @@ env:
 
 gemfile: Gemfile.ci
 
-# Only run a cross-section of 4 builds majoring on r1.9.3
-matrix:
-  exclude:
-    - rvm: 1.9.2
-      env: DB=sqlite
-      gemfile: Gemfile.ci
-    - rvm: 1.9.2
-      env: DB=postgres
-      gemfile: Gemfile.ci
-
 bundler_args: --path=vendor/bundle --without heroku
 
 before_install:

data/Gemfile

@@ -6,15 +6,6 @@ source 'https://rubygems.org'
 # gem 'sqlite3'
 gem 'pg'
 
-# Allows easy switching between locally developed gems, and gems installed from rubygems.org
-# See README for more info at: https://github.com/ndbroadbent/bundler_local_development
-gem 'bundler_local_development', :group => :development, :require => false
-begin
-  require 'bundler_local_development'
-  Bundler.development_gems = [/^ffcrm_/, /ransack/]
-rescue LoadError
-end
-
 # Removes a gem dependency
 def remove(name)
   @dependencies.reject! {|d| d.name == name }
@@ -29,7 +20,7 @@ end
 # Bundler no longer treats runtime dependencies as base dependencies.
 # The following code restores this behaviour.
 # (See https://github.com/carlhuda/bundler/issues/1041)
-spec = Bundler.load_gemspec(Dir["./{,*}.gemspec"].first)
+spec = Bundler.load_gemspec( File.expand_path("../fat_free_crm.gemspec", __FILE__) )
 spec.runtime_dependencies.each do |dep|
   gem dep.name, *(dep.requirement.as_list)
 end
@@ -41,14 +32,12 @@ gem 'premailer', :require => false
 remove 'fat_free_crm'
 
 group :development do
-  gem 'thin'
-  gem 'quiet_assets'
-  gem 'capistrano'
-  gem 'capistrano_colors'
-
-  # Use zeus and guard gems to speed up development
-  # Run 'zeus start' and 'bundle exec guard' to get going
+  # don't load these gems in travis
   unless ENV["CI"]
+    gem 'thin'
+    gem 'quiet_assets'
+    gem 'capistrano', '~> 2'
+    gem 'capistrano_colors'
     gem 'guard'
     gem 'guard-rspec'
     gem 'guard-rails'
@@ -66,7 +55,7 @@ group :development, :test do
 end
 
 group :test do
-  gem 'capybara', '~> 2.0.3'
+  gem 'capybara'
   gem 'selenium-webdriver'
   gem 'database_cleaner'
   gem "acts_as_fu"
@@ -79,7 +68,6 @@ group :heroku do
   gem 'unicorn', :platform => :ruby
 end
 
-
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do

data/Gemfile.lock

@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    actionmailer (3.2.16)
+      actionpack (= 3.2.16)
+      mail (~> 2.5.4)
+    actionpack (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -14,19 +14,19 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.16)
+      activesupport (= 3.2.16)
       builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activeresource (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
+    activesupport (3.2.16)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     acts-as-taggable-on (2.3.3)
       rails (~> 3.0)
@@ -34,147 +34,149 @@ GEM
     acts_as_fu (0.0.8)
       activerecord
       sqlite3
-    acts_as_list (0.1.6)
-    addressable (2.3.3)
-    ajax-chosen-rails (0.2.1)
-      chosen-rails_ffcrm
-      railties (~> 3.0)
-      thor (~> 0.14)
-    arel (3.0.2)
+    acts_as_list (0.1.9)
+    addressable (2.3.5)
+    arel (3.0.3)
     authlogic (3.1.0)
       activerecord (>= 3.0.7)
       activerecord (>= 3.0.7)
     builder (3.0.4)
-    bundler_local_development (0.4.1)
-      bundler
-    cancan (1.6.7)
-    capistrano (2.13.5)
+    cancan (1.6.10)
+    capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
     capistrano_colors (0.5.5)
-    capybara (2.0.3)
+    capybara (2.2.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
+      xpath (~> 2.0)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    chosen-rails_ffcrm (0.9.5)
-      railties (~> 3.0)
-      thor (~> 0.14)
-    chronic (0.6.7)
+    chronic (0.10.2)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.1)
+    cocaine (0.5.3)
       climate_control (>= 0.0.3, < 1.0)
-    coderay (1.0.6)
+    coderay (1.1.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.1)
-    colorize (0.5.8)
+    coffee-script-source (1.6.3)
     columnize (0.3.6)
-    coveralls (0.5.7)
-      colorize
-      json
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
+      term-ansicolor
       thor
-    css_parser (1.3.4)
+    css_parser (1.3.5)
       addressable
     daemons (1.1.9)
-    database_cleaner (0.9.1)
-    debugger (1.5.0)
+    database_cleaner (1.2.0)
+    debugger (1.6.3)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.4)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.0)
-    diff-lcs (1.2.1)
+    debugger-ruby_core_source (1.2.4)
+    diff-lcs (1.2.5)
+    docile (1.1.1)
     dynamic_form (1.1.4)
     email_reply_parser_ffcrm (0.5.0)
     erubis (2.7.0)
-    eventmachine (1.0.0)
-    execjs (1.3.1)
-      multi_json (~> 1.0)
-    factory_girl (4.2.0)
+    eventmachine (1.0.3)
+    execjs (2.0.2)
+    factory_girl (4.3.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
+    factory_girl_rails (4.3.0)
+      factory_girl (~> 4.3.0)
       railties (>= 3.0.0)
-    ffaker (1.14.0)
-    ffi (1.8.1)
-    guard (1.4.0)
-      listen (>= 0.4.2)
-      thor (>= 0.14.6)
-    guard-rails (0.4.2)
+    ffaker (1.22.1)
+    ffi (1.9.3)
+    font-awesome-rails (4.0.3.0)
+      railties (>= 3.2, < 5.0)
+    formatador (0.2.4)
+    guard (2.2.5)
+      formatador (>= 0.2.4)
+      listen (~> 2.1)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rails (0.4.7)
       guard (>= 0.2.2)
-    guard-rspec (2.5.3)
-      guard (>= 1.1)
-      rspec (~> 2.11)
-    haml (3.1.7)
+    guard-rspec (4.2.0)
+      guard (>= 2.1.1)
+      rspec (>= 2.14, < 4.0)
+    haml (3.1.8)
     headless (1.0.1)
-    highline (1.6.15)
-    hike (1.2.1)
+    highline (1.6.20)
+    hike (1.2.3)
     htmlentities (4.3.1)
-    i18n (0.6.1)
+    i18n (0.6.9)
     journey (1.0.4)
     jquery-rails (2.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.7)
-    kgio (2.7.4)
+    json (1.8.1)
+    kgio (2.8.1)
     libv8 (3.16.14.3)
-    listen (0.7.3)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    listen (2.4.0)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.4)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.7.1)
-    mime-types (1.23)
-    multi_json (1.7.2)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.6.1)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    nokogiri (1.5.9)
-    paper_trail (2.6.3)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    mini_portile (0.5.2)
+    multi_json (1.8.2)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.7.0)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    paper_trail (2.7.2)
       activerecord (~> 3.0)
       railties (~> 3.0)
-    paperclip (3.4.1)
+    paperclip (3.5.2)
       activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
-      cocaine (~> 0.5.0)
+      cocaine (~> 0.5.3)
       mime-types
-    pg (0.14.1)
-    polyamorous (0.5.0)
-      activerecord (~> 3.0)
+    pg (0.17.1)
+    polyamorous (0.6.4)
+      activerecord (>= 3.0)
     polyglot (0.3.3)
-    premailer (1.7.3)
+    premailer (1.7.9)
       css_parser (>= 1.1.9)
       htmlentities (>= 4.0.0)
     prototype-rails (3.2.1)
       rails (~> 3.2)
-    pry (0.9.9.4)
-      coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
-    pry-rails (0.1.6)
-      pry
-    quiet_assets (1.0.1)
-      railties (~> 3.1)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry-rails (0.3.2)
+      pry (>= 0.9.10)
+    psych (1.3.4)
+    quiet_assets (1.0.2)
+      railties (>= 3.1, < 5.0)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -182,43 +184,38 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
+    rails (3.2.16)
+      actionmailer (= 3.2.16)
+      actionpack (= 3.2.16)
+      activerecord (= 3.2.16)
+      activeresource (= 3.2.16)
+      activesupport (= 3.2.16)
       bundler (~> 1.0)
-      railties (= 3.2.13)
-    rails3-jquery-autocomplete (1.0.7)
-      rails (~> 3.0)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
+      railties (= 3.2.16)
+    rails3-jquery-autocomplete (1.0.12)
+      rails (>= 3.0)
+    railties (3.2.16)
+      actionpack (= 3.2.16)
+      activesupport (= 3.2.16)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    raindrops (0.8.0)
-    rake (10.0.3)
-    ransack (0.7.2)
-      actionpack (~> 3.0)
-      activerecord (~> 3.0)
-      polyamorous (~> 0.5.0)
+    raindrops (0.12.0)
+    rake (10.1.1)
+    ransack (1.1.0)
+      actionpack (>= 3.0)
+      activerecord (>= 3.0)
+      polyamorous (~> 0.6.0)
     ransack_chronic (1.1.0)
       chronic (>= 0.6.7)
-    ransack_ffcrm (0.7.1)
-      actionpack (~> 3.0)
-      activerecord (~> 3.0)
-      chronic (~> 0.6.7)
-      polyamorous (~> 0.5.0)
-    ransack_ui (1.1.0)
+    ransack_ui (1.2.2)
       ransack
       ransack_chronic (>= 1.1.0)
     rb-fchange (0.0.6)
       ffi
     rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
+    rb-inotify (0.9.3)
       ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -226,76 +223,81 @@ GEM
     responds_to_parent (1.1.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rspec-rails (2.13.0)
+    rspec-mocks (2.14.4)
+    rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rubyzip (0.9.9)
-    sass (3.2.1)
-    sass-rails (3.2.5)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rubyzip (1.1.0)
+    sass (3.2.13)
+    sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    select2-rails (3.2.1)
+    select2-rails (3.5.2)
       thor (~> 0.14)
-    selenium-webdriver (2.32.1)
+    selenium-webdriver (2.39.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
-      rubyzip
+      rubyzip (~> 1.0)
       websocket (~> 1.0.4)
-    simple_form (2.0.2)
+    simple_form (2.0.4)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (2.4.4)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.4.7)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.8)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
       ref
-    thin (1.5.0)
+    thin (1.6.1)
       daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
+      eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
-    thor (0.17.0)
-    tilt (1.3.6)
-    treetop (1.4.12)
+    thor (0.18.1)
+    tilt (1.4.1)
+    timers (1.1.0)
+    tins (0.13.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbo-sprockets-rails3 (0.3.6)
+    turbo-sprockets-rails3 (0.3.11)
       railties (> 3.2.8, < 4.0.0)
-      sprockets (>= 2.0.0)
-    tzinfo (0.3.37)
-    uglifier (1.2.4)
+      sprockets (>= 2.2.0)
+    tzinfo (0.3.38)
+    uglifier (2.4.0)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
-    unicorn (4.3.1)
+      json (>= 1.8.0)
+    unicorn (4.7.0)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
     valium (0.5.0)
       activerecord (>= 3.0.2)
     websocket (1.0.7)
-    will_paginate (3.0.3)
-    xpath (1.0.0)
+    will_paginate (3.0.5)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
     zeus (0.13.3)
       method_source (>= 0.6.7)
@@ -308,13 +310,11 @@ DEPENDENCIES
   acts_as_commentable (~> 3.0.1)
   acts_as_fu
   acts_as_list (~> 0.1.4)
-  ajax-chosen-rails (>= 0.2.1)
   authlogic (= 3.1.0)
-  bundler_local_development
   cancan
-  capistrano
+  capistrano (~> 2)
   capistrano_colors
-  capybara (~> 2.0.3)
+  capybara
   cocaine
   coffee-rails (~> 3.2.1)
   coveralls
@@ -325,6 +325,7 @@ DEPENDENCIES
   execjs
   factory_girl_rails
   ffaker (>= 1.12.0)
+  font-awesome-rails
   guard
   guard-rails
   guard-rspec
@@ -332,7 +333,7 @@ DEPENDENCIES
   headless
   jquery-rails (~> 2.1.4)
   nokogiri
-  paper_trail
+  paper_trail (~> 2.7.0)
   paperclip
   pg
   premailer
@@ -341,7 +342,6 @@ DEPENDENCIES
   quiet_assets
   rails (~> 3.2.12)
   rails3-jquery-autocomplete
-  ransack_ffcrm (~> 0.7.1)
   ransack_ui (>= 1.1.0)
   rb-fchange
   rb-fsevent