message_train 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c59cd4ee75e183221da8c3b2dd801177d7b3c60
-  data.tar.gz: c3cf3df9408cfb22be672d147c6fc92770056a4b
+  metadata.gz: 716a16971eee61264359b21e00b173108d805439
+  data.tar.gz: 42f17313e151dcfac3d27be981c0413905fd5673
 SHA512:
-  metadata.gz: a5b8949dbc963fdda36d71c41eae7b8f3f6dde94c87da7876497d4406cf2ce0d7c503b02819e26e844b26efa0fa7a8e0a484c105127cc0bf3a761e170f894d27
-  data.tar.gz: c2689982f54869d3d999255d2fa9c44763bdd8b640a89e630e9b2d49e930aaffab60b658865bd0ecb4f4f7cb812ba3b133dbb7be2e1ff9147a936841673567a2
+  metadata.gz: 9ab56f0364f5e857c4629668438f42655bdcb65b735c127ed29dd2a1e99f17d70298651cf252f45363936731cc0619fe65b62d5129faad4d5aef1c1bbe9f81e6
+  data.tar.gz: 56baa46472c54d19af75e72828ae480b1af8e07aa47fd594c89b8a4f1517f07cc60d53ba683084d7a83b9a974534aad15c684d7ba192397c2952693ea9d328a2

data/Gemfile

@@ -6,7 +6,7 @@ gem 'jquery-rails', '~> 4'
 gem 'paperclip', '>= 4.2', '< 6'
 gem 'rails', '>= 4', '< 6'
 gem 'rails-i18n', '>= 4', '< 6'
-gem 'uglifier', '>= 2.7', '< 3.2'
+gem 'uglifier', '>= 2.7', '< 4'
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.0'
@@ -27,10 +27,8 @@ gem 'twitter-typeahead-rails'
 group :development do
   gem 'bundler', '~> 1.0'
   gem 'juwelier', '~> 2'
-  gem 'pre-commit', '~> 0.27'
   gem 'rubocop', '~> 0.47.1', require: false
   gem 'scss_lint', '~> 0.52', require: false
-  gem 'sdoc', '~> 0.4.1'
 end
 
 group :development, :test do

data/README.md

@@ -237,6 +237,10 @@ config.address_book_methods[:users] = :valid_recipients_for
 
 ## Upgrading
 
+### 0.7.1
+
+Renamed `subscription` to `message_train_subscription` and `subscriptions` to `message_train_subscription`.
+
 ### 0.4.0
 
 Version 0.4.0 introduced database changes to the foreign key columns to

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/app/controllers/message_train/unsubscribes_controller.rb

@@ -3,7 +3,7 @@ module MessageTrain
   class UnsubscribesController < MessageTrain::ApplicationController
     # GET /unsubscribes
     def index
-      @subscriptions = @box_user.subscriptions
+      @subscriptions = @box_user.message_train_subscriptions
     end
 
     # POST /unsubscribes

data/lib/message_train/instance_methods.rb

@@ -112,10 +112,10 @@ module MessageTrain
         unsubscribes.find_or_create_by(from: from)
       end
 
-      def subscriptions
+      def message_train_subscriptions
         subscriptions = [self_subscription]
         subscriptions += collective_boxes.values.map do |boxes|
-          boxes.map { |box| subscription(box) }
+          boxes.map { |box| message_train_subscription(box) }
         end
         subscriptions.flatten.compact
       end
@@ -193,7 +193,7 @@ module MessageTrain
         }
       end
 
-      def subscription(box)
+      def message_train_subscription(box)
         parent = box.parent
         return unless parent.allows_receiving_by?(self)
         {

data/message_train.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: message_train 0.7.1 ruby lib
+# stub: message_train 0.7.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "message_train"
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Karen Lundgren"]
-  s.date = "2017-03-31"
+  s.date = "2017-04-28"
   s.description = "Rails 4 & 5 Engine providing private and public messaging for any object, such as Users or Groups"
   s.email = "karen.e.lundgren@gmail.com"
   s.extra_rdoc_files = [
@@ -290,7 +290,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<paperclip>, ["< 6", ">= 4.2"])
       s.add_runtime_dependency(%q<rails>, ["< 6", ">= 4"])
       s.add_runtime_dependency(%q<rails-i18n>, ["< 6", ">= 4"])
-      s.add_runtime_dependency(%q<uglifier>, ["< 3.2", ">= 2.7"])
+      s.add_runtime_dependency(%q<uglifier>, ["< 4", ">= 2.7"])
       s.add_runtime_dependency(%q<jbuilder>, ["~> 2.0"])
       s.add_runtime_dependency(%q<bootstrap-sass>, ["~> 3.3"])
       s.add_runtime_dependency(%q<bootstrap_form>, ["~> 2.3"])
@@ -304,10 +304,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<twitter-typeahead-rails>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<juwelier>, ["~> 2"])
-      s.add_development_dependency(%q<pre-commit>, ["~> 0.27"])
       s.add_development_dependency(%q<rubocop>, ["~> 0.47.1"])
       s.add_development_dependency(%q<scss_lint>, ["~> 0.52"])
-      s.add_development_dependency(%q<sdoc>, ["~> 0.4.1"])
       s.add_development_dependency(%q<byebug>, ["~> 9"])
       s.add_development_dependency(%q<devise>, ["~> 4"])
       s.add_development_dependency(%q<factory_girl_rails>, ["~> 4.5"])
@@ -325,7 +323,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<paperclip>, ["< 6", ">= 4.2"])
       s.add_dependency(%q<rails>, ["< 6", ">= 4"])
       s.add_dependency(%q<rails-i18n>, ["< 6", ">= 4"])
-      s.add_dependency(%q<uglifier>, ["< 3.2", ">= 2.7"])
+      s.add_dependency(%q<uglifier>, ["< 4", ">= 2.7"])
       s.add_dependency(%q<jbuilder>, ["~> 2.0"])
       s.add_dependency(%q<bootstrap-sass>, ["~> 3.3"])
       s.add_dependency(%q<bootstrap_form>, ["~> 2.3"])
@@ -339,10 +337,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<twitter-typeahead-rails>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<juwelier>, ["~> 2"])
-      s.add_dependency(%q<pre-commit>, ["~> 0.27"])
       s.add_dependency(%q<rubocop>, ["~> 0.47.1"])
       s.add_dependency(%q<scss_lint>, ["~> 0.52"])
-      s.add_dependency(%q<sdoc>, ["~> 0.4.1"])
       s.add_dependency(%q<byebug>, ["~> 9"])
       s.add_dependency(%q<devise>, ["~> 4"])
       s.add_dependency(%q<factory_girl_rails>, ["~> 4.5"])
@@ -361,7 +357,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<paperclip>, ["< 6", ">= 4.2"])
     s.add_dependency(%q<rails>, ["< 6", ">= 4"])
     s.add_dependency(%q<rails-i18n>, ["< 6", ">= 4"])
-    s.add_dependency(%q<uglifier>, ["< 3.2", ">= 2.7"])
+    s.add_dependency(%q<uglifier>, ["< 4", ">= 2.7"])
     s.add_dependency(%q<jbuilder>, ["~> 2.0"])
     s.add_dependency(%q<bootstrap-sass>, ["~> 3.3"])
     s.add_dependency(%q<bootstrap_form>, ["~> 2.3"])
@@ -375,10 +371,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<twitter-typeahead-rails>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<juwelier>, ["~> 2"])
-    s.add_dependency(%q<pre-commit>, ["~> 0.27"])
     s.add_dependency(%q<rubocop>, ["~> 0.47.1"])
     s.add_dependency(%q<scss_lint>, ["~> 0.52"])
-    s.add_dependency(%q<sdoc>, ["~> 0.4.1"])
     s.add_dependency(%q<byebug>, ["~> 9"])
     s.add_dependency(%q<devise>, ["~> 4"])
     s.add_dependency(%q<factory_girl_rails>, ["~> 4.5"])

data/spec/helpers/message_train/application_helper_spec.rb

@@ -7,7 +7,7 @@ describe MessageTrain::ApplicationHelper do
   before do
     view.extend MessageTrain::BoxesHelper
     view.extend MessageTrain::CollectivesHelper
-    view.extend BootstrapLeatherHelper
+    view.extend BootstrapLeather::ApplicationHelper
     login_user first_user
   end
 

data/spec/helpers/message_train/attachment_helper_spec.rb

@@ -4,7 +4,7 @@ describe MessageTrain::AttachmentsHelper do
   include_context 'loaded site'
 
   before do
-    view.extend BootstrapLeatherHelper
+    view.extend BootstrapLeather::ApplicationHelper
   end
 
   describe '#attachment_icon' do

data/spec/helpers/message_train/boxes_helper_spec.rb

@@ -5,7 +5,7 @@ describe MessageTrain::BoxesHelper do
   include ControllerMacros
 
   before do
-    view.extend BootstrapLeatherHelper
+    view.extend BootstrapLeather::ApplicationHelper
     login_user first_user
   end
 

data/spec/helpers/message_train/collectives_helper_spec.rb

@@ -5,7 +5,7 @@ describe MessageTrain::CollectivesHelper do
   include ControllerMacros
 
   before do
-    view.extend BootstrapLeatherHelper
+    view.extend BootstrapLeather::ApplicationHelper
     login_user first_user
   end
 

data/spec/helpers/message_train/conversations_helper_spec.rb

@@ -6,7 +6,7 @@ describe MessageTrain::ConversationsHelper do
 
   before do
     view.extend MessageTrain::BoxesHelper
-    view.extend BootstrapLeatherHelper
+    view.extend BootstrapLeather::ApplicationHelper
     login_user first_user
     assign(:box_user, first_user)
   end

data/spec/helpers/message_train/messages_helper_spec.rb

@@ -6,7 +6,7 @@ describe MessageTrain::MessagesHelper do
 
   before do
     view.extend MessageTrain::BoxesHelper
-    view.extend BootstrapLeatherHelper
+    view.extend BootstrapLeather::ApplicationHelper
     login_user first_user
     assign(:box_user, first_user)
   end

data/spec/models/user_spec.rb

@@ -168,8 +168,8 @@ RSpec.describe User do
       end
     end
 
-    describe '#subscriptions' do
-      subject { first_user.subscriptions }
+    describe '#message_train_subscriptions' do
+      subject { first_user.message_train_subscriptions }
       it { should be_an Array }
       it { should have_at_least(3).items }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_train
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Karen Lundgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml-rails
@@ -104,7 +104,7 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4'
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4'
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
@@ -300,20 +300,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: pre-commit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.27'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.27'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -342,20 +328,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.52'
-- !ruby/object:Gem::Dependency
-  name: sdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement