fat_free_crm 0.11.1 → 0.11.2

data/Gemfile

@@ -1,5 +1,11 @@
 source :rubygems
 
+# Uncomment the database that you have configured in config/database.yml
+# ----------------------------------------------------------------------
+# gem 'mysql2', '0.3.10'
+# gem 'sqlite3'
+gem 'pg', '~> 0.13.2'
+
 # Removes a gem dependency
 def remove(name)
   @dependencies.reject! {|d| d.name == name }
@@ -11,9 +17,6 @@ def gem(name, *args)
   super
 end
 
-# Load development dependencies from gemspec
-gemspec
-
 # Bundler no longer treats runtime dependencies as base dependencies.
 # The following code restores this behaviour.
 # (See https://github.com/carlhuda/bundler/issues/1041)
@@ -22,23 +25,38 @@ spec.runtime_dependencies.each do |dep|
   gem dep.name, *(dep.requirement.as_list)
 end
 
-gem 'ransack',      :git => "https://github.com/fatfreecrm/ransack.git"
-gem 'chosen-rails', :git => "https://github.com/fatfreecrm/chosen-rails.git"
-gem 'responds_to_parent', :git => "https://github.com/LessonPlanet/responds_to_parent.git"
+# Remove premailer auto-require
+gem 'premailer', :require => false
 
-# Remove fat_free_crm from dependencies, to stop it from being auto-required.
+# Remove fat_free_crm dependency, to stop it from being auto-required too early.
 remove 'fat_free_crm'
 
-gem 'pg', '~> 0.13.2'
-
 group :development, :test do
-  gem 'rspec-rails'
+  gem 'rspec-rails', '~> 2.9.0'
   gem 'steak', :require => false
   gem 'headless'
   unless ENV["CI"]
-    gem 'ruby-debug',   :platform => :mri_18
-    gem 'ruby-debug19', :platform => :mri_19
+    gem 'ruby-debug', :platform => :mri_18
+    gem 'debugger',   :platform => :mri_19
   end
+  gem 'pry-rails'
+end
+
+group :test do
+  gem 'capybara'
+  gem 'spork'
+  gem 'database_cleaner'
+  gem 'fuubar'
+
+  if RUBY_VERSION.to_f >= 1.9
+    gem 'factory_girl_rails', '~> 3.0.0'
+  else
+    gem 'factory_girl_rails', '~> 1.7.0'
+  end
+end
+
+group :heroku do
+  gem 'unicorn', :platform => :ruby
 end
 
 

data/Gemfile.lock

@@ -1,70 +1,42 @@
-GIT
-  remote: https://github.com/LessonPlanet/responds_to_parent.git
-  revision: 1f0c6d82eda5e7f331a30fc029e7ead2a7dbdebf
-  specs:
-    responds_to_parent (1.0.20091013)
-
-GIT
-  remote: https://github.com/fatfreecrm/chosen-rails.git
-  revision: 33c92a8554ee14d11b7293eb531371a05c0a0b67
-  specs:
-    chosen-rails (0.9.5)
-      railties (~> 3.0)
-      thor (~> 0.14)
-
-GIT
-  remote: https://github.com/fatfreecrm/ransack.git
-  revision: 92f5812d4320e5f1959f844d19d0386bb5654a08
-  specs:
-    ransack (0.6.0)
-      actionpack (~> 3.0)
-      activerecord (~> 3.0)
-      chronic (~> 0.6.7)
-      polyamorous (~> 0.5.0)
-
-PATH
-  remote: .
-  specs:
-
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.2)
-      actionpack (= 3.2.2)
-      mail (~> 2.4.0)
-    actionpack (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-    activesupport (3.2.2)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     acts-as-taggable-on (2.2.2)
       rails (~> 3.0)
     acts_as_commentable (3.0.1)
-    acts_as_list (0.1.5)
-    ajax-chosen-rails (0.1.5)
-      chosen-rails
+    acts_as_list (0.1.6)
+    addressable (2.2.8)
+    ajax-chosen-rails (0.2.0)
+      chosen-rails_ffcrm
       railties (~> 3.0)
       thor (~> 0.14)
-    archive-tar-minitar (0.5.2)
     arel (3.0.2)
     authlogic (3.1.0)
       activerecord (>= 3.0.7)
@@ -78,58 +50,77 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.3.1)
+    childprocess (0.3.2)
       ffi (~> 1.0.6)
+    chosen-rails_ffcrm (0.9.5)
+      railties (~> 3.0)
+      thor (~> 0.14)
     chronic (0.6.7)
     cocaine (0.2.1)
+    coderay (1.0.6)
     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.2.0)
+    coffee-script-source (1.3.1)
     columnize (0.3.6)
-    database_cleaner (0.7.1)
+    css_parser (1.2.6)
+      addressable
+      rdoc
+    database_cleaner (0.7.2)
+    debugger (1.1.3)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.2)
+    debugger-linecache (1.1.1)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.2)
     diff-lcs (1.1.3)
     dynamic_form (1.1.4)
+    email_reply_parser_ffcrm (0.5.0)
     erubis (2.7.0)
-    execjs (1.3.0)
+    execjs (1.3.1)
       multi_json (~> 1.0)
-    factory_girl (2.6.1)
-      activesupport (>= 2.3.9)
-    factory_girl_rails (1.7.0)
-      factory_girl (~> 2.6.0)
+    factory_girl (3.0.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (3.0.0)
+      factory_girl (~> 3.0.0)
       railties (>= 3.0.0)
-    ffaker (1.13.0)
+    ffaker (1.14.0)
     ffi (1.0.11)
     fuubar (1.0.0)
       rspec (~> 2.0)
       rspec-instafail (~> 0.2.0)
       ruby-progressbar (~> 0.0.10)
     haml (3.1.4)
-    headless (0.2.2)
+    headless (0.3.1)
     hike (1.2.1)
+    htmlentities (4.3.1)
     i18n (0.6.0)
     journey (1.0.3)
-    jquery-rails (2.0.1)
+    jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.5)
+    json (1.7.0)
+    kgio (2.7.4)
     libv8 (3.3.10.4)
+    libwebsocket (0.1.3)
+      addressable
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    mail (2.4.1)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
-    nokogiri (1.5.0)
-    paper_trail (2.6.0)
-      rails (~> 3)
+    method_source (0.7.1)
+    mime-types (1.18)
+    multi_json (1.3.4)
+    nokogiri (1.5.2)
+    paper_trail (2.6.3)
+      activerecord (~> 3.0)
+      railties (~> 3.0)
     paperclip (2.7.0)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
@@ -139,97 +130,113 @@ GEM
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.3)
+    premailer (1.7.3)
+      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
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.2)
-      actionmailer (= 3.2.2)
-      actionpack (= 3.2.2)
-      activerecord (= 3.2.2)
-      activeresource (= 3.2.2)
-      activesupport (= 3.2.2)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.2.2)
-    railties (3.2.2)
-      actionpack (= 3.2.2)
-      activesupport (= 3.2.2)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
+    raindrops (0.8.0)
     rake (0.9.2.2)
+    ransack_ffcrm (0.6.0)
+      actionpack (~> 3.0)
+      activerecord (~> 3.0)
+      chronic (~> 0.6.7)
+      polyamorous (~> 0.5.0)
     rbx-require-relative (0.0.9)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-instafail (0.2.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    responds_to_parent_ffcrm (1.1.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-instafail (0.2.4)
+    rspec-mocks (2.9.0)
+    rspec-rails (2.9.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.8.0)
+      rspec (~> 2.9.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
     ruby-progressbar (0.0.10)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    rubyzip (0.9.6.1)
-    sass (3.1.15)
-    sass-rails (3.2.4)
+    rubyzip (0.9.8)
+    sass (3.1.16)
+    sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.20.0)
+    selenium-webdriver (2.21.2)
       childprocess (>= 0.2.5)
       ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    simple_form (2.0.1)
+    simple_form (2.0.2)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
-    spork (0.9.0)
-    sprockets (2.1.2)
+    slop (2.4.4)
+    spork (0.9.1)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    squeel (0.9.5)
+      activerecord (~> 3.0)
+      activesupport (~> 3.0)
+      polyamorous (~> 0.5.0)
     steak (2.0.0)
       capybara (>= 1.0.0)
       rspec-rails (>= 2.5.0)
-    therubyracer (0.9.10)
+    therubyracer (0.10.1)
       libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    uglifier (1.2.3)
+    tzinfo (0.3.33)
+    uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
+    unicorn (4.3.1)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
     will_paginate (3.0.3)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -241,36 +248,41 @@ DEPENDENCIES
   acts-as-taggable-on (~> 2.2.1)
   acts_as_commentable (~> 3.0.1)
   acts_as_list (~> 0.1.4)
-  ajax-chosen-rails (>= 0.1.5)
+  ajax-chosen-rails (>= 0.2.0)
   authlogic (~> 3.1.0)
   cancan
   capybara
-  chosen-rails!
+  chosen-rails_ffcrm
   coffee-rails (~> 3.2.1)
   database_cleaner
+  debugger
   dynamic_form
-  factory_girl (~> 2.6.1)
-  factory_girl_rails (~> 1.7.0)
+  email_reply_parser_ffcrm
+  factory_girl_rails (~> 3.0.0)
   ffaker (>= 1.12.0)
   fuubar
   haml (~> 3.1.3)
   headless
   jquery-rails
+  nokogiri
   paper_trail
   paperclip (~> 2.7.0)
   pg (~> 0.13.2)
+  premailer
   prototype-rails
+  pry-rails
   rails (~> 3.2.2)
-  ransack!
-  responds_to_parent!
-  rspec-rails
+  ransack_ffcrm (~> 0.6.0)
+  responds_to_parent_ffcrm
+  rspec-rails (~> 2.9.0)
   ruby-debug
-  ruby-debug19
-  sass (~> 3.1.15)
+  sass (~> 3.1.10)
   sass-rails (~> 3.2.3)
   simple_form (~> 2.0.1)
   spork
+  squeel (~> 0.9.3)
   steak
   therubyracer
   uglifier (>= 1.0.3)
+  unicorn
   will_paginate (~> 3.0.2)