lipsiadmin 4.1.2 → 4.1.3

data/CHANGELOG

@@ -1,3 +1,12 @@
+2009-05-21
+  * Removed some grids defaults
+  * Added attacher_name in before_save
+  * Started a new task for translate models for I18n
+  * Fix a bug in account.rb
+  * Added ImageMagick requirements to gem
+  * Improved doc
+  * Allow models to have multiple attachments definitions
+  
 2009-05-18
   * Small fix in generation of account access
   * Fix an issue in backend_page generator

data/README.rdoc

@@ -2,7 +2,7 @@
 
 Lipsiadmin is a new revolutionary admin for your projects.
 
-Is developped by http://www.lipsiasoft.com that use it from 2 years in production enviroments.
+Is developped by http://www.lipsiasoft.com that use it from 3 years in production enviroments.
 
 Lipsiadmin is based on Ext Js 2.2 framework (with prototype adapter) works with Rails 2+
 
@@ -21,8 +21,8 @@ Twitter:: http://twitter.com/daddye
 
 ==Requirements
 
-Rails 2+
-Haml 2+
+* Rails 2+
+* Haml 2+
 
 ==Installation
 
@@ -38,8 +38,12 @@ Simply because we mantain backward compatibility until a 5.0 version.
 This mean that before v 5.0 we only do small improvemets, bug fix, doc etc...
 
 If you want install the edge version you can simply do:
-
+  
+  gem install haml
   script/plugin install git://github.com/Lipsiasoft/lipsiadmin.git
+
+Remember that for use your attachment processor (Paperclip) you need ImageMagick installed
+on your sistem
   
 ==Examples
 

data/Rakefile

@@ -45,6 +45,7 @@ spec = Gem::Specification.new do |s|
   s.summary           = "Lipsiadmin is a new revolutionary admin for your projects.Lipsiadmin is based on Ext Js 2.0. framework (with prototype adapter) and is ready for Rails 2.0. This admin is for newbie developper but also for experts, is not entirely written in javascript because the aim of developper wose build in a agile way web/site apps so we use extjs in a new intelligent way a mixin of 'old' html and new ajax functions, for example ext manage the layout of page, grids, tree and errors, but form are in html code."
   s.files             = FileList["CHANGELOG", "README.rdoc", "MIT-LICENSE", "Rakefile", "init.rb", "{lipsiadmin_generators,lib,resources,tasks}/**/*"].to_a
   s.has_rdoc          = true
+  s.requirements << "ImageMagick"
   s.add_dependency('haml')
   s.add_dependency('rails', '>= 2.2.1')
 end

data/lib/data_base/attachment.rb

@@ -47,6 +47,12 @@ module Lipsiadmin
         def has_one_attachment(name, options={})
           options[:as]         ||= :attacher
           options[:class_name] ||= "Attachment"
+          
+          # We need to check if the attachment model allow multiple attachments
+          multi_attachments = options[:class_name].constantize.column_names.include?("attacher_name")
+          
+          options[:conditions]   = "attacher_name = '#{name}'" if multi_attachments
+          
           has_one name, options
           before_save "before_save_for_#{name}"
           attr_accessor "#{name}_attributes"
@@ -75,6 +81,9 @@ module Lipsiadmin
             
             attributes.merge!(:attachment_definitions => self.class.attachment_definitions[name])
             
+            # We need to add the new attacher_name
+            attributes.merge!(:attacher_name => name.to_s) if multi_attachments
+            
             if file_column = self.send(name)
               file_column.update_attributes(attributes)
             else
@@ -103,6 +112,11 @@ module Lipsiadmin
           options[:as]         ||= :attacher
           options[:class_name] ||= "Attachment"
           
+          # We need to check if the attachment model allow multiple attachments
+          multi_attachments = options[:class_name].constantize.column_names.include?("attacher_name")
+          
+          options[:conditions]   = "attacher_name = '#{name}'" if multi_attachments
+
           has_many name, options
           before_save "before_save_for_#{name}"
           attr_accessor "#{name}_attributes"
@@ -135,6 +149,8 @@ module Lipsiadmin
             for attribute in attributes
               next if attribute["file"].blank?
               attribute.merge!(:attachment_definitions => self.class.attachment_definitions[name])
+              # We need to add the new attacher_name
+              attribute.merge!(:attacher_name => name.to_s) if multi_attachments
               self.send(name).build(attribute)
             end
 

data/lib/lipsiadmin.rb

@@ -71,6 +71,7 @@ ActionView::Helpers::AssetTagHelper.register_javascript_expansion :backend => ["
 I18n.load_path += Dir[File.join(RAILS_ROOT, 'config', 'locales', 'backend',  '*.{rb,yml}')]
 I18n.load_path += Dir[File.join(RAILS_ROOT, 'config', 'locales', 'frontend', '*.{rb,yml}')]
 I18n.load_path += Dir[File.join(RAILS_ROOT, 'config', 'locales', 'models',   '*.{rb,yml}')]
+I18n.load_path += Dir[File.join(RAILS_ROOT, 'config', 'locales', 'models',   '**/*.{rb,yml}')]
 I18n.load_path += Dir[File.join(RAILS_ROOT, 'config', 'locales', 'rails',    '*.{rb,yml}')]
 
 # Load generator languages

data/lib/version.rb

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

data/lipsiadmin_generators/attachment/templates/migration.rb

@@ -1,9 +1,10 @@
 class CreateAttachments < ActiveRecord::Migration
   def self.up
     create_table :attachments, :force => true do |t|
-      t.string  :attached_file_name, :attached_content_type
-      t.integer :attached_file_size
+      t.string     :attached_file_name, :attached_content_type
+      t.integer    :attached_file_size
       t.references :attacher, :polymorphic => true
+      t.string     :attacher_name
       t.timestamps
     end
   end

data/lipsiadmin_generators/backend/templates/models/account.rb

@@ -5,6 +5,7 @@ class Account < ActiveRecord::Base
   
   serialize                 :modules
   
+  # Validations
   validates_presence_of     :name, :surname, :email
   validates_presence_of     :password,                   :if => :password_required?
   validates_presence_of     :password_confirmation,      :if => :password_required?
@@ -13,31 +14,33 @@ class Account < ActiveRecord::Base
   validates_length_of       :email,    :within => 3..100
   validates_uniqueness_of   :email,    :case_sensitive => false
   validates_format_of       :email,    :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
+  validates_inclusion_of    :role,     :in => AccountAccess.roles
+
+  # Relations
+  # go here
+  
+  # Callbacks
   before_save               :encrypt_password
+  after_create              :deliver_registration
   
-  def after_create
-    Notifier.deliver_registration(self)
-  end
+  # Named Scopes
+  # go here
   
   def full_name
     "#{name} #{surname}".strip
   end
   
+  # If we don't found a module we need to 
+  # to return an empty array
   def modules
     read_attribute(:modules) || []
   end
   
+  # We need to perform a little rewrite
   def modules=(perms)
     perms = perms.collect {|p| p.to_sym unless p.blank? }.compact if perms
     write_attribute(:modules, perms)
   end
-  
-  # Activates the user in the database.
-  def activate
-    @activated = true
-    self.activated_at = Time.now.utc
-    self.activation_code = nil
-  end
 
   # Authenticates a user by their email and unencrypted password.  Returns the user or nil.
   def self.authenticate(email, password)
@@ -54,7 +57,8 @@ class Account < ActiveRecord::Base
   rescue
     nil
   end
-
+  
+  # Get the uncripted password
   def password_clean
     unless @password
       enc = OpenSSL::Cipher::Cipher.new('DES-EDE3-CBC')
@@ -67,8 +71,9 @@ class Account < ActiveRecord::Base
     nil
   end
   
+  # If you want you can integrate you custom activation/blocking system
+  # Our auth system already check this method so don't delete it
   def active?
-    # If you want you can integrate you custom activation/blocking system
     true
   end
 
@@ -77,11 +82,12 @@ class Account < ActiveRecord::Base
     self.class.encrypt(password, salt)
   end
 
+  # Check if the db password 
   def authenticated?(password)
-    crypted_password.chomp == encrypt(password).chomp
+    crypted_password.chomp == encrypt(password).chomp rescue false
   end
 
-  
+  # Gets the project modules for this accounts
   def maps
     if modules && modules.split(",").size > 0
       maps = AccountAccess.find_by_project_modules(modules.split(","))
@@ -100,17 +106,20 @@ class Account < ActiveRecord::Base
   #   def administrator?
   #     role == "administrator"
   #   end
-  AccountAccess.roles.each { |r| define_method("#{r.to_s.downcase.gsub(" ","_").to_sym}?") { role.to_s.downcase.gsub(" ","_").to_sym == r.to_s.downcase.gsub(" ","_").to_sym } }
+  AccountAccess.roles.each { |r| define_method("#{r.to_s.downcase.gsub(" ","_").to_sym}?") { role.to_s.downcase == r.to_s.downcase } }
   
-  protected
-    # before filter 
-    def encrypt_password
-      return if password.blank?
-      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new_record?
-      self.crypted_password = encrypt(password)
-    end
-      
-    def password_required?
-      crypted_password.blank? || !password.blank?
-    end
+protected
+  def encrypt_password
+    return if password.blank?
+    self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new_record?
+    self.crypted_password = encrypt(password)
+  end
+    
+  def password_required?
+    crypted_password.blank? || !password.blank?
+  end
+  
+  def deliver_registration
+    Notifier.deliver_registration(self)
+  end
 end

data/tasks/lipsiadmin_tasks.rake

@@ -9,20 +9,65 @@ namespace :lipsiadmin do
       end
     end
     
-    desc "Updated the current rails locale and backend locale"
-    task :locales do
-      Dir[File.join(File.dirname(__FILE__), '..', '/lipsiadmin_generators/backend/templates/config/locales/rails/*.yml')].each do |yml|
-        puts "Coping config/locales/rails/#{File.basename(yml)} ... DONE"
-        FileUtils.cp(yml, RAILS_ROOT + '/config/locales/rails')
-      end
+    
+    namespace :locales do
+      desc "Updated the current rails locale and backend locale"
+      task :system do
+        Dir[File.join(File.dirname(__FILE__), '..', '/lipsiadmin_generators/backend/templates/config/locales/rails/*.yml')].each do |yml|
+          puts "Coping config/locales/rails/#{File.basename(yml)} ... DONE"
+          FileUtils.cp(yml, RAILS_ROOT + '/config/locales/rails')
+        end
       
-      Dir[File.join(File.dirname(__FILE__), '..', '/lipsiadmin_generators/backend/templates/config/locales/backend/*.yml')].each do |yml|
-        puts "Coping config/locales/backend/#{File.basename(yml)} ... DONE"
-        FileUtils.cp(yml, RAILS_ROOT + '/config/locales/backend')
+        Dir[File.join(File.dirname(__FILE__), '..', '/lipsiadmin_generators/backend/templates/config/locales/backend/*.yml')].each do |yml|
+          puts "Coping config/locales/backend/#{File.basename(yml)} ... DONE"
+          FileUtils.cp(yml, RAILS_ROOT + '/config/locales/backend')
+        end
+      end
+    
+      desc "Updated the current models locales. Use LANGS=en,it,cz"
+      task :models => :environment do
+        langs = ENV['LANGS'] ? ENV['LANGS'].split(",") : [:en]
+        models = Dir["#{RAILS_ROOT}/app/models/*"].collect { |model| File.basename(model, ".rb") }
+
+        for model in models
+          # Get the model class
+          klass = model.camelize.constantize
+          next unless klass.respond_to?(:columns)
+
+          # Init the processing
+          print "Processing #{model.humanize}: "
+          FileUtils.mkdir_p("#{RAILS_ROOT}/config/locales/models/#{model}")
+
+          # Create models for it and en locales
+          langs.each do |lang|
+            filename   = "#{RAILS_ROOT}/config/locales/models/#{model}/#{lang}.yml"
+            columns    = klass.columns.collect(&:name)
+            # If the lang file already exist we need to check it
+            if File.exist?(filename)
+              locale = File.open(filename).read
+              columns.each do |c|
+                locale += "        #{c}: #{klass.human_attribute_name(c)}" unless locale.include?("#{c}:")
+              end
+              print "#{lang} already exist ... "; $stdout.flush
+              # Do some ere
+            else
+              locale     = "#{lang}:" + "\n" +
+                           "  activerecord:" + "\n" +
+                           "    models:" + "\n" +
+                           "      #{model}: #{klass.human_name}" + "\n" +
+                           "    attributes:" + "\n" +
+                           "      #{model}:" + "\n" +
+                           columns.collect { |c| "        #{c}: #{klass.human_attribute_name(c)}" }.join("\n")
+              print "#{lang} created new one ... "; $stdout.flush
+            end
+            File.open(filename, "w") { |f| f.puts locale }
+          end
+          puts
+        end
       end
     end
-  end
-end
+  end # namespace :update
+end # namespace :lipsiadmin
 
 desc "Init the test env and autotest them"
 task :autotest => "test:init" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lipsiadmin
 version: !ruby/object:Gem::Version 
-  version: 4.1.2
+  version: 4.1.3
 platform: ruby
 authors: 
 - Davide D'Agostino
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-19 00:00:00 +02:00
+date: 2009-05-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -556,8 +556,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-requirements: []
-
+requirements: 
+- ImageMagick
 rubyforge_project: lipsiadmin
 rubygems_version: 1.3.3
 signing_key: