netzke-basepack 0.6.0 → 0.6.1

data/lib/netzke/active_record/association_attributes.rb

@@ -9,21 +9,21 @@ module Netzke::ActiveRecord
     module InstanceMethods
       # Allow nested association access (assocs separated by "." or "__"), e.g.: proxy_service.asset__gui_folder__name
       # Example:
-      # 
+      #
       #   Book.first.genre__name = 'Fantasy'
-      # 
+      #
       # is the same as:
-      # 
+      #
       #   Book.first.genre = Genre.find_by_name('Fantasy')
       #
       # The result - easier forms and grids that handle nested models: simply specify column/field name as "genre__name".
       def method_missing_with_basepack(method, *args, &block)
         # if refering to a column, just pass it to the original method_missing
         return method_missing_without_basepack(method, *args, &block) if self.class.column_names.include?(method.to_s)
-    
+
         split = method.to_s.split(/\.|__/)
         if split.size > 1
-          if split.last =~ /=$/ 
+          if split.last =~ /=$/
             if split.size == 2
               # search for association and assign it to self
               assoc = self.class.reflect_on_association(split.first.to_sym)
@@ -61,12 +61,12 @@ module Netzke::ActiveRecord
           method_missing_without_basepack(method, *args, &block)
         end
       end
-    
+
       # Make respond_to? return true for association assignment method, like "genre__name="
       def respond_to_with_basepack?(method, include_private = false)
         split = method.to_s.split(/__/)
         if split.size > 1
-          if split.last =~ /=$/ 
+          if split.last =~ /=$/
             if split.size == 2
               # search for association and assign it to self
               assoc = self.class.reflect_on_association(split.first.to_sym)
@@ -91,12 +91,12 @@ module Netzke::ActiveRecord
 
     def self.included(receiver)
       receiver.extend ClassMethods
-      
+
       receiver.send :include, InstanceMethods
       receiver.alias_method_chain :method_missing, :basepack
       receiver.alias_method_chain :respond_to?, :basepack
     end
-    
+
   end
 end
 

data/lib/netzke/active_record/attributes.rb

@@ -1,6 +1,6 @@
 module Netzke::ActiveRecord::Attributes
   extend ActiveSupport::Concern
-  
+
   module ClassMethods
     # Define or configure an attribute.
     # Example:
@@ -24,7 +24,7 @@ module Netzke::ActiveRecord::Attributes
       end
       write_inheritable_attribute(:netzke_declared_attributes, declared_attrs)
     end
-    
+
     # Exclude attributes from being picked up by grids and forms.
     # Accepts an array of attribute names (as symbols).
     # Example:
@@ -32,7 +32,7 @@ module Netzke::ActiveRecord::Attributes
     def netzke_exclude_attributes(*args)
       write_inheritable_attribute(:netzke_excluded_attributes, args.map(&:to_s))
     end
-    
+
     # Explicitly expose attributes that should be picked up by grids and forms.
     # Accepts an array of attribute names (as symbols).
     # Takes precedence over <tt>netzke_exclude_attributes</tt>.
@@ -41,13 +41,13 @@ module Netzke::ActiveRecord::Attributes
     def netzke_expose_attributes(*args)
       write_inheritable_attribute(:netzke_exposed_attributes, args.map(&:to_s))
     end
-    
+
     # Returns the attributes that will be picked up by grids and forms.
     def netzke_attributes
       exposed = netzke_exposed_attributes
       exposed ? netzke_attrs_in_forced_order(exposed) : netzke_attrs_in_natural_order
     end
-    
+
     def netzke_exposed_attributes
       exposed = read_inheritable_attribute(:netzke_exposed_attributes)
       if exposed && !exposed.include?(self.primary_key)
@@ -57,12 +57,12 @@ module Netzke::ActiveRecord::Attributes
       end
       exposed
     end
-    
+
     private
       def netzke_declared_attributes
         read_inheritable_attribute(:netzke_declared_attributes) || []
       end
-    
+
       def netzke_excluded_attributes
         read_inheritable_attribute(:netzke_excluded_attributes) || []
       end
@@ -78,37 +78,38 @@ module Netzke::ActiveRecord::Attributes
             # .. otherwise merge with what's declared
             merged = in_columns_hash.merge(declared)
           end
-          
+
           # We didn't find it among declared, nor among the model columns, nor does it seem association attribute
           merged[:name].nil? && raise(ArgumentError, "Unknown attribute '#{attr_name}' for model #{self.name}", caller)
-          
+
           merged
         end
       end
-      
+
       # Returns netzke attributes in the order of columns in the table, followed by extra declared attributes
       # Detects one-to-many association columns and replaces the name of the column with association column name (Netzke style), e.g.:
-      # 
+      #
       #   role_id => role__name
       def netzke_attrs_in_natural_order
         (
           declared_attrs = netzke_declared_attributes
-          
+
           column_names.map do |name|
             c = {:name => name, :attr_type => columns_hash[name].type}
-            
+
             # If it's named as foreign key of some association, then it's an association column
             assoc = reflect_on_all_associations.detect{|a| a.primary_key_name == c[:name]}
 
             if assoc && !assoc.options[:polymorphic]
-              assoc_method = %w{name title label id}.detect{|m| (assoc.klass.instance_methods + assoc.klass.column_names).include?(m) } || assoc.klass.primary_key
+              candidates = %w{name title label} << assoc.primary_key_name
+              assoc_method = candidates.detect{|m| (assoc.klass.instance_methods.map(&:to_s) + assoc.klass.column_names).include?(m) }
               c[:name] = "#{assoc.name}__#{assoc_method}"
-              c[:attr_type] = assoc.klass.columns_hash[assoc_method].type
+              c[:attr_type] = assoc.klass.columns_hash[assoc_method].try(:type) || :string # when it's an instance method rather than a column, fall back to :string
             end
-            
+
             # auto set up the default value from the column settings
             c.merge!(:default_value => columns_hash[name].default) if columns_hash[name].default
-            
+
             # if there's a declared attr with the same name, simply merge it with what's taken from the model's columns
             if declared = declared_attrs.detect{ |va| va[:name] == c[:name] }
               c.merge!(declared)
@@ -119,13 +120,13 @@ module Netzke::ActiveRecord::Attributes
           declared_attrs
         ).reject { |attr| netzke_excluded_attributes.include?(attr[:name]) }
       end
-      
+
       def association_attr?(attr_name)
         !!attr_name.index("__") # probably we can't do much better than this, as we don't know at this moment if the associated model has a specific attribute, and we don't really want to find it out
       end
-      
+
   end
-  
+
   # Transforms a record to array of values according to the passed attributes
   def to_array(attributes)
     res = []
@@ -143,7 +144,7 @@ module Netzke::ActiveRecord::Attributes
     end
     res
   end
-  
+
   # Accepts both hash and array of attributes
   def to_hash(attributes)
     res = {}
@@ -153,7 +154,7 @@ module Netzke::ActiveRecord::Attributes
     end
     res
   end
-  
+
   def value_for_attribute(a)
     begin
       v = send(a[:name])
@@ -165,5 +166,5 @@ module Netzke::ActiveRecord::Attributes
       "UNDEF"
     end
   end
-  
+
 end

data/lib/netzke/active_record/combobox_options.rb

@@ -1,13 +1,13 @@
 module Netzke::ActiveRecord::ComboboxOptions
   module ClassMethods
-    
+
     def netzke_combo_options_for(column, query = "")
       records = query.empty? ? find_by_sql("select distinct #{column} from #{table_name}") : find_by_sql("select distinct #{column} from #{table_name} where #{column} like '#{query}%'")
       records.map{|r| r.send(column)}
     end
-    
+
   end
-  
+
   def self.included(receiver)
     receiver.extend         ClassMethods
   end

data/lib/netzke/active_record/relation_extensions.rb

@@ -1,7 +1,7 @@
 module Netzke
   module ActiveRecord
     module RelationExtensions
-      
+
       def extend_with(*params)
         scope = params.shift
         case scope.class.name
@@ -19,8 +19,8 @@ module Netzke
           raise ArgumentError, "Wrong parameter type for ActiveRecord::Relation#extend_with"
         end
       end
-      
-      # Non-destructively extends itself whith a hash of double-underscore'd conditions, 
+
+      # Non-destructively extends itself whith a hash of double-underscore'd conditions,
       # where the last part "__" is MetaWhere operator (which is required), e.g.:
       #     {:role__name__like => "%admin"}
       def extend_with_netzke_conditions(cond)
@@ -29,7 +29,7 @@ module Netzke
           operator.empty? ? r.where(assoc.to_sym.send(method) => v) : r.where(assoc.to_sym => {method.to_sym.send(operator.last) => v}).joins(assoc.to_sym)
         end
       end
-      
+
     end
   end
 end

data/lib/netzke/basepack.rb

@@ -4,18 +4,18 @@ require 'netzke/active_record'
 module Netzke
   module Basepack
     mattr_accessor :with_icons
-    
+
     mattr_accessor :icons_uri
-    
+
     class << self
       # Called from netzke-basepack.rb
       def init
         Netzke::Core.javascripts << "#{File.dirname(__FILE__)}/../../javascripts/basepack.js"
         Netzke::Core.stylesheets << "#{File.dirname(__FILE__)}/../../stylesheets/basepack.css"
       end
-    
+
       # Use it to confirure Basepack in the initializers, e.g.:
-      # 
+      #
       #     Netzke::Basepack.setup do |config|
       #      config.icons_uri = "/images/famfamfam/icons"
       #     end

data/{app/components → lib}/netzke/basepack/accordion_panel.rb

@@ -1,9 +1,9 @@
 module Netzke
   module Basepack
     # = AccordionPanel
-    # 
+    #
     # A panel with the 'accordion' layout. Can lazily load its nested components. For example:
-    # 
+    #
     #     netzke :my_accordion, :items => [{
     #         :html => "I'm a simple Ext.Panel",
     #         :title => "Panel One"
@@ -14,24 +14,24 @@ module Netzke
     #         :lazy_loading => true
     #       }]
     class AccordionPanel < Netzke::Base
-      
+
       include WrapLazyLoaded
-      
+
       js_property :layout, 'accordion'
-    
+
       js_method :init_component, <<-JS
         function(params){
           #{js_full_class_name}.superclass.initComponent.call(this);
           this.items.each(function(item){
             item.on('expand', function(i){
-              if (i.wrappedComponent && !i.items.first()) {
+              if (i && i.wrappedComponent && !i.items.first()) {
                 this.loadComponent({name: i.wrappedComponent, container: i.id});
               }
             }, this);
           }, this);
         }
       JS
-      
+
     end
   end
 end

data/{app/components → lib}/netzke/basepack/basic_app.rb

@@ -10,9 +10,9 @@ module Netzke
     # * (TODO) authentification support
     # * (TODO) masquerade support
     class BasicApp < Base
-      
+
       js_base_class "Ext.Viewport"
-      
+
       js_property :layout, :border
 
       def self.include_js
@@ -36,7 +36,7 @@ module Netzke
         elsif session[:masq_world]
           masq = %Q{World}
         end
-              
+
         {
           :items => [{
             :id => 'main-panel',
@@ -75,29 +75,29 @@ module Netzke
           }
 
           Ext.History.on('change', this.processHistory, this);
-        
+
           // Setting the "busy" indicator for Ajax requests
           Ext.Ajax.on('beforerequest', function(){this.findById('main-statusbar').showBusy()}, this);
           Ext.Ajax.on('requestcomplete', function(){this.findById('main-statusbar').hideBusy()}, this);
           Ext.Ajax.on('requestexception', function(){this.findById('main-statusbar').hideBusy()}, this);
-        
+
           // Initialize history
           Ext.History.init();
         }
       JS
-    
+
       js_method :on_login, <<-JS
         function(){
           window.location = "/login"
         }
       JS
-    
+
       js_method :on_logout, <<-JS
         function(){
           window.location = "#{logout_url}"
         }
       JS
-    
+
       js_method :process_history, <<-JS
         function(token){
           if (token){
@@ -107,13 +107,13 @@ module Netzke
           }
         }
       JS
-    
+
       js_method :instantiate_component, <<-JS
         function(config){
           this.findById('main-panel').instantiateChild(config);
         }
       JS
-    
+
       js_method :app_load_component, <<-JS
         function(name){
           Ext.History.add(name);
@@ -131,7 +131,7 @@ module Netzke
           this.toggleConfigMode();
         }
       JS
-    
+
       js_method :show_masquerade_selector, <<-JS
         function(){
           var w = new Ext.Window({
@@ -223,18 +223,18 @@ module Netzke
 
         strong_children_config.deep_merge!(:mode => :config) if session[:config_mode]
       end
-    
-    
+
+
       action :masquerade_selector, :text => "Masquerade as ...", :handler => :show_masquerade_selector
-      
-      action :toggle_config_mode do 
+
+      action :toggle_config_mode do
         {:text => "#{session[:config_mode] ? "Leave" : "Enter"} config mode"}
       end
-      
+
       action :login, :icon => :door_in
-      
+
       action :logout, :icon => :door_out
-    
+
       # Html required for Ext.History to work
       def js_component_html
         super << %Q{

data/lib/netzke/basepack/border_layout_panel.rb

@@ -0,0 +1,101 @@
+module Netzke
+  module Basepack
+    # Panel with border layout
+    # == Example configuration:
+    #
+    #     :items => [
+    #       {:title => "Item One", :class_name => "Basepack::Panel", :region => :center},
+    #       {:title => "Item Two", :class_name => "Basepack::Panel", :region => :west, :width => 300, :split => true}
+    #     ]
+    class BorderLayoutPanel < Netzke::Base
+      def items
+        @border_layout_items ||= begin
+          updated_items = super
+
+          if config[:persistence]
+            updated_items.each do |item|
+              region = item[:region] || components[item[:component]][:region]
+              item.merge!({
+                :width => state["#{region}_region_width"],
+                :height => state["#{region}_region_height"],
+                :collapsed => state["#{region}_region_collapsed"]
+              })
+            end
+          end
+          
+          updated_items
+        end
+      end
+      
+      js_property :layout, :border
+      
+      js_method :init_component, <<-JS
+        function(){
+          Ext.each(['center', 'west', 'east', 'south', 'north'], function(r){
+            // A function to access a region component (even if the component gets reloaded, the function will work).
+            // E.g.: getEastComponent()
+            var methodName = 'get'+r.capitalize()+'Component';
+            this[methodName] = function(){
+              Netzke.deprecationWarning("Instead of '" + methodName + "' use getChildComponent('<name of your component>').");
+              return this.find('region', r)[0];
+            }.createDelegate(this);
+          }, this);
+
+          // Now let Ext.Panel do the rest
+          #{js_full_class_name}.superclass.initComponent.call(this);
+
+          // First time on "afterlayout", set resize events
+          if (this.persistence) {this.on('afterlayout', this.setRegionEvents, this, {single: true});}
+        }
+      JS
+      
+      js_method :set_region_events, <<-JS
+        function(){
+          this.items.each(function(item, index, length){
+            if (!item.oldSize) item.oldSize = item.getSize(); // remember initial size
+              
+            item.on('resize', function(panel, w, h){
+              if (panel.region !== 'center' && w && h) {
+                var params = {region:panel.region};
+              
+                if (panel.oldSize.width != w) {
+                  params.width = w;
+                } else {
+                  params.height = h;
+                }
+              
+                panel.oldSize = panel.getSize();
+                this.regionResized(params);
+              }
+            }, this);
+
+            item.on('collapse', function(panel){
+              this.regionCollapsed({region: panel.region});
+            }, this);
+            
+            item.on('expand', function(panel){
+              this.regionExpanded({region: panel.region});
+            }, this);
+            
+          }, this);
+        }
+      JS
+
+      endpoint :region_resized do |params|
+        size_state_hash = {}
+        size_state_hash[:"#{params[:region]}_region_width"] = params[:width] if params[:width]
+        size_state_hash[:"#{params[:region]}_region_height"] = params[:height] if params[:height]
+        update_state(size_state_hash)
+      end
+
+      endpoint :region_collapsed do |params|
+        update_state(:"#{params[:region]}_region_collapsed" => true)
+      end
+
+      endpoint :region_expanded do |params|
+        update_state(:"#{params[:region]}_region_collapsed" => false)
+      end
+
+    end
+  end
+end