vigilante 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTFlNzRjZTM0MDcxNjlhMzM5ZjIyNjUyZjhkZDM3MWM1ZmUwM2Q2NA==
-  data.tar.gz: !binary |-
-    MTE2ZmNjNDdkODYyODkzMDY4ZDc5ZjZhNzUzZWYxNmM1NmExNDcyNw==
+SHA1:
+  metadata.gz: f69cabfdc29648468d44e85a4452a3c82c4ff024
+  data.tar.gz: 8a754afe21479b34e05180a54a3caede5c58b0f7
 SHA512:
-  metadata.gz: !binary |-
-    NjZmYmUwZjgyNzA4NjQ0MmQ5YjRmNWE4MTA2Mzg2YzY4Y2Y3YmVlOWRlNzUz
-    YzI3MGIwN2Y3MTY0NTAxMWRjNTUwN2MxZDBmMDM2OTFkY2RiNDlkZmQ5Zjkx
-    YmExZDgxYmY4MjU5YTA5MzViMDAwYzNkODcxODU3MTgxMWE0MzQ=
-  data.tar.gz: !binary |-
-    YjIxMzliZjQ1MWNiMzk1ZTVkYTY2YzFiYzI0MDdlZDU0NWEzOWJhMTg5MjRi
-    NWU5OWI3OTQ5YWJlMDI5Mjk1OWFiZTgzOGFhYWQ4NjQ4NzcwZjU4YTQ5Njhm
-    ZmZmNmQ2NTBhZDk1MzZhYWU1Njg4OTM5Yjg3YTAwNjU3YjM1NjU=
+  metadata.gz: 729e189211a33f6454002072d14de126b0b42260d522b82608eaf1bcc6e55e9ed84fb1ccaa8fe235747245bfbe4e9cb61ba098602d9ac1b1b0fa39458bdbc7c8
+  data.tar.gz: c2fd7e79b39566351ba115c94fa1e77f87fec796bb6311109ad0d205a41b2be5ae664116b247d436e6febf0fce086194e01c4d475f6b8071e56e09985ca3ae6a

data/Gemfile

@@ -1,20 +1,18 @@
 source "http://rubygems.org"
 
-gem "rails", ">= 3.0.3"
+gem "rails", ">= 4.0.0"
 
 group :development, :test do
   gem "jeweler"
-  gem "rspec-rails", ">= 2.4.0"
+  gem "rspec-rails", "~> 2.14.0"
 end
 
 
 # test-environment gems
 group :test, :spec, :cucumber do
-  gem 'sqlite3-ruby', :require => 'sqlite3'  # needed for the rails-3-app : not really needed, but not sure how to avoid it
-  gem "rspec",                   ">= 2.4.0"
-  gem "remarkable",              ">=4.0.0.alpha4"
-  gem "remarkable_activemodel",  ">=4.0.0.alpha4"
-  gem "remarkable_activerecord", ">=4.0.0.alpha4"
+  gem 'sqlite3'
+  gem "rspec",                   "~> 2.14.0"
+  gem "shoulda-matchers"
 #  gem "capybara"
 #  gem "cucumber"
 #  gem "database_cleaner"

data/Gemfile.lock

@@ -1,41 +1,48 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     addressable (2.3.6)
-    arel (2.0.6)
-    builder (2.1.2)
+    arel (6.0.0)
+    builder (3.2.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     git (1.2.6)
@@ -47,9 +54,11 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.0)
       oauth2
+    globalid (0.3.5)
+      activesupport (>= 4.1.0)
     hashie (3.0.0)
     highline (1.6.21)
-    i18n (0.5.0)
+    i18n (0.7.0)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -61,13 +70,13 @@ GEM
       rdoc
     json (1.8.1)
     jwt (1.0.0)
-    mail (2.2.14)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
+    loofah (2.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.6.1)
     mini_portile (0.6.0)
+    minitest (5.7.0)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -79,66 +88,76 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack (1.6.1)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
-      bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (10.3.2)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
     rdoc (4.1.1)
       json (~> 1.4)
-    remarkable (4.0.0.alpha4)
-      rspec (>= 2.0.0.alpha11)
-    remarkable_activemodel (4.0.0.alpha4)
-      remarkable (~> 4.0.0.alpha4)
-      rspec (>= 2.0.0.alpha11)
-    remarkable_activerecord (4.0.0.alpha4)
-      remarkable (~> 4.0.0.alpha4)
-      remarkable_activemodel (~> 4.0.0.alpha4)
-      rspec (>= 2.0.0.alpha11)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
-    rspec-rails (2.4.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.4.0)
-    sqlite3-ruby (1.3.2)
-    thor (0.14.6)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.2)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    shoulda-matchers (2.8.0)
+      activesupport (>= 3.0.0)
+    sprockets (3.2.0)
+      rack (~> 1.0)
+    sprockets-rails (2.3.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.10)
+    thor (0.19.1)
     thread_safe (0.3.4)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   jeweler
-  rails (>= 3.0.3)
-  remarkable (>= 4.0.0.alpha4)
-  remarkable_activemodel (>= 4.0.0.alpha4)
-  remarkable_activerecord (>= 4.0.0.alpha4)
-  rspec (>= 2.4.0)
-  rspec-rails (>= 2.4.0)
-  sqlite3-ruby
+  rails (>= 4.0.0)
+  rspec (~> 2.14.0)
+  rspec-rails (~> 2.14.0)
+  shoulda-matchers
+  sqlite3
+
+BUNDLED WITH
+   1.10.3

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/{lib/db/migrate/20101028091755_create_permissions.rb → db/migrate/20150609151817_create_permissions.rb}

@@ -1,13 +1,9 @@
 class CreatePermissions < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :permissions do |t|
       t.string :allowed_action
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
-
-  def self.down
-    drop_table :permissions
-  end
 end

data/{lib/generators/vigilante/install/templates/create_abilities.rb → db/migrate/20150609151836_create_abilities.rb}

@@ -1,14 +1,12 @@
 class CreateAbilities < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :abilities do |t|
       t.string  :name
       t.string  :description
-      t.boolean :needs_extent      
-      t.timestamps
-    end
-  end
+      t.boolean :needs_extent
+      t.integer :importance
 
-  def self.down
-    drop_table :abilities
+      t.timestamps null: false
+    end
   end
 end

data/db/migrate/20150609151845_create_ability_permissions.rb

@@ -0,0 +1,10 @@
+class CreateAbilityPermissions < ActiveRecord::Migration
+  def change
+    create_table :ability_permissions do |t|
+      t.references :ability
+      t.references :permission
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20150609152056_create_authorizations.rb

@@ -0,0 +1,10 @@
+class CreateAuthorizations < ActiveRecord::Migration
+  def change
+    create_table :authorizations do |t|
+      t.references :operator, references: false
+      t.references :ability
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20150609152444_create_authorization_extents.rb

@@ -0,0 +1,11 @@
+class CreateAuthorizationExtents < ActiveRecord::Migration
+  def change
+    create_table :authorization_extents do |t|
+      t.references :authorization
+      t.string     :extent_type
+      t.integer    :extent_objid
+
+      t.timestamps null: false
+    end
+  end
+end

data/lib/generators/vigilante/install/install_generator.rb

@@ -1,9 +1,6 @@
-require 'rails/generators/migration'
-
 module Vigilante
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
-      include Rails::Generators::Migration
       source_root File.expand_path('../templates', __FILE__)
       desc "This generator installs the default config file, and glue code into application-controller; which you can edit"
 
@@ -81,26 +78,6 @@ module Vigilante
 CODE
         end
       end
-
-      def self.next_migration_number(path)
-        unless @prev_migration_nr
-          @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-        else
-          @prev_migration_nr += 1
-        end
-        @prev_migration_nr.to_s
-      end
-
-      def copy_migrations
-        migration_template "create_permissions.rb",           "db/migrate/create_permissions.rb"
-        migration_template "create_abilities.rb",             "db/migrate/create_abilities.rb"
-        migration_template "create_ability_permissions.rb",   "db/migrate/create_ability_permissions.rb"
-        migration_template "create_authorizations.rb",        "db/migrate/create_authorizations.rb"
-        migration_template "create_authorization_extents.rb", "db/migrate/create_authorization_extents.rb"
-        migration_template "add_extent_flag_to_ability.rb",   "db/migrate/add_extent_flag_to_ability.rb"
-        migration_template "add_importance_to_abilities.rb",  "db/migrate/add_importance_to_abilities.rb"
-      end
-
     end
   end
 end

data/lib/vigilante/watched_operator.rb

@@ -6,7 +6,7 @@ module Vigilante
       base.has_many :abilities, :through => :authorizations
 
       base.accepts_nested_attributes_for :authorizations, :reject_if => proc {|x| x[:ability_id].blank?}, :allow_destroy => true
-      base.attr_accessible :authorizations_attributes
+      base.attr_accessible :authorizations_attributes if base.respond_to?(:attr_accessible)
     end
 
     def add_authorization(role, extent=nil)

data/lib/vigilante.rb

@@ -43,5 +43,13 @@ module Vigilante
       end
     end
 
+    initializer :append_migrations do |app|
+      unless app.root.to_s.match root.to_s
+        config.paths["db/migrate"].expanded.each do |expanded_path|
+          app.config.paths["db/migrate"] << expanded_path
+        end
+      end
+    end
+
   end
 end

data/spec/dummy/db/seeds/initial_watchman_permissions.rb

@@ -1,25 +1,25 @@
 
 
-perm_allowed_all = Permission.find_or_create_by_allowed_action('*[all]')
-perm_read_all    = Permission.find_or_create_by_allowed_action('*[index,show]')
-perm_blog_all     = Permission.find_or_create_by_allowed_action('blogs[all]')
-perm_blog_read    = Permission.find_or_create_by_allowed_action('blogs[index,show]')
+perm_allowed_all = Permission.where(allowed_action: '*[all]').first_or_create
+perm_read_all    = Permission.where(allowed_action: '*[index,show]').first_or_create
+perm_blog_all     = Permission.where(allowed_action: 'blogs[all]').first_or_create
+perm_blog_read    = Permission.where(allowed_action: 'blogs[index,show]').first_or_create
 
-ab_all = Ability.find_or_create_by_name(:name => 'can-manage-all') do |ab|
+ab_all = Ability.where(name: 'can-manage-all').first_or_create do |ab|
   ab.permissions << perm_allowed_all
 end
 
-ab_read_all = Ability.find_or_create_by_name(:name => 'can-read-all') do |ab|
+ab_read_all = Ability.where(name: 'can-read-all').first_or_create do |ab|
   ab.permissions << perm_read_all
 end
 
-ab_blog_all = Ability.find_or_create_by_name(:name => 'can-manage-blogs') do |ab|
+ab_blog_all = Ability.where(name: 'can-manage-blogs').first_or_create do |ab|
   ab.permissions << perm_blog_all
 end
 ab_blog_all.update_attribute(:needs_extent, true)
 
 
-ab_blog_read = Ability.find_or_create_by_name(:name => 'can-see-blogs') do |ab|
+ab_blog_read = Ability.where(name: 'can-see-blogs').first_or_create do |ab|
   ab.permissions << perm_blog_read
 end
 ab_blog_read.update_attribute(:needs_extent, true)

data/spec/models/authorization_spec.rb

@@ -14,7 +14,7 @@ end
 
 
 describe Authorization do
-  it {should belong_to :operator, :class_name => ::VIGILANTE_CONFIG['current_user_class']}
+  it {should belong_to(:operator).class_name(::VIGILANTE_CONFIG['current_user_class'])}
   it {should belong_to :ability}
   it {should have_many :authorization_extents}
 

data/spec/spec_helper.rb

@@ -3,8 +3,7 @@ ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rspec/rails"
-require 'remarkable/active_record'
-
+require 'shoulda/matchers'
 #Rails.backtrace_cleaner.remove_silencers!
 #
 ### Configure capybara for integration testing

data/vigilante.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: vigilante 1.0.3 ruby lib
+# stub: vigilante 1.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "vigilante"
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Nathan Van der Auwera"]
-  s.date = "2014-06-04"
+  s.date = "2015-06-10"
   s.description = "Vigilante is a db-backed authorisation, completely configurable and dynamic; where permissions can be limited to extents."
   s.email = "nathan@dixis.com"
   s.extra_rdoc_files = [
@@ -41,21 +41,13 @@ Gem::Specification.new do |s|
     "app/views/abilities/index.html.haml",
     "app/views/abilities/new.html.haml",
     "app/views/abilities/show.html.haml",
+    "db/migrate/20150609151817_create_permissions.rb",
+    "db/migrate/20150609151836_create_abilities.rb",
+    "db/migrate/20150609151845_create_ability_permissions.rb",
+    "db/migrate/20150609152056_create_authorizations.rb",
+    "db/migrate/20150609152444_create_authorization_extents.rb",
     "lib/config/vigilante_config.yml",
-    "lib/db/migrate/20101028091755_create_permissions.rb",
-    "lib/db/migrate/20101028091859_create_abilities.rb",
-    "lib/db/migrate/20101028091927_create_ability_permissions.rb",
-    "lib/db/migrate/20101028092014_create_authorizations.rb",
-    "lib/db/migrate/20101124131334_add_extent_flag_to_ability.rb",
-    "lib/db/migrate/20101129084538_add_authorization_extent.rb",
-    "lib/db/migrate/20101129084620_remove_extent_from_authorization.rb",
-    "lib/db/migrate/20130829160700_add_importance_to_abilities.rb",
     "lib/generators/vigilante/install/install_generator.rb",
-    "lib/generators/vigilante/install/templates/create_abilities.rb",
-    "lib/generators/vigilante/install/templates/create_ability_permissions.rb",
-    "lib/generators/vigilante/install/templates/create_authorization_extents.rb",
-    "lib/generators/vigilante/install/templates/create_authorizations.rb",
-    "lib/generators/vigilante/install/templates/create_permissions.rb",
     "lib/generators/vigilante/install/templates/vigilante_config.yml",
     "lib/vigilante.rb",
     "lib/vigilante/active_record_extensions.rb",
@@ -126,25 +118,25 @@ Gem::Specification.new do |s|
     "vigilante.gemspec"
   ]
   s.homepage = "http://github.com/vigilante"
-  s.rubygems_version = "2.2.1"
+  s.rubygems_version = "2.4.6"
   s.summary = "Context-based, db-backed authorisation for your rails3 apps"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.3"])
+      s.add_runtime_dependency(%q<rails>, [">= 4.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec-rails>, [">= 2.4.0"])
+      s.add_development_dependency(%q<rspec-rails>, ["~> 2.14.0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0.3"])
+      s.add_dependency(%q<rails>, [">= 4.0.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec-rails>, [">= 2.4.0"])
+      s.add_dependency(%q<rspec-rails>, ["~> 2.14.0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0.3"])
+    s.add_dependency(%q<rails>, [">= 4.0.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec-rails>, [">= 2.4.0"])
+    s.add_dependency(%q<rspec-rails>, ["~> 2.14.0"])
   end
 end
 

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: vigilante
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Nathan Van der Auwera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.14.0
 description: Vigilante is a db-backed authorisation, completely configurable and dynamic;
   where permissions can be limited to extents.
 email: nathan@dixis.com
@@ -60,8 +60,8 @@ extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
-- .document
-- .travis.yml
+- ".document"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - History.md
@@ -83,21 +83,13 @@ files:
 - app/views/abilities/index.html.haml
 - app/views/abilities/new.html.haml
 - app/views/abilities/show.html.haml
+- db/migrate/20150609151817_create_permissions.rb
+- db/migrate/20150609151836_create_abilities.rb
+- db/migrate/20150609151845_create_ability_permissions.rb
+- db/migrate/20150609152056_create_authorizations.rb
+- db/migrate/20150609152444_create_authorization_extents.rb
 - lib/config/vigilante_config.yml
-- lib/db/migrate/20101028091755_create_permissions.rb
-- lib/db/migrate/20101028091859_create_abilities.rb
-- lib/db/migrate/20101028091927_create_ability_permissions.rb
-- lib/db/migrate/20101028092014_create_authorizations.rb
-- lib/db/migrate/20101124131334_add_extent_flag_to_ability.rb
-- lib/db/migrate/20101129084538_add_authorization_extent.rb
-- lib/db/migrate/20101129084620_remove_extent_from_authorization.rb
-- lib/db/migrate/20130829160700_add_importance_to_abilities.rb
 - lib/generators/vigilante/install/install_generator.rb
-- lib/generators/vigilante/install/templates/create_abilities.rb
-- lib/generators/vigilante/install/templates/create_ability_permissions.rb
-- lib/generators/vigilante/install/templates/create_authorization_extents.rb
-- lib/generators/vigilante/install/templates/create_authorizations.rb
-- lib/generators/vigilante/install/templates/create_permissions.rb
 - lib/generators/vigilante/install/templates/vigilante_config.yml
 - lib/vigilante.rb
 - lib/vigilante/active_record_extensions.rb
@@ -175,17 +167,17 @@ 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.4.6
 signing_key: 
 specification_version: 4
 summary: Context-based, db-backed authorisation for your rails3 apps

data/lib/db/migrate/20101028091859_create_abilities.rb

@@ -1,14 +0,0 @@
-class CreateAbilities < ActiveRecord::Migration
-  def self.up
-    create_table :abilities do |t|
-      t.string :name
-      t.string :description
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :abilities
-  end
-end

data/lib/db/migrate/20101028091927_create_ability_permissions.rb

@@ -1,14 +0,0 @@
-class CreateAbilityPermissions < ActiveRecord::Migration
-  def self.up
-    create_table :ability_permissions do |t|
-      t.integer :ability_id
-      t.integer :permission_id
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :ability_permissions
-  end
-end

data/lib/db/migrate/20101028092014_create_authorizations.rb

@@ -1,16 +0,0 @@
-class CreateAuthorizations < ActiveRecord::Migration
-  def self.up
-    create_table :authorizations do |t|
-      t.integer :operator_id
-      t.integer :ability_id
-      t.string  :extent
-      t.string  :extent_type
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :authorizations
-  end
-end

data/lib/db/migrate/20101124131334_add_extent_flag_to_ability.rb

@@ -1,9 +0,0 @@
-class AddExtentFlagToAbility < ActiveRecord::Migration
-  def self.up
-    add_column :abilities, :needs_extent, :boolean
-  end
-
-  def self.down
-    remove_column :abilities, :needs_extent, :boolean
-  end
-end

data/lib/db/migrate/20101129084538_add_authorization_extent.rb

@@ -1,15 +0,0 @@
-class AddAuthorizationExtent < ActiveRecord::Migration
-  def self.up
-    create_table :authorization_extents do |t|
-      t.integer :authorization_id
-      t.string  :extent_type
-      t.integer :extent_objid
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :authorization_extents
-  end
-end

data/lib/db/migrate/20101129084620_remove_extent_from_authorization.rb

@@ -1,11 +0,0 @@
-class RemoveExtentFromAuthorization < ActiveRecord::Migration
-  def self.up
-    remove_column :authorizations, :extent
-    remove_column :authorizations, :extent_type
-  end
-
-  def self.down
-    add_column :authorizations, :extent,      :string
-    add_column :authorizations, :extent_type, :string
-  end
-end

data/lib/db/migrate/20130829160700_add_importance_to_abilities.rb

@@ -1,7 +0,0 @@
-class CreateAbilityPermissions < ActiveRecord::Migration
-  def self.change
-    change_table :abilities do |t|
-      t.integer :importance
-    end
-  end
-end

data/lib/generators/vigilante/install/templates/create_ability_permissions.rb

@@ -1,14 +0,0 @@
-class CreateAbilityPermissions < ActiveRecord::Migration
-  def self.up
-    create_table :ability_permissions do |t|
-      t.integer :ability_id
-      t.integer :permission_id
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :ability_permissions
-  end
-end

data/lib/generators/vigilante/install/templates/create_authorization_extents.rb

@@ -1,15 +0,0 @@
-class CreateAuthorizationExtents < ActiveRecord::Migration
-  def self.up
-    create_table :authorization_extents do |t|
-      t.integer :authorization_id
-      t.string  :extent_type
-      t.integer :extent_objid
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :authorization_extents
-  end
-end

data/lib/generators/vigilante/install/templates/create_authorizations.rb

@@ -1,13 +0,0 @@
-class CreateAuthorizations < ActiveRecord::Migration
-  def self.up
-    create_table :authorizations do |t|
-      t.integer :operator_id
-      t.integer :ability_id
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :authorizations
-  end
-end

data/lib/generators/vigilante/install/templates/create_permissions.rb

@@ -1,13 +0,0 @@
-class CreatePermissions < ActiveRecord::Migration
-  def self.up
-    create_table :permissions do |t|
-      t.string :allowed_action
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :permissions
-  end
-end