simple_discussion 1.2.0 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +44 -0
  3. data/Appraisals +16 -0
  4. data/CHANGELOG.md +10 -0
  5. data/Gemfile +8 -1
  6. data/README.md +5 -3
  7. data/Rakefile +25 -3
  8. data/app/controllers/simple_discussion/application_controller.rb +1 -1
  9. data/app/controllers/simple_discussion/forum_categories_controller.rb +5 -5
  10. data/app/controllers/simple_discussion/forum_posts_controller.rb +12 -12
  11. data/app/controllers/simple_discussion/forum_threads_controller.rb +9 -9
  12. data/app/controllers/simple_discussion/notifications_controller.rb +3 -3
  13. data/app/helpers/simple_discussion/forum_posts_helper.rb +7 -1
  14. data/app/helpers/simple_discussion/forum_threads_helper.rb +4 -4
  15. data/app/jobs/simple_discussion/forum_post_notification_job.rb +3 -3
  16. data/app/jobs/simple_discussion/forum_thread_notification_job.rb +2 -2
  17. data/app/mailers/simple_discussion/user_mailer.rb +4 -4
  18. data/app/models/forum_category.rb +1 -1
  19. data/app/models/forum_post.rb +1 -2
  20. data/app/models/forum_subscription.rb +4 -4
  21. data/app/models/forum_thread.rb +12 -12
  22. data/app/views/simple_discussion/forum_posts/_forum_post.html.erb +1 -1
  23. data/bin/rails +14 -0
  24. data/config/locales/en.yml +1 -0
  25. data/db/migrate/20170417012930_create_forum_categories.rb +5 -5
  26. data/db/migrate/20170417012932_create_forum_posts.rb +2 -2
  27. data/db/migrate/20170417012933_create_forum_subscriptions.rb +1 -1
  28. data/gemfiles/.bundle/config +2 -0
  29. data/gemfiles/rails_5_2.gemfile +12 -0
  30. data/gemfiles/rails_5_2.gemfile.lock +191 -0
  31. data/gemfiles/rails_6.gemfile +12 -0
  32. data/gemfiles/rails_6.gemfile.lock +207 -0
  33. data/gemfiles/rails_6_1.gemfile +12 -0
  34. data/gemfiles/rails_6_1.gemfile.lock +210 -0
  35. data/gemfiles/rails_master.gemfile +12 -0
  36. data/gemfiles/rails_master.gemfile.lock +222 -0
  37. data/lib/generators/simple_discussion/controllers_generator.rb +2 -2
  38. data/lib/generators/simple_discussion/helpers_generator.rb +2 -2
  39. data/lib/generators/simple_discussion/views_generator.rb +2 -2
  40. data/lib/simple_discussion.rb +8 -9
  41. data/lib/simple_discussion/engine.rb +1 -1
  42. data/lib/simple_discussion/slack.rb +6 -6
  43. data/lib/simple_discussion/version.rb +1 -1
  44. data/lib/simple_discussion/will_paginate.rb +12 -12
  45. data/simple_discussion.gemspec +15 -17
  46. metadata +17 -19
@@ -1,4 +1,4 @@
1
- require 'rails/generators'
1
+ require "rails/generators"
2
2
 
3
3
  module SimpleDiscussion
4
4
  module Generators
@@ -6,7 +6,7 @@ module SimpleDiscussion
6
6
  source_root File.expand_path("../../../..", __FILE__)
7
7
 
8
8
  def copy_controllers
9
- directory 'app/controllers/simple_discussion', 'app/controllers/simple_discussion'
9
+ directory "app/controllers/simple_discussion", "app/controllers/simple_discussion"
10
10
  end
11
11
  end
12
12
  end
@@ -1,4 +1,4 @@
1
- require 'rails/generators'
1
+ require "rails/generators"
2
2
 
3
3
  module SimpleDiscussion
4
4
  module Generators
@@ -6,7 +6,7 @@ module SimpleDiscussion
6
6
  source_root File.expand_path("../../../..", __FILE__)
7
7
 
8
8
  def copy_views
9
- directory 'app/helpers', 'app/helpers'
9
+ directory "app/helpers", "app/helpers"
10
10
  end
11
11
  end
12
12
  end
@@ -1,4 +1,4 @@
1
- require 'rails/generators'
1
+ require "rails/generators"
2
2
 
3
3
  module SimpleDiscussion
4
4
  module Generators
@@ -6,7 +6,7 @@ module SimpleDiscussion
6
6
  source_root File.expand_path("../../../..", __FILE__)
7
7
 
8
8
  def copy_views
9
- directory 'app/views', 'app/views'
9
+ directory "app/views", "app/views"
10
10
  end
11
11
  end
12
12
  end
@@ -1,13 +1,12 @@
1
- require 'font-awesome-sass'
2
- require 'friendly_id'
3
- require 'gravatar_image_tag'
4
- require 'will_paginate'
1
+ require "font-awesome-sass"
2
+ require "friendly_id"
3
+ require "will_paginate"
5
4
 
6
- require 'simple_discussion/engine'
7
- require 'simple_discussion/forum_user'
8
- require 'simple_discussion/slack'
9
- require 'simple_discussion/version'
10
- require 'simple_discussion/will_paginate'
5
+ require "simple_discussion/engine"
6
+ require "simple_discussion/forum_user"
7
+ require "simple_discussion/slack"
8
+ require "simple_discussion/version"
9
+ require "simple_discussion/will_paginate"
11
10
 
12
11
  module SimpleDiscussion
13
12
  # Define who owns the subscription
@@ -1,6 +1,6 @@
1
1
  module SimpleDiscussion
2
2
  class Engine < ::Rails::Engine
3
- engine_name 'simple_discussion'
3
+ engine_name "simple_discussion"
4
4
 
5
5
  # Grab the Rails default url options and use them for sending notifications
6
6
  config.after_initialize do
@@ -1,5 +1,5 @@
1
- require 'open-uri'
2
- require 'net/http'
1
+ require "open-uri"
2
+ require "net/http"
3
3
 
4
4
  module SimpleDiscussion
5
5
  class Slack
@@ -10,11 +10,11 @@ module SimpleDiscussion
10
10
  end
11
11
 
12
12
  def post(payload)
13
- uri = URI.parse(url)
14
- request = Net::HTTP::Post.new(uri)
15
- req_options = { use_ssl: uri.scheme == "https", }
13
+ uri = URI.parse(url)
14
+ request = Net::HTTP::Post.new(uri)
15
+ req_options = {use_ssl: uri.scheme == "https"}
16
16
  request.body = "payload=#{payload.to_json}"
17
- response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
17
+ Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
18
18
  http.request(request)
19
19
  end
20
20
  end
@@ -1,3 +1,3 @@
1
1
  module SimpleDiscussion
2
- VERSION = "1.2.0"
2
+ VERSION = "1.3.0"
3
3
  end
@@ -1,4 +1,4 @@
1
- require 'will_paginate/view_helpers/action_view'
1
+ require "will_paginate/view_helpers/action_view"
2
2
 
3
3
  module SimpleDiscussion
4
4
  # This code serves two purposes
@@ -7,14 +7,13 @@ module SimpleDiscussion
7
7
  # 2. It adds Bootstrap 4 styling to will_paginate
8
8
 
9
9
  class BootstrapLinkRenderer < WillPaginate::ActionView::LinkRenderer
10
-
11
10
  # This method adds the `url_builder` option so we can pass in the
12
11
  # mounted Rails engine's scope for will_paginate
13
12
  def url(page)
14
13
  @base_url_params ||= begin
15
- url_params = merge_get_params(default_url_params)
16
- merge_optional_params(url_params)
17
- end
14
+ url_params = merge_get_params(default_url_params)
15
+ merge_optional_params(url_params)
16
+ end
18
17
 
19
18
  url_params = @base_url_params.dup
20
19
  add_current_page_param(url_params, page)
@@ -24,30 +23,31 @@ module SimpleDiscussion
24
23
  end
25
24
 
26
25
  protected
26
+
27
27
  def html_container(html)
28
28
  tag :nav, tag(:ul, html, class: ul_class)
29
29
  end
30
30
 
31
31
  def page_number(page)
32
- item_class = if(page == current_page)
33
- 'active page-item'
32
+ item_class = if page == current_page
33
+ "active page-item"
34
34
  else
35
- 'page-item'
35
+ "page-item"
36
36
  end
37
37
 
38
- tag :li, link(page, page, :rel => rel_value(page), :class => 'page-link'), :class => item_class
38
+ tag :li, link(page, page, rel: rel_value(page), class: "page-link"), class: item_class
39
39
  end
40
40
 
41
41
  def gap
42
- tag :li, link('&hellip;'.html_safe, '#', :class => 'page-link'), :class => 'page-item disabled'
42
+ tag :li, link("&hellip;".html_safe, "#", class: "page-link"), class: "page-item disabled"
43
43
  end
44
44
 
45
45
  def previous_or_next_page(page, text, classname)
46
- tag :li, link(text, page || '#', :class => 'page-link'), :class => [(classname[0..3] if @options[:page_links]), (classname if @options[:page_links]), ('disabled' unless page), 'page-item'].join(' ')
46
+ tag :li, link(text, page || "#", class: "page-link"), class: [(classname[0..3] if @options[:page_links]), (classname if @options[:page_links]), ("disabled" unless page), "page-item"].join(" ")
47
47
  end
48
48
 
49
49
  def ul_class
50
- ["pagination", container_attributes[:class]].compact.join(" ")
50
+ ["pagination", container_attributes[:class]].compact.join(" ")
51
51
  end
52
52
  end
53
53
  end
@@ -1,29 +1,27 @@
1
- # coding: utf-8
2
1
  lib = File.expand_path("../lib", __FILE__)
3
2
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
3
  require "simple_discussion/version"
5
4
 
6
5
  Gem::Specification.new do |spec|
7
- spec.name = "simple_discussion"
8
- spec.version = SimpleDiscussion::VERSION
9
- spec.authors = ["Chris Oliver"]
10
- spec.email = ["excid3@gmail.com"]
6
+ spec.name = "simple_discussion"
7
+ spec.version = SimpleDiscussion::VERSION
8
+ spec.authors = ["Chris Oliver"]
9
+ spec.email = ["excid3@gmail.com"]
11
10
 
12
- spec.summary = %q{A simple, extensible Rails forum}
13
- spec.description = %q{A simple, extensible Rails forum}
14
- spec.homepage = "https://github.com/excid3/simple_discussion"
15
- spec.license = "MIT"
11
+ spec.summary = "A simple, extensible Rails forum"
12
+ spec.description = "A simple, extensible Rails forum"
13
+ spec.homepage = "https://github.com/excid3/simple_discussion"
14
+ spec.license = "MIT"
16
15
 
17
- spec.files = `git ls-files -z`.split("\x0").reject do |f|
16
+ spec.files = `git ls-files -z`.split("\x0").reject do |f|
18
17
  f.match(%r{^(test|spec|features)/})
19
18
  end
20
- spec.bindir = "exe"
21
- spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
19
+ spec.bindir = "exe"
20
+ spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
22
21
  spec.require_paths = ["lib"]
23
22
 
24
- spec.add_dependency 'font-awesome-sass', '~> 5.13.0'
25
- spec.add_dependency 'friendly_id', '>= 5.2.0'
26
- spec.add_dependency 'gravatar_image_tag'
27
- spec.add_dependency 'rails', '>= 4.2'
28
- spec.add_dependency 'will_paginate', '>= 3.1.0'
23
+ spec.add_dependency "font-awesome-sass", ">= 5.13.0"
24
+ spec.add_dependency "friendly_id", ">= 5.2.0"
25
+ spec.add_dependency "rails", ">= 4.2"
26
+ spec.add_dependency "will_paginate", ">= 3.1.0"
29
27
  end
metadata CHANGED
@@ -1,27 +1,27 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: simple_discussion
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Oliver
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-06-19 00:00:00.000000000 Z
11
+ date: 2021-03-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: font-awesome-sass
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: 5.13.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: 5.13.0
27
27
  - !ruby/object:Gem::Dependency
@@ -38,20 +38,6 @@ dependencies:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: 5.2.0
41
- - !ruby/object:Gem::Dependency
42
- name: gravatar_image_tag
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - ">="
46
- - !ruby/object:Gem::Version
47
- version: '0'
48
- type: :runtime
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - ">="
53
- - !ruby/object:Gem::Version
54
- version: '0'
55
41
  - !ruby/object:Gem::Dependency
56
42
  name: rails
57
43
  requirement: !ruby/object:Gem::Requirement
@@ -88,8 +74,10 @@ extensions: []
88
74
  extra_rdoc_files: []
89
75
  files:
90
76
  - ".github/FUNDING.yml"
77
+ - ".github/workflows/ci.yml"
91
78
  - ".gitignore"
92
79
  - ".travis.yml"
80
+ - Appraisals
93
81
  - CHANGELOG.md
94
82
  - CODE_OF_CONDUCT.md
95
83
  - Gemfile
@@ -125,6 +113,7 @@ files:
125
113
  - app/views/simple_discussion/user_mailer/new_post.html.erb
126
114
  - app/views/simple_discussion/user_mailer/new_thread.html.erb
127
115
  - bin/console
116
+ - bin/rails
128
117
  - bin/setup
129
118
  - config/locales/en.yml
130
119
  - config/locales/es.yml
@@ -134,6 +123,15 @@ files:
134
123
  - db/migrate/20170417012931_create_forum_threads.rb
135
124
  - db/migrate/20170417012932_create_forum_posts.rb
136
125
  - db/migrate/20170417012933_create_forum_subscriptions.rb
126
+ - gemfiles/.bundle/config
127
+ - gemfiles/rails_5_2.gemfile
128
+ - gemfiles/rails_5_2.gemfile.lock
129
+ - gemfiles/rails_6.gemfile
130
+ - gemfiles/rails_6.gemfile.lock
131
+ - gemfiles/rails_6_1.gemfile
132
+ - gemfiles/rails_6_1.gemfile.lock
133
+ - gemfiles/rails_master.gemfile
134
+ - gemfiles/rails_master.gemfile.lock
137
135
  - lib/generators/simple_discussion/controllers_generator.rb
138
136
  - lib/generators/simple_discussion/helpers_generator.rb
139
137
  - lib/generators/simple_discussion/views_generator.rb
@@ -163,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
163
161
  - !ruby/object:Gem::Version
164
162
  version: '0'
165
163
  requirements: []
166
- rubygems_version: 3.1.2
164
+ rubygems_version: 3.2.3
167
165
  signing_key:
168
166
  specification_version: 4
169
167
  summary: A simple, extensible Rails forum