the_role 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2da50021e5faf84fee4fc36f394a7261b6656f0d
-  data.tar.gz: de454cfc3be8494c1281d56dbc95a908a00fedda
+  metadata.gz: 12b0ae2b2e4a5afcc9026717b0c81155f02fa4d7
+  data.tar.gz: 7867224f80ba6715d9d3a562e77ea04f642a592f
 SHA512:
-  metadata.gz: 240a0b2438d2ab2031958de50996c7b05c5ca497569a2ee0308b2d1f19c8932fc885b08c55be2eb864d57d5defc4c2b45ce671bbdcfa2f92c400e61a68d8b80f
-  data.tar.gz: 2a8c73e9f25e3ce0f53fd0472b913f86c92e03ed447b1f875dbed910350a06fe0f0dc469d6dead73b9f1c25c361c3d94c2d0e3aadb81da43ab2cf51be5439731
+  metadata.gz: e768d539904516605ab9be3e3de04debe263116639edf2891eef306ced2db0c16008d3a7f9cfe3cc73f3ec054ca62d60deda76703e821c99d083d20ee7ee8681
+  data.tar.gz: d343d3fc7478400b0903eb278b0db31ce0653a27bf69ef478d9bd91486fafa06843bf9c57b01bd55c0903ff9ae07aa1ef4239534953396fa72c482ac5ffc1d4d

data/README.md

@@ -506,7 +506,7 @@ new_role_hash = {
 
 ### MIT-LICENSE
 
-##### Copyright (c) 2012 [Ilya N.Zykin]
+##### Copyright (c) 2012-2014 [Ilya N.Zykin]
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/models/concerns/base.rb

@@ -2,15 +2,15 @@ module TheRole
   module Base
     def has_section? section_name
       hash         =  role_hash
-      section_name =  section_name.to_s.to_slug_param(delimiter: '_')
+      section_name =  section_name.to_slug_param(sep: '_')
       return true  if hash[section_name]
       false
     end
 
     def has_role? section_name, rule_name
       hash         =  role_hash
-      section_name =  section_name.to_s.to_slug_param(delimiter: '_')
-      rule_name    =  rule_name.to_s.to_slug_param(delimiter: '_')
+      section_name =  section_name.to_slug_param(sep: '_')
+      rule_name    =  rule_name.to_slug_param(sep: '_')
 
       return true  if hash.try(:[], 'system').try(:[], 'administrator')
       return true  if hash.try(:[], 'moderator').try(:[], section_name)
@@ -26,7 +26,7 @@ module TheRole
     end
 
     def moderator? section_name
-      section_name = section_name.to_slug_param(delimiter: '_')
+      section_name = section_name.to_slug_param(sep: '_')
       has_role? section_name, 'any_crazy_name'
     end
 

data/app/models/concerns/role.rb

@@ -12,7 +12,7 @@ module TheRole
     alias_method :any?, :any_role?
 
     def has_section? section_name
-      to_hash.key? section_name.to_s.to_slug_param(delimiter: '_')
+      to_hash.key? section_name.to_slug_param(sep: '_')
     end
 
     included do
@@ -22,7 +22,7 @@ module TheRole
       validates :description, presence: true
 
       before_save do
-        self.name = name.to_s.to_slug_param(delimiter: '_')
+        self.name = name.to_slug_param(sep: '_')
 
         rules_set = self.the_role
         self.the_role = {}.to_json if rules_set.blank? # blank
@@ -41,7 +41,7 @@ module TheRole
     def create_section section_name = nil
       return false unless section_name
       role = to_hash
-      section_name = section_name.to_s.to_slug_param(delimiter: '_')
+      section_name = section_name.to_slug_param(sep: '_')
       return false if section_name.blank?
       return true  if role[section_name]
       role[section_name] = {}
@@ -53,8 +53,8 @@ module TheRole
       return false unless create_section(section_name)
       
       role = to_hash
-      rule_name    = rule_name.to_s.to_slug_param(delimiter: '_')
-      section_name = section_name.to_s.to_slug_param(delimiter: '_')
+      rule_name    = rule_name.to_slug_param(sep: '_')
+      section_name = section_name.to_slug_param(sep: '_')
 
       return true if role[section_name][rule_name]
       role[section_name][rule_name] = false
@@ -91,8 +91,8 @@ module TheRole
 
     def rule_on section_name, rule_name
       role = to_hash
-      rule_name    = rule_name.to_s.to_slug_param(delimiter: '_')
-      section_name = section_name.to_s.to_slug_param(delimiter: '_')
+      rule_name    = rule_name.to_slug_param(sep: '_')
+      section_name = section_name.to_slug_param(sep: '_')
 
       return false unless role[section_name]
       return false unless role[section_name].key? rule_name
@@ -104,8 +104,8 @@ module TheRole
 
     def rule_off section_name, rule_name
       role = to_hash
-      rule_name    = rule_name.to_s.to_slug_param(delimiter: '_')
-      section_name = section_name.to_s.to_slug_param(delimiter: '_')
+      rule_name    = rule_name.to_slug_param(sep: '_')
+      section_name = section_name.to_slug_param(sep: '_')
 
       return false unless role[section_name]
       return false unless role[section_name].key? rule_name
@@ -120,7 +120,7 @@ module TheRole
     def delete_section section_name = nil
       return false unless section_name
       role = to_hash
-      section_name = section_name.to_s.to_slug_param(delimiter: '_')
+      section_name = section_name.to_slug_param(sep: '_')
 
       return false if section_name.blank?
       return false unless role[section_name]
@@ -131,8 +131,8 @@ module TheRole
 
     def delete_rule section_name, rule_name
       role = to_hash
-      rule_name    = rule_name.to_s.to_slug_param(delimiter: '_')
-      section_name = section_name.to_s.to_slug_param(delimiter: '_')
+      rule_name    = rule_name.to_slug_param(sep: '_')
+      section_name = section_name.to_slug_param(sep: '_')
 
       return false unless role[section_name]
       return false unless role[section_name].key? rule_name

data/lib/the_role/hash.rb

@@ -34,7 +34,7 @@ class Hash
 
   unless {}.respond_to?(:underscorify_keys)
     def underscorify_keys
-      deep_transform_keys{ |key| key.to_s.to_slug_param(delimiter: '_') }
+      deep_transform_keys{ |key| key.to_slug_param(sep: '_') }
     end
 
     def underscorify_keys!

data/lib/the_role/version.rb

@@ -1,3 +1,3 @@
 module TheRole
-  VERSION = "2.5.1"
+  VERSION = "2.5.2"
 end

data/spec/dummy_app/Gemfile

@@ -18,8 +18,12 @@ gem 'uglifier'
 gem 'jquery-rails'
 gem 'jbuilder', '~> 1.0.1'
 
-gem 'the_role', "~> 2.5"
-  # path: '../../'
+gem 'the_string_to_slug',
+  path: "../../../the_string_to_slug"
+
+gem 'the_role',
+  # "~> 2.5.1"
+  path: '../../'
 
 gem 'the_role_bootstrap3_ui',
   github: 'the-teacher/the_role_bootstrap3_ui',

data/spec/dummy_app/config/application.rb

@@ -6,6 +6,8 @@ require 'rails/all'
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env)
 
+I18n.enforce_available_locales = true
+
 module RailsApp
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.

data/spec/dummy_app/spec/models/param_process_spec.rb

@@ -4,29 +4,29 @@ require 'spec_helper'
 
 describe "String to slug" do
   it 'string process 1' do
-    'hello world!'.to_slug_param(delimiter: '_').should eq 'hello_world'
+    'hello world!'.to_slug_param(sep: '_').should eq 'hello_world'
   end
 
   it 'string process 2' do
-    :hello_world!.to_s.to_slug_param(delimiter: '_').should eq 'hello_world'
+    :hello_world!.to_slug_param(sep: '_').should eq 'hello_world'
   end
 
   it 'string process 3' do
-    "hello !      world".to_slug_param(delimiter: '_').should eq 'hello_world'
+    "hello !      world".to_slug_param(sep: '_').should eq 'hello_world'
   end
 
   it 'string process 4' do
-    "HELLO  $!= WorlD".to_slug_param(delimiter: '_').should eq 'hello_world'
+    "HELLO  $!= WorlD".to_slug_param(sep: '_').should eq 'hello_world'
   end
 
   it 'string process 5' do
-    "HELLO---WorlD".to_slug_param(delimiter: '_').should eq 'hello_world'
+    "HELLO---WorlD".to_slug_param(sep: '_').should eq 'hello_world'
   end
 
   it "should work with Controller Name" do
     ctrl = PagesController.new
     ctrl.controller_path
-    ctrl.controller_path.to_slug_param(delimiter: '_').should eq 'pages'
+    ctrl.controller_path.to_slug_param(sep: '_').should eq 'pages'
   end
 
   it "should work with Nested Controller Name" do
@@ -34,6 +34,6 @@ describe "String to slug" do
     ctrl = Admin::PagesController.new
     ctrl.controller_path
 
-    ctrl.controller_path.to_slug_param(delimiter: '_').should eq 'admin_pages'
+    ctrl.controller_path.to_slug_param(sep: '_').should eq 'admin_pages'
   end
 end

data/the_role.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'the_string_to_slug', '~> 1.1'
+  s.add_dependency 'the_string_to_slug', '~> 1.2'
   s.add_runtime_dependency 'rails', ['>= 3', '< 5']
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_role
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Ilya N. Zykin [the-teacher]
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: the_string_to_slug
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement