update catarse monkeymail

Rails 41

.travis.yml

@@ -1,5 +1,8 @@
 rvm:
-  - 2.0.0-p0
+  - 2.1.2
+
+before_install:
+  - "gem install bundler -v '= 1.5.1'"
 
 before_script:
   - "cp config/database.sample.yml config/database.yml"
@@ -13,10 +16,8 @@ env:
 
 script:
   - "bundle exec rspec spec"
-  - "bundle exec rake jasmine:ci"
+    #- "bundle exec rake jasmine:ci" removed while jasmine has some bugs with ruby 2.1.0
 
 branches:
   only:
     - master
-    - production
-    - channels

Gemfile

@@ -1,47 +1,49 @@
 source 'https://rubygems.org'
 
-# For heroku
-ruby '2.0.0'
-# Papertrail does not work with rails 3.2.12 + ruby 2.0.0
-# https://github.com/airblade/paper_trail/issues/208
+ruby '2.1.2'
 
-# We got some weird bug concerning encoding of AR objects in rails 3.2.13+
-gem 'rails',    '3.2.13'
-gem 'mail', '2.5.3'
-gem 'sidekiq',  '~> 2.13.0'
+gem 'rails',    '~> 4.1.1'
+
+gem 'protected_attributes', '~> 1.0.5' # When upgrade to strong_parameters, remove this gem.
+gem 'rails-observers', '~> 0.1.2'
+
+gem 'sidekiq',  '~> 2.15.2'
 gem 'sinatra', require: false # required by sidekiq web interface mounted on /sidekiq
 
 # Turns every field on a editable one
-gem 'best_in_place'
+gem 'best_in_place', github: 'bernat/best_in_place', branch: 'rails-4'
 
 # State machine for attributes on models
 gem 'state_machine', require: 'state_machine/core'
 
-# paranoid stuff
-gem 'paper_trail', '~> 2.7.2'
-
 # Database and data related
 gem 'pg'
-gem 'pg_search'
 gem 'postgres-copy'
+gem 'pg_search'
+
 gem 'schema_plus'
 gem 'schema_associations'
 gem 'chartkick'
+gem 'catarse_settings_db'
 
-# Payment engine using Paypal
-gem 'catarse_paypal_express', '~> 1.0.0'
-
-# Payment engine using Moip
-gem 'catarse_moip', '~> 1.0.1'
-#gem 'catarse_moip', path: '../catarse_moip'
+# Mixpanel for backend tracking
+gem 'mixpanel-ruby'
 
+# Payment engines
+gem 'catarse_paypal_express', '2.2.3'
+gem 'catarse_moip', '~> 2.3.5'
+# gem 'catarse_wepay', '~> 0.0.1'
 
 # Decorators
 gem 'draper'
 
 # Frontend stuff
-gem 'slim-rails', '~> 1.1.1'
+gem 'slim-rails'
 gem 'jquery-rails'
+gem 'browser'
+
+# Static pages
+gem 'high_voltage'
 
 # Authentication and Authorization
 gem 'omniauth'
@@ -49,46 +51,41 @@ gem 'omniauth-twitter'
 gem 'omniauth-facebook', '1.4.0'
 gem 'devise'
 gem 'ezcrypto'
-
-# See https://github.com/ryanb/cancan/tree/2.0 for help about this
-# In resume: this version of cancan allow checking for authorization on specific fields on the model
-gem 'cancan', git: 'git://github.com/ryanb/cancan.git', branch: '2.0', ref: 'f1cebde51a87be149b4970a3287826bb63c0ac0b'
+gem 'pundit'
 
 # Email marketing
-gem 'catarse_mailchimp', git: 'git://github.com/catarse/catarse_mailchimp', ref: '2ed4f39'
+gem 'catarse_monkeymail', '>= 0.1.4'
 
 # HTML manipulation and formatting
 gem 'formtastic',   '~> 2.2.1'
+gem 'simple_form'
 gem "auto_html",    '= 1.4.2'
+gem "RedCloth"
 gem 'kaminari'
 
 # Uploads
-gem 'carrierwave', '~> 0.8.0'
-gem 'rmagick'
+gem 'carrierwave', '~> 0.10.0'
+gem 'rmagick', :require => 'RMagick'
 
 # Other Tools
+gem 'to_xls'
 gem 'ranked-model'
-gem 'feedzirra'
-gem 'validation_reflection',      git: 'git://github.com/ncri/validation_reflection.git'
-gem 'inherited_resources',        '1.3.1'
-gem 'has_scope'
+gem 'feedjira'
+gem 'inherited_resources',        '~> 1.4.1'
+gem 'has_scope', '~> 0.6.0.rc'
 gem 'spectator-validates_email',  require: 'validates_email'
 gem 'video_info', '>= 1.1.1'
-gem 'enumerate_it'
 gem 'httparty', '~> 0.6.1' # this version is required by moip gem, otherwise payment confirmation will break
 
 # Translations
 gem 'http_accept_language'
-gem 'routing-filter'
+gem 'routing-filter', '~> 0.4.0.pre'
 
 # Payment
-gem 'moip', git: 'git://github.com/catarse/moip-ruby.git'
-gem 'activemerchant', '>= 1.17.0', require: 'active_merchant'
+gem 'moip', github: 'catarse/moip-ruby', ref: 'c0225ad71645cd1df35dafa1e45c9f092b3abb9e'
 gem 'httpclient',     '>= 2.2.5'
 
 group :production do
-  gem 'google-analytics-rails'
-
   # Gem used to handle image uploading
   gem 'fog', '>= 1.3.1'
 
@@ -99,9 +96,12 @@ group :production do
   # If you don't use Heroku, please comment the line below.
   gem 'heroku-deflater', '>= 0.4.1'
 
+  # Make heroku serve static assets and loggin with stdout
+  #gem 'rails_on_heroku'
+  gem 'rails_12factor'
 
   # Monitoring with the new new relic
-  gem 'newrelic_rpm'
+  gem 'newrelic_rpm', '3.6.5.130'
 
   # Using dalli and memcachier have not presented significative performance gains
   # Probably this is due to our pattern of cache usage
@@ -109,7 +109,6 @@ group :production do
   #gem 'memcachier'
   #gem 'dalli'
 end
-
 group :development do
   gem "letter_opener"
   gem 'foreman'
@@ -120,39 +119,30 @@ group :development do
 end
 
 group :test, :development do
-  gem 'rspec-rails'
-  gem "pry"
+  gem 'rspec-rails', '~> 2.14.0'
+  gem 'pry'
+  gem 'jasmine-rails'
 end
 
 group :test do
+  gem 'fakeweb'
+  gem 'poltergeist'
   gem 'launchy'
   gem 'database_cleaner'
   gem 'shoulda'
   gem 'factory_girl_rails'
-  gem 'capybara',   '~> 2.0.2'
-  gem 'jasmine'
+  gem 'capybara',   '~> 2.1.0'
   gem 'coveralls', require: false
-  gem "selenium-webdriver", "~> 2.34.0"
+  gem 'selenium-webdriver'
 end
 
-
-group :assets do
-  gem 'sass-rails'
-  gem 'coffee-rails'
-  gem "compass-rails"
-  gem 'uglifier'
-  gem 'compass-960-plugin'
-end
-
-
+gem 'sass-rails', '~> 4.0.0'
+gem 'coffee-rails', '~> 4.0.0'
+gem "compass-rails"
+gem 'uglifier'
+gem 'compass-960-plugin'
+gem 'sprockets', '~> 2.10.1'
 
 # FIXME: Not-anymore-on-development
 # Gems that are with 1 or more years on the vacuum
 gem 'weekdays'
-gem "rack-timeout"
-
-# TODO: Take a look on dependencies. Why not auto_html?
-gem 'rails_autolink', '~> 1.0.7'
-
-# TODO: Take a look on dependencies
-gem "RedCloth"

Gemfile.lock

@@ -1,251 +1,260 @@
 GIT
-  remote: git://github.com/catarse/catarse_mailchimp
-  revision: 2ed4f3931dfa292e5c1c62619772f04e41c68629
-  ref: 2ed4f39
+  remote: git://github.com/bernat/best_in_place.git
+  revision: 366413be357d65cdf47031e928aea969f72e3659
+  branch: rails-4
   specs:
-    catarse_mailchimp (0.0.1)
-      mailchimp
-      supermodel
+    best_in_place (2.0.3)
+      jquery-rails
+      rails (~> 4)
 
 GIT
   remote: git://github.com/catarse/moip-ruby.git
-  revision: 39f9dab38fc33fe9bf614deb8e90ca166ab2d6bf
+  revision: c0225ad71645cd1df35dafa1e45c9f092b3abb9e
+  ref: c0225ad71645cd1df35dafa1e45c9f092b3abb9e
   specs:
     moip (1.0.2)
       activesupport (>= 2.3.2)
       httparty (~> 0.6.1)
-      nokogiri (~> 1.5.0)
-
-GIT
-  remote: git://github.com/ncri/validation_reflection.git
-  revision: 60320e6beb088808fd625a8d958dbd0d2661d494
-  specs:
-    validation_reflection (1.0.0)
-
-GIT
-  remote: git://github.com/ryanb/cancan.git
-  revision: f1cebde51a87be149b4970a3287826bb63c0ac0b
-  ref: f1cebde51a87be149b4970a3287826bb63c0ac0b
-  branch: 2.0
-  specs:
-    cancan (2.0.0.alpha)
+      nokogiri (>= 1.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionmailer (4.1.1)
+      actionpack (= 4.1.1)
+      actionview (= 4.1.1)
+      mail (~> 2.5.4)
+    actionpack (4.1.1)
+      actionview (= 4.1.1)
+      activesupport (= 4.1.1)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    active_utils (2.0.0)
+    active_utils (2.2.1)
       activesupport (>= 2.3.11)
       i18n
-    activemerchant (1.36.0)
-      active_utils (>= 1.0.2)
-      activesupport (>= 2.3.14)
-      builder (>= 2.0.0)
-      i18n
-      json (>= 1.5.1)
-      money
-      nokogiri (< 1.6.0)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      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)
-      multi_json (~> 1.0)
-    addressable (2.3.5)
-    arel (3.0.2)
+    activemerchant (1.43.1)
+      active_utils (~> 2.0, >= 2.0.1)
+      activesupport (>= 2.3.14, < 5.0.0)
+      builder (>= 2.1.2, < 4.0.0)
+      i18n (~> 0.5)
+      json (~> 1.7)
+      money (< 7.0.0)
+      nokogiri (~> 1.4)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+    activerecord (4.1.1)
+      activemodel (= 4.1.1)
+      activesupport (= 4.1.1)
+      arel (~> 5.0.0)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    addressable (2.3.6)
+    arel (5.0.1.20140414130214)
     auto_html (1.4.2)
       RedCloth
       redcarpet
       rinku
       tag_helper
-    bcrypt-ruby (3.1.1)
-    best_in_place (2.1.0)
-      jquery-rails
-      rails (~> 3.1)
-    better_errors (0.9.0)
+    bcrypt (3.1.7)
+    better_errors (1.1.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    builder (3.0.4)
-    capybara (2.0.3)
+    browser (0.5.0)
+    builder (3.2.2)
+    capybara (2.1.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)
-    carrierwave (0.8.0)
+      xpath (~> 2.0)
+    carrierwave (0.10.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
-    catarse_moip (1.0.1)
+      json (>= 1.7)
+      mime-types (>= 1.16)
+    catarse_moip (2.3.5)
+      enumerate_it
       libxml-ruby (~> 2.6.0)
-      rails (~> 3.2.12)
-    catarse_paypal_express (1.0.0)
-      activemerchant (>= 1.17.0)
-      rails (~> 3.2.6)
+      rails (~> 4.0)
+    catarse_monkeymail (0.1.4)
+      mailchimp-api (~> 2.0.4)
+      rails (>= 4.0.3)
+    catarse_paypal_express (2.2.3)
+      activemerchant (>= 1.34.0)
+      rails (~> 4.0)
       slim-rails
-    celluloid (0.14.1)
-      timers (>= 1.0.0)
-    chartkick (1.2.0)
-    childprocess (0.3.9)
+    catarse_settings_db (0.0.2)
+      rails (~> 4.1.1)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    chartkick (1.2.4)
+    childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
-    chunky_png (1.2.8)
-    coderay (1.0.9)
-    coffee-rails (3.2.2)
+    chunky_png (1.3.1)
+    cliver (0.3.2)
+    coderay (1.1.0)
+    coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
+      railties (>= 4.0.0, < 5.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
-    colorize (0.5.8)
-    compass (0.12.2)
+    coffee-script-source (1.7.0)
+    compass (0.12.6)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (~> 3.1)
+      sass (~> 3.2.19)
     compass-960-plugin (0.10.4)
       compass (>= 0.10.0)
-    compass-rails (1.0.3)
-      compass (>= 0.12.2, < 0.14)
-    connection_pool (1.1.0)
-    coveralls (0.6.7)
-      colorize
+    compass-rails (1.1.7)
+      compass (>= 0.12.2)
+      sprockets (<= 2.11.0)
+    connection_pool (2.0.0)
+    coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
+      term-ansicolor
       thor
     crack (0.1.8)
-    curb (0.8.4)
-    database_cleaner (1.1.1)
+    curb (0.8.5)
+    database_cleaner (1.3.0)
     debug_inspector (0.0.2)
-    devise (3.0.2)
-      bcrypt-ruby (~> 3.0)
+    devise (3.2.4)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    diff-lcs (1.2.4)
-    dotenv (0.8.0)
-    draper (1.2.1)
+    diff-lcs (1.2.5)
+    docile (1.1.3)
+    dotenv (0.11.1)
+      dotenv-deployment (~> 0.0.2)
+    dotenv-deployment (0.0.2)
+    draper (1.3.0)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       request_store (~> 1.0.3)
-    enumerate_it (1.1.1)
+    enumerate_it (1.2.1)
       activesupport (>= 3.0.0)
     erubis (2.7.0)
-    excon (0.25.3)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    excon (0.36.0)
+    execjs (2.1.0)
     ezcrypto (0.7.2)
-    factory_girl (4.2.0)
+    factory_girl (4.4.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
+    factory_girl_rails (4.4.1)
+      factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    feedzirra (0.0.24)
-      activesupport (>= 2.3.8)
-      builder (>= 2.1.2)
-      curb (>= 0.2.3)
-      loofah (>= 0.3.1)
-      nokogiri (> 0.0.0)
-      sax-machine (>= 0.0.12)
-    ffi (1.9.0)
-    fog (1.14.0)
+    fakeweb (1.3.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    feedjira (1.3.0)
+      curb (~> 0.8.1)
+      loofah (~> 2.0.0)
+      sax-machine (~> 0.2.1)
+    ffi (1.9.3)
+    fog (1.22.1)
+      fog-brightbox
+      fog-core (~> 1.22)
+      fog-json
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-brightbox (0.0.2)
+      fog-core
+      fog-json
+    fog-core (1.22.0)
       builder
-      excon (~> 0.25.0)
-      formatador (~> 0.2.0)
+      excon (~> 0.33)
+      formatador (~> 0.2)
       mime-types
-      multi_json (~> 1.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5)
-      ruby-hmac
-    foreman (0.63.0)
-      dotenv (>= 0.7)
-      thor (>= 0.13.6)
-    formatador (0.2.4)
+    fog-json (1.0.0)
+      multi_json (~> 1.0)
+    foreman (0.71.0)
+      dotenv (~> 0.11.1)
+      thor (~> 0.19.1)
+    formatador (0.2.5)
     formtastic (2.2.1)
       actionpack (>= 3.0)
     fssm (0.2.10)
-    google-analytics-rails (0.0.4)
-    has_scope (0.5.1)
-    hashie (2.0.5)
-    heroku-deflater (0.5.1)
+    has_scope (0.6.0.rc)
+      actionpack (>= 3.2, < 5)
+      activesupport (>= 3.2, < 5)
+    hashie (2.1.1)
+    heroku-deflater (0.5.3)
       rack (>= 1.4.5)
+    high_voltage (2.1.0)
     hike (1.2.3)
-    http_accept_language (1.0.2)
+    htmlentities (4.3.2)
+    http_accept_language (2.0.1)
     httparty (0.6.1)
       crack (= 0.1.8)
-    httpauth (0.2.0)
+    httpauth (0.2.1)
     httpclient (2.3.4.1)
-    i18n (0.6.1)
-    inherited_resources (1.3.1)
-      has_scope (~> 0.5.0)
-      responders (~> 0.6)
-    jasmine (1.3.2)
-      jasmine-core (~> 1.3.1)
-      rack (~> 1.0)
-      rspec (>= 1.3.1)
-      selenium-webdriver (>= 0.1.3)
-    jasmine-core (1.3.1)
-    journey (1.0.4)
-    jquery-rails (3.0.4)
+    i18n (0.6.9)
+    inherited_resources (1.4.1)
+      has_scope (~> 0.6.0.rc)
+      responders (~> 1.0.0.rc)
+    ipaddress (0.8.0)
+    jasmine-core (2.0.0)
+    jasmine-rails (0.9.0)
+      jasmine-core (>= 1.3, < 3.0)
+      phantomjs
+      railties (>= 3.1.0)
+      sprockets-rails
+    jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.0)
-    jwt (0.1.8)
+    json (1.8.1)
+    jwt (0.1.13)
       multi_json (>= 1.5)
-    kaminari (0.14.1)
+    kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.8.0)
-    launchy (2.3.0)
+    kgio (2.9.2)
+    launchy (2.4.2)
       addressable (~> 2.3)
-    letter_opener (1.1.2)
+    letter_opener (1.2.0)
       launchy (~> 2.2)
     libxml-ruby (2.6.0)
-    loofah (1.2.1)
-      nokogiri (>= 1.4.4)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    loofah (2.0.0)
+      nokogiri (>= 1.5.9)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mailchimp (0.0.9)
-      httparty
+    mailchimp-api (2.0.4)
+      excon (>= 0.16.0)
+      json (>= 1.7.7)
     method_source (0.8.2)
-    mime-types (1.24)
-    money (5.1.1)
-      i18n (~> 0.6.0)
-    multi_json (1.7.9)
-    multipart-post (1.2.0)
-    net-scp (1.1.2)
+    mime-types (1.25.1)
+    mini_portile (0.6.0)
+    minitest (5.3.4)
+    mixpanel-ruby (1.4.0)
+    money (6.1.1)
+      i18n (~> 0.6.4)
+    multi_json (1.10.1)
+    multipart-post (2.0.0)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
-    newrelic_rpm (3.6.6.147)
-    nokogiri (1.5.10)
+    net-ssh (2.9.1)
+    newrelic_rpm (3.6.5.130)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
     oauth (0.4.7)
     oauth2 (0.8.1)
       faraday (~> 0.8)
@@ -253,9 +262,9 @@ GEM
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       rack (~> 1.2)
-    omniauth (1.1.4)
+    omniauth (1.2.1)
       hashie (>= 1.2, < 3)
-      rack
+      rack (~> 1.0)
     omniauth-facebook (1.4.0)
       omniauth-oauth2 (~> 1.0.2)
     omniauth-oauth (1.0.1)
@@ -264,172 +273,192 @@ GEM
     omniauth-oauth2 (1.0.3)
       oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
-    omniauth-twitter (1.0.0)
+    omniauth-twitter (1.0.1)
       multi_json (~> 1.3)
       omniauth-oauth (~> 1.0)
-    orm_adapter (0.4.0)
-    paper_trail (2.7.2)
-      activerecord (~> 3.0)
-      railties (~> 3.0)
-    pg (0.16.0)
-    pg_search (0.7.0)
+    orm_adapter (0.5.0)
+    pg (0.17.1)
+    pg_search (0.7.4)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
       arel
-    polyglot (0.3.3)
-    postgres-copy (0.6.0)
-      activerecord (>= 3.0.0)
+    phantomjs (1.9.7.1)
+    poltergeist (1.5.1)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
+    polyglot (0.3.5)
+    postgres-copy (0.8.0)
+      activerecord (~> 4.0)
       pg
-      rails (>= 3.0.0)
+      rails (~> 4.0)
       responders
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    protected_attributes (1.0.7)
+      activemodel (>= 4.0.1, < 5.0)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-protection (1.5.0)
-      rack
-    rack-ssl (1.3.3)
+    pundit (0.2.3)
+      activesupport (>= 3.0.0)
+    rack (1.5.2)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rack-timeout (0.0.4)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    rails_autolink (1.0.9)
-      rails (~> 3.1)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    rails (4.1.1)
+      actionmailer (= 4.1.1)
+      actionpack (= 4.1.1)
+      actionview (= 4.1.1)
+      activemodel (= 4.1.1)
+      activerecord (= 4.1.1)
+      activesupport (= 4.1.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.1)
+      sprockets-rails (~> 2.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
+    rails_12factor (0.0.2)
+      rails_serve_static_assets
+      rails_stdout_logging
+    rails_serve_static_assets (0.0.2)
+    rails_stdout_logging (0.0.3)
+    railties (4.1.1)
+      actionpack (= 4.1.1)
+      activesupport (= 4.1.1)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    raindrops (0.11.0)
-    rake (10.1.0)
-    ranked-model (0.3)
+      thor (>= 0.18.1, < 2.0)
+    raindrops (0.13.0)
+    rake (10.3.2)
+    ranked-model (0.4.0)
       activerecord (>= 3.1.12)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    redcarpet (3.0.0)
-    redis (3.0.4)
-    redis-namespace (1.3.1)
-      redis (~> 3.0.0)
+    redcarpet (3.1.2)
+    redis (3.0.7)
+    redis-namespace (1.4.1)
+      redis (~> 3.0.4)
     request_store (1.0.5)
-    responders (0.9.3)
-      railties (~> 3.1)
+    responders (1.0.0)
+      railties (>= 3.2, < 5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rinku (1.7.3)
     rmagick (2.13.2)
-    routing-filter (0.3.1)
+    routing-filter (0.4.0.pre)
       actionpack
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.1)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    rspec-rails (2.14.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.2)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    ruby-hmac (0.4.0)
-    rubyzip (0.9.9)
-    sass (3.2.10)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    sax-machine (0.1.0)
-      nokogiri (> 0.0.0)
-    schema_associations (1.1.0)
-      schema_plus
-    schema_plus (1.1.2)
-      rails (>= 3.2)
+    ruby-ole (1.2.11.7)
+    rubyzip (1.1.4)
+    sass (3.2.19)
+    sass-rails (4.0.3)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.2.0)
+      sprockets (~> 2.8, <= 2.11.0)
+      sprockets-rails (~> 2.0)
+    sax-machine (0.2.1)
+      nokogiri (~> 1.6.0)
+    schema_associations (1.2.0)
+      schema_plus (>= 1.2.0)
+    schema_plus (1.5.1)
+      activerecord (>= 3.2)
       valuable
-    selenium-webdriver (2.34.0)
-      childprocess (>= 0.2.5)
+    selenium-webdriver (2.42.0)
+      childprocess (>= 0.5.0)
       multi_json (~> 1.0)
-      rubyzip
+      rubyzip (~> 1.0)
       websocket (~> 1.0.4)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.4)
-    shoulda-matchers (2.2.0)
+    shoulda-context (1.2.1)
+    shoulda-matchers (2.6.1)
       activesupport (>= 3.0.0)
-    sidekiq (2.13.1)
-      celluloid (>= 0.14.1)
+    sidekiq (2.15.2)
+      celluloid (>= 0.15.2)
       connection_pool (>= 1.0.0)
       json
-      redis (>= 3.0)
-      redis-namespace
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sinatra (1.4.3)
+      redis (>= 3.0.4)
+      redis-namespace (>= 1.3.1)
+    simple_form (3.0.2)
+      actionpack (~> 4.0)
+      activemodel (~> 4.0)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    slim (1.3.9)
-      temple (~> 0.6.3)
-      tilt (~> 1.3, >= 1.3.3)
-    slim-rails (1.1.1)
-      actionpack (>= 3.0, < 4.1)
-      activesupport (>= 3.0, < 4.1)
-      railties (>= 3.0, < 4.1)
-      slim (~> 1.3)
-    slop (3.4.6)
+    slim (2.0.2)
+      temple (~> 0.6.6)
+      tilt (>= 1.3.3, < 2.1)
+    slim-rails (2.1.4)
+      actionpack (>= 3.0, < 4.2)
+      activesupport (>= 3.0, < 4.2)
+      railties (>= 3.0, < 4.2)
+      slim (~> 2.0)
+    slop (3.5.0)
     spectator-validates_email (0.2.0)
       activemodel (>= 3.0.0)
-    sprockets (2.2.2)
+    spreadsheet (0.9.7)
+      ruby-ole (>= 1.0)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.1.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
     state_machine (1.2.0)
-    supermodel (0.1.4)
-      activemodel (>= 3.0.0.beta)
     tag_helper (0.0.3)
-    temple (0.6.6)
-    thor (0.18.1)
+    temple (0.6.7)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     timers (1.1.0)
-    treetop (1.4.14)
+    tins (1.3.0)
+    to_xls (1.5.3)
+      spreadsheet
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    uglifier (2.1.2)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    unicorn (4.6.3)
+      json (>= 1.8.0)
+    unicorn (4.8.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
     valuable (0.9.8)
-    video_info (1.4.0)
+    video_info (2.3.1)
       addressable
+      htmlentities
       multi_json
     warden (1.2.3)
       rack (>= 1.0)
     websocket (1.0.7)
+    websocket-driver (0.3.3)
     weekdays (1.0.2)
-    xpath (1.0.0)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -437,74 +466,78 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
-  activemerchant (>= 1.17.0)
   auto_html (= 1.4.2)
-  best_in_place
+  best_in_place!
   better_errors
   binding_of_caller
-  cancan!
-  capybara (~> 2.0.2)
-  carrierwave (~> 0.8.0)
-  catarse_mailchimp!
-  catarse_moip (~> 1.0.1)
-  catarse_paypal_express (~> 1.0.0)
+  browser
+  capybara (~> 2.1.0)
+  carrierwave (~> 0.10.0)
+  catarse_moip (~> 2.3.5)
+  catarse_monkeymail (>= 0.1.4)
+  catarse_paypal_express (= 2.2.3)
+  catarse_settings_db
   chartkick
-  coffee-rails
+  coffee-rails (~> 4.0.0)
   compass-960-plugin
   compass-rails
   coveralls
   database_cleaner
   devise
   draper
-  enumerate_it
   ezcrypto
   factory_girl_rails
-  feedzirra
+  fakeweb
+  feedjira
   fog (>= 1.3.1)
   foreman
   formtastic (~> 2.2.1)
-  google-analytics-rails
-  has_scope
+  has_scope (~> 0.6.0.rc)
   heroku-deflater (>= 0.4.1)
+  high_voltage
   http_accept_language
   httparty (~> 0.6.1)
   httpclient (>= 2.2.5)
-  inherited_resources (= 1.3.1)
-  jasmine
+  inherited_resources (~> 1.4.1)
+  jasmine-rails
   jquery-rails
   kaminari
   launchy
   letter_opener
-  mail (= 2.5.3)
+  mixpanel-ruby
   moip!
-  newrelic_rpm
+  newrelic_rpm (= 3.6.5.130)
   omniauth
   omniauth-facebook (= 1.4.0)
   omniauth-twitter
-  paper_trail (~> 2.7.2)
   pg
   pg_search
+  poltergeist
   postgres-copy
+  protected_attributes (~> 1.0.5)
   pry
-  rack-timeout
-  rails (= 3.2.13)
-  rails_autolink (~> 1.0.7)
+  pundit
+  rails (~> 4.1.1)
+  rails-observers (~> 0.1.2)
+  rails_12factor
   ranked-model
   rmagick
-  routing-filter
-  rspec-rails
-  sass-rails
+  routing-filter (~> 0.4.0.pre)
+  rspec-rails (~> 2.14.0)
+  sass-rails (~> 4.0.0)
   schema_associations
   schema_plus
-  selenium-webdriver (~> 2.34.0)
+  selenium-webdriver
   shoulda
-  sidekiq (~> 2.13.0)
+  sidekiq (~> 2.15.2)
+  simple_form
   sinatra
-  slim-rails (~> 1.1.1)
+  slim-rails
   spectator-validates_email
+  sprockets (~> 2.10.1)
   state_machine
+  to_xls
   uglifier
   unicorn
-  validation_reflection!
   video_info (>= 1.1.1)
   weekdays

README.md

@@ -1,80 +1,68 @@
-# Catarse 
+# Catarse [![Build Status](https://secure.travis-ci.org/catarse/catarse.png?branch=master)](https://travis-ci.org/catarse/catarse) [![Coverage Status](https://coveralls.io/repos/catarse/catarse/badge.png?branch=channels)](https://coveralls.io/r/catarse/catarse) [![Dependency Status](https://gemnasium.com/catarse/catarse.png)](https://gemnasium.com/catarse/catarse) [![Code Climate](https://codeclimate.com/github/catarse/catarse.png)](https://codeclimate.com/github/catarse/catarse)
 
 The first crowdfunding platform from Brazil
 
-
-## Code & Build Status
-
-- [![Build Status](https://secure.travis-ci.org/catarse/catarse.png?branch=master)](https://travis-ci.org/catarse/catarse) 
-- [![Coverage Status](https://coveralls.io/repos/catarse/catarse/badge.png?branch=channels)](https://coveralls.io/r/catarse/catarse)
-- [![Dependency Status](https://gemnasium.com/catarse/catarse.png)](https://gemnasium.com/catarse/catarse)
-
-## Official repository changed!
-
-Our new address is https://github.com/catarse/catarse
-
 ## An open source crowdfunding platform for creative projects
 
-Welcome to Catarse's source code repository. Our goal with opening the source code is to stimulate the creation of a community of developers around a high-quality crowdfunding platform.
+Welcome to Catarse's source code repository.
+Our goal with opening the source code is to stimulate the creation of a community of developers around a high-quality crowdfunding platform.
 
 You can see the software in action in http://catarse.me.
+The official repo is https://github.com/catarse/catarse
 
 ## Getting started
 
-## Internationalization
+### Quick Installation
 
-This software was first created as Brazil's first crowdfunding platform. 
-Thus, it was first made in Portuguese and with a brazilian payment gateway. 
-We are now internationalizing it, and already have a good support for the english language and for paypal express checkout.
-See below the Payment gateways section for more information about integrating Catarse with a payment system of your choice.
-If you want to join us in this effort, please feel free to fork the repository and send us a pull request with your changes. If you have *any* doubt, please join our Google Group at http://groups.google.com/group/catarse-dev and we will help you.
+**IMPORTANT**: Make sure you have postgresql-contrib ([Aditional Modules](http://www.postgresql.org/docs/9.3/static/contrib.html)) installed on your system.
+
+
+```bash
+$ git clone https://github.com/catarse/catarse.git
+$ cd catarse
+$ cp config/database.sample.yml config/database.yml
+$ vim config/database.yml
+# change username/password and save
+$ bundle install
+$ rake db:create db:migrate db:seed
+$ rails server
+```
 
 ### Translations
 
-We hope to support a lot of languages in the future. So we are willing to accept pull requests with translations to other languages. Here's a small guide to translate Catarse to your language in a way that we can integrate your translation in the main repository:
-* TODO 
+We hope to support a lot of languages in the future.
+So we are willing to accept pull requests with translations to other languages.
 
 Thanks a lot to Daniel Walmsley, from http://purpose.com, for starting the internationalization and beginning the english translation.
 
 ## Payment gateways
 
-Currently, we support MoIP and PayPal through our payment engines. Payment engines are extensions to Catarse that implement a specific payment gateway logic. 
-The two current working engines are:
+Currently, we support MoIP, PayPal and WePay through our payment engines. Payment engines are extensions to Catarse that implement a specific payment gateway logic.
+The current working engines are:
 * MoIP
 * PayPal
+* WePay
 
 If you have created a different payment engine to Catarse please contact us so we can link your engine here.
 If you want to create a payment engine please join our mailing list at http://groups.google.com/group/catarse-dev
 
-
-Here are some tips to get things started:
-
 ## How to contribute with code
 
 Before contributing, take a look at our Roadmap (https://www.pivotaltracker.com/projects/427075) and discuss your plans in our mailing list (http://groups.google.com/group/catarse-dev).
 
 Our pivotal is concerned with user visible features using user stories. But we do have some features not visible to users that are planned such as:
 * Turn Catarse into a Rails Engine with customizable views.
-* Turn Backer model into a finite state machine using the state_machine gem as we did with the Project model.
-* Improve the payments engine isolation providing a clear API to integrate new payment engines in the backer review page.
 * Make a installer script to guide users through initial Catarse configuration.
 
-Currently, a lot of functionality is not tested. If you don't know how to start contributing, please help us regaining control over the code and write a few tests for us! *Any* doubt, please join our Google Group at http://groups.google.com/group/catarse-dev and we will help you out.
-
 After that, just fork the project, change what you want, and send us a pull request.
 
-### Coding style
-* We prefer the `{foo: 'bar'}` over `{:foo => 'bar'}`
-* We prefer the `->(foo){ bar(foo) }` over `lambda{|foo| bar(foo) }`
-
 ### Best practices (or how to get your pull request accepted faster)
 
-We use RSpec and Steak for the tests, and the best practices are:
+* Follow this style guide: https://github.com/bbatsov/ruby-style-guide
 * Create one acceptance tests for each scenario of the feature you are trying to implement.
 * Create model and controller tests to keep 100% of code coverage at least in the new parts that you are writing.
 * Feel free to add specs to the code that is already in the repository without the proper coverage ;)
-* Try to isolate models from controllers as best as you can.
-* Regard the existing tests for a style guide, we try to use implicit spec subjects and lazy evaluation as often as we can. 
+* Regard the existing tests for a style guide, we try to use implicit spec subjects and lazy evaluation as often as we can.
 
 ## Credits
 

Vagrantfile

@@ -9,7 +9,7 @@ Vagrant::Config.run do |config|
   config.vm.box_url = "http://files.vagrantup.com/precise32.box"
 
   # Customizing memory. The VM will need at least 512MB
-  config.vm.customize ["modifyvm", :id, "--memory", 512] 
+  config.vm.customize ["modifyvm", :id, "--memory", 512]
   config.vm.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
 
   # In case the Rails app runs on port 3000, make it available on the host
@@ -21,7 +21,7 @@ Vagrant::Config.run do |config|
     # NOTE:
     # This path should be created. Why? Because we want to enforce cookbooks repositories
     # Just `mkdir cookbooks` inside the Catarse repository
-    # Install vagrant gem install librarian-chef 
+    # Install vagrant gem install librarian-chef
     # Only this and cookbooks will be automatically installed
     chef.cookbooks_path = "cookbooks"
 
@@ -61,28 +61,28 @@ Vagrant::Config.run do |config|
     chef.add_recipe "set_locale::postgres"
 
 
-    #  Configuration: 
+    #  Configuration:
     #  The JSON below is where we configure or modify our recipes attributes
     #  Every recipe has an 'attributes' folder, and these are accessible using the hash format
 
     chef.json = {
       # Installing The latest ruby version
       rvm: {
-        default_ruby: 'ruby-1.9.3-p392',
-        
+        default_ruby: 'ruby-2.1.0',
+
         # Installing multiple ruby versions
         rubies: ['2.0.0-p0'],
         upgrade: :latest,
 
         # Gems that will be accessed globally
         global_gems: [
-          { name: :thin }, 
+          { name: :thin },
           { name: :bundler },
 
           # Add heroku to make deployment easier
           { name: :heroku },
         ],
-        
+
         # Somehow needed for Vagrant
         vagrant: {
           system_chef_solo: '/opt/vagrant_ruby/bin/chef-solo'
@@ -90,7 +90,7 @@ Vagrant::Config.run do |config|
       },
 
       # Configuring postgreSQL
-      # WARNING: 
+      # WARNING:
       # If you're going to deploy using Chef, please Change all these configurations!
       postgresql: {
         listen_addresses: "*",
@@ -110,18 +110,18 @@ Vagrant::Config.run do |config|
       },
       # Making the terminal looks good with theming and assigning to the vagrant user
       oh_my_zsh: {
-        users: [{ 
+        users: [{
           login: :vagrant,
           plugins: %w{git bundler ruby vi rails}
         }]
       }
     }
-  
+
 
   end
 
-  
-  # Run the Rails project right on vagrant up 
+
+  # Run the Rails project right on vagrant up
   config.vm.provision :shell, inline: %q{cd /vagrant && export DISPLAY=:99}
   config.vm.provision :shell, inline: %q{sudo /etc/init.d/xvfb start}
   config.vm.provision :shell, inline: %q{sudo bash -c "echo 'UseDNS no' >> /etc/ssh/sshd_config"}