consul 0.2.2 → 0.2.3

data/lib/consul/power.rb

@@ -39,8 +39,13 @@ module Consul
         ids_method = power_ids_name(name)
         define_method(ids_method) do |*args|
           scope = send(name, *args)
-          scope_ids = scope.scoped(:select => "`#{scope.table_name}`.`id`")
-          scope_ids.collect(&:id)
+          scope = scope.scoped(:select => "`#{scope.table_name}`.`id`")
+          query = if scope.respond_to?(:to_sql)
+            scope.to_sql
+          else
+            scope.construct_finder_sql({})
+          end
+          ::ActiveRecord::Base.connection.select_values(query).collect(&:to_i)
         end
         memoize ids_method
         name

data/lib/consul/version.rb

@@ -1,3 +1,3 @@
 module Consul
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/consul/power_spec.rb

@@ -41,7 +41,7 @@ describe Consul::Power do
     end
 
     it 'should cache scope ids' do
-      @user.power.should_receive(:clients).once.and_return(double('scope').as_null_object)
+      @user.power.should_receive(:clients).once.and_return(double('scope', :construct_finder_sql => 'SELECT 1').as_null_object)
       2.times { @user.power.client_ids }
     end
 
@@ -62,7 +62,7 @@ describe Consul::Power do
     end
 
     it 'should only trigger a single query for multiple checks on the same scope' do
-      ActiveRecord::Base.connection.should_receive(:select_all).once.and_return([]) #.and_return(double('connection').as_null_object)
+      ActiveRecord::Base.connection.should_receive(:select_values).once.and_return([]) #.and_return(double('connection').as_null_object)
       @user.power.client?(@client1)
       @user.power.client?(@deleted_client)
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: consul
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-29 00:00:00 +01:00
-default_executable: 
+date: 2012-06-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +27,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rails
-  version_requirements: *id001
+  requirement: *id001
+  prerelease: false
   type: :runtime
+  name: rails
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,12 +41,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: assignable_values
-  version_requirements: *id002
+  requirement: *id002
+  prerelease: false
   type: :runtime
+  name: assignable_values
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -58,12 +56,12 @@ dependencies:
         - 2
         - 3
         version: "2.3"
-  name: rails
-  version_requirements: *id003
+  requirement: *id003
+  prerelease: false
   type: :development
+  name: rails
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -73,12 +71,12 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  name: rspec
-  version_requirements: *id004
+  requirement: *id004
+  prerelease: false
   type: :development
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -88,12 +86,12 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  name: rspec-rails
-  version_requirements: *id005
+  requirement: *id005
+  prerelease: false
   type: :development
+  name: rspec-rails
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -102,12 +100,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: shoulda-matchers
-  version_requirements: *id006
+  requirement: *id006
+  prerelease: false
   type: :development
+  name: shoulda-matchers
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -116,9 +114,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: sqlite3
-  version_requirements: *id007
+  requirement: *id007
+  prerelease: false
   type: :development
+  name: sqlite3
 description: A scope-based authorization solution for Ruby on Rails.
 email: henning.koch@makandra.de
 executables: []
@@ -175,7 +174,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/spec.opts
 - spec/support/spec_candy.rb
-has_rdoc: true
 homepage: https://github.com/makandra/consul
 licenses: []
 
@@ -205,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A scope-based authorization solution for Ruby on Rails.