consul 0.1.1 → 0.1.2

data/Gemfile

@@ -6,3 +6,4 @@ gem 'rspec', '=1.3.1'
 gem 'rspec-rails', '=1.3.3'
 gem 'jeweler'
 gem 'ruby-debug'
+gem 'sqlite3-ruby'

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/consul.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{consul}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henning Koch"]
-  s.date = %q{2011-04-13}
+  s.date = %q{2011-07-07}
   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 = [
@@ -61,38 +61,37 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/makandra/consul}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.7.2}
   s.summary = %q{Scope-based authorization solution for Rails}
   s.test_files = [
-    "spec/app_root/db/migrate/001_create_users.rb",
-     "spec/app_root/db/migrate/002_create_clients.rb",
-     "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/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/controllers/users_controller_spec.rb",
+     "spec/controllers/songs_controller_spec.rb",
+     "spec/controllers/dashboards_controller_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/consul/power_spec.rb",
+     "spec/app_root/app/controllers/songs_controller.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/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"
+     "spec/app_root/app/models/user.rb",
+     "spec/app_root/app/models/note.rb",
+     "spec/app_root/lib/console_with_fixtures.rb",
+     "spec/app_root/config/boot.rb",
+     "spec/app_root/config/routes.rb",
+     "spec/app_root/config/environments/mysql.rb",
+     "spec/app_root/config/environments/sqlite3.rb",
+     "spec/app_root/config/environments/in_memory.rb",
+     "spec/app_root/config/environments/postgresql.rb",
+     "spec/app_root/config/environments/sqlite.rb",
+     "spec/app_root/config/environment.rb",
+     "spec/app_root/db/migrate/001_create_users.rb",
+     "spec/app_root/db/migrate/002_create_clients.rb",
+     "spec/app_root/db/migrate/003_create_notes.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/consul/power.rb

@@ -37,7 +37,11 @@ module Consul
         define_method("#{name.to_s.singularize}?") { |*args| include?(name, *args) }
         define_method("#{name.to_s.singularize}!") { |*args| include!(name, *args) }
         ids_method = power_ids_name(name)
-        define_method(ids_method) { |*args| send(name, *args).scoped(:select => 'id').collect(&:id) }
+        define_method(ids_method) do |*args|
+          scope = send(name, *args)
+          scope_ids = scope.scoped(:select => "`#{scope.table_name}`.`id`")
+          scope_ids.collect(&:id)
+        end
         memoize ids_method
         name
       end

data/spec/app_root/app/models/client.rb

@@ -4,10 +4,4 @@ class Client < ActiveRecord::Base
 
   named_scope :active, :conditions => ["deleted = ? OR deleted IS NULL", false]
 
-  def foo
-    with_scope do
-
-    end
-  end
-
 end

data/spec/app_root/app/models/power.rb

@@ -13,6 +13,10 @@ class Power
     client.notes
   end
 
+  power :notes do
+    Note.scoped(:joins => :client)
+  end
+
   power :admin do
     false
   end

data/spec/consul/power_spec.rb

@@ -45,6 +45,10 @@ describe Consul::Power do
       2.times { @user.power.client_ids }
     end
 
+    it 'should return ids when the scope joins another table (bugfix)' do
+      expect { @user.power.note_ids }.to_not raise_error
+    end
+
   end
 
   describe 'include?' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: consul
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 +02:00
-default_executable: 
+date: 2011-07-07 00:00:00 Z
 dependencies: []
 
 description: Consul is a scope-based authorization solution for Ruby on Rails.
@@ -69,7 +68,6 @@ files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/makandra/consul
 licenses: []
 
@@ -99,33 +97,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Scope-based authorization solution for Rails
 test_files: 
-- spec/app_root/db/migrate/001_create_users.rb
-- spec/app_root/db/migrate/002_create_clients.rb
-- 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/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/controllers/users_controller_spec.rb
+- spec/controllers/songs_controller_spec.rb
+- spec/controllers/dashboards_controller_spec.rb
+- spec/spec_helper.rb
+- spec/consul/power_spec.rb
+- spec/app_root/app/controllers/songs_controller.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/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
+- spec/app_root/app/models/user.rb
+- spec/app_root/app/models/note.rb
+- spec/app_root/lib/console_with_fixtures.rb
+- spec/app_root/config/boot.rb
+- spec/app_root/config/routes.rb
+- spec/app_root/config/environments/mysql.rb
+- spec/app_root/config/environments/sqlite3.rb
+- spec/app_root/config/environments/in_memory.rb
+- spec/app_root/config/environments/postgresql.rb
+- spec/app_root/config/environments/sqlite.rb
+- spec/app_root/config/environment.rb
+- spec/app_root/db/migrate/001_create_users.rb
+- spec/app_root/db/migrate/002_create_clients.rb
+- spec/app_root/db/migrate/003_create_notes.rb