Merge pull request #1343 from Growstuff/dev

Release 26
Growstuff · Jun 12, 2017 · 3b6a42b · 3b6a42b
2 parents 1ad171f + 2f30343
commit 3b6a42b
Show file tree

Hide file tree

Showing 74 changed files with 791 additions and 698 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-offense-counts`
-# on 2017-03-01 11:18:11 +1300 using RuboCop version 0.47.1.
+# on 2017-05-28 10:57:55 +1200 using RuboCop version 0.47.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -26,7 +26,6 @@ Lint/HandleExceptions:
 # Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
 Lint/UnusedBlockArgument:
   Exclude:
-    - 'app/controllers/crops_controller.rb'
     - 'app/controllers/sessions_controller.rb'
     - 'config/unicorn.rb'
     - 'lib/haml/filters/growstuff_markdown.rb'
@@ -41,12 +40,6 @@ Lint/UnusedMethodArgument:
     - 'app/validators/approved_validator.rb'
     - 'spec/views/plantings/show.html.haml_spec.rb'
 
-Lint/Void:
-  Exclude:
-    - 'spec/models/crop_spec.rb'
-    - 'spec/models/garden_spec.rb'
-    - 'spec/models/post_spec.rb'
-
 # Cop supports --auto-correct.
 Performance/StringReplacement:
   Exclude:
@@ -63,9 +56,7 @@ Rails/OutputSafety:
     - 'app/helpers/gardens_helper.rb'
 
 # Configuration parameters: Blacklist.
-# Blacklist: decrement!, decrement_counter, increment!, increment_counter
-# toggle!, touch, update_all, update_attribute, update_column, update_columns,
-# update_counters
+# Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/seeds.rb'
@@ -114,7 +105,6 @@ Style/BlockDelimiters:
     - 'spec/models/comment_spec.rb'
     - 'spec/models/follow_spec.rb'
     - 'spec/models/member_spec.rb'
-    - 'spec/models/planting_spec.rb'
     - 'spec/models/post_spec.rb'
     - 'spec/views/crops/edit.html.haml_spec.rb'
 
@@ -123,7 +113,6 @@ Style/BlockEndNewline:
   Exclude:
     - 'spec/models/ability_spec.rb'
     - 'spec/models/member_spec.rb'
-    - 'spec/models/planting_spec.rb'
 
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: nested, compact
@@ -134,24 +123,12 @@ Style/ClassAndModuleChildren:
     - 'lib/haml/filters/escaped_markdown.rb'
     - 'lib/haml/filters/growstuff_markdown.rb'
 
-# Cop supports --auto-correct.
-Style/ClassMethods:
-  Exclude:
-    - 'app/models/planting.rb'
-
 # Cop supports --auto-correct.
 Style/ColonMethodCall:
   Exclude:
     - 'spec/lib/haml/filters/escaped_markdown_spec.rb'
     - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
 
-# Cop supports --auto-correct.
-# Configuration parameters: Keywords.
-# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW
-Style/CommentAnnotation:
-  Exclude:
-    - 'app/controllers/crops_controller.rb'
-
 # Cop supports --auto-correct.
 Style/EachForSimpleLoop:
   Exclude:
@@ -163,14 +140,7 @@ Style/EachForSimpleLoop:
 # SupportedStyles: compact, expanded
 Style/EmptyMethod:
   Exclude:
-    - 'app/controllers/accounts_controller.rb'
-    - 'app/controllers/photos_controller.rb'
-    - 'app/controllers/plant_parts_controller.rb'
-    - 'app/controllers/posts_controller.rb'
-    - 'app/controllers/products_controller.rb'
     - 'app/controllers/roles_controller.rb'
-    - 'app/controllers/scientific_names_controller.rb'
-    - 'app/controllers/seeds_controller.rb'
 
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: format, sprintf, percent
@@ -188,7 +158,6 @@ Style/IdenticalConditionalBranches:
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
   Exclude:
-    - 'app/controllers/shop_controller.rb'
     - 'app/helpers/crops_helper.rb'
     - 'app/models/planting.rb'
     - 'config/initializers/geocoder.rb'
@@ -207,11 +176,6 @@ Style/MultilineIfModifier:
   Exclude:
     - 'spec/rails_helper.rb'
 
-# Cop supports --auto-correct.
-Style/MultilineIfThen:
-  Exclude:
-    - 'script/check_contributors_md'
-
 Style/MultilineTernaryOperator:
   Exclude:
     - 'app/controllers/notifications_controller.rb'
@@ -248,7 +212,6 @@ Style/NumericPredicate:
     - 'app/helpers/harvests_helper.rb'
     - 'app/helpers/plantings_helper.rb'
     - 'lib/tasks/growstuff.rake'
-    - 'script/check_contributors_md'
 
 # Cop supports --auto-correct.
 Style/ParallelAssignment:
@@ -260,7 +223,6 @@ Style/ParallelAssignment:
 Style/PercentLiteralDelimiters:
   Exclude:
     - 'app/helpers/auto_suggest_helper.rb'
-    - 'script/check_contributors_md'
     - 'spec/features/signin_spec.rb'
     - 'spec/features/signout_spec.rb'
 
@@ -292,7 +254,6 @@ Style/SpecialGlobalVars:
 # IgnoredMethods: respond_to, define_method
 Style/SymbolProc:
   Exclude:
-    - 'app/controllers/crops_controller.rb'
     - 'lib/tasks/growstuff.rake'
 
 # Cop supports --auto-correct.

diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 
 ruby '2.3.4'
 
-gem 'rails', '~> 4.2.7'
+gem 'rails', '~> 4.2.8'
 
 gem 'bundler', '>=1.1.5'
 
@@ -88,6 +88,9 @@ gem 'rake', '>= 10.0.0'
 # locale based flash notices for controllers
 gem "responders"
 
+# allows soft delete. Used for members.
+gem 'acts_as_paranoid', '~> 0.5.0'
+
 group :production, :staging do
   gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
   gem 'dalli'
@@ -136,6 +139,7 @@ end
 
 group :test do
   gem 'codeclimate-test-reporter', require: false
+  gem 'timecop'
 end
 
 group :travis do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -25,13 +25,13 @@ GEM
       addressable
     active_merchant-paypal-bogus-gateway (0.1.0)
       activemerchant
-    active_utils (3.3.4)
+    active_utils (3.3.6)
       activesupport (>= 3.2, < 5.2.0)
       i18n
     activejob (4.2.8)
       activesupport (= 4.2.8)
       globalid (>= 0.3.0)
-    activemerchant (1.66.0)
+    activemerchant (1.67.0)
       activesupport (>= 3.2.14, < 6.x)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
@@ -48,11 +48,14 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    acts_as_paranoid (0.5.0)
+      activerecord (>= 4.0, < 5.1)
+      activesupport (>= 4.0, < 5.1)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     arel (6.0.4)
     ast (2.3.0)
-    autoprefixer-rails (7.0.1)
+    autoprefixer-rails (7.1.1)
       execjs
     bcrypt (3.1.11)
     better_errors (2.1.1)
@@ -79,8 +82,8 @@ GEM
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.10.0)
     byebug (9.0.6)
-    cancancan (1.16.0)
-    capybara (2.14.0)
+    cancancan (1.17.0)
+    capybara (2.14.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -141,10 +144,10 @@ GEM
     dalli (2.7.6)
     database_cleaner (1.5.3)
     debug_inspector (0.0.3)
-    devise (4.2.1)
+    devise (4.3.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
+      railties (>= 4.1.0, < 5.2)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.3)
@@ -167,7 +170,7 @@ GEM
       faraday
       multi_json
     erubis (2.7.0)
-    excon (0.55.0)
+    excon (0.56.0)
     execjs (2.7.0)
     factory_girl (4.8.0)
       activesupport (>= 3.0.0)
@@ -185,7 +188,7 @@ GEM
     formatador (0.2.5)
     friendly_id (5.0.5)
       activerecord (>= 4.0.0)
-    geocoder (1.4.3)
+    geocoder (1.4.4)
     gibbon (1.2.1)
       httparty
       multi_json (>= 1.9.0)
@@ -238,9 +241,9 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    httparty (0.15.2)
+    httparty (0.15.5)
       multi_xml (>= 0.5.2)
-    i18n (0.8.1)
+    i18n (0.8.4)
     i18n-tasks (0.9.12)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
@@ -256,7 +259,7 @@ GEM
       phantomjs
       rack (>= 1.2.1)
       rake
-    jasmine-core (2.6.1)
+    jasmine-core (2.6.3)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -295,19 +298,19 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.2.0)
     minitest (5.10.2)
     multi_json (1.11.3)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nenv (0.3.0)
-    newrelic_rpm (4.1.0.333)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
+    newrelic_rpm (4.2.0.334)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oauth (0.5.1)
+    oauth (0.5.3)
     oauth2 (1.3.1)
       faraday (>= 0.8, < 0.12)
       jwt (~> 1.0)
@@ -356,7 +359,7 @@ GEM
     public_suffix (2.0.5)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.6.6)
+    rack (1.6.8)
     rack-protection (2.0.0)
       rack
     rack-test (0.6.3)
@@ -440,7 +443,7 @@ GEM
     ruby_parser (3.9.0)
       sexp_processor (~> 4.1)
     rubyzip (1.2.1)
-    sass (3.4.23)
+    sass (3.4.24)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
@@ -453,7 +456,7 @@ GEM
       websocket (~> 1.0)
     sexp_processor (4.9.0)
     shellany (0.0.1)
-    sidekiq (5.0.0)
+    sidekiq (5.0.2)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
@@ -462,7 +465,7 @@ GEM
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.1)
     slop (3.6.0)
     sparkpost_rails (1.4.0)
       rails (>= 4.0, < 5.1)
@@ -476,20 +479,21 @@ GEM
     sysexits (1.2.0)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.19.4)
     thread (0.2.2)
     thread_safe (0.3.6)
     tilt (2.0.7)
-    tins (1.13.2)
+    timecop (0.8.1)
+    tins (1.14.0)
     trollop (1.16.2)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    unicode-display_width (1.1.3)
+    unicode-display_width (1.2.1)
     unicorn (5.3.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -504,8 +508,8 @@ GEM
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    will_paginate (3.1.5)
-    xpath (2.0.0)
+    will_paginate (3.1.6)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -515,6 +519,7 @@ DEPENDENCIES
   active_merchant-paypal-bogus-gateway
   active_utils
   activemerchant
+  acts_as_paranoid (~> 0.5.0)
   better_errors
   binding_of_caller
   bluecloth
@@ -576,7 +581,7 @@ DEPENDENCIES
   poltergeist
   pry
   quiet_assets
-  rails (~> 4.2.7)
+  rails (~> 4.2.8)
   rails_12factor
   rainbow (< 2.2.0)
   rake (>= 10.0.0)
@@ -589,6 +594,7 @@ DEPENDENCIES
   selenium-webdriver
   sidekiq
   sparkpost_rails
+  timecop
   uglifier (~> 2.7.2)
   unicorn
   webrat
@@ -599,4 +605,4 @@ RUBY VERSION
    ruby 2.3.4p301
 
 BUNDLED WITH
-   1.14.6
+   1.15.1