consul 0.11.2 → 0.12.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NGJjOTg0MzEzODg3Mzc2Mjk1OGIyYzhmNTRlMDgwYzczZDFjNGY5Mw==
+  data.tar.gz: !binary |-
+    NjEwOTM0ZjMwNzllMWQxMTgzNzZmMDAwZWQ3ODk0NTA0NTU0N2U3YQ==
+SHA512:
+  metadata.gz: !binary |-
+    NmY4NzcxNDM2YTFmOGQxOGJhNzY2Mzc1M2UyZWFhNzMzZWEwNzVjNjNjYjU5
+    ODg0NTUzNmE4MmI3NzM5YWNmMjkzMjI3NjUzMzA3N2U5ZTZlNjM4YmE1OWJk
+    YTg5NGQ5NjNlYjM3Y2RhODZiZTUyZDNlZWIwZjQ3OGYyNTI2MWM=
+  data.tar.gz: !binary |-
+    Nzg4Nzc2NGU2Y2FlZjA5N2Y1YzBmMGYyZjhlMjIxZTU0ZDgyOGQ3YjZkNTM5
+    MWZkNDA0OTJhNjVjZTVkMTZlM2E0MDg4NWIwODFkZjQ5MGJiYzE4NWEyYTA2
+    ZjQ2NjJjMjc2N2RhZGE1NmZiZWVlZDdmYmY4NmIyOGRmMzQ3Mjg=

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - "1.8.7"
   - "1.9.3"
+  - "2.1.0"
   - ree
 before_script: rake travis_ci:prepare
 script: rake all:bundle all:spec

data/README.md

@@ -1,13 +1,15 @@
-Consul - A next gen authorization solution
+Consul — A next gen authorization solution
 ==========================================
 
 [![Build Status](https://secure.travis-ci.org/makandra/consul.png?branch=master)](https://travis-ci.org/makandra/consul) [![Code Climate](https://codeclimate.com/github/makandra/consul.png)](https://codeclimate.com/github/makandra/consul)
 
-Consul is a authorization solution for Ruby on Rails where you describe *sets of accessible things* to control what a user can see or edit.
+Consul is an authorization solution for Ruby on Rails where you describe *sets of accessible things* to control what a user can see or edit.
 
 We have used Consul in combination with [assignable_values](https://github.com/makandra/assignable_values) to solve a variety of authorization requirements ranging from boring to bizarre.
 Also see our crash course video: [Solving bizare authorization requirements with Rails](http://bizarre-authorization.talks.makandra.com/).
 
+Consul is tested with Rails 2.3, 3.0, 3.2 and 4.1 on Ruby 1.8.7, 1.9.3 and 2.1.0.
+
 
 Describing access to your application
 -------------------------------------
@@ -82,7 +84,7 @@ Or you can ask if the power is given (meaning it's not `nil`):
 
 Or you can raise an error unless a power its given, e.g. to guard access into a controller action:
 
-    power.notes? # => returns true if Power#notes returns a scope, even if it's empty
+    power.notes! # => raises Consul::Powerless unless Power#notes returns a scope (even if it's empty)
 
 Or you ask whether a given record is included in its scope (can be [optimized](#optimizing-record-checks-for-scope-powers)):
 
@@ -361,7 +363,7 @@ You can use `:except` and `:only` options like in before filters.
 You can also map different powers to different actions:
 
     class NotesController < ApplicationController
-      power :notes, :map => { [:edit, :update, :destroy] => :changable_notes }
+      power :notes, :map => { [:edit, :update, :destroy] => :changeable_notes }
     end
 
 Actions that are not listed in `:map` will get the default action `:notes`.

data/Rakefile

@@ -7,11 +7,13 @@ task :default => 'all:spec'
 namespace :travis_ci do
 
   desc 'Things to do before Travis CI begins'
-  task :prepare => :slimgems
+  task :prepare => [:compatible_rubygems]
 
-  desc 'Install slimgems'
-  task :slimgems do
-    system('gem install slimgems')
+  desc 'Ensure compatible Rubygems version for Ruby 1.8'
+  task :compatible_rubygems do
+    if RUBY_VERSION == '1.8.7'
+      system "rvm rubygems latest-1.8 --force"
+    end
   end
 
 end
@@ -42,7 +44,14 @@ end
 def for_each_directory_of(path, &block)
   Dir[path].sort.each do |rakefile|
     directory = File.dirname(rakefile)
-    puts '', "\033[44m#{directory}\033[0m", ''
-    block.call(directory)
+    puts '', "\033[4;34m# #{directory}\033[0m", '' # blue underline
+    
+    if directory.include?('rails-2.3') and RUBY_VERSION != '1.8.7'
+      puts 'Skipping - Rails 2.3 requires Ruby 1.8.7'
+    elsif directory.include?('rails-4.1') and RUBY_VERSION == '1.8.7'
+      puts 'Skipping - Rails 4.1 does not support Ruby 1.8'
+    else
+      block.call(directory)
+    end
   end
 end

data/consul.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency('memoizer')
   s.add_dependency('rails')
-  s.add_dependency('edge_rider')
+  s.add_dependency('edge_rider', '>= 0.3.0')
 end

data/lib/consul/util.rb

@@ -22,11 +22,27 @@ module Consul
       value.is_a?(Array) || value.is_a?(Set)
     end
 
-    def define_scope(klass, name, options)
-      if Rails.version.to_i < 3
-        klass.send(:named_scope, name, options)
+    def define_scope(klass, name, lambda)
+      if Rails.version.to_i < 4 # Rails 2/3
+        scope_definition = Rails.version.to_i < 3 ? :named_scope : :scope
+        klass.send scope_definition, name, lambda
+      else
+        klass.send :scope, name, lambda { |*args|
+          options = lambda.call(*args)
+          klass.scoped(options.slice *EdgeRider::Scoped::VALID_FIND_OPTIONS)
+        }
+      end      
+    end
+    
+    # This method does not support dynamic default scopes via lambdas
+    # (as does #define_scope), because it is currently not required.
+    def define_default_scope(klass, conditions)
+      if Rails.version.to_i < 4 # Rails 2/3
+        klass.send :default_scope, conditions
       else
-        klass.send(:scope, name, options)
+        klass.send :default_scope do
+          klass.scoped(conditions)
+        end
       end
     end
 

data/lib/consul/version.rb

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

data/spec/rails-2.3/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../..
   specs:
-    consul (0.11.1)
-      edge_rider
+    consul (0.12.0)
+      edge_rider (>= 0.3.0)
       memoizer
       rails
 
@@ -21,7 +21,7 @@ GEM
     activesupport (2.3.18)
     assignable_values (0.7.1)
       activerecord
-    edge_rider (0.2.3)
+    edge_rider (0.3.0)
       activerecord
     hoe (2.8.0)
       rake (>= 0.8.7)

data/spec/rails-3.0/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../..
   specs:
-    consul (0.11.1)
-      edge_rider
+    consul (0.12.0)
+      edge_rider (>= 0.3.0)
       memoizer
       rails
 
@@ -43,7 +43,7 @@ GEM
       mocha (~> 0.13.2)
     builder (2.1.2)
     diff-lcs (1.2.4)
-    edge_rider (0.2.3)
+    edge_rider (0.3.0)
       activerecord
     erubis (2.6.6)
       abstract (>= 1.0.0)

data/spec/rails-3.2/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../..
   specs:
-    consul (0.11.1)
-      edge_rider
+    consul (0.12.0)
+      edge_rider (>= 0.3.0)
       memoizer
       rails
 
@@ -43,7 +43,7 @@ GEM
       mocha (~> 0.13.2)
     builder (3.0.4)
     diff-lcs (1.2.4)
-    edge_rider (0.2.3)
+    edge_rider (0.3.0)
       activerecord
     erubis (2.7.0)
     hike (1.2.2)

data/spec/rails-4.1/.rspec

@@ -0,0 +1,2 @@
+--colour
+--format progress

data/spec/rails-4.1/Gemfile

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gem 'minitest' # fix MiniTest deprecation warnings
+gem 'assignable_values'
+gem 'rails', '4.1.0'
+gem 'rspec'
+gem 'rspec-rails'
+gem 'shoulda-matchers'
+gem 'sqlite3'
+gem 'rspec_candy'
+
+gem 'consul', :path => '../..'

data/spec/rails-4.1/Gemfile.lock

@@ -0,0 +1,134 @@
+PATH
+  remote: ../..
+  specs:
+    consul (0.12.0)
+      edge_rider (>= 0.3.0)
+      memoizer
+      rails
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.1.0)
+      actionpack (= 4.1.0)
+      actionview (= 4.1.0)
+      mail (~> 2.5.4)
+    actionpack (4.1.0)
+      actionview (= 4.1.0)
+      activesupport (= 4.1.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+    activerecord (4.1.0)
+      activemodel (= 4.1.0)
+      activesupport (= 4.1.0)
+      arel (~> 5.0.0)
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    assignable_values (0.9.0)
+      activerecord
+    builder (3.2.2)
+    diff-lcs (1.2.5)
+    edge_rider (0.3.0)
+      activerecord
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.9)
+    json (1.8.1)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    memoizer (1.0.1)
+    mime-types (1.25.1)
+    minitest (5.3.4)
+    multi_json (1.10.1)
+    polyglot (0.3.5)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.1.0)
+      actionmailer (= 4.1.0)
+      actionpack (= 4.1.0)
+      actionview (= 4.1.0)
+      activemodel (= 4.1.0)
+      activerecord (= 4.1.0)
+      activesupport (= 4.1.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.0)
+      sprockets-rails (~> 2.0)
+    railties (4.1.0)
+      actionpack (= 4.1.0)
+      activesupport (= 4.1.0)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-rails (3.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.0)
+    rspec_candy (0.3.1)
+      rspec
+      sneaky-save
+    shoulda-matchers (2.6.1)
+      activesupport (>= 3.0.0)
+    sneaky-save (0.0.5)
+      activerecord (>= 3.2.0)
+    sprockets (2.11.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.1.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.9)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  assignable_values
+  consul!
+  minitest
+  rails (= 4.1.0)
+  rspec
+  rspec-rails
+  rspec_candy
+  shoulda-matchers
+  sqlite3

data/spec/rails-4.1/Rakefile

@@ -0,0 +1,12 @@
+require 'rake'
+require 'rspec/core/rake_task'
+
+desc 'Default: Run all specs for a specific rails version.'
+task :default => :spec
+
+desc "Run all specs for a specific rails version"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = defined?(SPEC) ? SPEC : ['**/*_spec.rb', '../shared/**/*_spec.rb']
+  t.verbose = false
+  t.rspec_opts = "-b"
+end

data/spec/rails-4.1/app_root/.gitignore

@@ -0,0 +1,16 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp

data/spec/rails-4.1/app_root/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/rails-4.1/app_root/bin/rails

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path("../spring", __FILE__)
+rescue LoadError
+end
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/rails-4.1/app_root/bin/rake

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path("../spring", __FILE__)
+rescue LoadError
+end
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/rails-4.1/app_root/bin/spring

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast
+# It gets overwritten when you run the `spring binstub` command
+
+unless defined?(Spring)
+  require "rubygems"
+  require "bundler"
+
+  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    spring \((.*?)\)$.*?^$/m)
+    ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
+    ENV["GEM_HOME"] = ""
+    Gem.paths = ENV
+
+    gem "spring", match[1]
+    require "spring/binstub"
+  end
+end

data/spec/rails-4.1/app_root/config/application.rb

@@ -0,0 +1,28 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module SpecApp
+  class Application < Rails::Application
+    config.encoding = "utf-8"
+
+    config.cache_classes = true
+    config.whiny_nils = true
+
+    config.consider_all_requests_local       = true
+    config.action_controller.perform_caching = false
+    config.action_controller.allow_forgery_protection    = false
+
+    config.action_dispatch.show_exceptions = false
+
+    config.action_mailer.delivery_method = :test
+
+    config.active_support.deprecation = :stderr
+
+    config.root = File.expand_path('../..', __FILE__)
+  end
+end