cantango-core 0.1.4 → 0.1.5

data/Gemfile

@@ -11,6 +11,9 @@ end
 group :test do
   gem 'require_all', '~> 1.2.0'
 
+
+  gem 'cancan',           '>= 1.4'
+  
   # Data
   gem 'database_cleaner'
   gem 'factory_girl'

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/cantango-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cantango-core}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kristian Mandrup}, %q{Stanislaw Pankevich}]
-  s.date = %q{2011-12-03}
+  s.date = %q{2011-12-04}
   s.description = %q{Define your permission rules as role- or role group specific permits.
 Integrates well with multiple Devise user acounts.
 Includes rules caching.
@@ -54,9 +54,9 @@ Store permissions in yaml file or key-value store}
     "lib/cantango/adaptor/mongo_mapper.rb",
     "lib/cantango/adaptor/mongoid.rb",
     "lib/cantango/adaptor/relational.rb",
-    "lib/cantango/cancan.rb",
-    "lib/cantango/cancan/rule.rb",
-    "lib/cantango/cancan/rule_class.rb",
+    "lib/cantango/can_can.rb",
+    "lib/cantango/can_can/rule.rb",
+    "lib/cantango/can_can/rule_class.rb",
     "lib/cantango/core.rb",
     "lib/cantango/engine.rb",
     "lib/cantango/filter.rb",
@@ -97,6 +97,7 @@ Store permissions in yaml file or key-value store}
     "spec/cantango/adaptor/data_mapper_spec.rb",
     "spec/cantango/adaptor/mongo_mapper_spec.rb",
     "spec/cantango/adaptor/mongoid_spec.rb",
+    "spec/cantango/cancan/rule_class_spec.rb",
     "spec/cantango/cancan/rule_spec.rb",
     "spec/cantango/core_spec.rb",
     "spec/cantango/engine_spec.rb",

data/lib/cantango/can_can/rule_class.rb

@@ -0,0 +1,15 @@
+require 'cancan'
+require 'cancan/rule'
+
+module CanTango
+  module CanCan
+    module RuleClass
+      # CanCan 1.5 compatibility
+      def rule_class
+        return ::CanCan::Rule if defined? ::CanCan::Rule
+        return ::CanCan::CanDefinition if defined? ::CanCan::CanDefinition
+        raise "CanCan has changed the Rule class and CanTango is not yet compatible with this change!"
+      end
+    end
+  end
+end

data/lib/cantango/core.rb

@@ -2,7 +2,7 @@ require 'cancan'
 require 'active_support' # for Delegate module
 require 'active_support/core_ext/module/delegation'
 
-require 'cantango/cancan/rule'
+require 'cantango/can_can/rule'
 require 'sugar-high/array'
 require 'sugar-high/blank'
 require 'hashie'
@@ -14,5 +14,5 @@ SweetLoader.mode = :require
 module CanTango
   autoload_modules :Helpers, :Ability, :Engine, :Filter
   autoload_modules :Loader, :Model, :Adaptor
-  autoload_modules :Scope
+  autoload_modules :Scope, :CanCan
 end

data/spec/cantango/cancan/rule_class_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+class CanCanRule
+  include CanTango::CanCan::RuleClass
+end
+
+describe CanTango::CanCan::RuleClass do
+  subject { CanCanRule.new }
+
+  its(:rule_class) { should be_a Class }
+end

data/spec/cantango/cancan/rule_spec.rb

@@ -1,5 +1,13 @@
-describe CanCan::RuleClass do
-  subject { CanCan::RuleClass.new }
+require 'spec_helper'
+require 'fixtures/models'
 
-  its(:block) { should be_nil }
+describe CanCan::Rule do
+  subject { CanCan::Rule.new :read, User, 1, 2, 3 }
+
+  describe 'block' do
+    before do
+      subject.block = lambda { puts hello }
+    end
+    specify { subject.block.should respond_to(:call) }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango-core
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-03 00:00:00.000000000Z
+date: 2011-12-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70163679813280 !ruby/object:Gem::Requirement
+  requirement: &70246704091920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70163679813280
+  version_requirements: *70246704091920
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70163679812800 !ruby/object:Gem::Requirement
+  requirement: &70246704089120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70163679812800
+  version_requirements: *70246704089120
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70163679812280 !ruby/object:Gem::Requirement
+  requirement: &70246704087260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70163679812280
+  version_requirements: *70246704087260
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70163679811380 !ruby/object:Gem::Requirement
+  requirement: &70246704086340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70163679811380
+  version_requirements: *70246704086340
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70163679810520 !ruby/object:Gem::Requirement
+  requirement: &70246704079420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163679810520
+  version_requirements: *70246704079420
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70163679809380 !ruby/object:Gem::Requirement
+  requirement: &70246704078320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70163679809380
+  version_requirements: *70246704078320
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &70163679808280 !ruby/object:Gem::Requirement
+  requirement: &70246704077240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70163679808280
+  version_requirements: *70246704077240
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70163679807800 !ruby/object:Gem::Requirement
+  requirement: &70246704076140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163679807800
+  version_requirements: *70246704076140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70163679807260 !ruby/object:Gem::Requirement
+  requirement: &70246704074560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163679807260
+  version_requirements: *70246704074560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70163679806460 !ruby/object:Gem::Requirement
+  requirement: &70246704057660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70163679806460
+  version_requirements: *70246704057660
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70163679805780 !ruby/object:Gem::Requirement
+  requirement: &70246704050840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70163679805780
+  version_requirements: *70246704050840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70163679805020 !ruby/object:Gem::Requirement
+  requirement: &70246704049820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70163679805020
+  version_requirements: *70246704049820
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70163679804300 !ruby/object:Gem::Requirement
+  requirement: &70246704048780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163679804300
+  version_requirements: *70246704048780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70163679803780 !ruby/object:Gem::Requirement
+  requirement: &70246704047900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70163679803780
+  version_requirements: *70246704047900
 description: ! 'Define your permission rules as role- or role group specific permits.
 
   Integrates well with multiple Devise user acounts.
@@ -214,9 +214,9 @@ files:
 - lib/cantango/adaptor/mongo_mapper.rb
 - lib/cantango/adaptor/mongoid.rb
 - lib/cantango/adaptor/relational.rb
-- lib/cantango/cancan.rb
-- lib/cantango/cancan/rule.rb
-- lib/cantango/cancan/rule_class.rb
+- lib/cantango/can_can.rb
+- lib/cantango/can_can/rule.rb
+- lib/cantango/can_can/rule_class.rb
 - lib/cantango/core.rb
 - lib/cantango/engine.rb
 - lib/cantango/filter.rb
@@ -257,6 +257,7 @@ files:
 - spec/cantango/adaptor/data_mapper_spec.rb
 - spec/cantango/adaptor/mongo_mapper_spec.rb
 - spec/cantango/adaptor/mongoid_spec.rb
+- spec/cantango/cancan/rule_class_spec.rb
 - spec/cantango/cancan/rule_spec.rb
 - spec/cantango/core_spec.rb
 - spec/cantango/engine_spec.rb
@@ -293,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2968475514432928712
+      hash: 2028541459112874735
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/cantango/cancan/rule_class.rb

@@ -1,11 +0,0 @@
-module CanTango
-  module CanCan
-    module RuleClass
-      # CanCan 1.5 compatibility
-      def rule_class
-        return CanCan::Rule if defined? CanCan::Rule
-        CanCan::CanDefinition
-      end
-    end
-  end
-end