right_on 0.4.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 305432803fdcefcb6756f2ba6711de9e35af49b8
-  data.tar.gz: a8b370dc3ad398e34f886c9d8d63d39111265c68
+SHA256:
+  metadata.gz: '0108c3ce3f394b0af09b9935e0db745fa3cdd28806ae3f12bc54dc66fdde6c2a'
+  data.tar.gz: 718de624b9388bd1ffa6f28f4f2ac3511eef8b1326d04a8fe9f1e81f0d8337f3
 SHA512:
-  metadata.gz: ece57f18a2b65d827a12599fe3d04c5a2603c5ae4bd204af8d6a5e5fb0143eba6fa689ad407ac8927a425198bb5e5390afeaab7be81d14745ac68a21c87438c6
-  data.tar.gz: d22b65a1d068cb522587d082d4d01fcf75bcb8c0d2c89ecfcae82e38d7577a8acd6e5e522b267725a2927e8bd7ee21f89be9d16e4351a477ffd60884b0964b6e
+  metadata.gz: c90a862b99c4b7f9e63307865d21b33c7ea5662f5c0d27557c3f60fe4d28ea50c0effc74a219a873873af7dfdc0c9d577d9ec2d1c14067d34f5afe9ea4eca626
+  data.tar.gz: d2f3ca8c0d84b83c04460668260c317e603c945086931714f7617df6789586a755d2249ac8fdc1b349dfabaf902cdfa316f557d59b3d800047ece1347b6bb2ca

data/.travis.yml

@@ -1,13 +1,11 @@
 language: ruby
 rvm:
-  - 2.3
-  - 2.4
   - 2.5
   - 2.6
 script: "bundle exec rake spec"
 gemfile:
-  - gemfiles/rails4.gemfile
   - gemfiles/rails5.gemfile
+  - gemfiles/rails6.gemfile
 # fix ruby 2.5 issue - https://github.com/travis-ci/travis-ci/issues/9333
 before_install: gem install bundler
 notifications:

data/CHANGELOG.md

@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).  
 This changelog adheres to [Keep a CHANGELOG](http://keepachangelog.com/).  
 
+## 1.0.0
+
+- [TT-6078] Fix Travis builds
+- [TT-6093] Only rights should be in the rights.yml
+
 ## 0.4.1
 
 - [TT-4960] ByGroup will now return a hash sorted by role name

data/db/rights.yml

@@ -0,0 +1,8 @@
+---
+general:
+  - models:
+    - index
+    - view
+    - change
+admin:
+  - users

data/gemfiles/{rails4.gemfile → rails6.gemfile}

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 gemspec :path => '../'
 
 group :development, :test do
-  gem 'rails', '~> 4.2'
+  gem 'rails', '~> 6.0'
 end

data/lib/right_on/by_group.rb

@@ -18,7 +18,7 @@ module RightOn
     private
 
     def yaml_rights
-      YAML.load_file(RightOn.rights_yaml)['rights']
+      YAML.load_file(RightOn.rights_yaml)
     end
 
     def right_name_to_rights(right_name)

data/lib/right_on/version.rb

@@ -1,3 +1,3 @@
 module RightOn
-  VERSION = '0.4.1'
+  VERSION = '1.0.0'
 end

data/right_on.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activerecord', '>= 4.0.0'
   spec.add_dependency 'activesupport', '>= 4.0.0'
   spec.add_dependency 'input_reader', '~> 0.0'
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'coverage-kit'

data/spec/by_group_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RightOn.rights_yaml 'db/rights_roles.yml'
+RightOn.rights_yaml 'db/rights.yml'
 
 describe RightOn::ByGroup do
   let(:rights) { Bootstrap.various_rights_with_actions }

data/spec/controller_additions_spec.rb

@@ -3,6 +3,7 @@ require 'action_controller'
 require 'cancan/ability'
 require 'cancan/controller_additions'
 require 'cancan/exceptions'
+require 'cancan/parameter_validators'
 require 'cancan/rule'
 require 'right_on/ability'
 require 'right_on/controller_additions'

data/spec/rule_spec.rb

@@ -1,5 +1,6 @@
 require 'active_record'
 require 'active_support/all'
+require 'cancan/parameter_validators'
 require 'cancan/rule'
 require 'right_on/error'
 require 'right_on/rule'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_on
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Michael Noack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-03 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan
@@ -71,16 +71,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -210,9 +210,9 @@ files:
 - README.md
 - Rakefile
 - db/migration.rb
-- db/rights_roles.yml
-- gemfiles/rails4.gemfile
+- db/rights.yml
 - gemfiles/rails5.gemfile
+- gemfiles/rails6.gemfile
 - lib/right_on.rb
 - lib/right_on/ability.rb
 - lib/right_on/by_group.rb
@@ -267,8 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Set of extensions to core rails to give rights and roles.

data/db/rights_roles.yml

@@ -1,16 +0,0 @@
-rights:
-  general:
-    - models:
-      - index
-      - view
-      - change
-  admin:
-    - users
-
-roles:
-  simple_role:
-    - models@index
-  advanced_role:
-    - models
-    - models@index
-    - users