consul 0.12.0 → 0.12.1

data/lib/consul/power.rb

@@ -78,14 +78,16 @@ module Consul
         "#{name.to_s.singularize}_ids"
       end
 
-      THREAD_KEY = :'Power.current'
+      def self.thread_key(klass)
+        "consul|#{klass.to_s}.current"
+      end
 
       def current
-        Thread.current[THREAD_KEY]
+        Thread.current[ClassMethods.thread_key(self)]
       end
 
       def current=(power)
-        Thread.current[THREAD_KEY] = power
+        Thread.current[ClassMethods.thread_key(self)] = power
       end
 
       def with_power(inner_power, &block)

data/lib/consul/spec/matchers.rb

@@ -18,9 +18,11 @@ module Consul
           "expected #{@controller_class} to check against power #{@expected_args.inspect} but it checked against #{@actual_args.inspect}"
         end
 
-        def negative_failure_message
+        def failure_message_when_negated
           "expected #{@controller_class} to not check against power #{@expected_args.inspect}"
         end
+        # Compatibility for older rspec versions
+        alias_method :negative_failure_message, :failure_message_when_negated
 
         def description
           description = "check against power #{@expected_args.inspect}"

data/lib/consul/version.rb

@@ -1,3 +1,3 @@
 module Consul
-  VERSION = '0.12.0'
+  VERSION = '0.12.1'
 end

data/spec/rails-3.0/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    consul (0.12.0)
+    consul (0.12.1)
       edge_rider (>= 0.3.0)
       memoizer
       rails

data/spec/rails-3.2/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    consul (0.12.0)
+    consul (0.12.1)
       edge_rider (>= 0.3.0)
       memoizer
       rails

data/spec/rails-4.1/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    consul (0.12.0)
+    consul (0.12.1)
       edge_rider (>= 0.3.0)
       memoizer
       rails

data/spec/shared/consul/power_spec.rb

@@ -468,6 +468,18 @@ describe Consul::Power do
       Power.current.should be_nil
     end
 
+    it 'should keep multiple powers separated' do
+      FrontendPower = Class.new(Power)
+      BackendPower = Class.new(Power)
+      frontend_power = FrontendPower.new
+      backend_power = BackendPower.new
+      FrontendPower.current = frontend_power
+      BackendPower.current = backend_power
+
+      FrontendPower.current.should == frontend_power
+      BackendPower.current.should == backend_power
+    end
+
   end
 
   describe '.with_power' do

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: consul
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memoizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: edge_rider
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 description: A scope-based authorization solution for Ruby on Rails.
@@ -58,8 +58,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - LICENSE
 - README.md
 - Rakefile
@@ -200,134 +200,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A scope-based authorization solution for Ruby on Rails.
-test_files:
-- spec/rails-2.3/Gemfile
-- spec/rails-2.3/Gemfile.lock
-- spec/rails-2.3/Rakefile
-- spec/rails-2.3/app_root/config/boot.rb
-- spec/rails-2.3/app_root/config/database.yml
-- spec/rails-2.3/app_root/config/environment.rb
-- spec/rails-2.3/app_root/config/environments/in_memory.rb
-- spec/rails-2.3/app_root/config/environments/mysql.rb
-- spec/rails-2.3/app_root/config/environments/postgresql.rb
-- spec/rails-2.3/app_root/config/environments/sqlite.rb
-- spec/rails-2.3/app_root/config/environments/sqlite3.rb
-- spec/rails-2.3/app_root/config/initializers/fix_missing_source_file.rb
-- spec/rails-2.3/app_root/config/preinitializer.rb
-- spec/rails-2.3/app_root/config/routes.rb
-- spec/rails-2.3/app_root/log/.gitignore
-- spec/rails-2.3/rcov.opts
-- spec/rails-2.3/spec.opts
-- spec/rails-2.3/spec/spec_helper.rb
-- spec/rails-3.0/.rspec
-- spec/rails-3.0/Gemfile
-- spec/rails-3.0/Gemfile.lock
-- spec/rails-3.0/Rakefile
-- spec/rails-3.0/app_root/.gitignore
-- spec/rails-3.0/app_root/config/application.rb
-- spec/rails-3.0/app_root/config/boot.rb
-- spec/rails-3.0/app_root/config/database.yml
-- spec/rails-3.0/app_root/config/environment.rb
-- spec/rails-3.0/app_root/config/environments/test.rb
-- spec/rails-3.0/app_root/config/initializers/backtrace_silencers.rb
-- spec/rails-3.0/app_root/config/initializers/inflections.rb
-- spec/rails-3.0/app_root/config/initializers/mime_types.rb
-- spec/rails-3.0/app_root/config/initializers/secret_token.rb
-- spec/rails-3.0/app_root/config/initializers/session_store.rb
-- spec/rails-3.0/app_root/config/routes.rb
-- spec/rails-3.0/app_root/lib/tasks/.gitkeep
-- spec/rails-3.0/app_root/log/.gitkeep
-- spec/rails-3.0/app_root/script/rails
-- spec/rails-3.0/rcov.opts
-- spec/rails-3.0/spec/spec_helper.rb
-- spec/rails-3.2/.rspec
-- spec/rails-3.2/Gemfile
-- spec/rails-3.2/Gemfile.lock
-- spec/rails-3.2/Rakefile
-- spec/rails-3.2/app_root/.gitignore
-- spec/rails-3.2/app_root/config/application.rb
-- spec/rails-3.2/app_root/config/boot.rb
-- spec/rails-3.2/app_root/config/database.yml
-- spec/rails-3.2/app_root/config/environment.rb
-- spec/rails-3.2/app_root/config/environments/test.rb
-- spec/rails-3.2/app_root/config/initializers/backtrace_silencers.rb
-- spec/rails-3.2/app_root/config/initializers/inflections.rb
-- spec/rails-3.2/app_root/config/initializers/mime_types.rb
-- spec/rails-3.2/app_root/config/initializers/secret_token.rb
-- spec/rails-3.2/app_root/config/initializers/session_store.rb
-- spec/rails-3.2/app_root/config/routes.rb
-- spec/rails-3.2/app_root/log/.gitignore
-- spec/rails-3.2/rcov.opts
-- spec/rails-3.2/spec/spec_helper.rb
-- spec/rails-4.1/.rspec
-- spec/rails-4.1/Gemfile
-- spec/rails-4.1/Gemfile.lock
-- spec/rails-4.1/Rakefile
-- spec/rails-4.1/app_root/.gitignore
-- spec/rails-4.1/app_root/bin/bundle
-- spec/rails-4.1/app_root/bin/rails
-- spec/rails-4.1/app_root/bin/rake
-- spec/rails-4.1/app_root/bin/spring
-- spec/rails-4.1/app_root/config/application.rb
-- spec/rails-4.1/app_root/config/boot.rb
-- spec/rails-4.1/app_root/config/database.yml
-- spec/rails-4.1/app_root/config/environment.rb
-- spec/rails-4.1/app_root/config/environments/development.rb
-- spec/rails-4.1/app_root/config/environments/production.rb
-- spec/rails-4.1/app_root/config/environments/test.rb
-- spec/rails-4.1/app_root/config/initializers/backtrace_silencers.rb
-- spec/rails-4.1/app_root/config/initializers/cookies_serializer.rb
-- spec/rails-4.1/app_root/config/initializers/filter_parameter_logging.rb
-- spec/rails-4.1/app_root/config/initializers/inflections.rb
-- spec/rails-4.1/app_root/config/initializers/mime_types.rb
-- spec/rails-4.1/app_root/config/initializers/session_store.rb
-- spec/rails-4.1/app_root/config/initializers/wrap_parameters.rb
-- spec/rails-4.1/app_root/config/locales/en.yml
-- spec/rails-4.1/app_root/config/routes.rb
-- spec/rails-4.1/app_root/config/secrets.yml
-- spec/rails-4.1/log/test.log
-- spec/rails-4.1/rcov.opts
-- spec/rails-4.1/spec/spec_helper.rb
-- spec/shared/app_root/app/controllers/application_controller.rb
-- spec/shared/app_root/app/controllers/cakes_controller.rb
-- spec/shared/app_root/app/controllers/client_notes_controller.rb
-- spec/shared/app_root/app/controllers/colors_controller.rb
-- spec/shared/app_root/app/controllers/dashboards_controller.rb
-- spec/shared/app_root/app/controllers/risks_controller.rb
-- spec/shared/app_root/app/controllers/songs_controller.rb
-- spec/shared/app_root/app/controllers/users_controller.rb
-- spec/shared/app_root/app/models/client.rb
-- spec/shared/app_root/app/models/deal.rb
-- spec/shared/app_root/app/models/deal/item.rb
-- spec/shared/app_root/app/models/note.rb
-- spec/shared/app_root/app/models/power.rb
-- spec/shared/app_root/app/models/song.rb
-- spec/shared/app_root/app/models/user.rb
-- spec/shared/app_root/db/migrate/001_create_users.rb
-- spec/shared/app_root/db/migrate/002_create_clients.rb
-- spec/shared/app_root/db/migrate/003_create_notes.rb
-- spec/shared/app_root/db/migrate/004_create_songs.rb
-- spec/shared/consul/active_record_spec.rb
-- spec/shared/consul/controllers/cakes_controller_spec.rb
-- spec/shared/consul/controllers/client_notes_controller_spec.rb
-- spec/shared/consul/controllers/colors_controller_spec.rb
-- spec/shared/consul/controllers/dashboards_controller_spec.rb
-- spec/shared/consul/controllers/risks_controller_spec.rb
-- spec/shared/consul/controllers/songs_controller_spec.rb
-- spec/shared/consul/controllers/users_controller_spec.rb
-- spec/shared/consul/power_spec.rb
-- spec/shared/consul/util_spec.rb
+test_files: []