right_on 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d604e3a0d52e8dd395888dce6b1d201138ea8b6
-  data.tar.gz: 62d8d15da688d03422d5a31b3641a577f92ec42b
+  metadata.gz: 440d9cc6f2bd3abd809e3a57bb7c62e6086ba1c9
+  data.tar.gz: ca7322b951d1f21f126c055f4ca9c69540c0075f
 SHA512:
-  metadata.gz: 59b6d8bbf60c6328bfc0753b622a05603d53362a762f47f490b1cf39cf8f083f4e0423616fdc28f99e088db2d77d16052e44f4ea8fc8f99daf71e990aab9b3b0
-  data.tar.gz: 829f2b6d9050d1cd92b38f9e70cda0a41e325b72d35cc77443e2e70a17c382f3718c983ca41799eec0177131876ec0ba45b49d0c9018a9edba488552ad044173
+  metadata.gz: 40ac1d0adebc602bb7b7d051a6b679d0f3a28e7edf79a6b873fc9a3bb25c100b3604f83818aa67991b9dde0ac67e0744964080fc4e4fe0b581e6c8ab1644347e
+  data.tar.gz: 7c8b1ffba321fc5098f516a76105c7e6454aef06fcf0af0e9bb741b3ec92138ae82ab98af0c19ba45ca5f8cb2cee6956abdeab2c69967ca28ab5adc2881e65a7

data/.travis.yml

@@ -5,6 +5,7 @@ script: "bundle exec rake spec"
 gemfile:
   - gemfiles/rails3.gemfile
   - gemfiles/rails4.gemfile
+  - gemfiles/rails5.gemfile
 notifications:
   email:
     - support@travellink.com.au

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Change Log
+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/).  
+
+## 0.2.0
+
+### Added
+- Rails 4/5 support
+- Groupless rights
+
+### Added
+- [TT-1392] Changelog file

data/gemfiles/rails5.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec :path => '../'
+
+group :development, :test do
+  gem 'rails', '~> 5.0'
+end

data/lib/right_on/right.rb

@@ -23,7 +23,7 @@ module RightOn
         unless @@restricted_by_right_classes.include?(klass)
           @@restricted_by_right_classes << klass
         end
-        has_one klass.table_name.singularize.to_sym, :dependent => :restrict
+        has_one klass.table_name.singularize.to_sym, dependent: :restrict_with_exception
       end
 
       def rights_yaml(file_path)
@@ -31,52 +31,58 @@ module RightOn
       end
 
       def by_groups
-        rights = []
-        rights += regular_rights_with_group
-        rights += restricted_rights_with_group
+        rights = regular_rights_with_group + restricted_rights_with_group
+        rights += (Right.all - rights)
         rights.group_by(&:group)
       end
 
       def regular_rights_with_group
-        yaml = YAML::load_file(@@rights_yaml)
-        rights = []
-        rights_by_name = Hash[Right.all.map{|r| [r.name, r]}]
-        yaml['rights'].each_pair do |group, right_names|
-          rights_for_group = []
-          right_names.each do |right_name|
-            if right_name.is_a?(String) # controller
-              r = rights_by_name[right_name]
-              raise right_name if r.nil?
-              rights_for_group << r
-            else right_name.is_a?(Hash) # controller + actions
-              controller, actions = right_name.first
-              r = rights_by_name[controller]
-              if r
-                rights_for_group << r
-              end
-              actions.each do |action|
-                name = "#{controller}##{action}"
-                r = rights_by_name[name]
-                raise name.inspect + "****" + right_name.inspect + '---' + action_right.inspect if r.nil?
-                rights_for_group << r
-              end
-            end
-          end
-          rights_for_group.each{|r| r.group = group}
-          rights += rights_for_group
+        yaml_rights.each_pair.flat_map do |group, right_names|
+          right_names
+            .flat_map { |right_name| right_name_to_rights(right_name) }
+            .each { |r| r.group = group }
         end
-        rights
+      end
+
+      def yaml_rights
+        YAML::load_file(@@rights_yaml)['rights']
+      end
+
+      def right_name_to_rights(right_name)
+        case right_name
+        when String # controller
+          [rights_by_name!(right_name)]
+        when Hash # controller + actions
+          controller, actions = right_name.first
+          controller_rights(controller) + action_rights(controller, actions)
+        end
+      end
+
+      def controller_rights(controller)
+        r = rights_by_name[controller]
+        return [] unless r
+        [r]
+      end
+
+      def action_rights(controller, actions)
+        actions.map { |action| rights_by_name!("#{controller}##{action}") }
+      end
+
+      def rights_by_name
+        @rights_by_name ||= Hash[Right.all.map{|r| [r.name, r]}]
+      end
+
+      def rights_by_name!(name)
+        rights_by_name[name] or fail name.inspect
       end
 
       def restricted_rights_with_group
-        rights = []
-        @@restricted_by_right_classes.each do |klass|
+        @@restricted_by_right_classes.flat_map do |klass|
           group = klass.restricted_by_right_group
-          rights += all_rights(klass).map(&:right).each do |right|
+          all_rights(klass).map(&:right).sort_by(&:name).each do |right|
             right.group = group
           end
         end
-        rights
       end
 
       def all_rights(klass)

data/lib/right_on/version.rb

@@ -1,3 +1,3 @@
 module RightOn
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/right_on.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency('activerecord', [">= 3.2.0", "< 5.0.0"])
-  spec.add_dependency('activesupport', [">= 3.2.0", "< 5.0.0"])
-  spec.add_dependency('dependent_restrict', [">= 0.2.1"])
-  spec.add_dependency('input_reader', ["~> 0.0"])
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_dependency 'activerecord', '>= 3.2.0'
+  spec.add_dependency 'activesupport', '>= 3.2.0'
+  spec.add_dependency 'dependent_restrict', '>= 0.2.3'
+  spec.add_dependency 'input_reader', '~> 0.0'
+  spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'coverage-kit'
   spec.add_development_dependency 'simplecov-rcov'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'sqlite3'

data/spec/support/coverage_loader.rb

@@ -1,26 +1,4 @@
-MINIMUM_COVERAGE = 70
-
-unless ENV['COVERAGE'] == 'off'
-  require 'simplecov'
-  require 'simplecov-rcov'
-  require 'coveralls'
-  Coveralls.wear!
-
-  SimpleCov.formatters = [
-    SimpleCov::Formatter::RcovFormatter,
-    Coveralls::SimpleCov::Formatter
-  ]
-  SimpleCov.start do
-    add_filter '/vendor/'
-    add_filter '/spec/'
-    add_group 'lib', 'lib'
-  end
-  SimpleCov.at_exit do
-    SimpleCov.result.format!
-    percent = SimpleCov.result.covered_percent
-    unless percent >= MINIMUM_COVERAGE
-      puts "Coverage must be above #{MINIMUM_COVERAGE}%. It is #{"%.2f" % percent}%"
-      Kernel.exit(1)
-    end
-  end
-end
+require 'simplecov-rcov'
+require 'coveralls'
+require 'coverage/kit'
+Coverage::Kit.setup(minimum_coverage: 84.7)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_on
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Noack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,9 +18,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -38,9 +32,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,23 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: dependent_restrict
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: input_reader
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: coverage-kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -200,6 +188,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -208,6 +197,7 @@ files:
 - db/rights_roles.yml
 - gemfiles/rails3.gemfile
 - gemfiles/rails4.gemfile
+- gemfiles/rails5.gemfile
 - lib/right_on.rb
 - lib/right_on/action_controller_extensions.rb
 - lib/right_on/generators/USAGE
@@ -254,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Set of extensions to core rails to give rights and roles.