the_role 2.4 → 2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 390002fab78f75cdae9b6aa2f354133640b21646
-  data.tar.gz: f7ef67983c17684310ec02f606454b58b921a58f
+  metadata.gz: d7700ef13fecc1ba8b6947d6a0ba4456e91cbf91
+  data.tar.gz: edee96d6f042e8f6454d6d899572603ba0057bd8
 SHA512:
-  metadata.gz: e0512d3c687adf75d494cfee54b1fde431295bc0b59ccd677f3666b9949ea166f7b2a05c19f22192ff54f636de59835e58e3177db11403feee0f4a148339601c
-  data.tar.gz: 172dc91e2f26a1a1dd1f979302c59a7fe7186caff13c404472ed80ac387fa701160cd467a647133c2ba8474f37de8fdb01ab031a0f94935591bd5fc2d6cd1cd7
+  metadata.gz: a95cff998b90f59352d1b380ae698ca026f0f31b024844219b1a6ed55f761e7a83ac42a6a3d9ff99ccde0be192ac7f2ec7cd2e121ee39dd8eb4cda7c35473a81
+  data.tar.gz: b44c2b1b3fbcaf32e2127e632cf866298307a4f6837930ff3ab752d7b72fd2a2bc268614c2db1b3aa97eb50fa20ab4a4ce003e8076e6bc2f7540adf2bc79eb7b

data/README.md

@@ -19,7 +19,9 @@
 
 ### GUI
 
-:warn: UI moved in **the_role_bootstrap3_ui** gem
+:warning: UI moved in **the_role_bootstrap3_ui** gem
+
+https://github.com/the-teacher/the_role_bootstrap3_ui
 
 We are waiting for **foundation** version of UI
 
@@ -49,6 +51,9 @@ gem 'the_role_bootstrap3_ui'
 
 Please read *the_role_bootstrap3_ui* docs to know more about assets
 
+https://github.com/the-teacher/the_role_bootstrap3_ui
+
+
 ## If you have any questions
 
 Please, before asking anything try to launch and play with the **[Dummy App](spec/dummy_app)** in the spec folder. Maybe an example integration will be better than any documentation. Thank you!

data/app/models/concerns/base.rb

@@ -2,15 +2,15 @@ module TheRole
   module Base
     def has_section? section_name
       hash         =  role_hash
-      section_name =  TheRoleParam.process section_name
+      section_name =  section_name.to_s.to_slug_param(delimiter: '_')
       return true  if hash[section_name]
       false
     end
 
     def has_role? section_name, rule_name
       hash         =  role_hash
-      section_name =  TheRoleParam.process(section_name)
-      rule_name    =  TheRoleParam.process(rule_name)
+      section_name =  section_name.to_s.to_slug_param(delimiter: '_')
+      rule_name    =  rule_name.to_s.to_slug_param(delimiter: '_')
 
       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 = TheRoleParam.process(section_name)
+      section_name = section_name.to_slug_param(delimiter: '_')
       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? TheRoleParam.process(section_name)
+      to_hash.key? section_name.to_s.to_slug_param(delimiter: '_')
     end
 
     included do
@@ -22,7 +22,7 @@ module TheRole
       validates :description, presence: true
 
       before_save do
-        self.name = TheRoleParam.process(name)
+        self.name = name.to_s.to_slug_param(delimiter: '_')
 
         rules_set = self.the_role
         self.the_role = {}.to_json if rules_set.blank? # blank
@@ -41,9 +41,9 @@ module TheRole
     def create_section section_name = nil
       return false unless section_name
       role = to_hash
-      section_name = TheRoleParam.process(section_name)
+      section_name = section_name.to_s.to_slug_param(delimiter: '_')
       return false if section_name.blank?
-      return true if role[section_name]
+      return true  if role[section_name]
       role[section_name] = {}
       update(the_role: role)
     end
@@ -51,9 +51,11 @@ module TheRole
     def create_rule section_name, rule_name
       return false if     rule_name.blank?
       return false unless create_section(section_name)
+      
       role = to_hash
-      rule_name = TheRoleParam.process(rule_name)
-      section_name = TheRoleParam.process(section_name)
+      rule_name    = rule_name.to_s.to_slug_param(delimiter: '_')
+      section_name = section_name.to_s.to_slug_param(delimiter: '_')
+
       return true if role[section_name][rule_name]
       role[section_name][rule_name] = false
       update(the_role: role)
@@ -89,22 +91,26 @@ module TheRole
 
     def rule_on section_name, rule_name
       role = to_hash
-      rule_name = TheRoleParam.process(rule_name)
-      section_name = TheRoleParam.process(section_name)
+      rule_name    = rule_name.to_s.to_slug_param(delimiter: '_')
+      section_name = section_name.to_s.to_slug_param(delimiter: '_')
+
       return false unless role[section_name]
       return false unless role[section_name].key? rule_name
-      return true if     role[section_name][rule_name]
+      return true  if     role[section_name][rule_name]
+
       role[section_name][rule_name] = true
       update(the_role: role)
     end
 
     def rule_off section_name, rule_name
       role = to_hash
-      rule_name = TheRoleParam.process(rule_name)
-      section_name = TheRoleParam.process(section_name)
+      rule_name    = rule_name.to_s.to_slug_param(delimiter: '_')
+      section_name = section_name.to_s.to_slug_param(delimiter: '_')
+
       return false unless role[section_name]
       return false unless role[section_name].key? rule_name
-      return true unless role[section_name][rule_name]
+      return true  unless role[section_name][rule_name]
+
       role[section_name][rule_name] = false
       update(the_role: role)
     end
@@ -114,19 +120,23 @@ module TheRole
     def delete_section section_name = nil
       return false unless section_name
       role = to_hash
-      section_name = TheRoleParam.process(section_name)
+      section_name = section_name.to_s.to_slug_param(delimiter: '_')
+
       return false if section_name.blank?
       return false unless role[section_name]
+      
       role.delete section_name
       update(the_role: role)
     end
 
     def delete_rule section_name, rule_name
       role = to_hash
-      rule_name = TheRoleParam.process(rule_name)
-      section_name = TheRoleParam.process(section_name)
+      rule_name    = rule_name.to_s.to_slug_param(delimiter: '_')
+      section_name = section_name.to_s.to_slug_param(delimiter: '_')
+
       return false unless role[section_name]
       return false unless role[section_name].key? rule_name
+
       role[section_name].delete rule_name
       update(the_role: role)
     end

data/lib/the_role/hash.rb

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

data/lib/the_role/version.rb

@@ -1,3 +1,3 @@
 module TheRole
-  VERSION = "2.4"
+  VERSION = "2.5"
 end

data/lib/the_role.rb

@@ -1,7 +1,6 @@
 require 'the_role/hash'
 require 'the_role/config'
 require 'the_role/version'
-require 'the_role/param_helper'
 require 'the_role/activerecord'
 
 module TheRole

data/spec/dummy_app/Gemfile

@@ -6,6 +6,8 @@ gem 'devise'
 gem 'sqlite3'
 gem 'state_machine', '~> 1.2.0'
 
+gem "the_string_to_slug", path: "../../../the_string_to_slug"
+
 gem 'sprockets-rails', github: 'rails/sprockets-rails'
 gem 'coffee-rails',    github: 'rails/coffee-rails'
 gem 'sass-rails',      github: 'rails/sass-rails'

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

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

data/the_role.gemspec

@@ -18,5 +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_runtime_dependency 'rails', ['>= 3', '< 5']
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: the_role
 version: !ruby/object:Gem::Version
-  version: '2.4'
+  version: '2.5'
 platform: ruby
 authors:
 - Ilya N. Zykin [the-teacher]
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: the_string_to_slug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -70,7 +84,6 @@ files:
 - lib/the_role/activerecord.rb
 - lib/the_role/config.rb
 - lib/the_role/hash.rb
-- lib/the_role/param_helper.rb
 - lib/the_role/the_class_exists.rb
 - lib/the_role/version.rb
 - pic.png

data/lib/the_role/param_helper.rb

@@ -1,9 +0,0 @@
-require "active_support/inflector"
-
-# TheRoleParam.process 'hello world'
-
-module TheRoleParam
-  def self.process param
-    param.to_s.parameterize.underscore
-  end
-end