hydra-role-management 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b39aee0a1843b7757cddd4c4c92855619c527285
-  data.tar.gz: b9c227a38b244b07c2db9f15ca7542630be413f6
+  metadata.gz: baf9353a04409963f28f95ea224b60c48168db9e
+  data.tar.gz: 29250a4135ab334b0623059089d134cf11d4e774
 SHA512:
-  metadata.gz: 11eeaa238371f79a82e34b222505b3abf2e10066f61831abeb0eff31cb628456bd7a28d1acb7cff48ffed60369fb968e5bb497028930858aaaa64a5607fcd424
-  data.tar.gz: 465692f1adcbf16fe1a2f1e1518f3aeb461a87c39e593607e0192b1ee5463e810c77d8fac02d7a5ba81ec6ad9eaf952b96b3f34c44cd8ef7b3335d954d0d1782
+  metadata.gz: 20a29eccb32ce9505bd897f3eedf45cff5e86d4c18e97c4ee2f27b6aba1df151aee85b3cd29d4ecaa8ade05ff865bae703c0f894072814eba0ca1388aec1d61b
+  data.tar.gz: c1a59c994d0e3a385ab36bc71cbea72ab23cea653e125ffbb07319fc0b02beeda0e431dbd8b54b4f50ae016aa9243319671ff5e8a2bd19f429cba01e727bcf7f

data/LICENSE.md

@@ -0,0 +1,14 @@
+Copyright 2015 Data Curation Experts
+Additional copyright may be held by others, as reflected in the commit history.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -24,4 +24,5 @@ Given the need to support both Rails 3 and 4, the test suite has been parameteri
 * Set Rails version you want to test against.  For example:
 	* ```RAILS_VERSION=3.2.13``` or ```RAILS_VERSION=4.0.0```
 * Ensure that the correct version of Rails is installed:  ```bundle update```
-* Build test app and run tests: ```bundle exec rake spec```
+* Build test app: ```bundle exec engine_cart:generate```
+* And run tests: ```bundle exec rake spec```

data/hydra-role-management.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.name          = "hydra-role-management"
   gem.require_paths = ["lib"]
   gem.version       = Hydra::RoleManagement::VERSION
+  gem.license       = 'Apache 2.0'
 
   gem.add_dependency 'bootstrap_form'
   gem.add_dependency 'blacklight'

data/lib/generators/roles/roles_generator.rb

@@ -1,19 +1,19 @@
 # -*- encoding : utf-8 -*-
 require 'rails/generators'
-require 'rails/generators/migration'     
+require 'rails/generators/migration'
 
 class RolesGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
 
   source_root File.expand_path('../templates', __FILE__)
-  
+
   argument     :model_name, :type => :string , :default => "user"
   desc """
 This generator makes the following changes to your application:
  1. Creates several database migrations if they do not exist in /db/migrate
  2. Adds user behavior to the user model
  2. Adds routes
-       """ 
+       """
 
   # Implement the required interface for Rails::Generators::Migration.
   # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
@@ -41,18 +41,18 @@ This generator makes the following changes to your application:
       place_marker = if File.read(file_path).match(/include Hydra::User/)
         /include Hydra::User/
       elsif File.read(file_path).match(/include Blacklight::User/)
-       /include Blacklight::User/ 
+       /include Blacklight::User/
       end
-      if place_marker 
-        code = "\n # Connects this user object to Role-management behaviors. " +
-          "\n include Hydra::RoleManagement::UserRoles\n"        
+      if place_marker
+        code = "\n  # Connects this user object to Role-management behaviors.\n" +
+          "  include Hydra::RoleManagement::UserRoles\n\n"
         inject_into_file file_path, code, { :after => place_marker }
       else
         puts "     \e[31mFailure\e[0m  Hydra::User is not included in #{file_path}.  Add 'include Hydra::User' and rerun."
       end
     else
-      puts "     \e[31mFailure\e[0m  hydra-role-management requires a user object. This generators assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails -g roles client" 
-    end    
+      puts "     \e[31mFailure\e[0m  hydra-role-management requires a user object. This generators assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails -g roles client"
+    end
   end
 
   # The engine routes have to come after the devise routes so that /users/sign_in will work
@@ -62,22 +62,6 @@ This generator makes the following changes to your application:
     inject_into_file 'config/routes.rb', "\n  #{routing_code}\n", { :after => sentinel, :verbose => false }
   end
 
-  # As of 7.23.2013 cancan support for Rails 4 is weak and requires monkey-patching.
-  # More information can be found at https://github.com/ryanb/cancan/issues/835
-  def rails4_application_controller_patch
-    if Rails::VERSION::MAJOR == 4
-      puts "Adding before_filter to application_controller to help Cancan work with Rails 4."
-      file_path = "app/controllers/application_controller.rb"
-      code = "\n  before_filter do" +
-        "\n    resource = controller_path.singularize.gsub('/', '_').to_sym \n" + 
-        '    method = "#{resource}_params"'+ 
-        "\n    params[resource] &&= send(method) if respond_to?(method, true)" + 
-        "\n  end"
-
-      inject_into_file file_path, code, {after: 'class ApplicationController < ActionController::Base'}
-    end
-  end
-
   # If this gem is installed under Rails 3, an attr_accessible method is required for the Role model.  This
   # file will be added to config/initializers and the correct code will be added to the model at runtime.
   def rails3_attr_accessible
@@ -87,8 +71,8 @@ This generator makes the following changes to your application:
     end
   end
 
-  private  
-  
+  private
+
   def better_migration_template (file)
     begin
       sleep 1 # ensure scripts have different time stamps
@@ -98,6 +82,4 @@ This generator makes the following changes to your application:
     end
   end
 
-end  
-
-
+end

data/lib/hydra/role_management/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module RoleManagement
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-role-management
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap_form
@@ -119,6 +119,7 @@ files:
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
+- LICENSE.md
 - README.md
 - Rakefile
 - app/controllers/concerns/hydra/role_management/roles_behavior.rb
@@ -152,7 +153,8 @@ files:
 - spec/test_app_templates/config/initializers/hydra_config.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 homepage: https://github.com/projecthydra/hydra-role-management
-licenses: []
+licenses:
+- Apache 2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -170,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rails engine to do user roles in an RDBMS for hydra-head