Merge pull request #209 from socializer/rails_5_1

Upgrade to Rails 5.1.x

.gitignore

@@ -1,3 +1,32 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+/node_modules
+/yarn-error.log
+
+.byebug_history
+
+
+#
+# Review the ignored items below
+#
+
 .DS_Store
 *.rbc
 capybara-*.html
@@ -26,33 +55,12 @@ config/secrets.yml
 # TODO Comment out this rule if environment variables can be committed
 .env
 
-# Ignore bundler config.
-/.bundle
-
-# Ignore the default SQLite database.
-/db/*.sqlite3
-/db/*.sqlite3-journal
-
-# Ignore all logfiles and tempfiles.
-/log/*
-/tmp/*
-!/log/.keep
-!/tmp/.keep
-
 # these should all be checked in to normalize the environment:
 # Gemfile.lock, .ruby-version, .ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
 
-# if using bower-rails ignore default bower_components path bower.json files
-# /vendor/assets/bower_components
-# *.bowerrc
-# bower.json
-
-# Ignore pow environment settings
-# .powenv
-
 # Ignore Byebug command history file.
 .byebug_history
 

Gemfile

@@ -1,5 +1,18 @@
 source "https://rubygems.org"
 
+# Declare your gem's dependencies in socializer.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
+
+# To use a debugger
+# gem 'byebug', group: [:development, :test]
+
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"

Gemfile.lock

@@ -17,59 +17,59 @@ PATH
       omniauth-linkedin (~> 0.2.0)
       omniauth-openid (~> 1.0.1)
       omniauth-twitter (~> 1.4.0)
-      rails (~> 5.0.3)
+      rails (~> 5.1.1)
       sass-rails (~> 5.0.6)
       simple_form (~> 3.5.0)
       uglifier (>= 3.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.3)
-      actionpack (= 5.0.3)
-      nio4r (>= 1.2, < 3.0)
+    actioncable (5.1.1)
+      actionpack (= 5.1.1)
+      nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.3)
-      actionpack (= 5.0.3)
-      actionview (= 5.0.3)
-      activejob (= 5.0.3)
+    actionmailer (5.1.1)
+      actionpack (= 5.1.1)
+      actionview (= 5.1.1)
+      activejob (= 5.1.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.3)
-      actionview (= 5.0.3)
-      activesupport (= 5.0.3)
+    actionpack (5.1.1)
+      actionview (= 5.1.1)
+      activesupport (= 5.1.1)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.3)
-      activesupport (= 5.0.3)
+    actionview (5.1.1)
+      activesupport (= 5.1.1)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.3)
-      activesupport (= 5.0.3)
+    activejob (5.1.1)
+      activesupport (= 5.1.1)
       globalid (>= 0.3.6)
-    activemodel (5.0.3)
-      activesupport (= 5.0.3)
+    activemodel (5.1.1)
+      activesupport (= 5.1.1)
     activemodel-serializers-xml (1.0.1)
       activemodel (> 5.x)
       activerecord (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.0.3)
-      activemodel (= 5.0.3)
-      activesupport (= 5.0.3)
-      arel (~> 7.0)
-    activesupport (5.0.3)
+    activerecord (5.1.1)
+      activemodel (= 5.1.1)
+      activesupport (= 5.1.1)
+      arel (~> 8.0)
+    activesupport (5.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    arel (7.1.4)
+    arel (8.0.0)
     ast (2.3.0)
     autoprefixer-rails (7.1.0)
       execjs
@@ -135,6 +135,7 @@ GEM
     elasticsearch-rails (5.0.1)
     enumerize (2.1.1)
       activesupport (>= 3.2)
+    erubi (1.6.0)
     erubis (2.7.0)
     execjs (2.7.0)
     factory_girl (4.8.0)
@@ -236,17 +237,17 @@ GEM
       ruby-openid (>= 2.1.8)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.3)
-      actioncable (= 5.0.3)
-      actionmailer (= 5.0.3)
-      actionpack (= 5.0.3)
-      actionview (= 5.0.3)
-      activejob (= 5.0.3)
-      activemodel (= 5.0.3)
-      activerecord (= 5.0.3)
-      activesupport (= 5.0.3)
+    rails (5.1.1)
+      actioncable (= 5.1.1)
+      actionmailer (= 5.1.1)
+      actionpack (= 5.1.1)
+      actionview (= 5.1.1)
+      activejob (= 5.1.1)
+      activemodel (= 5.1.1)
+      activerecord (= 5.1.1)
+      activesupport (= 5.1.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.3)
+      railties (= 5.1.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.2)
       actionpack (~> 5.x, >= 5.0.1)
@@ -267,9 +268,9 @@ GEM
       json
       require_all
       ruby-progressbar
-    railties (5.0.3)
-      actionpack (= 5.0.3)
-      activesupport (= 5.0.3)
+    railties (5.1.1)
+      actionpack (= 5.1.1)
+      activesupport (= 5.1.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright 2011-2016, Dominic Goulet, http://www.dominicgoulet.com
+Copyright 2011-2017, Dominic Goulet, http://www.dominicgoulet.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

app/assets/javascripts/socializer/application.js

@@ -1,8 +1,14 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
+// vendor/assets/javascripts directory can be referenced here using a relative path.
+//
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
 //
 //= require jquery2
 //= require jquery_ujs

app/decorators/socializer/activity_decorator.rb

@@ -13,7 +13,7 @@ class ActivityDecorator < ApplicationDecorator
     # `helpers` (aka `h`). You can override attributes, for example:
     #
     #   def created_at
-    #     helpers.content_tag :span, class: 'time' do
+    #     helpers.tag.span(class: 'time') do
     #       object.created_at.strftime("%a %m/%d/%y")
     #     end
     #   end

app/decorators/socializer/activity_object_decorator.rb

@@ -12,7 +12,7 @@ class ActivityObjectDecorator < Draper::Decorator
     # `helpers` (aka `h`). You can override attributes, for example:
     #
     #   def created_at
-    #     helpers.content_tag :span, class: "time" do
+    #     helpers.tag.span(class: 'time') do
     #       object.created_at.strftime("%a %m/%d/%y")
     #     end
     #   end
@@ -69,9 +69,7 @@ def like_or_unlike_content
       content = []
       like_count = model.like_count
 
-      content << helpers.content_tag(:span,
-                                     nil,
-                                     class: "fa fa-fw fa-thumbs-o-up")
+      content << helpers.tag.span(class: "fa fa-fw fa-thumbs-o-up")
 
       content << like_count.to_s if like_count > 0
       helpers.safe_join(content)

app/decorators/socializer/circle_decorator.rb

@@ -12,7 +12,7 @@ class CircleDecorator < Draper::Decorator
     # `helpers` (aka `h`). You can override attributes, for example:
     #
     #   def created_at
-    #     helpers.content_tag :span, class: "time" do
+    #     helpers.tag.span(class: 'time') do
     #       object.created_at.strftime("%a %m/%d/%y")
     #     end
     #   end

app/decorators/socializer/group_decorator.rb

@@ -12,7 +12,7 @@ class GroupDecorator < Draper::Decorator
     # `helpers` (aka `h`). You can override attributes, for example:
     #
     #   def created_at
-    #     helpers.content_tag :span, class: 'time' do
+    #     helpers.tag.span(class: 'time') do
     #       object.created_at.strftime("%a %m/%d/%y")
     #     end
     #   end

app/decorators/socializer/note_decorator.rb

@@ -13,7 +13,7 @@ class NoteDecorator < ApplicationDecorator
     # `helpers` (aka `h`). You can override attributes, for example:
     #
     #   def created_at
-    #     helpers.content_tag :span, class: 'time' do
+    #     helpers.tag.span(class: 'time') do
     #       object.created_at.strftime("%a %m/%d/%y")
     #     end
     #   end

app/decorators/socializer/notification_decorator.rb

@@ -12,7 +12,7 @@ class NotificationDecorator < ApplicationDecorator
     # `helpers` (aka `h`). You can override attributes, for example:
     #
     #   def created_at
-    #     helpers.content_tag :span, class: "time" do
+    #     helpers.tag.span(class: 'time') do
     #       object.created_at.strftime("%a %m/%d/%y")
     #     end
     #   end

app/decorators/socializer/person/address_decorator.rb

@@ -14,7 +14,7 @@ class AddressDecorator < Draper::Decorator
       # `helpers` (aka `h`). You can override attributes, for example:
       #
       #   def created_at
-      #     helpers.content_tag :span, class: 'time' do
+      #     helpers.tag.span(class: 'time') do
       #       object.created_at.strftime("%a %m/%d/%y")
       #     end
       #   end

app/decorators/socializer/person/education_decorator.rb

@@ -14,7 +14,7 @@ class EducationDecorator < Draper::Decorator
       # `helpers` (aka `h`). You can override attributes, for example:
       #
       #   def created_at
-      #     helpers.content_tag :span, class: 'time' do
+      #     helpers.tag.span(class: 'time') do
       #       object.created_at.strftime("%a %m/%d/%y")
       #     end
       #   end

app/decorators/socializer/person/employment_decorator.rb

@@ -14,7 +14,7 @@ class EmploymentDecorator < Draper::Decorator
       # `helpers` (aka `h`). You can override attributes, for example:
       #
       #   def created_at
-      #     helpers.content_tag :span, class: 'time' do
+      #     helpers.tag.span(class: 'time') do
       #       object.created_at.strftime("%a %m/%d/%y")
       #     end
       #   end

app/decorators/socializer/person/phone_decorator.rb

@@ -14,7 +14,7 @@ class PhoneDecorator < Draper::Decorator
       # `helpers` (aka `h`). You can override attributes, for example:
       #
       #   def created_at
-      #     helpers.content_tag :span, class: 'time' do
+      #     helpers.tag.span(class: 'time') do
       #       object.created_at.strftime("%a %m/%d/%y")
       #     end
       #   end