cancan-permits 0.1.1 → 0.1.2

data/Rakefile

@@ -7,10 +7,13 @@ begin
     gem.email = "kmandrup@gmail.com"
     gem.homepage = "http://github.com/kristianmandrup/cancan-permits"
     gem.authors = ["Kristian Mandrup"]
-    gem.add_development_dependency "rspec", "~> 2.0.0"
-    gem.add_dependency 'cancan', "~> 1.3"
-    gem.add_dependency 'require_all', "~> 1.1"
-    gem.add_dependency 'sugar-high', "~> 0.1"
+    gem.add_development_dependency "rspec",           "~> 2.0.0.beta.22"
+    gem.add_development_dependency 'code-spec',       "~> 0.2.5"
+    gem.add_development_dependency 'rails-app-spec',  "~> 0.2.10"
+
+    gem.add_dependency 'cancan',          "~> 1.3.2"
+    gem.add_dependency 'require_all',     "~> 1.1.0"
+    gem.add_dependency 'sugar-high',      "~> 0.2.10"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

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

data/cancan-permits.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cancan-permits}
-  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 = ["Kristian Mandrup"]
-  s.date = %q{2010-09-19}
+  s.date = %q{2010-09-20}
   s.description = %q{Role specific Permits for use with CanCan permission system}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -26,12 +26,14 @@ Gem::Specification.new do |s|
      "VERSION",
      "cancan-permits.gemspec",
      "lib/cancan-permits.rb",
+     "lib/cancan-permits/main.rb",
      "lib/cancan-permits/namespaces.rb",
      "lib/cancan-permits/permit/base_license.rb",
      "lib/cancan-permits/permit/base_permit.rb",
      "lib/cancan-permits/permits/ability.rb",
      "lib/cancan-permits/permits/configuration.rb",
      "lib/cancan-permits/permits/roles.rb",
+     "lib/cancan-permits/rspec.rb",
      "lib/cancan-permits/rspec/config.rb",
      "lib/cancan-permits/rspec/matchers/have_license.rb",
      "lib/cancan-permits/rspec/matchers/have_license_class.rb",
@@ -69,21 +71,27 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
-      s.add_runtime_dependency(%q<cancan>, ["~> 1.3"])
-      s.add_runtime_dependency(%q<require_all>, ["~> 1.1"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.1"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_development_dependency(%q<code-spec>, ["~> 0.2.5"])
+      s.add_development_dependency(%q<rails-app-spec>, ["~> 0.2.10"])
+      s.add_runtime_dependency(%q<cancan>, ["~> 1.3.2"])
+      s.add_runtime_dependency(%q<require_all>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.10"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
-      s.add_dependency(%q<cancan>, ["~> 1.3"])
-      s.add_dependency(%q<require_all>, ["~> 1.1"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.1"])
+      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_dependency(%q<code-spec>, ["~> 0.2.5"])
+      s.add_dependency(%q<rails-app-spec>, ["~> 0.2.10"])
+      s.add_dependency(%q<cancan>, ["~> 1.3.2"])
+      s.add_dependency(%q<require_all>, ["~> 1.1.0"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
-    s.add_dependency(%q<cancan>, ["~> 1.3"])
-    s.add_dependency(%q<require_all>, ["~> 1.1"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.1"])
+    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+    s.add_dependency(%q<code-spec>, ["~> 0.2.5"])
+    s.add_dependency(%q<rails-app-spec>, ["~> 0.2.10"])
+    s.add_dependency(%q<cancan>, ["~> 1.3.2"])
+    s.add_dependency(%q<require_all>, ["~> 1.1.0"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
   end
 end
 

data/lib/cancan-permits.rb

@@ -1,3 +1,3 @@
 require 'cancan'
 require 'require_all'
-require_all File.dirname(__FILE__) + '/cancan-permits'
+require 'cancan-permits/main'

data/lib/cancan-permits/main.rb

@@ -0,0 +1,3 @@
+require 'cancan-permits/namespaces'
+require_all File.dirname(__FILE__) + '/permit'
+require_all File.dirname(__FILE__) + '/permits'

data/lib/cancan-permits/rspec.rb

@@ -0,0 +1 @@
+require_all File.dirname(__FILE__) + '/rspec'

data/lib/generators/permits/permits_generator.rb

@@ -19,6 +19,7 @@ class PermitsGenerator < Rails::Generators::Base
     roles.each do |role|      
       template_permit role if !role == :admin     
     end    
+    template "licenses.rb", "app/permits/licenses.rb"        
   end
   
   protected
@@ -35,7 +36,6 @@ class PermitsGenerator < Rails::Generators::Base
     self.permit_name = name
 
     template "permit.rb", "app/permits/#{name}_permit.rb"
-    template "licenses.rb", "app/permits/licenses.rb"    
   end 
 
   def any_logic

data/lib/generators/permits/templates/permit.rb

@@ -5,8 +5,7 @@ class <%= permit_name.to_s.camelize %>Permit < Permit::Base
 
   def permit?(user, request=nil) 
     super
-    <%= permit_logic %>
-    
+    <%= permit_logic %>    
     licenses :user_admin, :blogging
   end  
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rspec/core'
 require 'cancan/matchers'
 require 'cancan-permits'
+require 'cancan-permits/rspec'
 
 require_all File.dirname(__FILE__) + '/cancan-permits/fixtures/permits'
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-19 00:00:00 +02:00
+date: 2010-09-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,13 +29,45 @@ dependencies:
         - 2
         - 0
         - 0
-        version: 2.0.0
+        - beta
+        - 22
+        version: 2.0.0.beta.22
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: cancan
+  name: code-spec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 5
+        version: 0.2.5
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rails-app-spec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 10
+        version: 0.2.10
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: cancan
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -43,13 +75,14 @@ dependencies:
         segments: 
         - 1
         - 3
-        version: "1.3"
+        - 2
+        version: 1.3.2
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: require_all
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -57,23 +90,25 @@ dependencies:
         segments: 
         - 1
         - 1
-        version: "1.1"
+        - 0
+        version: 1.1.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sugar-high
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        version: "0.1"
+        - 2
+        - 10
+        version: 0.2.10
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id006
 description: Role specific Permits for use with CanCan permission system
 email: kmandrup@gmail.com
 executables: []
@@ -93,12 +128,14 @@ files:
 - VERSION
 - cancan-permits.gemspec
 - lib/cancan-permits.rb
+- lib/cancan-permits/main.rb
 - lib/cancan-permits/namespaces.rb
 - lib/cancan-permits/permit/base_license.rb
 - lib/cancan-permits/permit/base_permit.rb
 - lib/cancan-permits/permits/ability.rb
 - lib/cancan-permits/permits/configuration.rb
 - lib/cancan-permits/permits/roles.rb
+- lib/cancan-permits/rspec.rb
 - lib/cancan-permits/rspec/config.rb
 - lib/cancan-permits/rspec/matchers/have_license.rb
 - lib/cancan-permits/rspec/matchers/have_license_class.rb