lockdown 0.6.3 → 0.7.0

data/rails_generators/lockdown/templates/app/views/permissions/show.html.erb

@@ -1,3 +1,26 @@
-<%%= render :partial => "data"  %>
+<p>
+  <b>Name</b><br />
+  <%%= h @permission.name %>
+</p>
+<p>
+  <b>Access rights:</b><br />
+  <%%
+    Lockdown::System.access_rights_for_permission(@permission).each do |access_right| 
+  %>
+    <%%= access_right %><br/>
+  <%%
+    end
+  %>
+</p>
+<p>
+  <b>Users with permission:</b><br />
+  <%%
+    @permission.all_users.each do |user| 
+  %>
+      <%%= link_to_or_show(user.full_name, <%= namespace.blank? ? 'user' : "#{namespace}_user_path(user)" %>) %><br/>
+  <%%
+    end
+  %>
+</p>
 
 <%%= link_to 'Back', <%= namespace.blank? ? 'permissions_path' : "#{namespace}_permissions_path" %> %>

data/rails_generators/lockdown/templates/app/views/user_groups/edit.html.erb

@@ -1,6 +1,33 @@
-<h1>Editing Usergroup</h1>
+<h1>Editing User Group</h1>
+
+<%% form_for(<%= namespace.blank? ? '@user_group' : "[:#{namespace}, @user_group]"  %>) do |f| %>
+  <%%= f.error_messages %>
+  <p>
+    <b>Name</b><br />
+    <%%= f.text_field :name %>
+  </p>
+  <p>
+    <b>Permissions</b><br />
+    <ul style="list-style: none;">
+      <%% 
+        @all_permissions.each_with_index do |perm,i|
+          input_id = "perm_#{perm.id}"
+          checked = (@user_group.permission_ids.include?(perm.id) ? "checked" : "")
+      %>
+          <li id="li_<%%= input_id %>">
+            <label for="<%%= input_id %>">
+            <input id="<%%= input_id %>" name="<%%= input_id %>" type="checkbox" <%%= checked %>/>&nbsp;&nbsp;<%%= perm.name %>
+            </label>
+          </li>
+      <%% 
+        end
+      %>
+    </ul>
+  </p>
+
+  <p> <%%= f.submit "Update" %> </p>
+<%% end %>
 
-<%%= render :partial => "form" %>
 
 <%%= link_to 'Show', <%= namespace.blank? ? '@user_group' : "#{namespace}_user_group_path(@user_group)" %> %> |
 <%%= link_to 'Back', <%= namespace.blank? ? 'user_groups_path' : "#{namespace}_user_groups_path" %> %>

data/rails_generators/lockdown/templates/app/views/user_groups/new.html.erb

@@ -1,5 +1,31 @@
-<h1>New Usergroup</h1>
+<h1>New User Group</h1>
 
-<%%= render :partial => "form" %>
+<%% form_for(<%= namespace.blank? ? '@user_group' : "[:#{namespace}, @user_group]"  %>) do |f| %>
+  <%%= f.error_messages %>
+  <p>
+    <b>Name</b><br />
+    <%%= f.text_field :name %>
+  </p>
+  <p>
+    <b>Permissions</b><br />
+    <ul style="list-style: none;">
+      <%% 
+        @all_permissions.each_with_index do |perm,i|
+          input_id = "perm_#{perm.id}"
+          checked = (@user_group.permission_ids.include?(perm.id) ? "checked" : "")          
+      %>
+          <li id="li_<%%= input_id %>">
+            <label for="<%%= input_id %>">
+              <input id="<%%= input_id %>" name="<%%= input_id %>" type="checkbox" <%%= checked %>/>&nbsp;&nbsp;<%%= perm.name %>
+            </label>
+          </li>
+      <%% 
+        end
+      %>
+    </ul>
+  </p>
+
+  <p> <%%= f.submit "Create" %> </p>
+<%% end %>
 
 <%%= link_to 'Back', <%= namespace.blank? ? 'user_groups_path' : "#{namespace}_user_groups_path" %> %>

data/rails_generators/lockdown/templates/app/views/user_groups/show.html.erb

@@ -1,4 +1,27 @@
-<%%= render :partial => "data" %>
+<p>
+  <b>Name</b><br />
+  <%%= h @user_group.name %>
+</p>
+<p>
+  <b>Permissions</b><br />
+  <%%
+    @user_group.permissions.each do |perm| 
+  %>
+      <%%= perm.name %><br/>
+  <%%
+    end
+  %>
+</p>
+<p>
+	<b>Users in user group:</b><br />
+	<%%
+	  @user_group.all_users.each do |user| 
+	%>
+	    <%%= link_to_or_show(user.full_name, <%= namespace.blank? ? 'user' : "#{namespace}_user_path(user)" %>) %><br/>
+	<%%
+    end
+	%>
+</p>
 
 <%% unless Lockdown::System.has_user_group?(@user_group) %>
   <%%= link_to 'Edit', <%= namespace.blank? ? 'edit_user_group_path(@user_group)' : "edit_#{namespace}_user_group_path(@user_group)" %> %> |

data/rails_generators/lockdown/templates/app/views/users/edit.html.erb

@@ -1,6 +1,51 @@
 <h1>Editing User</h1>
 
-<%%= render :partial => "form" %>
+<%% form_for(<%= namespace.blank? ? "@user" : "[:#{namespace}, @user]" %>) do |f| %>
+  <%%= f.error_messages %>
+  <p>
+    <b>First name</b><br />
+    <%%= f.text_field :first_name %>
+  </p>
+  <p>
+    <b>Last name</b><br />
+    <%%= f.text_field :last_name %>
+  </p>
+  <p>
+    <b>Email</b><br />
+    <%%= f.text_field :email %>
+  </p>
+  <p>
+  	<b>Login</b><br />
+    <%%= f.text_field :login %>
+  </p>
+  <p>
+    <b>Password</b><br />
+    <%%= f.password_field :password %>
+  </p>
+  <p>
+    <b>Password confirmation</b><br />
+    <%%= f.password_field :password_confirmation %>
+  </p>
+  <p>
+    <b>User Groups</b><br />
+    <ul style="list-style: none;">
+      <%% 
+        @user_groups_for_user.each_with_index do |ug,i|
+          input_id = "ug_#{ug.id}"
+          checked = (@user.user_group_ids.include?(ug.id) ? "checked" : "")          
+      %>
+          <li id="li_<%%= input_id %>">
+            <label for="<%%= input_id %>">
+            <input id="<%%= input_id %>" name="<%%= input_id %>" type="checkbox" <%%= checked %>/>&nbsp;&nbsp;<%%= ug.name %>
+            </label>
+          </li>
+      <%% 
+        end
+      %>
+    </ul>
+  </p>
+  <p> <%%= f.submit "Update" %> </p>
+<%% end %>
 
 <%%= link_to 'Show', <%= namespace.blank? ? "user_path(@user)" : "#{namespace}_user_path(@user)" %> %> |
 <%%= link_to 'Back', <%= namespace.blank? ? "users_path" : "#{namespace}_users_path" %> %>

data/rails_generators/lockdown/templates/app/views/users/new.html.erb

@@ -1,5 +1,50 @@
 <h1>New User</h1>
 
-<%%= render :partial => "form" %>
+<%% form_for(<%= namespace.blank? ? "@user" : "[:#{namespace}, @user]" %>) do |f| %>
+  <%%= f.error_messages %>
+  <p>
+    <b>First name</b><br />
+    <%%= f.text_field :first_name %>
+  </p>
+  <p>
+    <b>Last name</b><br />
+    <%%= f.text_field :last_name %>
+  </p>
+  <p>
+    <b>Email</b><br />
+    <%%= f.text_field :email %>
+  </p>
+  <p>
+  	<b>Login</b><br />
+    <%%= f.text_field :login %>
+  </p>
+  <p>
+    <b>Password</b><br />
+    <%%= f.password_field :password %>
+  </p>
+  <p>
+    <b>Password confirmation</b><br />
+    <%%= f.password_field :password_confirmation %>
+  </p>
+  <p>
+    <b>User Groups</b><br />
+    <ul style="list-style: none;">
+      <%% 
+        @user_groups_for_user.each_with_index do |ug,i|
+          input_id = "ug_#{ug.id}"
+          checked = (@user.user_group_ids.include?(ug.id) ? "checked" : "")                    
+      %>
+          <li id="li_<%%= input_id %>">
+            <label for="<%%= input_id %>">
+            <input id="<%%= input_id %>" name="<%%= input_id %>" type="checkbox" <%%= checked %>/>&nbsp;&nbsp;<%%= ug.name %>
+            </label>
+          </li>
+      <%% 
+        end
+      %>
+    </ul>
+  </p>
+  <p> <%%= f.submit "Create" %> </p>
+<%% end %>
 
 <%%= link_to 'Back', <%= namespace.blank? ? "users_path" : "#{namespace}_users_path" %> %>

data/rails_generators/lockdown/templates/app/views/users/show.html.erb

@@ -1,4 +1,33 @@
-<%%= render :partial => "data" %>
+<h1>Showing User</h1>
+
+<p>
+  <b>First name</b><br />
+  <%%= h @user.first_name %>
+</p>
+<p>
+  <b>Last name</b><br />
+  <%%= h @user.last_name %>
+</p>
+<p>
+  <b>Email</b><br />
+  <%%= h @user.email %>
+</p>
+<p>
+	<b><span>L</span>ogin</b><br />
+  <%%= h @user.login %>
+</p>
+<p>
+  <b>User Groups</b><br />
+  <ul style="list-style: none;">
+    <%% 
+      @user.user_groups.each do |ug| 
+    %>
+       <%%= h ug.name %> <br/>
+    <%% 
+      end
+    %>
+  </ul>
+</p>
 
 <%%= link_to 'Edit', <%= namespace.blank? ? "edit_user_path(@user)" : "edit_#{namespace}_user_path(@user)" %> %> |
 <%%= link_to 'Back', <%= namespace.blank? ? "users_path" : "#{namespace}_users_path" %> %>

data/rails_generators/lockdown/templates/config/initializers/lockit.rb

@@ -0,0 +1 @@
+require 'lockdown'

data/{app_generators/lockdown/templates → rails_generators/lockdown/templates/lib/lockdown}/init.rb

@@ -1,4 +1,3 @@
-require "lockdown"
 require File.join(File.dirname(__FILE__), "session")
 
 Lockdown::System.configure do

data/{app_generators/lockdown/templates → rails_generators/lockdown/templates/lib/lockdown}/session.rb

@@ -55,15 +55,16 @@ module Lockdown
   end # Session module
 end # Lockdown module
 
-<% if framework == "merb" -%>
-Merb::Controller.send :include, Lockdown::Session
-<% else %>
-ActionController::Base.send :include, Lockdown::Session
-ActionController::Base.send :helper_method, :logged_in?, 
-                                           :current_user,
-                                           :current_user_name, 
-                                           :current_user_id, 
-                                           :current_profile_id,
-                                           :current_user_is_admin?,
-                                           :current_user_access_in_group?
-<% end -%>
+ActionController::Base.class_eval do
+ include Lockdown::Session
+end
+
+ActionController::Base.class_eval do 
+  helper_method :logged_in?, 
+    :current_user,
+    :current_user_name, 
+    :current_user_id, 
+    :current_profile_id,
+    :current_user_is_admin?,
+    :current_user_access_in_group?
+end

data/tasks/ann.rake

@@ -0,0 +1,80 @@
+
+begin
+  require 'bones/smtp_tls'
+rescue LoadError
+  require 'net/smtp'
+end
+require 'time'
+
+namespace :ann do
+
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
+
+  file PROJ.ann.file do
+    ann = PROJ.ann
+    puts "Generating #{ann.file}"
+    File.open(ann.file,'w') do |fd|
+      fd.puts("#{PROJ.name} version #{PROJ.version}")
+      fd.puts("    by #{Array(PROJ.authors).first}") if PROJ.authors
+      fd.puts("    #{PROJ.url}") if PROJ.url.valid?
+      fd.puts("    (the \"#{PROJ.release_name}\" release)") if PROJ.release_name
+      fd.puts
+      fd.puts("== DESCRIPTION")
+      fd.puts
+      fd.puts(PROJ.description)
+      fd.puts
+      fd.puts(PROJ.changes.sub(%r/^.*$/, '== CHANGES'))
+      fd.puts
+      ann.paragraphs.each do |p|
+        fd.puts "== #{p.upcase}"
+        fd.puts
+        fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
+        fd.puts
+      end
+      fd.puts ann.text if ann.text
+    end
+  end
+
+  desc "Create an announcement file"
+  task :announcement => ['ann:prereqs', PROJ.ann.file]
+
+  desc "Send an email announcement"
+  task :email => ['ann:prereqs', PROJ.ann.file] do
+    ann = PROJ.ann
+    from = ann.email[:from] || Array(PROJ.authors).first || PROJ.email
+    to   = Array(ann.email[:to])
+
+    ### build a mail header for RFC 822
+    rfc822msg =  "From: #{from}\n"
+    rfc822msg << "To: #{to.join(',')}\n"
+    rfc822msg << "Subject: [ANN] #{PROJ.name} #{PROJ.version}"
+    rfc822msg << " (#{PROJ.release_name})" if PROJ.release_name
+    rfc822msg << "\n"
+    rfc822msg << "Date: #{Time.new.rfc822}\n"
+    rfc822msg << "Message-Id: "
+    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{ann.email[:domain]}>\n\n"
+    rfc822msg << File.read(ann.file)
+
+    params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
+      ann.email[key]
+    end
+
+    params[3] = PROJ.email if params[3].nil?
+
+    if params[4].nil?
+      STDOUT.write "Please enter your e-mail password (#{params[3]}): "
+      params[4] = STDIN.gets.chomp
+    end
+
+    ### send email
+    Net::SMTP.start(*params) {|smtp| smtp.sendmail(rfc822msg, from, to)}
+  end
+end  # namespace :ann
+
+desc 'Alias to ann:announcement'
+task :ann => 'ann:announcement'
+
+CLOBBER << PROJ.ann.file
+
+# EOF

data/tasks/bones.rake

@@ -0,0 +1,20 @@
+
+if HAVE_BONES
+
+namespace :bones do
+
+  desc 'Show the PROJ open struct'
+  task :debug do |t|
+    atr = if t.application.top_level_tasks.length == 2
+      t.application.top_level_tasks.pop
+    end
+
+    if atr then Bones::Debug.show_attr(PROJ, atr)
+    else Bones::Debug.show PROJ end
+  end
+
+end  # namespace :bones
+
+end  # HAVE_BONES
+
+# EOF

data/tasks/gem.rake

@@ -0,0 +1,192 @@
+
+require 'find'
+require 'rake/packagetask'
+require 'rubygems/user_interaction'
+require 'rubygems/builder'
+
+module Bones
+class GemPackageTask < Rake::PackageTask
+  # Ruby GEM spec containing the metadata for this package.  The
+  # name, version and package_files are automatically determined
+  # from the GEM spec and don't need to be explicitly provided.
+  #
+  attr_accessor :gem_spec
+
+  # Tasks from the Bones gem directory
+  attr_reader :bones_files
+
+  # Create a GEM Package task library.  Automatically define the gem
+  # if a block is given.  If no block is supplied, then +define+
+  # needs to be called to define the task.
+  #
+  def initialize(gem_spec)
+    init(gem_spec)
+    yield self if block_given?
+    define if block_given?
+  end
+
+  # Initialization tasks without the "yield self" or define
+  # operations.
+  #
+  def init(gem)
+    super(gem.name, gem.version)
+    @gem_spec = gem
+    @package_files += gem_spec.files if gem_spec.files
+    @bones_files = []
+
+    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
+
+  # Create the Rake tasks and actions specified by this
+  # GemPackageTask.  (+define+ is automatically called if a block is
+  # given to +new+).
+  #
+  def define
+    super
+    task :prereqs
+    task :package => ['gem:prereqs', "#{package_dir_path}/#{gem_file}"]
+    file "#{package_dir_path}/#{gem_file}" => [package_dir_path] + package_files + bones_files do
+      when_writing("Creating GEM") {
+        chdir(package_dir_path) do
+          Gem::Builder.new(gem_spec).build
+          verbose(true) {
+            mv gem_file, "../#{gem_file}"
+          }
+        end
+      }
+    end
+
+    file package_dir_path => bones_files do
+      mkdir_p package_dir rescue nil
+      bones_files.each do |fn|
+        base_fn = File.join('tasks', File.basename(fn))
+        f = File.join(package_dir_path, base_fn)
+        fdir = File.dirname(f)
+        mkdir_p(fdir) if !File.exist?(fdir)
+        if File.directory?(fn)
+          mkdir_p(f)
+        else
+          raise "file name conflict for '#{base_fn}' (conflicts with '#{fn}')" if test(?e, f)
+          safe_ln(fn, f)
+        end
+      end
+    end
+  end
+  
+  def gem_file
+    if @gem_spec.platform == Gem::Platform::RUBY
+      "#{package_name}.gem"
+    else
+      "#{package_name}-#{@gem_spec.platform}.gem"
+    end
+  end
+end  # class GemPackageTask
+end  # module Bones
+
+namespace :gem do
+
+  PROJ.gem._spec = Gem::Specification.new do |s|
+    s.name = PROJ.name
+    s.version = PROJ.version
+    s.summary = PROJ.summary
+    s.authors = Array(PROJ.authors)
+    s.email = PROJ.email
+    s.homepage = Array(PROJ.url).first
+    s.rubyforge_project = PROJ.rubyforge.name
+
+    s.description = PROJ.description
+
+    PROJ.gem.dependencies.each do |dep|
+      s.add_dependency(*dep)
+    end
+
+    PROJ.gem.development_dependencies.each do |dep|
+      s.add_development_dependency(*dep)
+    end
+
+    s.files = PROJ.gem.files
+    s.executables = PROJ.gem.executables.map {|fn| File.basename(fn)}
+    s.extensions = PROJ.gem.files.grep %r/extconf\.rb$/
+
+    s.bindir = 'bin'
+    dirs = Dir["{#{PROJ.libs.join(',')}}"]
+    s.require_paths = dirs unless dirs.empty?
+
+    incl = Regexp.new(PROJ.rdoc.include.join('|'))
+    excl = PROJ.rdoc.exclude.dup.concat %w[\.rb$ ^(\.\/|\/)?ext]
+    excl = Regexp.new(excl.join('|'))
+    rdoc_files = PROJ.gem.files.find_all do |fn|
+                   case fn
+                   when excl; false
+                   when incl; true
+                   else false end
+                 end
+    s.rdoc_options = PROJ.rdoc.opts + ['--main', PROJ.rdoc.main]
+    s.extra_rdoc_files = rdoc_files
+    s.has_rdoc = true
+
+    if test ?f, PROJ.test.file
+      s.test_file = PROJ.test.file
+    else
+      s.test_files = PROJ.test.files.to_a
+    end
+
+    # Do any extra stuff the user wants
+    PROJ.gem.extras.each do |msg, val|
+      case val
+      when Proc
+        val.call(s.send(msg))
+      else
+        s.send "#{msg}=", val
+      end
+    end
+  end  # Gem::Specification.new
+
+  Bones::GemPackageTask.new(PROJ.gem._spec) do |pkg|
+    pkg.need_tar = PROJ.gem.need_tar
+    pkg.need_zip = PROJ.gem.need_zip
+  end
+
+  desc 'Show information about the gem'
+  task :debug => 'gem:prereqs' do
+    puts PROJ.gem._spec.to_ruby
+  end
+
+  desc 'Install the gem'
+  task :install => [:clobber, 'gem:package'] do
+    sh "#{SUDO} #{GEM} install --local pkg/#{PROJ.gem._spec.full_name}"
+
+    # use this version of the command for rubygems > 1.0.0
+    #sh "#{SUDO} #{GEM} install --no-update-sources pkg/#{PROJ.gem._spec.full_name}"
+  end
+
+  desc 'Uninstall the gem'
+  task :uninstall do
+    installed_list = Gem.source_index.find_name(PROJ.name)
+    if installed_list and installed_list.collect { |s| s.version.to_s}.include?(PROJ.version) then
+      sh "#{SUDO} #{GEM} uninstall --version '#{PROJ.version}' --ignore-dependencies --executables #{PROJ.name}"
+    end
+  end
+
+  desc 'Reinstall the gem'
+  task :reinstall => [:uninstall, :install]
+
+  desc 'Cleanup the gem'
+  task :cleanup do
+    sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}"
+  end
+end  # namespace :gem
+
+
+desc 'Alias to gem:package'
+task :gem => 'gem:package'
+
+task :clobber => 'gem:clobber_package'
+remove_desc_for_task 'gem:clobber_package'
+
+# EOF