grant 2.1.0 → 3.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6a9b86c1e0b9860495eefdb5fc8596b14bb4ceca
+  data.tar.gz: 2645c84a2d13f358efc4d47dbc9060a5ea7ddec1
+SHA512:
+  metadata.gz: e2fa6522ad720325ea322b58de103aa818ccfbee3375b4f241bf8d0c95237f9280ec8491e0e7870ce96189bab92be4ddb107d2780486773184239960b8c13a1a
+  data.tar.gz: 49a613c5752e38303ce1f08cef27092916d8c23822f0c5b040c27df7a36d73f7480287985fc4a12aceb6000829b9266f86482a3949d6c2374c731a2d2101b409

data/.ruby-gemset

@@ -0,0 +1 @@
+grant

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.2.3

data/README.rdoc

@@ -107,4 +107,8 @@ you can include the Grant::Status module for help.
     end
   end
 
-Copyright (c) 2011 Near Infinity Corporation, released under the MIT license
+= License
+
+Grant is released under the MIT license.
+
+Copyright (c) 2011 Near Infinity. http://www.nearinfinity.com

data/grant.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Grant::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jeff Kunkle", "Matt Wizeman"]
-  s.homepage    = "http://github.com/nearinfinity/grant"
+  s.homepage    = "http://github.com/AnalyticsMediaGroup/grant"
   s.summary     = "Conscious security constraints for your ActiveRecord model objects"
   s.description = "Grant is a Ruby gem and Rails plugin that forces you to make explicit security decisions about the operations performed on your ActiveRecord models."
   s.license     = "MIT"
@@ -17,9 +17,8 @@ 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('activerecord', '> 3.0.0')
+  s.add_dependency('activerecord', '>= 4.0.0')
 
   s.add_development_dependency('rspec', '2.5.0')
-  s.add_development_dependency('sqlite3-ruby', '1.3.3')
-  s.add_development_dependency('activerecord', '> 3.0.0')
+  s.add_development_dependency('sqlite3', '1.3.9')
 end

data/lib/grant.rb

@@ -2,11 +2,6 @@ require 'active_record'
 require 'grant/grantable'
 require 'grant/error'
 
-# TODO: Remove these two requires when backwards compatibility with grant 2.0.0
-# is no longer necessary
-require 'grant/integration'
-require 'grant/model_security'
-
 ActiveRecord::Base.send :include, Grant::Grantable
 
 if defined?(ActionController) and defined?(ActionController::Base)

data/lib/grant/status.rb

@@ -1,20 +1,84 @@
 module Grant
   module Status
+    #
+    # Thread dependant status
+    #
+    module MonoThread
+      module InstanceMethods 
+        #
+        # 1 status per thread
+        #
+        def is_grant_disabled
+          Thread.current[:grant_disabled]
+        end
 
+        def is_grant_disabled= value
+          Thread.current[:grant_disabled] = value
+        end
+      end
+
+      def self.included receiver
+        receiver.send :include, InstanceMethods
+        receiver.module_eval do
+          module_function :is_grant_disabled, :is_grant_disabled=
+        end
+      end
+    end
+
+    #
+    # Multi thread status
+    #
+    module MultiThread
+      module InstanceMethods 
+        def is_grant_disabled
+          @@grant_disabled ||= false
+        end
+
+        def is_grant_disabled= value
+          @@grant_disabled = value
+        end
+      end
+
+      def self.included receiver
+        receiver.send :include, InstanceMethods
+        receiver.module_eval do
+          module_function :is_grant_disabled, :is_grant_disabled=
+        end
+      end
+    end
+
+    include MonoThread
+
+    #
+    # Change to global status (use ONLY in test env)
+    #
+    def switch_to_multithread
+      Grant::Status.send :include, MultiThread
+    end
+    def switch_to_monothread
+      Grant::Status.send :include, MonoThread
+    end
+
+    #
+    # Status
+    #
     def grant_disabled?
-      Thread.current[:grant_disabled] == true
+      is_grant_disabled == true
     end
 
     def grant_enabled?
-      Thread.current[:grant_disabled] == false
+      ! grant_disabled?
     end
 
+    #
+    # Getters/Setters
+    #
     def disable_grant
-      Thread.current[:grant_disabled] = true
+      self.is_grant_disabled = true
     end
 
     def enable_grant
-      Thread.current[:grant_disabled] = false
+      self.is_grant_disabled = false
     end
 
     def without_grant
@@ -56,6 +120,8 @@ module Grant
       result
     end
 
-    module_function :grant_enabled?, :grant_disabled?, :disable_grant, :enable_grant, :without_grant, :with_grant, :do_as
+    module_function :grant_enabled?, :grant_disabled?, :disable_grant, :enable_grant,
+      :without_grant, :with_grant, :do_as, :switch_to_multithread,
+      :switch_to_monothread
   end
 end

data/lib/grant/version.rb

@@ -1,3 +1,3 @@
 module Grant
-  VERSION = "2.1.0"
+  VERSION = "3.0.0"
 end

data/run_test.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -e
+
+rubies=("ruby-1.9.3" "ruby-2.0.0" "ruby-2.1.3" "ruby-2.2.3")
+for i in "${rubies[@]}"
+do
+  echo "====================================================="
+  echo "$i: Start Test"
+  echo "====================================================="
+  rvm $i exec bundle
+  rvm $i exec bundle exec rspec spec
+  echo "====================================================="
+  echo "$i: End Test"
+  echo "====================================================="
+done

data/spec/grantable_spec.rb

@@ -90,7 +90,7 @@ describe Grant::Grantable do
     end
 
     class SubModel < Model
-      set_table_name 'models'
+      self.table_name = 'models'
       grant(:update) { true }
       grant(:destroy) { false }
     end

data/spec/status_spec.rb

@@ -2,6 +2,10 @@ require File.dirname(__FILE__) + '/spec_helper'
 require 'grant/status'
 
 describe Grant::Status do
+  it "should be enabled by default" do
+    Grant::Status.grant_enabled?.should be_true  
+  end
+
   it "should be enabled if set to enabled" do
     obj = Class.new do
       include Grant::Status
@@ -23,4 +27,48 @@ describe Grant::Status do
     Grant::Status.grant_enabled?.should be_false
     Grant::Status.grant_disabled?.should be_true
   end
+
+  describe "threads" do
+    context "when mono thread" do
+      before { Grant::Status.disable_grant }
+      after { Grant::Status.enable_grant }
+
+      it "should be disabled in current thread" do
+        Grant::Status.grant_enabled?.should be_false
+      end
+
+      it "should still be enable in another thread" do |variable|
+        t = Thread.new do
+          Grant::Status.grant_enabled?.should be_true
+        end
+        t.join
+      end
+    end
+
+    context "when multithread" do
+      before do
+        Grant::Status.switch_to_multithread
+        Grant::Status.disable_grant
+      end
+      after do
+        Grant::Status.enable_grant
+        Grant::Status.switch_to_monothread
+      end
+
+      it "should have set class variable" do
+        Grant::Status.class_variable_get(:@@grant_disabled).should be_true
+      end
+
+      it "should be disabled in current thread" do
+        Grant::Status.grant_enabled?.should be_false
+      end
+
+      it "should also be disabled in another thread" do |variable|
+        t = Thread.new do
+          Grant::Status.grant_enabled?.should be_false
+        end
+        t.join
+      end
+    end
+  end
 end

metadata

@@ -1,97 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: grant
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 0
-  version: 2.1.0
+version: !ruby/object:Gem::Version
+  version: 3.0.0
 platform: ruby
-authors: 
+authors:
 - Jeff Kunkle
 - Matt Wizeman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-05 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-01-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
-        version: 1.3.3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.9
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :development
-  version_requirements: *id004
-description: Grant is a Ruby gem and Rails plugin that forces you to make explicit security decisions about the operations performed on your ActiveRecord models.
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.9
+description: Grant is a Ruby gem and Rails plugin that forces you to make explicit
+  security decisions about the operations performed on your ActiveRecord models.
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- ".ruby-gemset"
+- ".ruby-version"
 - CHANGELOG.md
 - LICENSE
 - README.rdoc
@@ -102,12 +72,11 @@ files:
 - lib/grant/error.rb
 - lib/grant/grantable.rb
 - lib/grant/grantor.rb
-- lib/grant/integration.rb
-- lib/grant/model_security.rb
 - lib/grant/spec_helpers.rb
 - lib/grant/status.rb
 - lib/grant/user.rb
 - lib/grant/version.rb
+- run_test.sh
 - spec/config_spec.rb
 - spec/error_spec.rb
 - spec/grantable_spec.rb
@@ -117,41 +86,31 @@ files:
 - spec/support/db_setup.rb
 - spec/support/transactional_specs.rb
 - spec/user_spec.rb
-has_rdoc: true
-homepage: http://github.com/nearinfinity/grant
-licenses: 
+homepage: http://github.com/AnalyticsMediaGroup/grant
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Conscious security constraints for your ActiveRecord model objects
-test_files: 
+test_files:
 - spec/config_spec.rb
 - spec/error_spec.rb
 - spec/grantable_spec.rb

data/lib/grant/integration.rb

@@ -1,5 +0,0 @@
-# TODO: Remove this file when backwards compatibility with grant 2.0.0
-# is no longer necessary
-module Grant
-  Integration = Grant::Status
-end

data/lib/grant/model_security.rb

@@ -1,7 +0,0 @@
-# TODO: Remove this file when backwards compatibility with grant 2.0.0
-# is no longer necessary
-require 'grant/grantable'
-
-module Grant
-  ModelSecurity = Grant::Grantable
-end