blaxter-lockdown 0.9.8.99 → 0.9.9

data/lib/lockdown.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), "lockdown", "helper")
 module Lockdown
   extend Lockdown::Helper
 
-  VERSION = '0.9.8.99'
+  VERSION = '0.9.9'
 
   # Returns the version string for the library.
   def self.version

data/lib/lockdown/frameworks/rails/controller.rb

@@ -129,16 +129,22 @@ module Lockdown
               redirect_to(session[:prevpage])
             end
           end
-  
+
           # Called from current_user.  Now, attempt to login by
           # basic authentication information.
           def login_from_basic_auth?
             username, passwd = get_auth_data
             if username && passwd
-              set_session_user ::User.authenticate(username, passwd)
+              add_lockdown_session_values ::User.authenticate(username, passwd)
+              @_logged_from_basic_auth = logged_in?
             end
           end
 
+          # Whether the login has been made through basic auth
+          def logged_from_basic_auth?
+            @_logged_from_basic_auth
+          end
+
           @@http_auth_headers = %w(X-HTTP_AUTHORIZATION HTTP_AUTHORIZATION Authorization)
           # gets BASIC auth info
           def get_auth_data

data/lockdown.gemspec

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{lockdown}
+  s.version = "0.9.9"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Andrew Stone"]
+  s.date = %q{2009-08-26}
+  s.description = %q{Lockdown is an authorization system for RubyOnRails (ver >= 2.1).}
+  s.email = %q{andy@stonean.com}
+  s.extra_rdoc_files = ["History.txt", "README.txt"]
+  s.files = ["History.txt", "README.txt", "Rakefile", "lib/lockdown.rb", "lib/lockdown/context.rb", "lib/lockdown/database.rb", "lib/lockdown/frameworks/rails.rb", "lib/lockdown/frameworks/rails/controller.rb", "lib/lockdown/frameworks/rails/view.rb", "lib/lockdown/helper.rb", "lib/lockdown/orms/active_record.rb", "lib/lockdown/permission.rb", "lib/lockdown/rules.rb", "lib/lockdown/session.rb", "lib/lockdown/system.rb", "lockdown.gemspec", "rails_generators/lockdown/lockdown_generator.rb", "rails_generators/lockdown/templates/app/controllers/permissions_controller.rb", "rails_generators/lockdown/templates/app/controllers/sessions_controller.rb", "rails_generators/lockdown/templates/app/controllers/user_groups_controller.rb", "rails_generators/lockdown/templates/app/controllers/users_controller.rb", "rails_generators/lockdown/templates/app/helpers/permissions_helper.rb", "rails_generators/lockdown/templates/app/helpers/user_groups_helper.rb", "rails_generators/lockdown/templates/app/helpers/users_helper.rb", "rails_generators/lockdown/templates/app/models/permission.rb", "rails_generators/lockdown/templates/app/models/profile.rb", "rails_generators/lockdown/templates/app/models/user.rb", "rails_generators/lockdown/templates/app/models/user_group.rb", "rails_generators/lockdown/templates/app/views/permissions/index.html.erb", "rails_generators/lockdown/templates/app/views/permissions/show.html.erb", "rails_generators/lockdown/templates/app/views/sessions/new.html.erb", "rails_generators/lockdown/templates/app/views/user_groups/edit.html.erb", "rails_generators/lockdown/templates/app/views/user_groups/index.html.erb", "rails_generators/lockdown/templates/app/views/user_groups/new.html.erb", "rails_generators/lockdown/templates/app/views/user_groups/show.html.erb", "rails_generators/lockdown/templates/app/views/users/edit.html.erb", "rails_generators/lockdown/templates/app/views/users/index.html.erb", "rails_generators/lockdown/templates/app/views/users/new.html.erb", "rails_generators/lockdown/templates/app/views/users/show.html.erb", "rails_generators/lockdown/templates/config/initializers/lockit.rb", "rails_generators/lockdown/templates/db/migrate/create_admin_user.rb", "rails_generators/lockdown/templates/db/migrate/create_permissions.rb", "rails_generators/lockdown/templates/db/migrate/create_profiles.rb", "rails_generators/lockdown/templates/db/migrate/create_user_groups.rb", "rails_generators/lockdown/templates/db/migrate/create_users.rb", "rails_generators/lockdown/templates/lib/lockdown/README", "rails_generators/lockdown/templates/lib/lockdown/init.rb", "spec/lockdown/database_spec.rb", "spec/lockdown/frameworks/rails/controller_spec.rb", "spec/lockdown/frameworks/rails/view_spec.rb", "spec/lockdown/frameworks/rails_spec.rb", "spec/lockdown/permission_spec.rb", "spec/lockdown/rules_spec.rb", "spec/lockdown/session_spec.rb", "spec/lockdown/system_spec.rb", "spec/lockdown_spec.rb", "spec/rcov.opts", "spec/spec.opts", "spec/spec_helper.rb"]
+  s.homepage = %q{http://stonean.com/wiki/lockdown}
+  s.rdoc_options = ["--main", "README.txt"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{lockdown}
+  s.rubygems_version = %q{1.3.3}
+  s.summary = %q{Lockdown is an authorization system for RubyOnRails (ver >= 2}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<bones>, [">= 2.5.1"])
+    else
+      s.add_dependency(%q<bones>, [">= 2.5.1"])
+    end
+  else
+    s.add_dependency(%q<bones>, [">= 2.5.1"])
+  end
+end

data/rails_generators/lockdown/templates/lib/lockdown/README

@@ -37,6 +37,8 @@
 # Will return true if the session[:access_rights] contain at 
 # least one match to the access_right list associated to the group
 #
+# logged_from_basic_auth?: whether the login process has been made by basic auth
+#
 # If you want access to any of these methods in your view, just add them 
 # as helpers in your controller (application controller for global use).
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blaxter-lockdown
 version: !ruby/object:Gem::Version 
-  version: 0.9.8.99
+  version: 0.9.9
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-04 00:00:00 -07:00
+date: 2009-08-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ files:
 - lib/lockdown/rules.rb
 - lib/lockdown/session.rb
 - lib/lockdown/system.rb
+- lockdown.gemspec
 - rails_generators/lockdown/lockdown_generator.rb
 - rails_generators/lockdown/templates/app/controllers/permissions_controller.rb
 - rails_generators/lockdown/templates/app/controllers/sessions_controller.rb