Have other rights appear in groupless

.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

gemfiles/rails5.gemfile

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

lib/right_on/right.rb

@@ -23,60 +23,66 @@ def associate_group(klass, group)
         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)
         @@rights_yaml = file_path
       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)

right_on.gemspec

@@ -18,11 +18,11 @@ 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'