cbac 0.6.10 → 0.7.0

data/spec/cbac_pristine_role_spec.rb

@@ -4,74 +4,73 @@ include Cbac::CbacPristine
 
 describe "CbacPristineRole" do
   describe "convert pristine role to a yml fixture" do
-    it "should return an empty string if the pristine role is of type :context" do
+    it "returns an empty string if the pristine role is of type :context" do
       pristine_role = PristineRole.new(:role_id => 0, :role_type => PristineRole.ROLE_TYPES[:context], :name => "name is irrelevant")
 
-      pristine_role.to_yml_fixture.should be_empty
+      expect(pristine_role.to_yml_fixture).to be_empty
     end
 
-    it "should raise an error if the role name is not specified" do
+    it "raises an error if the role name is not specified" do
       pristine_role = PristineRole.new(:role_id => 0, :role_type => PristineRole.ROLE_TYPES[:admin], :name => "")
 
-      proc{
+      expect(proc{
         pristine_role.to_yml_fixture
-      }.should raise_error(ArgumentError)
+      }).to raise_error(ArgumentError)
     end
 
-    it "should return a yml string starting with cbac_generic_role_ " do
+    it "returns a yml string starting with cbac_generic_role_ " do
       pristine_role = PristineRole.new(:role_id => 0, :role_type => PristineRole.ROLE_TYPES[:generic], :name => "name is irrelevant")
 
-      pristine_role.to_yml_fixture.should match(/\Acbac_generic_role_/)
+      expect(pristine_role.to_yml_fixture).to match(/\Acbac_generic_role_/)
     end
 
-    it "should return a yml string containing the id of the pristine role" do
+    it "returns a yml string containing the id of the pristine role" do
       role_id = 100
       pristine_role = PristineRole.new(:role_id => role_id, :role_type => PristineRole.ROLE_TYPES[:generic], :name => "name is irrelevant")
 
-      pristine_role.to_yml_fixture.should match(/id: #{role_id}/)
+      expect(pristine_role.to_yml_fixture).to match(/id: #{role_id}/)
     end
 
-    it "should return a yml string containing the name of the pristine role" do
+    it "returns a yml string containing the name of the pristine role" do
       name = "Administrator"
       pristine_role = PristineRole.new(:role_id => 0, :role_type => PristineRole.ROLE_TYPES[:generic], :name => name)
-      pristine_role.to_yml_fixture.should match(/name: #{name}/)
+
+      expect(pristine_role.to_yml_fixture).to match(/name: #{name}/)
     end
 
-    it "should return a yml string containing created_at and updated_at" do
+    it "returns a yml string containing created_at and updated_at" do
       pristine_role = PristineRole.new(:role_id => 0, :role_type => PristineRole.ROLE_TYPES[:generic], :name => "name is irrelevant")
 
-      pristine_role.to_yml_fixture.should match(/created_at:.+updated_at:/m)
+      expect(pristine_role.to_yml_fixture).to match(/created_at:.+updated_at:/m)
     end
   end
 
   describe "admin role" do
-    it "should return a role with the admin role_type" do
+    it "returns a role with the admin role_type" do
       admin_role = PristineRole.admin_role
 
-      admin_role.role_type.should == PristineRole.ROLE_TYPES[:admin]
+      expect(admin_role.role_type).to eq(PristineRole.ROLE_TYPES[:admin])
     end
 
-    it "should return a new admin role if the role does not exist in the database" do
+    it "returns a new admin role if the role does not exist in the database" do
       admin_role = PristineRole.admin_role
 
-      admin_role.id.should be_nil
+      expect(admin_role.id).to be_nil
     end
 
-    it "should return an existing admin role if possible" do
+    it "returns an existing admin role if possible" do
       existing_admin_role = PristineRole.create(:role_id => 0, :role_type => PristineRole.ROLE_TYPES[:admin], :name => "administrator")
-
       admin_role = PristineRole.admin_role
 
-      admin_role.should == existing_admin_role
+      expect(admin_role).to eq(existing_admin_role)
     end
 
-    it "should not return an existing admin role if database should not be used" do
+    it "does not return an existing admin role if database should not be used" do
       existing_admin_role = PristineRole.create(:role_id => 0, :role_type => PristineRole.ROLE_TYPES[:admin], :name => "administrator")
-
       admin_role = PristineRole.admin_role(false)
 
-      admin_role.should_not == existing_admin_role
-      admin_role.id.should be_nil
+      expect(admin_role).not_to eq(existing_admin_role)
+      expect(admin_role.id).to be_nil
     end
   end
 end

data/spec/fixtures/controllers/dating/daughter_controller.rb

@@ -5,7 +5,8 @@ module Dating
     def take_to_dinner; end
     def bring_home; end
 
-  private
-    attr_accessor :current_user
+    def authorize
+      authorization_check(params[:controller], params[:action], request.request_method.downcase, self)
+    end
   end
 end

data/tasks/cbac.rake

@@ -16,7 +16,7 @@
 
 # Get a privilege set that fulfills the provided conditions
   def get_privilege_set(conditions)
-    Cbac::PrivilegeSetRecord.first(:conditions => conditions)
+    Cbac::PrivilegeSetRecord.where(conditions).first
   end
 
 # Get a Hash containing all entries from the provided table

data/test/test_helper.rb

@@ -14,7 +14,7 @@ ActiveRecord::Base.establish_connection(
 )
 fixture_files = Dir.glob(File.join(File.dirname(__FILE__), "fixtures", "*.yml"))
 fixture_files.each do |filename|
-  Fixtures.create_fixtures('test/fixtures', File.basename(filename, ".*"))
+  ActiveRecord::FixtureSet.create_fixtures('test/fixtures', File.basename(filename, ".*"))
 end
 RAILS_ROOT ||=  "."
 

metadata

@@ -1,133 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: cbac
 version: !ruby/object:Gem::Version
-  version: 0.6.10
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Bert Meerman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: '1.5'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: echoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 description: Simple authorization system for Rails applications. Allows you to develop
   applications with a mixed role based authorization and a context based authorization
   model. Does not supply authentication.
 email: bertm@rubyforge.org
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
-- lib/cbac.rb
-- lib/cbac/cbac_pristine/pristine.rb
-- lib/cbac/cbac_pristine/pristine_file.rb
-- lib/cbac/cbac_pristine/pristine_permission.rb
-- lib/cbac/cbac_pristine/pristine_role.rb
-- lib/cbac/config.rb
-- lib/cbac/context_role.rb
-- lib/cbac/generic_role.rb
-- lib/cbac/known_permission.rb
-- lib/cbac/membership.rb
-- lib/cbac/permission.rb
-- lib/cbac/privilege.rb
-- lib/cbac/privilege_new_api.rb
-- lib/cbac/privilege_set.rb
-- lib/cbac/privilege_set_record.rb
-- lib/cbac/setup.rb
-- lib/cbac/version.rb
-- lib/generators/cbac/USAGE
-- lib/generators/cbac/cbac_generator.rb
-- lib/generators/cbac/copy_files/config/cbac.pristine
-- lib/generators/cbac/copy_files/config/context_roles.rb
-- lib/generators/cbac/copy_files/config/privileges.rb
-- lib/generators/cbac/copy_files/controllers/generic_roles_controller.rb
-- lib/generators/cbac/copy_files/controllers/memberships_controller.rb
-- lib/generators/cbac/copy_files/controllers/permissions_controller.rb
-- lib/generators/cbac/copy_files/controllers/upgrade_controller.rb
-- lib/generators/cbac/copy_files/fixtures/cbac_generic_roles.yml
-- lib/generators/cbac/copy_files/fixtures/cbac_memberships.yml
-- lib/generators/cbac/copy_files/fixtures/cbac_permissions.yml
-- lib/generators/cbac/copy_files/initializers/cbac_config.rb
-- lib/generators/cbac/copy_files/migrate/create_cbac_from_scratch.rb
-- lib/generators/cbac/copy_files/stylesheets/cbac.css
-- lib/generators/cbac/copy_files/tasks/cbac.rake
-- lib/generators/cbac/copy_files/views/generic_roles/index.html.erb
-- lib/generators/cbac/copy_files/views/layouts/cbac.html.erb
-- lib/generators/cbac/copy_files/views/memberships/_update.html.erb
-- lib/generators/cbac/copy_files/views/memberships/index.html.erb
-- lib/generators/cbac/copy_files/views/permissions/_update_context_role.html.erb
-- lib/generators/cbac/copy_files/views/permissions/_update_generic_role.html.erb
-- lib/generators/cbac/copy_files/views/permissions/index.html.erb
-- lib/generators/cbac/copy_files/views/upgrade/index.html.erb
-- tasks/cbac.rake
+extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".rspec"
 - Gemfile
-- Gemfile.lock
+- Manifest
 - README.rdoc
 - Rakefile
 - cbac.gemspec
@@ -199,41 +163,40 @@ files:
 - test/test_cbac_privilege.rb
 - test/test_cbac_privilege_set.rb
 - test/test_helper.rb
-- Manifest
 homepage: http://cbac.rubyforge.org
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - Cbac
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '1.2'
+      version: 1.8.11
 requirements: []
 rubyforge_project: cbac
-rubygems_version: 1.8.24
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CBAC - Simple authorization system for Rails applications.
 test_files:
-- test/test_cbac_privilege.rb
-- test/test_cbac_context_role.rb
-- test/test_helper.rb
 - test/test_cbac_actions.rb
-- test/test_cbac_privilege_set.rb
 - test/test_cbac_authorize_generic_roles.rb
+- test/test_cbac_context_role.rb
+- test/test_cbac_privilege.rb
+- test/test_cbac_privilege_set.rb
+- test/test_helper.rb

data/Gemfile.lock

@@ -1,121 +0,0 @@
-PATH
-  remote: .
-  specs:
-    cbac (0.6.5)
-      rails (>= 3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.10)
-      actionpack (= 3.2.10)
-      mail (~> 2.4.4)
-    actionpack (3.2.10)
-      activemodel (= 3.2.10)
-      activesupport (= 3.2.10)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.10)
-      activesupport (= 3.2.10)
-      builder (~> 3.0.0)
-    activerecord (3.2.10)
-      activemodel (= 3.2.10)
-      activesupport (= 3.2.10)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.10)
-      activemodel (= 3.2.10)
-      activesupport (= 3.2.10)
-    activesupport (3.2.10)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    allison (2.0.3)
-    arel (3.0.2)
-    builder (3.0.4)
-    database_cleaner (0.9.1)
-    diff-lcs (1.1.3)
-    echoe (4.6.3)
-      allison (>= 2.0.3)
-      gemcutter (>= 0.7.0)
-      rake (>= 0.9.2)
-      rdoc (>= 3.6.1)
-      rubyforge (>= 2.0.4)
-    erubis (2.7.0)
-    gemcutter (0.7.1)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.5)
-    json_pure (1.7.5)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.5.0)
-    polyglot (0.3.3)
-    rack (1.4.3)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.10)
-      actionmailer (= 3.2.10)
-      actionpack (= 3.2.10)
-      activerecord (= 3.2.10)
-      activeresource (= 3.2.10)
-      activesupport (= 3.2.10)
-      bundler (~> 1.0)
-      railties (= 3.2.10)
-    railties (3.2.10)
-      actionpack (= 3.2.10)
-      activesupport (= 3.2.10)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    rspec-rails (2.12.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  cbac!
-  database_cleaner
-  echoe
-  rspec-rails
-  sqlite3