radiant-users-extension 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/users/models/user.rb

@@ -5,13 +5,13 @@ module Users
       def self.included(base)
         base.class_eval do
           attr_protected :access
-          after_create :generate_api_key
+          after_initialize :generate_api_key
           
           def generate_api_key
             begin
-              self.api_key = self.sha1(Time.now + Radiant::Config['session_timeout'].to_i)
+              self.api_key = ActiveSupport::SecureRandom.hex(18) unless api_key.present?
             rescue
-              logger.error "attempt to create api key failed - please migrate radiant-scoped-extension"
+              logger.error "attempt to create api key failed - please migrate radiant-users-extension"
             end
           end
         end

data/lib/users/tags/core.rb

@@ -0,0 +1,47 @@
+module Users
+  module Tags
+    module Core
+      include Radiant::Taggable
+          
+      tag 'user' do |tag|
+        return if tag.locals.page.cache?
+        
+        tag.locals.user = Helpers.current_user(tag)
+        
+        tag.expand
+      end
+      
+      tag 'user:if_user' do |tag|
+        tag.expand if tag.locals.user.present?
+      end
+      
+      tag 'user:unless_user' do |tag|
+        tag.expand unless tag.locals.user.present?
+      end
+      
+      tag 'user:if_authorized' do |tag|
+        tag.expand unless tag.locals.user.access.present?
+      end
+      
+      tag 'user:unless_authorized' do |tag|
+        tag.expand if tag.locals.user.access.present?
+      end
+      
+      tag 'user:if_admin' do |tag|
+        tag.expand if tag.locals.user.admin
+      end
+      
+      tag 'user:unless_admin' do |tag|
+        tag.expand unless tag.locals.user.admin
+      end
+      
+      [:name, :first_name, :last_name, :login, :email, :access].each do |symbol|
+        desc %{ outputs the #{symbol} of the current user }
+        tag "user:#{symbol}" do |tag|
+          tag.locals.user.send(symbol)
+        end
+      end
+      
+    end
+  end
+end

data/lib/users/tags/helpers.rb

@@ -0,0 +1,19 @@
+module Users
+  module Tags
+    class Helpers
+      class << self
+        include ActionView::Helpers::NumberHelper
+        
+        def current_user(tag)
+          begin
+            user_id = tag.locals.page.request.session['user_id']
+            User.find(user_id)
+          rescue
+            return false
+          end
+        end
+        
+      end
+    end
+  end
+end

data/radiant-users-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-users-extension}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christopher Rankin", "Dirk Kelly"]
-  s.date = %q{2010-11-30}
+  s.date = %q{2010-12-14}
   s.description = %q{Users creates support for non-admin users with API access}
   s.email = %q{dk@squaretalent.com}
   s.extra_rdoc_files = [
@@ -30,6 +30,8 @@ Gem::Specification.new do |s|
     "lib/users/lib/login_system.rb",
     "lib/users/models/user.rb",
     "lib/users/models/user/scoped.rb",
+    "lib/users/tags/core.rb",
+    "lib/users/tags/helpers.rb",
     "radiant-users-extension.gemspec",
     "spec/datasets/scoped_users_dataset.rb",
     "spec/models/user_spec.rb",

data/users_extension.rb

@@ -4,6 +4,9 @@ class UsersExtension < Radiant::Extension
   url "http://github.com/dirkkelly/radiant-users-extension"
 
   def activate
+    # Tags
+    Page.send :include, Users::Tags::Core
+    
     # Models
     User.send :include, Users::Models::User
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-users-extension
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Christopher Rankin
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 +08:00
+date: 2010-12-14 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -43,6 +43,8 @@ files:
 - lib/users/lib/login_system.rb
 - lib/users/models/user.rb
 - lib/users/models/user/scoped.rb
+- lib/users/tags/core.rb
+- lib/users/tags/helpers.rb
 - radiant-users-extension.gemspec
 - spec/datasets/scoped_users_dataset.rb
 - spec/models/user_spec.rb