consul 0.1.0 → 0.1.1

data/.gitignore

@@ -3,5 +3,6 @@ pkg
 *.gem
 .idea
 spec/app_root/log/*
+Gemfile.lock
 
 

data/Gemfile

@@ -1,9 +1,8 @@
 source 'http://rubygems.org'
 
-gem 'rails', '<3.0.0'
+gem 'rails', '=2.3.11'
 gem 'consul', :path => '.'
 gem 'rspec', '=1.3.1'
 gem 'rspec-rails', '=1.3.3'
 gem 'jeweler'
 gem 'ruby-debug'
-

data/README.rdoc

@@ -188,10 +188,10 @@ Should you for some obscure reason want to forego the power check:
 == Installation
 
 Add the following to your <tt>Gemfile</tt>:
-    gem 'consul'
+  gem 'consul'
 
 Now run
-    bundle install
+  bundle install
 
 
 == Rails 3 compatibility

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/consul.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{consul}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henning Koch"]
-  s.date = %q{2011-04-12}
+  s.date = %q{2011-04-13}
   s.description = %q{Consul is a scope-based authorization solution for Ruby on Rails.}
   s.email = %q{henning.koch@makandra.de}
   s.extra_rdoc_files = [
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      "Gemfile",
-     "Gemfile.lock",
      "README.rdoc",
      "Rakefile",
      "VERSION",
@@ -29,6 +28,9 @@ Gem::Specification.new do |s|
      "lib/consul/power.rb",
      "lib/consul/spec/matchers.rb",
      "spec/app_root/app/controllers/application_controller.rb",
+     "spec/app_root/app/controllers/dashboards_controller.rb",
+     "spec/app_root/app/controllers/songs_controller.rb",
+     "spec/app_root/app/controllers/users_controller.rb",
      "spec/app_root/app/models/client.rb",
      "spec/app_root/app/models/note.rb",
      "spec/app_root/app/models/power.rb",
@@ -49,6 +51,9 @@ Gem::Specification.new do |s|
      "spec/app_root/log/.gitignore",
      "spec/app_root/script/console",
      "spec/consul/power_spec.rb",
+     "spec/controllers/dashboards_controller_spec.rb",
+     "spec/controllers/songs_controller_spec.rb",
+     "spec/controllers/users_controller_spec.rb",
      "spec/rcov.opts",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -64,20 +69,26 @@ Gem::Specification.new do |s|
      "spec/app_root/db/migrate/003_create_notes.rb",
      "spec/app_root/config/boot.rb",
      "spec/app_root/config/environment.rb",
-     "spec/app_root/config/routes.rb",
      "spec/app_root/config/environments/in_memory.rb",
      "spec/app_root/config/environments/mysql.rb",
      "spec/app_root/config/environments/postgresql.rb",
      "spec/app_root/config/environments/sqlite.rb",
      "spec/app_root/config/environments/sqlite3.rb",
+     "spec/app_root/config/routes.rb",
      "spec/app_root/lib/console_with_fixtures.rb",
+     "spec/app_root/app/controllers/dashboards_controller.rb",
      "spec/app_root/app/controllers/application_controller.rb",
+     "spec/app_root/app/controllers/users_controller.rb",
+     "spec/app_root/app/controllers/songs_controller.rb",
      "spec/app_root/app/models/client.rb",
      "spec/app_root/app/models/note.rb",
-     "spec/app_root/app/models/power.rb",
      "spec/app_root/app/models/user.rb",
+     "spec/app_root/app/models/power.rb",
      "spec/consul/power_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/controllers/users_controller_spec.rb",
+     "spec/controllers/dashboards_controller_spec.rb",
+     "spec/controllers/songs_controller_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/consul/controller.rb

@@ -68,7 +68,7 @@ module Consul
 
       private
 
-      def unchecked_permissions
+      def unchecked_power
         raise Consul::UncheckedPower, "This controller does not check against a power"
       end
 

data/lib/consul/spec/matchers.rb

@@ -1,4 +1,4 @@
-module Aegis
+module Consul
   module Spec
     module Matchers
 
@@ -37,4 +37,4 @@ module Aegis
   end
 end
 
-ActiveSupport::TestCase.send :include, Aegis::Spec::Matchers
+ActiveSupport::TestCase.send :include, Consul::Spec::Matchers

data/spec/app_root/app/controllers/application_controller.rb

@@ -1,3 +1,12 @@
 class ApplicationController < ActionController::Base
+  include Consul::Controller
 
+  require_power_check
+
+  private
+
+  def current_power
+    Power.new User.new
+  end
+  
 end

data/spec/app_root/app/controllers/dashboards_controller.rb

@@ -0,0 +1,8 @@
+class DashboardsController < ApplicationController
+  
+  power :dashboard
+
+  def show
+  end
+
+end

data/spec/app_root/app/controllers/songs_controller.rb

@@ -0,0 +1,13 @@
+class SongsController < ApplicationController
+
+  # power check is missing
+
+  skip_power_check :only => :index
+
+  def show
+  end
+
+  def index
+  end
+
+end

data/spec/app_root/app/controllers/users_controller.rb

@@ -0,0 +1,11 @@
+class UsersController < ApplicationController
+
+  power :admin, :map => { :index => :dashboard }
+
+  def index
+  end
+
+  def show
+  end
+
+end

data/spec/app_root/config/routes.rb

@@ -1,7 +1,9 @@
 ActionController::Routing::Routes.draw do |map|
 
-  map.resources :properties do |properties|
-    properties.resources :reviews
-  end
+  map.resource :dashboard
+
+  map.resources :songs
+
+  map.resources :users
 
 end

data/spec/controllers/dashboards_controller_spec.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe DashboardsController do
+
+  it "should not raise an error if the checked power is given" do
+    expect { get :show }.to_not raise_error
+  end
+
+end

data/spec/controllers/songs_controller_spec.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe SongsController do
+
+  it "should raise an error if an action is not checked against a power" do
+    expect { get :show, :id => '123' }.to raise_error(Consul::UncheckedPower)
+  end
+
+  it 'should allow to skip a required power check' do
+    expect { get :index }.to_not raise_error
+  end
+
+end

data/spec/controllers/users_controller_spec.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe UsersController do
+
+  it "should raise an error if the checked power is not given" do
+    expect { get :show, :id => '1' }.to raise_error(Consul::Powerless)
+  end
+
+  it 'should allow to map actions to another power' do
+    expect { get :index }.to_not raise_error
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: consul
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 +02:00
+date: 2011-04-13 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +30,6 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - README.rdoc
 - Rakefile
 - VERSION
@@ -41,6 +40,9 @@ files:
 - lib/consul/power.rb
 - lib/consul/spec/matchers.rb
 - spec/app_root/app/controllers/application_controller.rb
+- spec/app_root/app/controllers/dashboards_controller.rb
+- spec/app_root/app/controllers/songs_controller.rb
+- spec/app_root/app/controllers/users_controller.rb
 - spec/app_root/app/models/client.rb
 - spec/app_root/app/models/note.rb
 - spec/app_root/app/models/power.rb
@@ -61,6 +63,9 @@ files:
 - spec/app_root/log/.gitignore
 - spec/app_root/script/console
 - spec/consul/power_spec.rb
+- spec/controllers/dashboards_controller_spec.rb
+- spec/controllers/songs_controller_spec.rb
+- spec/controllers/users_controller_spec.rb
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -104,17 +109,23 @@ test_files:
 - spec/app_root/db/migrate/003_create_notes.rb
 - spec/app_root/config/boot.rb
 - spec/app_root/config/environment.rb
-- spec/app_root/config/routes.rb
 - spec/app_root/config/environments/in_memory.rb
 - spec/app_root/config/environments/mysql.rb
 - spec/app_root/config/environments/postgresql.rb
 - spec/app_root/config/environments/sqlite.rb
 - spec/app_root/config/environments/sqlite3.rb
+- spec/app_root/config/routes.rb
 - spec/app_root/lib/console_with_fixtures.rb
+- spec/app_root/app/controllers/dashboards_controller.rb
 - spec/app_root/app/controllers/application_controller.rb
+- spec/app_root/app/controllers/users_controller.rb
+- spec/app_root/app/controllers/songs_controller.rb
 - spec/app_root/app/models/client.rb
 - spec/app_root/app/models/note.rb
-- spec/app_root/app/models/power.rb
 - spec/app_root/app/models/user.rb
+- spec/app_root/app/models/power.rb
 - spec/consul/power_spec.rb
 - spec/spec_helper.rb
+- spec/controllers/users_controller_spec.rb
+- spec/controllers/dashboards_controller_spec.rb
+- spec/controllers/songs_controller_spec.rb

data/Gemfile.lock

@@ -1,58 +0,0 @@
-PATH
-  remote: .
-  specs:
-    consul (0.0.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (2.3.10)
-      actionpack (= 2.3.10)
-    actionpack (2.3.10)
-      activesupport (= 2.3.10)
-      rack (~> 1.1.0)
-    activerecord (2.3.10)
-      activesupport (= 2.3.10)
-    activeresource (2.3.10)
-      activesupport (= 2.3.10)
-    activesupport (2.3.10)
-    columnize (0.3.2)
-    gemcutter (0.6.1)
-    git (1.2.5)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
-      git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
-    linecache (0.43)
-    rack (1.1.0)
-    rails (2.3.10)
-      actionmailer (= 2.3.10)
-      actionpack (= 2.3.10)
-      activerecord (= 2.3.10)
-      activeresource (= 2.3.10)
-      activesupport (= 2.3.10)
-      rake (>= 0.8.3)
-    rake (0.8.7)
-    rspec (1.3.1)
-    rspec-rails (1.3.3)
-      rack (>= 1.0.0)
-      rspec (= 1.3.1)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  consul!
-  jeweler
-  rails (< 3.0.0)
-  rspec (= 1.3.1)
-  rspec-rails (= 1.3.3)
-  ruby-debug