lockdown 0.7.0 → 0.7.1

data/Manifest.txt

@@ -4,7 +4,6 @@ Manifest.txt
 README.txt
 Rakefile
 lib/lockdown.rb
-lib/lockdown/classy-inheritance.rb
 lib/lockdown/controller.rb
 lib/lockdown/database.rb
 lib/lockdown/frameworks/merb.rb

data/lib/lockdown.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), "lockdown", "helper")
 
 module Lockdown
   # :stopdoc:
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -11,19 +11,16 @@ module Lockdown
     include Lockdown::Helper
 
     # Returns the version string for the library.
-    #
     def version
       VERSION
     end
  
     # Returns the qualified path to the init file
-    #
     def init_file
      "#{Dir.pwd}/lib/lockdown/init.rb"
     end
 
-    # Mixin Lockdown code to the appropriate Controller and ORM
-    #
+    # Mixin Lockdown code to the appropriate framework and ORM
     def mixin
       if mixin_resource?("frameworks")
         unless mixin_resource?("orms")

data/rails_generators/lockdown/templates/lib/lockdown/init.rb

@@ -39,6 +39,10 @@ Lockdown::System.configure do
   # :all_methods(:products) will return an array of all controller actions
   # for the products controller
   #
+  # If you need to reference a namespaced controller use two underscores:
+  # :admin__products would tell lockdown to look for:
+  # app/controllers/admin/products_controller.rb
+  #
   # if products is your standard RESTful resource you'll get:
   #   ["products/index , "products/show",
   #    "products/new", "products/edit",

data/tasks/gem.rake

@@ -37,8 +37,6 @@ class GemPackageTask < Rake::PackageTask
     local_setup = File.join(Dir.pwd, %w[tasks setup.rb])
     if !test(?e, local_setup)
       Dir.glob(::Bones.path(%w[lib bones tasks *])).each {|fn| bones_files << fn}
-      gem_spec.files = (gem_spec.files +
-          bones_files.map {|fn| File.join('tasks', File.basename(fn))}).sort
     end
   end
 
@@ -63,6 +61,10 @@ class GemPackageTask < Rake::PackageTask
 
     file package_dir_path => bones_files do
       mkdir_p package_dir rescue nil
+
+      gem_spec.files = (gem_spec.files +
+          bones_files.map {|fn| File.join('tasks', File.basename(fn))}).sort
+
       bones_files.each do |fn|
         base_fn = File.join('tasks', File.basename(fn))
         f = File.join(package_dir_path, base_fn)
@@ -157,6 +159,13 @@ namespace :gem do
     puts PROJ.gem._spec.to_ruby
   end
 
+  desc 'Write the gemspec '
+  task :spec => 'gem:prereqs' do
+    File.open("#{PROJ.name}.gemspec", 'w') do |f|
+      f.write PROJ.gem._spec.to_ruby
+    end
+  end
+
   desc 'Install the gem'
   task :install => [:clobber, 'gem:package'] do
     sh "#{SUDO} #{GEM} install --local pkg/#{PROJ.gem._spec.full_name}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-08 00:00:00 -05:00
+date: 2009-01-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.1
+        version: 2.2.0
     version: 
 description: Lockdown is a authentication/authorization system for RubyOnRails (ver >= 2.1).
 email: andy@stonean.com
@@ -38,7 +38,6 @@ files:
 - README.txt
 - Rakefile
 - lib/lockdown.rb
-- lib/lockdown/classy-inheritance.rb
 - lib/lockdown/controller.rb
 - lib/lockdown/database.rb
 - lib/lockdown/frameworks/merb.rb

data/lib/lockdown/classy-inheritance.rb

@@ -1,13 +0,0 @@
-if Object.const_defined?("ActiveRecord")
-  unless  Object.const_defined?("Stonean") && Stonean.const_defined?("ClassyInheritance")
-    begin
-      require "classy-inheritance"
-    rescue LoadError
-      puts <<-MSG 
-        You need to install classy-inheritance to use the provided models.
-        With gems, use `gem install classy-inheritance'
-      MSG
-      exit
-    end
-  end
-end