lockdown 0.5.2 → 0.5.3

data/History.txt

@@ -1,3 +1,8 @@
+== 0.5.3 2008-06-01
+* Fixed: Issue with new timestamped based migrations in rails 2.1.  Migration templates created were all done within the same second, therefore having the same timestamp, added a sleep call to the next_migration_string to get around the issue.
+
+* Fixed: User Groups management template had a bug on the show screen.  Was not getting @all_permissions instance variable set.
+
 == 0.5.2 2008-05-26
 * Fixed: make call to Dependencies.clear after inspecting controllers.  Using Dependencies.require_or_load is not sufficient it seems.
 

data/bin/lockdown

@@ -11,55 +11,50 @@ if %w(-v --version).include? ARGV.first
   exit(0)
 end
 
+MERB_CONFIG = 'config/init.rb'
+RAILS_CONFIG = 'config/environment.rb'
+
+if File.exists?(MERB_CONFIG)
+  @framework = "merb"
+elsif File.exists?(RAILS_CONFIG)
+  @framework = "rails"
+else
+  raise NotImplementedError, "Configuration file not found.  Looking for init.rb (Merb) or environment.rb (Rails)"
+end
 
-#
-#  Created on 2008-4-21.
-#  Copyright (c) 2008. All rights reserved.
+def merb_app?
+  @framework == "merb"
+end
 
-  MERB_CONFIG = 'config/init.rb'
-  RAILS_CONFIG = 'config/environment.rb'
+def rails_app?
+  @framework == "rails"
+end
 
-  if File.exists?(MERB_CONFIG)
-    @framework = "merb"
-  elsif File.exists?(RAILS_CONFIG)
-    @framework = "rails"
+#
+# Right now we only have the two and we raise an exception
+# if we don't know prior to getting here..
+#
+def config_file
+  if merb_app?
+    MERB_CONFIG
   else
-    raise NotImplementedError, "Configuration file not found.  Looking for init.rb (Merb) or environment.rb (Rails)"
-  end
-
-  def merb_app?
-    @framework == "merb"
-  end
-
-  def rails_app?
-    @framework == "rails"
-  end
-
-  #
-  # Right now we only have the two and we raise an exception
-  # if we don't know prior to getting here..
-  #
-  def config_file
-    if merb_app?
-      MERB_CONFIG
-    else
-      RAILS_CONFIG
-    end
+    RAILS_CONFIG
   end
+end
 
-  begin
-    require 'rubygems'
-  rescue LoadError
-    # no rubygems to load, so we fail silently
-  end
+begin
+  require 'rubygems'
+rescue LoadError
+  # no rubygems to load, so we fail silently
+end
 
 
-  OPTIONS = {
-    :path     => File.expand_path('.')
-  }
+OPTIONS = {
+  :path     => File.expand_path('.')
+}
 
-  parser = OptionParser.new do |opts|
-    opts.banner = <<-BANNER
+parser = OptionParser.new do |opts|
+  opts.banner = <<-BANNER
     Lockdown will add init.rb and session.rb to the lib/lockdown directory and require them in #{config_file}.
 
     Usage: #{File.basename($0)} [options]
@@ -67,25 +62,25 @@ end
     Options are:
     BANNER
 
-    opts.separator ""
-    opts.on("-p", "--path=PATH", String,
-              "The root path for selecting files",
-              "Default: [current directory]") { |OPTIONS[:path]| }
-    opts.on("-h", "--help",
-              "Show this help message.") { puts opts; exit }
-    opts.parse!(ARGV)
-  end 
-
-  #
-  # Load up the config file contents
-  #
-  @configuration = File.open config_file do |f|
-    f.map {|line| line.chomp}
-  end
+  opts.separator ""
+  opts.on("-p", "--path=PATH", String,
+    "The root path for selecting files",
+    "Default: [current directory]") { |OPTIONS[:path]| }
+  opts.on("-h", "--help",
+    "Show this help message.") { puts opts; exit }
+  opts.parse!(ARGV)
+end 
 
-  def configuration_file_has?(req)
-    @configuration.include?(req)
-  end
+#
+# Load up the config file contents
+#
+@configuration = File.open config_file do |f|
+  f.map {|line| line.chomp}
+end
+
+def configuration_file_has?(req)
+  @configuration.include?(req)
+end
 
 puts <<-MSG
 \n------------------------------------------------------------
@@ -94,7 +89,7 @@ MSG
 
 begin
   source = RubiGen::PathSource.new(:application,
-                                   File.join(File.dirname(__FILE__), "../app_generators"))
+    File.join(File.dirname(__FILE__), "../app_generators"))
   RubiGen::Base.reset_sources
   RubiGen::Base.append_sources source
   RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'lockdown', :framework => @framework)

data/lib/lockdown/version.rb

@@ -2,7 +2,7 @@ module Lockdown #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rails_generators/lockdown/lockdown_generator.rb

@@ -1,3 +1,13 @@
+if Rails::VERSION::MAJOR >= 2 && Rails::VERSION::MINOR >= 1
+  class Rails::Generator::Commands::Base
+    protected
+    def next_migration_string(padding = 3)
+      sleep(1)
+      Time.now.utc.strftime("%Y%m%d%H%M%S") 
+    end
+  end
+end
+
 class LockdownGenerator < Rails::Generator::Base
   attr_accessor :file_name
 

data/rails_generators/lockdown/templates/app/controllers/user_groups_controller.rb

@@ -16,6 +16,7 @@ class UserGroupsController < ApplicationController
   # GET /user_groups/1
   # GET /user_groups/1.xml
   def show
+		@all_permissions = Lockdown::System.permissions_assignable_for_user(current_user)
     respond_to do |format|
       format.html # show.html.erb
       format.xml  { render :xml => @user_group }

data/website/generator.html

@@ -33,7 +33,7 @@
     <h1>Lockdown</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/lockdown"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/lockdown" class="numbers">0.5.2</a>
+      <a href="http://rubyforge.org/projects/lockdown" class="numbers">0.5.3</a>
     </div>
     <h2>What</h2>
 

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Lockdown</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/lockdown"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/lockdown" class="numbers">0.5.2</a>
+      <a href="http://rubyforge.org/projects/lockdown" class="numbers">0.5.3</a>
     </div>
     <h2>What</h2>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-26 00:00:00 -04:00
+date: 2008-06-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency