arrthorizer 0.1.3 → 0.2.0

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+Gemfile
 Gemfile.lock
 InstalledFiles
 _yardoc

data/.travis.yml

@@ -4,3 +4,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+gemfile:
+  - gemfiles/Gemfile.rails.3.2
+  - gemfiles/Gemfile.rails.4.0
+  - gemfiles/Gemfile.rails.4.1

data/{Gemfile → gemfiles/Gemfile.rails.3.2}

@@ -2,9 +2,9 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2.16'
 
-# Specify your gem's dependencies in arrthorizer.gemspec
-gemspec
+gemspec path: '../'
 
 group :test do
   gem 'rake'
 end
+

data/gemfiles/Gemfile.rails.4.0

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 4.0.0'
+
+gemspec path: '../'
+
+group :test do
+  gem 'rake'
+end

data/gemfiles/Gemfile.rails.4.1

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 4.1.0.beta1'
+
+gemspec path: '../'
+
+group :test do
+  gem 'rake'
+end
+

data/lib/arrthorizer/context.rb

@@ -61,6 +61,10 @@ module Arrthorizer
       marshal_dump
     end
 
+    def eql?(other)
+      self == other
+    end
+
     def ==(other)
       to_hash == other.to_hash
     end

data/lib/arrthorizer/rails/configuration.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Arrthorizer
   module Rails
     class Configuration

data/lib/arrthorizer/rspec/shared_examples.rb

@@ -0,0 +1,12 @@
+Arrthorizer::RSpec::SharedExamples do
+  shared_examples "not persisting state in the role object" do |options = {}|
+    specify "no state is maintained in the role object" do
+      the_role = options[:role] || role
+      the_context = options[:current_context] || current_context
+
+      the_role.applies_to_user?(user, Arrthorizer::Context(the_context))
+
+      expect(the_role.instance.instance_variables).to be_empty
+    end
+  end
+end

data/lib/arrthorizer/rspec.rb

@@ -2,14 +2,18 @@ require 'rspec/expectations'
 
 module Arrthorizer
   module RSpec
-    autoload :Matchers,   'arrthorizer/rspec/matchers'
+    autoload :Matchers,       'arrthorizer/rspec/matchers'
+    autoload :SharedExamples, 'arrthorizer/rspec/shared_examples'
   end
 
-  ::RSpec.configure do |config|
-    config.include Arrthorizer::RSpec::Matchers::Roles, {
+  role_spec = {
       type: :role,
       example_group: { file_path: %r(spec/roles) }
     }
+
+  ::RSpec.configure do |config|
+    config.include Arrthorizer::RSpec::Matchers::Roles, role_spec
+    config.include Arrthorizer::RSpec::SharedExamples, role_spec
   end
 end
 

data/lib/arrthorizer/version.rb

@@ -1,3 +1,3 @@
 module Arrthorizer
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/generators/rspec/context_role/templates/role_spec.rb

@@ -5,49 +5,47 @@ describe <%= class_name %> do
 
   let(:user) { double(:user) }
 
-  let(:context_hash) { { } }
-  let(:current_context) { Arrthorizer::Context.new(context_hash) }
+  let(:current_context) { { } }
 
   describe :applies_to_user? do
     context "when some_condition" do
       before :each do
-        # TODO: Add the required elements to the context_hash to make the ContextRole apply to the user
+        # TODO: Add the required elements to the current_context
+        # to make the ContextRole apply to the user
       end
 
       it "returns true" do
         pending
 
-        expect(role.applies_to_user?(user, current_context)).to be_true
+        expect(role).to apply_to_user(user).with_context(current_context)
       end
 
       # This is an extremely important test - it safeguards against
       # persisting data between requests.
-      specify "no state is maintained in the role object" do
-        role.applies_to_user?(user, current_context)
-
-        role.instance.instance_variables.should be_empty
-      end
+      # if you want to rename the 'role' or 'current_context' variables,
+      # you can call this shared example with different options like so:
+      # it_behaves_like "not persisting state in the role object", role: some_role, current_context: some_context
+      it_behaves_like "not persisting state in the role object"
     end
 
     context "when some_other_condition" do
       before :each do
-        # TODO: Add the required elements to the context_hash
+        # TODO: Add the required elements to the current_context
         # to make the ContextRole *not* apply to the user
       end
 
       it "returns false" do
         pending
 
-        expect(role.applies_to_user?(user, current_context)).to be_false
+        expect(role).not_to apply_to_user(user).with_context(current_context)
       end
 
       # This is an extremely important test - it safeguards against
       # persisting data between requests.
-      specify "no state is maintained in the role object" do
-        role.applies_to_user?(user, current_context)
-
-        role.instance.instance_variables.should be_empty
-      end
+      # if you want to rename the 'role' or 'current_context' variables,
+      # you can call this shared example with different options like so:
+      # it_behaves_like "not persisting state in the role object", role: some_role, current_context: some_context
+      it_behaves_like "not persisting state in the role object"
     end
   end
 end

data/spec/arrthorizer_exception/inner_spec.rb

@@ -12,7 +12,7 @@ describe Arrthorizer::ArrthorizerException do
           begin
             raise Arrthorizer::ArrthorizerException
           rescue Exception => e
-            e.inner.should be inner_exception
+            expect(e.inner).to be inner_exception
           end
         end
       end

data/spec/context/merge_spec.rb

@@ -9,13 +9,13 @@ describe Arrthorizer::Context do
 
     shared_examples_for "the return value of Arrthorizer::Context#merge" do
       it "returns an Arrthorizer::Context" do
-        result.should be_an Arrthorizer::Context
+        expect(result).to be_an Arrthorizer::Context
       end
 
       describe "the returned Arrthorizer::Context" do
         it "contains the merged contents" do
           merged_hash.each_pair do |key, value|
-            result.send(key).should == value
+            expect(result.send(key)).to eql value
           end
         end
       end

data/spec/context_builder/build_spec.rb

@@ -5,7 +5,7 @@ describe Arrthorizer::ContextBuilder do
 
   describe :build do
     it "returns an Arrthorizer::Context" do
-      builder.build.should be_an Arrthorizer::Context
+      expect(builder.build).to be_an Arrthorizer::Context
     end
   end
 end

data/spec/context_spec.rb

@@ -26,14 +26,14 @@ describe Arrthorizer do
       it "returns an Arrthorizer::Context" do
         result = Arrthorizer::Context(arg)
 
-        result.should be_an Arrthorizer::Context
+        expect(result).to be_an Arrthorizer::Context
       end
 
       describe "the returned Arrthorizer::Context" do
         let(:result) { Arrthorizer::Context(arg) }
 
         specify "it contains the same key-value pairs" do
-          result.send(key).should == value
+          expect(result.send(key)).to eql(value)
         end
       end
     end
@@ -42,7 +42,7 @@ describe Arrthorizer do
       let(:param) { Arrthorizer::Context.new }
 
       specify "that context is returned unmodified" do
-        Arrthorizer::Context(param).should be(param)
+        expect(Arrthorizer::Context(param)).to be(param)
       end
     end
   end

data/spec/integration/group/initialize_spec.rb

@@ -5,7 +5,7 @@ describe Arrthorizer::Group do
     it "registers the new instance with Role" do
       role = Arrthorizer::Group.new("some new group")
 
-      Arrthorizer::Role.get(role).should == role
+      expect(Arrthorizer::Role.get(role)).to eql role
     end
   end
 end

data/spec/integration/role_spec.rb

@@ -5,7 +5,7 @@ describe Arrthorizer::Role do
     let(:context_role) { class TestRole < Arrthorizer::ContextRole; end; TestRole.instance }
 
     specify "that role is stored" do
-      Arrthorizer::Role.get(context_role.to_key).should be context_role
+      expect(Arrthorizer::Role.get(context_role.to_key)).to be context_role
     end
 
     after :each do

data/spec/integration/some_controller_spec.rb

@@ -28,7 +28,7 @@ describe SomeController do
           it "succeeds" do
             get :some_action
 
-            response.should be_success
+            expect(response).to be_success
           end
         end
 
@@ -40,7 +40,7 @@ describe SomeController do
           it "fails" do
             get :some_action
 
-            response.should be_forbidden
+            expect(response).to be_forbidden
           end
         end
 
@@ -57,7 +57,7 @@ describe SomeController do
           it "fails" do
             get :some_action
 
-            response.should be_forbidden
+            expect(response).to be_forbidden
           end
         end
       end
@@ -87,7 +87,7 @@ describe SomeController do
           it "succeeds" do
             get :some_action, some_param: allow_request
 
-            response.should be_success
+            expect(response).to be_success
           end
         end
 
@@ -97,7 +97,7 @@ describe SomeController do
           it "succeeds" do
             get :some_action, some_param: allow_request
 
-            response.should be_forbidden
+            expect(response).to be_forbidden
           end
         end
       end
@@ -114,7 +114,7 @@ describe SomeController do
           it "still fails" do
             get :some_action, some_param: allow_request
 
-            response.should be_forbidden
+            expect(response).to be_forbidden
           end
         end
       end

data/spec/permission/grant_spec.rb

@@ -5,7 +5,7 @@ describe Arrthorizer::Permission do
     let(:privilege) { Arrthorizer::Privilege.new(name: "privilege") }
     let(:role) { Arrthorizer::Group.new("role") }
 
-    it "adds the role to the privilege set" do
+    it "adds the role to the privilege" do
       Arrthorizer::Permission.grant(privilege, to: role)
 
       expect(privilege).to be_accessible_to(role)

data/spec/privilege/get_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Arrthorizer::Privilege do
   describe :get do
-    context "when the privilege set does not exist" do
+    context "when the privilege does not exist" do
       it "raises a Privilege::NotFound error" do
         expect {
           Arrthorizer::Privilege.get("computer_says_no")
@@ -10,25 +10,29 @@ describe Arrthorizer::Privilege do
       end
     end
 
-    context "when the privilege set with the given name exists" do
+    context "when the privilege with the given name exists" do
       let(:name) { "computer_says_hi" }
 
       before do
         @privilege = Arrthorizer::Privilege.new(name: name)
       end
 
-      it "returns that privilege set" do
-        Arrthorizer::Privilege.get(name).should be @privilege
+      it "returns that privilege" do
+        fetched_privilege = Arrthorizer::Privilege.get(name)
+
+        expect(fetched_privilege).to be @privilege
       end
     end
 
-    context "when the parameter is already a privilege set" do
+    context "when the parameter is already a privilege" do
       before do
         @privilege = Arrthorizer::Privilege.new(name: "irrelevant")
       end
 
-      specify "that privilege set is returned" do
-        Arrthorizer::Privilege.get(@privilege).should be @privilege
+      specify "that privilege is returned" do
+        fetched_privilege = Arrthorizer::Privilege.get(@privilege)
+
+        expect(fetched_privilege).to be @privilege
       end
     end
   end

data/spec/rails/controller_concern/arrthorizer_context_spec.rb

@@ -16,7 +16,9 @@ describe Arrthorizer::Rails::ControllerConcern do
 
   describe :arrthorizer_context do
     it "returns an Arrthorizer::Context" do
-      controller.send(:arrthorizer_context).should be_a Arrthorizer::Context
+      context = controller.send(:arrthorizer_context)
+
+      expect(context).to be_a Arrthorizer::Context
     end
   end
 end

data/spec/rails/controller_concern/integration_spec.rb

@@ -8,11 +8,11 @@ describe Arrthorizer::Rails do
 
     describe "each controller class" do
       it "responds to :prepare_context" do
-        controller_class.should respond_to :to_prepare_context
+        expect(controller_class).to respond_to :to_prepare_context
       end
 
       it "responds to :arrthorizer_configuration" do
-        controller_class.should respond_to :arrthorizer_configuration
+        expect(controller_class).to respond_to :arrthorizer_configuration
       end
     end
 
@@ -22,7 +22,7 @@ describe Arrthorizer::Rails do
       it "has a protected method called :arrthorizer_context" do
         # this method is protected to prevent exposing it
         # via default or wildcard routes
-        controller.protected_methods.should include :arrthorizer_context
+        expect(controller.protected_methods).to include :arrthorizer_context
       end
 
       context "when it has a proper configuration for context building" do
@@ -45,7 +45,9 @@ describe Arrthorizer::Rails do
           end
 
           it "uses the 'default' config to build an Arrthorizer context" do
-            controller.send(:arrthorizer_context).should == Arrthorizer::Context(injected_params)
+            context = controller.send(:arrthorizer_context)
+
+            expect(context).to eql Arrthorizer::Context(injected_params)
           end
         end
 
@@ -68,7 +70,9 @@ describe Arrthorizer::Rails do
             context_hash = injected_params.merge(action_specific_config)
             expected_context = Arrthorizer::Context(context_hash)
 
-            controller.send(:arrthorizer_context).should == expected_context
+            context = controller.send(:arrthorizer_context)
+
+            expect(context).to eql expected_context
           end
         end
       end

data/spec/spec_helper.rb

@@ -18,4 +18,8 @@ end
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrthorizer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,12 +86,14 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
-- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - arrthorizer.gemspec
 - config.ru
+- gemfiles/Gemfile.rails.3.2
+- gemfiles/Gemfile.rails.4.0
+- gemfiles/Gemfile.rails.4.1
 - lib/arrthorizer.rb
 - lib/arrthorizer/arrthorizer_exception.rb
 - lib/arrthorizer/context.rb
@@ -111,6 +113,7 @@ files:
 - lib/arrthorizer/roles.rb
 - lib/arrthorizer/rspec.rb
 - lib/arrthorizer/rspec/matchers.rb
+- lib/arrthorizer/rspec/shared_examples.rb
 - lib/arrthorizer/version.rb
 - lib/generators/arrthorizer/context_role/USAGE
 - lib/generators/arrthorizer/context_role/context_role_generator.rb
@@ -197,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4378932366296225598
+      hash: -1100063686042318668
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -206,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4378932366296225598
+      hash: -1100063686042318668
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24