canard 0.2.4 → 0.2.5

data/test/schema.rb

@@ -0,0 +1,12 @@
+ActiveRecord::Schema.define :version => 0 do
+
+  create_table :users, :force => true do |t|
+    t.string     :roles_mask
+  end
+  create_table :user_without_roles, :force => true do |t|
+    t.string     :roles_mask
+  end
+  create_table :user_without_role_masks, :force => true do |t|
+  end
+
+end

data/test/support/reloadable.rb

@@ -0,0 +1,22 @@
+module MiniTest
+  class Unit
+    class TestCase
+    
+    def teardown
+      Object.send(:remove_const, 'Canard') if Object.const_defined?('Canard')
+      GC.start
+    end
+    
+    def setup
+      [ 'canard/abilities.rb',
+        'canard/user_model.rb',
+        "canard/find_abilities.rb"
+      ].each do |file|
+        file_path = File.join(File.expand_path('../../../lib', __FILE__), file)
+        load file_path
+      end
+    end
+  end
+
+  end
+end

data/test/test_helper.rb

@@ -1,87 +1,18 @@
 require 'rubygems'
-gem     'minitest'
-require 'active_record'
+gem 'minitest'
 require 'minitest/autorun'
-require 'pathname'
 
-module Rails
-  
-  module VERSION
-    MAJOR = 0
-  end
-  
-  def self.root
-    Pathname.new(File.expand_path('..', __FILE__))
-  end
-end
+# Configure Rails Environment
+ENV["RAILS_ENV"] = "test"
 
-module MiniTestWithHooks
-  class Unit < MiniTest::Unit
-    def before_suites
-    end
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require "rails/test_help"
 
-    def after_suites
-    end
+Rails.backtrace_cleaner.remove_silencers!
 
-    def _run_suites(suites, type)
-      begin
-        before_suites
-        super(suites, type)
-      ensure
-        after_suites
-      end
-    end
-  end
-end
+# Load support files (reloadable reloads canard)
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-module MiniTestWithActiveRecord
-  class Unit < MiniTestWithHooks::Unit
-
-    def before_suites
-      super
-      ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-      ActiveRecord::Migration.verbose = false
-      
-      @migration  = Class.new(ActiveRecord::Migration) do
-
-        def change
-          create_table :users, :force => true do |t|
-            t.string     :roles_mask
-          end
-          create_table :user_without_roles, :force => true do |t|
-            t.string     :roles_mask
-          end
-          create_table :user_without_role_masks, :force => true do |t|
-          end
-        end
-
-      end
-      
-      @migration.new.migrate(:up)
-    end
-
-    def after_suites
-      @migration.new.migrate(:down)
-      super
-    end
-  end
-end
-
-MiniTestWithActiveRecord::Unit::TestCase.add_teardown_hook do
-  Object.send(:remove_const, 'Canard') if Object.const_defined?('Canard')
-  GC.start
-end
-
-MiniTestWithActiveRecord::Unit::TestCase.add_setup_hook do
-  [ 'canard/abilities.rb',
-    'canard/user_model.rb',
-    "canard/find_abilities.rb"
-  ].each do |file|
-    file_path = File.join(File.expand_path('../../lib', __FILE__), file)
-    load file_path
-  end
-  
-end
-
-MiniTest::Unit.runner = MiniTestWithActiveRecord::Unit.new
+ActiveRecord::Migration.verbose = false
+load(File.dirname(__FILE__) + '/schema.rb')
 

data/test/user_model_test.rb

@@ -5,9 +5,6 @@ describe Canard::UserModel do
   
   before do
     Canard.abilities_path = 'abilities'
-    require 'models/user'
-    require 'models/user_without_role'
-    require 'models/user_without_role_mask'
   end
   
   # Sanity test

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canard
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000Z
+date: 2012-04-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2156040520 !ruby/object:Gem::Requirement
+  requirement: &2152360020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2156040520
+  version_requirements: *2152360020
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156040060 !ruby/object:Gem::Requirement
+  requirement: &2152359280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156040060
+  version_requirements: *2152359280
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &2156039580 !ruby/object:Gem::Requirement
+  name: rails
+  requirement: &2152358360 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.3
   type: :development
   prerelease: false
-  version_requirements: *2156039580
+  version_requirements: *2152358360
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156038960 !ruby/object:Gem::Requirement
+  requirement: &2152357560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156038960
+  version_requirements: *2152357560
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2156038380 !ruby/object:Gem::Requirement
+  requirement: &2152356620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156038380
+  version_requirements: *2152356620
 - !ruby/object:Gem::Dependency
   name: role_model
-  requirement: &2156037880 !ruby/object:Gem::Requirement
+  requirement: &2152355660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156037880
+  version_requirements: *2152355660
 description: Wraps CanCan and RoleModel up to make role based authorisation really
   easy in Rails 3.x.
 email:
@@ -107,12 +107,31 @@ files:
 - lib/generators/rspec/ability/templates/abilities_spec.rb.erb
 - test/abilities/admins.rb
 - test/abilities_test.rb
-- test/app/abilities/moderators.rb
 - test/canard_test.rb
+- test/dummy/Rakefile
+- test/dummy/app/abilities/moderators.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/models/user.rb
+- test/dummy/app/models/user_without_role.rb
+- test/dummy/app/models/user_without_role_mask.rb
+- test/dummy/config.ru
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
+- test/dummy/db/test.sqlite3
+- test/dummy/log/.gitkeep
+- test/dummy/log/test.log
 - test/find_abilities_test.rb
-- test/models/user.rb
-- test/models/user_without_role.rb
-- test/models/user_without_role_mask.rb
+- test/schema.rb
+- test/support/reloadable.rb
 - test/test_helper.rb
 - test/user_model_test.rb
 homepage: https://github.com/james2m/canard
@@ -142,11 +161,30 @@ summary: Adds role based authorisation to Rails by combining RoleModel and CanCa
 test_files:
 - test/abilities/admins.rb
 - test/abilities_test.rb
-- test/app/abilities/moderators.rb
 - test/canard_test.rb
+- test/dummy/Rakefile
+- test/dummy/app/abilities/moderators.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/models/user.rb
+- test/dummy/app/models/user_without_role.rb
+- test/dummy/app/models/user_without_role_mask.rb
+- test/dummy/config.ru
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
+- test/dummy/db/test.sqlite3
+- test/dummy/log/.gitkeep
+- test/dummy/log/test.log
 - test/find_abilities_test.rb
-- test/models/user.rb
-- test/models/user_without_role.rb
-- test/models/user_without_role_mask.rb
+- test/schema.rb
+- test/support/reloadable.rb
 - test/test_helper.rb
 - test/user_model_test.rb