merit 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f485a4853da5aa06c851c133b85206b798755c41
-  data.tar.gz: c148037a475f47d09b9a774da2fc8669ec016212
+SHA256:
+  metadata.gz: b2cbaa14467c3e05f09615f1fccf0fb0b504246ed8e11320245d9c160f2f81c9
+  data.tar.gz: 940d31167c9bd59cd1ecaa96055cbf87f6e5bf6e7e1fbb3b433215b0d27d3291
 SHA512:
-  metadata.gz: e43c8bb0a86b3d57adfeaa8816d566a8e9d4705d75a9ac926ce5e6dcc9c27eb1fd96bd145c353818275ea241a91475c9d3a7700f0d35d28532b1f54b794864c0
-  data.tar.gz: 5f137da4113ebfb20f398fd733aa0b65285a3a8f6aa9758dae9536d13bab161fb2bef80da3d492468564cbaa9a933143343146b3dcd4f7d369a6022a6535cb44
+  metadata.gz: db2f9a9d70500a9e11985d7dd54d8fc5a891b69a940a72ce8fea8a465d733ae4ab1e197ad1eb11b50f6699321d9d55cffc36f5f1da2ad3c5deebb9d41414380c
+  data.tar.gz: 9230dda9fe83d1b137dd5105134b4ed41614d2323308a40ae87f98302931f1309e87f00a13c8f893b8dae8c732b4e23e7d22c3ec8353a49a83a465bfd852579c

data/Gemfile

@@ -2,8 +2,12 @@ source 'https://rubygems.org'
 
 gemspec
 
-version = ENV['RAILS_VERSION'] || '5.0.3'
-gem 'rails', version
+version = ENV['RAILS_VERSION']
+if version =~ /^5.2/
+  gem 'rails', github: "rails/rails", branch: "5-2-stable"
+else
+  gem 'rails', version
+end
 
 case ENV['ORM']
 when 'active_record'
@@ -14,15 +18,7 @@ end
 
 group :development, :test do
   gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
-  gem 'sqlite3', '~> 1.3.8', :platforms => [:ruby, :mswin, :mingw]
-end
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'psych'
-  gem 'racc'
-  gem 'minitest', '~> 5.10', '!= 5.10.2'
-  gem 'rubinius-developer_tools'
+  gem 'sqlite3'
 end
 
 gem 'coveralls', require: false

data/NEWS.md

@@ -2,6 +2,12 @@
 
 User-visible changes worth mentioning.
 
+## 3.0.2
+
+- [#287] Make Sash an optional dependency, fixing issues in Rails 5.1.
+- [#297] Initialize merit once both for API or non-API apps
+- Updates dependencies
+
 ## 3.0.1
 
 - [#282] Run action controller load hook only once

data/Rakefile

@@ -8,7 +8,7 @@ end
 require 'rake/testtask'
 
 desc 'Default: run tests for all ORMs.'
-task default: :test
+task default: [:test, :api_test]
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
@@ -17,6 +17,14 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
+Rake::TestTask.new(:api_test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.test_files = FileList['test/**/*_test.rb'].exclude(/navigation_test.rb/)
+  t.verbose = true
+  t.options = '-- -api-only'
+end
+
 begin
   require 'rdoc/task'
   Rake::RDocTask.new(:rdoc) do |rdoc|

data/lib/merit.rb

@@ -82,7 +82,7 @@ module Merit
     initializer 'merit.controller' do |app|
       extend_orm_with_has_merit
       require_models
-      ActiveSupport.on_load(:action_controller, run_once: true) do
+      ActiveSupport.on_load(action_controller_hook) do
         begin
           # Load app rules on boot up
           Merit::AppBadgeRules = Merit::BadgeRules.new.defined_rules
@@ -113,5 +113,13 @@ module Merit
         Mongoid::Document.send :include, Merit
       end
     end
+
+    def action_controller_hook
+      if Rails.application.config.api_only
+        :action_controller_api
+      else
+        :action_controller_base
+      end
+    end
   end
 end

data/lib/merit/model_additions.rb

@@ -7,7 +7,7 @@ module Merit
       # That's why MeritableModel belongs_to Sash. Can't use
       # dependent: destroy as it may raise FK constraint exceptions. See:
       # https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/1079-belongs_to-dependent-destroy-should-destroy-self-before-assocation
-      belongs_to :sash, class_name: 'Merit::Sash', inverse_of: nil
+      belongs_to :sash, class_name: 'Merit::Sash', inverse_of: nil, optional: true
       attr_accessible :sash if show_attr_accessible?
 
       send :"_merit_#{Merit.orm}_specific_config"

data/lib/merit/models/active_record/merit/activity_log.rb

@@ -3,7 +3,7 @@ module Merit
     self.table_name = :merit_activity_logs
 
     belongs_to :action, class_name: 'Merit::Action'
-    belongs_to :related_change, polymorphic: true
+    belongs_to :related_change, polymorphic: true, optional: true
     has_one :sash, through: :related_change
 
     if show_attr_accessible?

data/merit.gemspec

@@ -6,17 +6,17 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
   s.test_files  = `git ls-files -- test/*`.split("\n")
   s.license     = 'MIT'
-  s.version     = '3.0.1'
+  s.version     = '3.0.2'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
 
-  s.required_ruby_version = '>= 2.2.2'
+  s.required_ruby_version = '>= 2.3.0'
 
   s.add_dependency 'ambry', '~> 1.0.0'
-  s.add_development_dependency 'rails', '>= 5.0.0'
+  s.add_development_dependency 'rails', '>= 5.1.6'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'minitest-rails'
-  s.add_development_dependency 'mocha', '1.1.0'
+  s.add_development_dependency 'mocha'
 end

data/test/dummy/config/application.rb

@@ -11,18 +11,12 @@ require "merit"
 
 module Dummy
   class Application < Rails::Application
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-    # config.active_record.whitelist_attributes = true
+    if Rails.version >= "5.2"
+      config.active_record.sqlite3.represent_boolean_as_integer = true
+    end
 
-    # http://stackoverflow.com/questions/20361428/rails-i18n-validation-deprecation-warning
     config.i18n.enforce_available_locales = true
-
-    # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
   end
 end

data/test/dummy/config/application_api_only.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative "boot"
+
+require "rails"
+# Pick the frameworks you want:
+require "active_model/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_view/railtie"
+require "action_mailer/railtie"
+
+# require "sprockets/railtie"
+require "rails/test_unit/railtie"
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require
+require "merit"
+
+module Dummy
+  class Application < Rails::Application
+    config.load_defaults 5.2 if ENV["RAILS_VERSION"] =~ /^5.2/
+    config.api_only = true
+    config.i18n.enforce_available_locales = true
+    config.encoding = "utf-8"
+  end
+end

data/test/dummy/config/environment_api_only.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# Load the rails application
+require File.expand_path("application_api_only", __dir__)
+
+# Initialize the rails application
+Dummy::Application.initialize!

data/test/dummy/config/initializers/new_framework_defaults.rb

@@ -0,0 +1,3 @@
+if Rails.version >= "5.1"
+  Rails.application.config.active_record.belongs_to_required_by_default = true
+end

data/test/orm/active_record.rb

@@ -1,2 +1,8 @@
 # Place orm-dependent test preparation here
-ActiveRecord::Migrator.migrate File.expand_path("../../dummy/db/migrate/", __FILE__)
+migrations = File.expand_path("../../dummy/db/migrate/", __FILE__)
+
+if Rails.version >= "5.2"
+  ActiveRecord::MigrationContext.new(migrations).migrate
+else
+  ActiveRecord::Migrator.migrate migrations
+end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 # Configure Rails Envinronment
 ENV['RAILS_ENV'] = 'test'
-RUBYOPT="-w $RUBYOPT"
+RUBYOPT = "-w $RUBYOPT".freeze
 
 if ENV["COVERAGE"]
   require 'coveralls'
@@ -18,10 +18,15 @@ if ENV["COVERAGE"]
   SimpleCov.start 'rubygem'
 end
 
-require File.expand_path('../dummy/config/environment.rb', __FILE__)
-require 'rails/test_help'
-require 'minitest/rails'
-require 'mocha/mini_test'
+if ARGV.include?("-api-only")
+  require File.expand_path("dummy/config/environment_api_only.rb", __dir__)
+else
+  require File.expand_path("dummy/config/environment.rb", __dir__)
+end
+
+require "rails/test_help"
+require "minitest/rails"
+require "mocha/minitest"
 require "orm/#{Merit.orm}"
 
 Rails.backtrace_cleaner.remove_silencers!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Tute Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.6
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 description: Manage badges, points and rankings (reputation) in your Rails app.
 email: tutecosta@gmail.com
 executables: []
@@ -203,9 +203,11 @@ files:
 - test/dummy/app/views/users/show.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
+- test/dummy/config/application_api_only.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
 - test/dummy/config/environment.rb
+- test/dummy/config/environment_api_only.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
@@ -213,6 +215,7 @@ files:
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/merit.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/new_framework_defaults.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/locales/en.yml
@@ -274,7 +277,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -282,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Reputation engine for Rails apps
@@ -317,9 +320,11 @@ test_files:
 - test/dummy/app/views/users/show.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
+- test/dummy/config/application_api_only.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
 - test/dummy/config/environment.rb
+- test/dummy/config/environment_api_only.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
@@ -327,6 +332,7 @@ test_files:
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/merit.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/new_framework_defaults.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/locales/en.yml