lipsiadmin 2.9 → 3.0

data/CHANGELOG

@@ -1,4 +1,17 @@
+2009-02-28
+  * Fixed a small js error on dblclick on grids
+  * Added for Ext::Component a new method for remove listener, remove_listener 
+  * Added for Ext::Component a new alias for grid.on, called add_listener
+  * Fixed problem with generation of template for boolean cols
+  * Improvement in Backend.js, now mask() when clean()
+  * Fixed Attachment for get many styles
+  * Added a new method in Ext::Component for generate on the fly extjs objects
+  * Small refactoring in Ext::Component
+  * Small refactoring in Ext::Grid
+  * Fixed a small errror in Ext::Store
+
 2009-02-27
+  * Added as default sm :checkbox
   * Fixed a litte padding in firefox for datetimefield
   * Fixed a typo in account.rb
   * Fixed attachment creation for new records

data/README

@@ -24,18 +24,20 @@ Haml 2+
 
 ==Installation
 
-  script/plugin install git://github.com/Lipsiasoft/lipsiadmin.git
+  $ sudo gem install lipsiadmin
+  
+Then in your config/environment.rb
+  
+  config.gem "lipsiadmin", :version => "< 4.0"
+  
+Why we need to specify version?
 
-The version 2.9 version is an alpha relase and the gem will be aviable from 3.0
+Simply because we mantain backward compatibility until a 4.0 version.
+This mean that before v 4.0 we only do small improvemets, bug fix, doc etc...
 
-In future you can simply do:
+If you want install the edge version you can simply do:
 
-  in config/environments.rb
-  config.gem "lipsiadmin"
-  
-then (if you don't have it already)
-  
-  $ rake gems:install
+  script/plugin install git://github.com/Lipsiasoft/lipsiadmin.git
   
 ==Examples
 

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/gempackagetask'
 require 'rake/contrib/sshpublisher'
 
 PKG_NAME      = 'lipsiadmin'
-PKG_VERSION   = "2.9"
+PKG_VERSION   = "3.0"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')

data/lib/data_base/attachment.rb

@@ -174,7 +174,8 @@ module Lipsiadmin
         # inside the dimensions and then crop the rest off (weighted at the center). The 
         # default value is to generate no thumbnails.
         def attachment_styles_for(name, style_name, styles)
-          attachment_definitions[name][:styles] = { style_name => styles }
+          attachment_definitions[name][:styles] ||= {}
+          attachment_definitions[name][:styles].merge!(style_name => styles)
         end
         
         # The thumbnail style that will be used by default URLs. 
@@ -216,7 +217,8 @@ module Lipsiadmin
         #   attachment_convert_options :avatar, :all,      "-strip"
         #   attachment_convert_options :avatar, :negative, "-negate"
         def attachment_convert_options_for(name, convert_name, convert_options)
-          attachment_definitions[name][:convert_options] = { convert_name => convert_options}
+          attachment_definitions[name][:convert_options] ||= {}
+          attachment_definitions[name][:convert_options].merge!(convert_name => convert_options)
         end
         
         # When processing, if the spawn plugin is installed, processing can be done in
@@ -265,7 +267,8 @@ module Lipsiadmin
         # options "{ :quality => :better }". This parameter may not mean anything to one
         # or more or the processors, and they are free to ignore it.        
         def attachment_processors_for(name, processor_name, processors)
-          attachment_definitions[name][:processors] = { processor_name => processor_processors }
+          attachment_definitions[name][:processors] ||= {}
+          attachment_definitions[name][:processors].merge!(processor_name => processor_processors)
         end
 
         # Places ActiveRecord-style validations on the size of the file assigned. The

data/lib/mailer/pdf_builder.rb

@@ -45,7 +45,6 @@ module Lipsiadmin
         # search for images src, append full-path.
         input.gsub!('src="/', 'src="' + RAILS_ROOT + '/public/')
         input.gsub!('url(','url('+RAILS_ROOT+'/public')
-        #RAILS_DEFAULT_LOGGER.debug ('input: ' + input)
 
         cmd = "java -Xmx512m -Djava.awt.headless=true -cp pd4ml.jar:.:#{File.dirname(__FILE__)}/#{JARPATH} Pd4Ruby '#{input}' 950 A4 #{landescape}"
 

data/lib/version.rb

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

data/lib/view/helpers/ext/column_model.rb

@@ -29,7 +29,8 @@ module Lipsiadmin
     #     
     class ColumnModel < Component      
       def initialize(options={}, &block)#:nodoc:
-        super("Ext.grid.ColumnModel", { :columns => [] }.merge(options), &block)
+        super("Ext.grid.ColumnModel", { :columns => [] }.merge(options))
+        yield self if block_given?
       end
       
       # This add automatically fields from an array

data/lib/view/helpers/ext/component.rb

@@ -20,7 +20,10 @@ module Lipsiadmin#:nodoc:
         @klass = klass
         @config = Configuration.new(options)
         @before, @after = [], []
-        yield self if block_given?
+      
+        if self.class == Component && block_given?
+          yield self 
+        end
       end
       
       # The id of the component
@@ -64,7 +67,7 @@ module Lipsiadmin#:nodoc:
         if method.to_s.start_with?("get_")
           @config[method.to_s.gsub("get_", "").to_sym]
         else
-          @config[method.to_sym] = arg
+          add_object(method, arg)
         end
       end
       
@@ -73,12 +76,6 @@ module Lipsiadmin#:nodoc:
       def before
         @before
       end
-
-      # Returns the javascript to add before component is rendered.
-      #
-      def before_js
-        @before.uniq.compact.join("\n\n") + "\n\n"
-      end
       
       # Returns an array of javascripts to add afters component is rendered.
       #
@@ -86,13 +83,6 @@ module Lipsiadmin#:nodoc:
         @after
       end
       
-      # Returns the javascript to add after component is rendered.
-      #   
-      def after_js
-        "\n\n" + @after.uniq.compact.join("\n\n")
-      end
-      
-      
       # Generates a new handler for the given component
       # 
       #   Examples:
@@ -111,28 +101,55 @@ module Lipsiadmin#:nodoc:
       #     end
       def on(event, function=nil, scope=nil, &block)
         # Remove old handlers
-        @after.delete_if { |s| s.start_with?("#{get_var}.on(#{event.to_json}") if s.is_a?(String) }
-        scope = ", #{scope}" unless scope.blank?        
+        remove_listener(event)
+        scope = ", #{l(scope)}" unless scope.blank?        
         if function
           after << "#{get_var}.on(#{event.to_json}, #{function}#{scope});"
         else
           generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(self, &block)
-          after << "#{get_var}.on(#{event.to_json}, function() { \n  #{generator.to_s.gsub("\n", "\n  ")}\n}#{scope});"
+          after << "#{get_var}.on(#{event.to_json}, function() { #{generator.to_s.gsub("\n", "\n  ")}\n}#{scope});"
         end
       end
+      alias_method :add_listener, :on
+      
+      # Remove a listener
+      # 
+      #   Example: grid.remove_listener(:dblclick)
+      def remove_listener(event)
+        @after.delete_if { |s| s.start_with?("#{get_var}.on(#{event.to_json}") if s.is_a?(String) }
+      end
       
+      # Generates a new Component for generate on the fly ExtJs Objects
+      # 
+      #   Examples:
+      # 
+      #     # Generates:
+      #     #   var myComponent = new MyComponent({
+      #     #     default: true
+      #     #   });
+      #     grid.my_component grid.new_component("MyComponent") { |p| p.default true }
+      # 
+      def new_component(klass, options={}, &block)
+        Component.new(klass, options, &block)
+      end
+      
+      # Used by ActionView::Helpers::PrototypeHelper::JavaScriptGenerator
       def with_output_buffer(buf = '')#:nodoc:
         yield
       end
       
       
-      # Returns the javascript example
+      # Returns the javascript for current component
       #
       #   # Generates: var rowSelectionModel = Ext.grid.RowSelectionModel();
       #   Component.new("Ext.grid.RowSelectionModel")
       # 
       def to_s
-        "var #{get_var} = new #{@klass}(#{config.to_s});"
+        script = []
+        script << @before.uniq.compact.join("\n\n")
+        script << "var #{get_var} = new #{@klass}(#{config.to_s});"
+        script << @after.uniq.compact.join("\n\n")
+        script.delete_if { |s| s.blank? }.join("\n\n")
       end
       
       def raise_error(error)#:nodoc:
@@ -158,6 +175,15 @@ module Lipsiadmin#:nodoc:
           template = File.read("#{File.dirname(__FILE__)}/templates/#{template}.js.erb")
           return ERB.new(template).result(binding)
         end
+        
+        def add_object(name, object)
+          if object.class == Component || object.class.superclass == Component
+            @before << object.to_s
+            @config[name.to_sym] = l(object.get_var)
+          else
+            @config[name.to_sym] = object
+          end
+        end
     end
   end
 end

data/lib/view/helpers/ext/grid.rb

@@ -42,19 +42,24 @@ module Lipsiadmin
       def initialize(options={}, &block)#:nodoc:
         # Call Super Class for initialize configuration
         super("Ext.grid.GridPanel", options)
-        
+
         # Write default configuration if not specified
         config[:plugins]      ||= []
-        viewConfig            l("{ forceFit: true }")       
-        clicksToEdit          l(1)                          
-        border                l(false)                      
-        bodyBorder            l(false)                      
-        region                "center"                      
-        sm                    :checkbox                     
-        add_plugin            l("new Ext.grid.Search()")    
-        view                  :default                      
-        on(:dblclick, :edit, l("this"))          
+        viewConfig            :forceFit => true
+        clicksToEdit          1
+        border                false
+        bodyBorder            false
+        region                "center"
+        sm                    :checkbox
+        add_plugin            l("new Ext.grid.Search()")
+        view                  :default
         
+        # We need to add a setTimeout because, we destroy
+        # the grid before loading a new page/js.
+        on(:dblclick) do |p|
+          p.delay(0.2) { p.call :edit }
+        end
+
         yield self if block_given?
       end
       
@@ -69,15 +74,14 @@ module Lipsiadmin
       # 
       #   new Ext.grid.CheckboxSelectionModel()
       # 
-      def sm(value)
-        selmodel = case value
+      def sm(object)
+        selmodel = case object
           when :default  then Component.new("Ext.grid.CheckboxSelectionModel")
           when :checkbox then Component.new("Ext.grid.CheckboxSelectionModel")
           when :row      then Component.new("Ext.grid.RowSelectionModel")
-          when Component then value
+          else object
         end
-        before << selmodel.to_s
-        config[:sm] = l(selmodel.get_var)
+        add_object(:sm, selmodel)
       end
       
       # Define the title of the grid
@@ -125,18 +129,16 @@ module Lipsiadmin
       #
       #   tbar  :default
       # 
-      def tbar(obj=nil, &block)
-        tbar = obj.is_a?(ToolBar) ? obj : ToolBar.new
-        if obj == :default
+      def tbar(object=nil, &block)
+        tbar = object.is_a?(ToolBar) ? object : ToolBar.new
+        if object == :default
           tbar.add l("Backend.locale.buttons.add"),    :id => "add",    :disabled => literal(false), :cls => "x-btn-text-icon add",    :handler => l("add")
           tbar.add l("Backend.locale.buttons.edit"),   :id => "edit",   :disabled => literal(true),  :cls => "x-btn-text-icon edit",   :handler => l("edit")
           tbar.add l("Backend.locale.buttons.remove"), :id => "remove", :disabled => literal(true),  :cls => "x-btn-text-icon remove", :handler => l("remove")
           @default_tbar = true 
         end
         yield tbar if block_given?
-        before << tbar.to_s
-        after  << tbar.after
-        config[:tbar] = l(tbar.get_var)
+        add_object(:tbar, tbar)
       end
       
       # Generate or set a new Ext.Toolbar
@@ -149,11 +151,9 @@ module Lipsiadmin
       #     })
       #   bbar :pageSize => params[:limit], :store => store.get_var, displayInfo: true
       # 
-      def bbar(value=nil, &block)
-        bbar = value.is_a?(Hash) ? Component.new("Ext.PagingToolbar", value) : value
-        before << bbar.to_s
-        after  << bbar.after
-        config[:bbar] = l(bbar.get_var)
+      def bbar(object=nil, &block)
+        bbar = object.is_a?(Hash) ? Component.new("Ext.PagingToolbar", object) : object
+        add_object(:bbar, bbar)
       end
 
       # Generate or set a new Ext.grid.GroupingView
@@ -166,38 +166,31 @@ module Lipsiadmin
       #     })
       #   view :forceFit => true, :groupTextTpl => "{text} ({[values.rs.length]} {[values.rs.length > 1 ? "Foo" : "Bar"]})"
       # 
-      def view(value=nil, &block)
-        if value.is_a?(Symbol) && (value == :default)
+      def view(object=nil, &block)
+        if object == :default
           view = Component.new("Ext.grid.GroupingView", { :forceFit => true })
         elsif value.is_a?(Hash)
-          view = Component.new("Ext.grid.GroupingView", { :forceFit => true })
+          view = Component.new("Ext.grid.GroupingView", { :forceFit => true }.merge(object))
         else
-          view = value
+          view = object
         end
-        
-        before << view.to_s
-        after  << view.after
-        config[:view] = l(view.get_var)
+        add_object(:view, view)
       end
       
       # Generate or set a new Ext.data.GroupingStore
-      def store(value=nil, url=nil, &block)
-        datastore = value.is_a?(Store) ? value : Store.new(&block)
-        before << datastore.to_s
-        after  << datastore.after
-        config[:store] = l(datastore.get_var)
+      def store(object=nil, &block)
+        store = object.is_a?(Store) ? object : Store.new(&block)
+        add_object(:store, store)
       end
       
       # Generate or set new Ext.grid.ColumnModel
-      def columns(value=nil, &block)
+      def columns(object=nil, &block)
         options = { :columns => [] }
         if config[:sm] && before.find { |js| js.start_with?("var #{config[:sm]} = new Ext.grid.CheckboxSelectionModel") }
           options[:columns] << config[:sm]
         end
-        columnmodel = value.is_a?(ColumnModel) ? value : ColumnModel.new(options, &block)
-        before << columnmodel.to_s
-        after  << columnmodel.after
-        config[:cm] = l(columnmodel.get_var)
+        cm = object.is_a?(ColumnModel) ? value : ColumnModel.new(options, &block)
+        add_object(:cm, cm)
       end
       
       # The base_path used for ToolBar, it's used for generate [:new, :edit, :destory] urls
@@ -274,7 +267,8 @@ module Lipsiadmin
         end
         
         after << "Backend.app.addItem(#{get_var})"
-        "#{before_js}var #{get_var} = new Ext.grid.GridPanel(#{config.to_s});#{after_js}"
+        
+        super
       end
     end
   end

data/lib/view/helpers/ext/store.rb

@@ -40,9 +40,10 @@ module Lipsiadmin#:nodoc:
       
       def initialize(options={}, &block)#:nodoc:
         @items   = []
-        super("Ext.data.GroupingStore", options, &block)
-        remoteSort l(true)                  if config[:remoteSort].blank?
+        super("Ext.data.GroupingStore", options)
+        remoteSort true                     if config[:remoteSort].blank?
         baseParams("_method" => "GET")      if config[:baseParams].blank?
+        yield self if block_given?
       end
       
       # The url for getting the json data

data/lib/view/helpers/ext/tool_bar.rb

@@ -23,7 +23,8 @@ module Lipsiadmin
     class ToolBar < Component
       attr_accessor :items
       def initialize(options={}, &block)#:nodoc:
-        super("Ext.Toolbar", { :items => [] }.merge(options), &block)
+        super("Ext.Toolbar", { :items => [] }.merge(options))
+        yield self if block_given?
       end
       
       # Add new items to a Ext.Toolbar

data/lipsiadmin_generators/backend/templates/views/javascripts/backend.js.erb

@@ -48,7 +48,7 @@ Backend.app = function(){
         items: header ? [header, this.contentDynamic] : [this.contentDynamic]
       });
 
-      this.contentDynamic.getUpdater().on('beforeupdate', function(){ this.clean(); this.mask(); }, this);
+      this.contentDynamic.getUpdater().on('beforeupdate', function(){ this.clean(); }, this);
       this.contentDynamic.getUpdater().on('update', this.inspectContent, this);
       this.load(loadUrl ? loadUrl : '/backend/base/welcome');
       setTimeout(function(){
@@ -104,6 +104,7 @@ Backend.app = function(){
     }, // update
     
     clean : function(){
+      this.mask();
       this.contentDynamic.body.update('');
       this.contentDynamic.removeAll(true);
       this.contentDynamic.doLayout();

data/lipsiadmin_generators/backend_page/backend_page_generator.rb

@@ -48,6 +48,10 @@ class ActionView::Helpers::InstanceTag
   def to_time_select_tag(options = {})
     "=time_select :#{@object_name}, :#{@method_name}#{options.empty? ? '' : ', '+ options.inspect}"
   end
+  
+  def to_boolean_select_tag(options = {})
+    "=check_box :#{@object_name}, :#{@method_name}#{options.empty? ? '' : ', '+ options.inspect}"
+  end
 end
 
 class BackendPageGenerator < Rails::Generator::NamedBase

data/lipsiadmin_generators/backend_page/templates/view_index.rjs.erb

@@ -5,6 +5,7 @@ page.grid do |grid|
   grid.forgery_protection_token request_forgery_protection_token
   grid.authenticity_token form_authenticity_token
   grid.tbar  :default
+  grid.sm :checkbox
   grid.store do |store|
     store.url "/backend/<%= plural_name %>.json"
     store.fields @column_store.store_fields

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lipsiadmin
 version: !ruby/object:Gem::Version 
-  version: "2.9"
+  version: "3.0"
 platform: ruby
 authors: 
 - Davide D'Agostino
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 +01:00
+date: 2009-03-02 00:00:00 +01:00
 default_executable: 
 dependencies: []