cancancan 1.7.1 → 1.8.0

data/spec/spec_helper.rb

@@ -3,79 +3,24 @@ require 'bundler/setup'
 
 Bundler.require
 
-require 'supermodel'
 require 'matchers'
 require 'cancan/matchers'
-require 'i18n'
 
 # I8n setting to fix deprecation.
-# Seting it to true will skip the locale validation (Rails 3 behavior).
-# Seting it to false will raise an error if an invalid locale is passed (Rails 4 behavior).
-I18n.enforce_available_locales = false
+I18n.enforce_available_locales = false if defined? I18n
+
+# Add support to load paths
+$:.unshift File.expand_path('../support', __FILE__)
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
   config.mock_with :rspec
+  config.order = 'random'
 
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
-
-  config.before(:each) do
-    Project.delete_all
-    Category.delete_all
-  end
-end
-
-# Working around CVE-2012-5664 requires us to convert all ID params
-# to strings. Let's switch to using string IDs in tests, otherwise
-# SuperModel and/or RR will fail (as strings are not fixnums).
-
-module SuperModel
-  class Base
-    def generate_id
-      object_id.to_s
-    end
-  end
-end
-
-class Ability
-  include CanCan::Ability
-
-  def initialize(user)
-  end
-end
-
-class Category < SuperModel::Base
-  has_many :projects
-end
-
-module Sub
-  class Project < SuperModel::Base
-    belongs_to :category
-    attr_accessor :category # why doesn't SuperModel do this automatically?
-
-    def self.respond_to?(method, include_private = false)
-      if method.to_s == "find_by_name!" # hack to simulate ActiveRecord
-        true
-      else
-        super
-      end
-    end
-  end
-end
-
-class Project < SuperModel::Base
-  belongs_to :category
-  attr_accessor :category # why doesn't SuperModel do this automatically?
-
-  def self.respond_to?(method, include_private = false)
-    if method.to_s == "find_by_name!" # hack to simulate ActiveRecord
-      true
-    else
-      super
-    end
-  end
 end

data/spec/support/ability.rb

@@ -0,0 +1,7 @@
+class Ability
+  include CanCan::Ability
+
+  def initialize(user)
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cancancan
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Bryan Rite
@@ -9,50 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: supermodel
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 10.1.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: 1.0.0
 description: Continuation of the simple authorization solution for Rails which is
   decoupled from user roles. All permissions are stored in a single location.
 email: bryan@bryanrite.com
@@ -71,9 +85,12 @@ files:
 - README.rdoc
 - Rakefile
 - cancancan.gemspec
-- gemfiles/rails_3.0.gemfile
-- gemfiles/rails_3.0_datamapper.gemfile
-- gemfiles/rails_3.0_mongoid.gemfile
+- gemfiles/activerecord_3.0.gemfile
+- gemfiles/activerecord_3.1.gemfile
+- gemfiles/activerecord_3.2.gemfile
+- gemfiles/datamapper_1.x.gemfile
+- gemfiles/mongoid_2.x.gemfile
+- gemfiles/sequel_3.x.gemfile
 - init.rb
 - lib/cancan.rb
 - lib/cancan/ability.rb
@@ -87,6 +104,7 @@ files:
 - lib/cancan/model_adapters/data_mapper_adapter.rb
 - lib/cancan/model_adapters/default_adapter.rb
 - lib/cancan/model_adapters/mongoid_adapter.rb
+- lib/cancan/model_adapters/sequel_adapter.rb
 - lib/cancan/model_additions.rb
 - lib/cancan/rule.rb
 - lib/cancan/version.rb
@@ -105,10 +123,12 @@ files:
 - spec/cancan/model_adapters/data_mapper_adapter_spec.rb
 - spec/cancan/model_adapters/default_adapter_spec.rb
 - spec/cancan/model_adapters/mongoid_adapter_spec.rb
+- spec/cancan/model_adapters/sequel_adapter_spec.rb
 - spec/cancan/rule_spec.rb
 - spec/matchers.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/ability.rb
 homepage: https://github.com/CanCanCommunity/cancancan
 licenses:
 - MIT
@@ -135,9 +155,12 @@ specification_version: 4
 summary: Simple authorization solution for Rails.
 test_files:
 - Appraisals
-- gemfiles/rails_3.0.gemfile
-- gemfiles/rails_3.0_datamapper.gemfile
-- gemfiles/rails_3.0_mongoid.gemfile
+- gemfiles/activerecord_3.0.gemfile
+- gemfiles/activerecord_3.1.gemfile
+- gemfiles/activerecord_3.2.gemfile
+- gemfiles/datamapper_1.x.gemfile
+- gemfiles/mongoid_2.x.gemfile
+- gemfiles/sequel_3.x.gemfile
 - spec/README.rdoc
 - spec/cancan/ability_spec.rb
 - spec/cancan/controller_additions_spec.rb
@@ -149,7 +172,9 @@ test_files:
 - spec/cancan/model_adapters/data_mapper_adapter_spec.rb
 - spec/cancan/model_adapters/default_adapter_spec.rb
 - spec/cancan/model_adapters/mongoid_adapter_spec.rb
+- spec/cancan/model_adapters/sequel_adapter_spec.rb
 - spec/cancan/rule_spec.rb
 - spec/matchers.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/ability.rb