netzke-core 0.2.3 → 0.2.4

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.2.4
+Some minor improvements.
+
 v0.2.3
 FeedbackGhost will show the feedback on the top of the screen independent of the page scrolling.
 Ext.Panel#loadWidget will accept null as url to delete the currently loaded widget

data/javascripts/core.js

@@ -10,126 +10,126 @@ Ext.Ajax.extraParams = {
 
 // helper method to do multiple Ext.apply's
 Ext.chainApply = function(objectArray){
-	var res = {};
-	Ext.each(objectArray, function(obj){Ext.apply(res, obj)});
-	return res;
+  var res = {};
+  Ext.each(objectArray, function(obj){Ext.apply(res, obj)});
+  return res;
 };
 
 // implementation of totalProperty, successProperty and root configuration options for ArrayReader
 Ext.data.ArrayReader = Ext.extend(Ext.data.JsonReader, {
-    readRecords : function(o){
-     	var sid = this.meta ? this.meta.id : null;
-    	var recordType = this.recordType, fields = recordType.prototype.fields;
-    	var records = [];
-			// console.info(this.meta);
-    	var root = o[this.meta.root] || o, totalRecords = o[this.meta.totalProperty], success = o[this.meta.successProperty];
-	    for(var i = 0; i < root.length; i++){
-		    var n = root[i];
-	        var values = {};
-	        var id = ((sid || sid === 0) && n[sid] !== undefined && n[sid] !== "" ? n[sid] : null);
-	        for(var j = 0, jlen = fields.length; j < jlen; j++){
-                var f = fields.items[j];
-                var k = f.mapping !== undefined && f.mapping !== null ? f.mapping : j;
-                var v = n[k] !== undefined ? n[k] : f.defaultValue;
-                v = f.convert(v, n);
-                values[f.name] = v;
-            }
-	        var record = new recordType(values, id);
-	        record.json = n;
-	        records[records.length] = record;
-	    }
-	    return {
-	        records : records,
-	        totalRecords : totalRecords,
-					success : success
-	    };
+  readRecords : function(o){
+    var sid = this.meta ? this.meta.id : null;
+    var recordType = this.recordType, fields = recordType.prototype.fields;
+    var records = [];
+    // console.info(this.meta);
+    var root = o[this.meta.root] || o, totalRecords = o[this.meta.totalProperty], success = o[this.meta.successProperty];
+    for(var i = 0; i < root.length; i++){
+      var n = root[i];
+      var values = {};
+      var id = ((sid || sid === 0) && n[sid] !== undefined && n[sid] !== "" ? n[sid] : null);
+      for(var j = 0, jlen = fields.length; j < jlen; j++){
+        var f = fields.items[j];
+        var k = f.mapping !== undefined && f.mapping !== null ? f.mapping : j;
+        var v = n[k] !== undefined ? n[k] : f.defaultValue;
+        v = f.convert(v, n);
+        values[f.name] = v;
+      }
+      var record = new recordType(values, id);
+      record.json = n;
+      records[records.length] = record;
     }
+    return {
+      records : records,
+      totalRecords : totalRecords,
+      success : success
+    };
+  }
 });
 
 // Methods common to all widget classes
 Ext.widgetMixIn = {
-	widgetInit:function(config){
+  widgetInit:function(config){
     this.app = Ext.getCmp('feedback_ghost');
     // this.app = Ext.getCmp('application');
     if (config.tools) Ext.each(config.tools, function(i){i.on.click = this[i.on.click].createDelegate(this)}, this);
     if (config.actions) Ext.each(config.actions, function(i){i.handler = this[i.handler].createDelegate(this);}, this);
-	},
+  },
 
-	setEvents: function(){
-		this.on('beforedestroy', function(){
-			// clean-up menus
-			if (this.app && !!this.app.unhostMenus) {
-				// alert('beforedestroy');
-				this.app.unhostMenus(this)
-			}
-		}, this);
-		
-		this.on('render', this.onWidgetLoad, this);
-	},
+  setEvents: function(){
+    this.on('beforedestroy', function(){
+      // clean-up menus
+      if (this.app && !!this.app.unhostMenus) {
+        // alert('beforedestroy');
+        this.app.unhostMenus(this)
+      }
+    }, this);
+    
+    this.on('render', this.onWidgetLoad, this);
+  },
 
-	feedback:function(msg){
-		if (this.initialConfig.quiet) return false;
-		if (this.app && !!this.app.showFeedback) {
-			this.app.showFeedback(msg)
-		} else {
-			// there's no application to show the feedback - so, we do it ourselves
-			if (typeof msg == 'string'){
-				alert(msg)
-			} else {
-				var compoundResponse = ""
-				Ext.each(msg, function(m){
+  feedback:function(msg){
+    if (this.initialConfig.quiet) return false;
+    if (this.app && !!this.app.showFeedback) {
+      this.app.showFeedback(msg)
+    } else {
+      // there's no application to show the feedback - so, we do it ourselves
+      if (typeof msg == 'string'){
+        alert(msg)
+      } else {
+        var compoundResponse = ""
+        Ext.each(msg, function(m){
           compoundResponse += m.msg + "\n"
         })
-				if (compoundResponse != "") alert(compoundResponse);
-			}
-		};
-	},
+        if (compoundResponse != "") alert(compoundResponse);
+      }
+    };
+  },
 
-	addMenus:function(menus){
-		if (this.app && !!this.app.hostMenu) {
-			Ext.each(menus, function(menu){this.app.hostMenu(menu, this)}, this)
-		}
-	},
-	
-	onWidgetLoad:Ext.emptyFn // gets overridden
+  addMenus:function(menus){
+    if (this.app && !!this.app.hostMenu) {
+      Ext.each(menus, function(menu){this.app.hostMenu(menu, this)}, this)
+    }
+  },
+  
+  onWidgetLoad:Ext.emptyFn // gets overridden
 };
 
 // Make Panel with layout 'fit' capable to dynamically load widgets
 Ext.override(Ext.Panel, {
-	getWidget: function(){
-		return this.items.get(0)
-	},
-	
-	loadWidget: function(url, params){
-		if (!params) params = {}
-		
-		this.remove(this.getWidget()); // first delete previous widget
-		
-		if (!url) return false;
-		
-		// we will let the server know which components we have cached
-		var cachedComponentNames = [];
-		for (name in Ext.componentCache) {
-			cachedComponentNames.push(name);
-		}
-		
-		this.disable(); // to visually emphasize loading
-		
-		Ext.Ajax.request(
-			{url:url, params:Ext.apply(params, {components_cache:Ext.encode(cachedComponentNames)}), script:false, callback:function(panel, success, response){
-				var response = Ext.decode(response.responseText);
-				if (response['classDefinition']) eval(response['classDefinition']); // evaluate widget's class if it was sent
+  getWidget: function(){
+    return this.items.get(0)
+  },
+  
+  loadWidget: function(url, params){
+    if (!params) params = {}
+    
+    this.remove(this.getWidget()); // first delete previous widget
+    
+    if (!url) return false; // don't load any widget if the url is null
+
+    // we will let the server know which components we have cached
+    var cachedComponentNames = [];
+    for (name in Ext.componentCache) {
+      cachedComponentNames.push(name);
+    }
+    
+    this.disable(); // to visually emphasize loading
+    
+    Ext.Ajax.request(
+      {url:url, params:Ext.apply(params, {components_cache:Ext.encode(cachedComponentNames)}), script:false, callback:function(panel, success, response){
+        var response = Ext.decode(response.responseText);
+        if (response['classDefinition']) eval(response['classDefinition']); // evaluate widget's class if it was sent
 
-				response.config.parent = this // we might want to know the parent panel in advance (e.g. to know its size)
-				var instance = new Ext.componentCache[response.config.widgetClassName](response.config)
-				
-				this.add(instance);
-				this.doLayout();
-				this.enable();
-			}, scope:this}
-		)
-		
-	}
+        response.config.parent = this // we might want to know the parent panel in advance (e.g. to know its size)
+        var instance = new Ext.componentCache[response.config.widgetClassName](response.config)
+        
+        this.add(instance);
+        this.doLayout();
+        this.enable();
+      }, scope:this}
+    )
+    
+  }
 });
 
 // Some Rubyish String extensions

data/lib/app/models/netzke_layout.rb

@@ -24,7 +24,7 @@ class NetzkeLayout < ActiveRecord::Base
   end
   
   def self.by_widget(widget_name)
-    self.find(:first, :conditions => {:widget_name => widget_name, :user_id => user_id})
+    self.find(:first, :conditions => {:widget_name => widget_name.to_s, :user_id => user_id})
   end
 
   def move_item(old_index, new_index)

data/lib/app/models/netzke_preference.rb

@@ -30,17 +30,14 @@ class NetzkePreference < ActiveRecord::Base
   end
   
   def normalized_value
-    klass = read_attribute(:pref_type)
+    klass      = read_attribute(:pref_type)
     norm_value = read_attribute(:value)
-    if klass.nil?
-      # do not cast
-      r = norm_value
-    elsif klass == 'Boolean'
-      r = norm_value == 'false' ? false : (norm_value == 'true' || norm_value)
-    elsif klass == 'NilClass'
-      r = nil
-    elsif klass == 'Array' || klass == 'Hash'
-      r = JSON.parse(norm_value)
+    
+    case klass
+    when nil             then r = norm_value  # do not cast
+    when 'Boolean'       then r = norm_value == 'false' ? false : (norm_value == 'true' || norm_value)
+    when 'NilClass'      then r = nil
+    when 'Array', 'Hash' then r = JSON.parse(norm_value)
     else
       r = norm_value.send(ELEMENTARY_CONVERTION_METHODS[klass])
     end
@@ -48,30 +45,25 @@ class NetzkePreference < ActiveRecord::Base
   end
   
   def normalized_value=(new_value)
-    # norm_value = (new_value.to_s if new_value == true or new_value == false) || new_value
     case new_value.class.name
-    when "Array"
-      write_attribute(:value, new_value.to_json)
-    when "Hash"
-      write_attribute(:value, new_value.to_json)
-    else
-      write_attribute(:value, new_value.to_s)
+    when "Array" then write_attribute(:value, new_value.to_json)
+    when "Hash"  then write_attribute(:value, new_value.to_json)
+    else              write_attribute(:value, new_value.to_s)
     end
     write_attribute(:pref_type, [TrueClass, FalseClass].include?(new_value.class) ? 'Boolean' : new_value.class.to_s)
   end
   
   def self.[](pref_name)
-    pref_name = pref_name.to_s
+    pref_name  = pref_name.to_s
     conditions = {:name => pref_name, :user_id => user_id, :widget_name => self.widget_name}
-    pref = self.find(:first, :conditions => conditions)
-    # pref = @@user.nil? ? self.find_by_name(pref_name) : self.find_by_name_and_user_id(pref_name, @@user.id)
+    pref       = self.find(:first, :conditions => conditions)
     pref && pref.normalized_value
   end
   
   def self.[]=(pref_name, new_value)
-    pref_name = pref_name.to_s
+    pref_name  = pref_name.to_s
     conditions = {:name => pref_name, :user_id => user_id, :widget_name => self.widget_name}
-    pref = self.find(:first, :conditions => conditions)
+    pref       = self.find(:first, :conditions => conditions)
     
     # if assigning nil, simply delete the eventually found preference
     if new_value.nil?

data/lib/netzke/action_view_ext.rb

@@ -5,14 +5,14 @@ module Netzke
       res = ""
 
       if ENV['RAILS_ENV'] == 'development'
-    	  res << javascript_include_tag("/extjs/adapter/ext/ext-base.js", "/extjs/ext-all-debug.js")
-  	  else
-  	    res << javascript_include_tag("/extjs/adapter/ext/ext-base.js", "/extjs/ext-all.js")
+        res << javascript_include_tag("/extjs/adapter/ext/ext-base.js", "/extjs/ext-all-debug.js")
+      else
+        res << javascript_include_tag("/extjs/adapter/ext/ext-base.js", "/extjs/ext-all.js")
       end
       res << javascript_tag( "Ext.authenticityToken = '#{form_authenticity_token}'") # forgery protection
-    	res << javascript_include_tag("/netzke/netzke.js")
+      res << javascript_include_tag("/netzke/netzke.js")
       
-    	res
+      res
     end
 
     def netzke_css_include(theme_name = :default)

data/lib/netzke/base.rb

@@ -16,9 +16,9 @@ module Netzke
       # Global Netzke::Base configuration
       def config
         set_default_config({
-          :javascripts => [],
-          :css => [],
-          :layout_manager => "NetzkeLayout",
+          :javascripts               => [],
+          :css                       => [],
+          :layout_manager            => "NetzkeLayout",
           :persistent_config_manager => "NetzkePreference"
         })
       end
@@ -97,8 +97,8 @@ module Netzke
     attr_reader :pref
 
     def initialize(config = {}, parent = nil)
-      @config = initial_config.recursive_merge(config)
-      @parent = parent
+      @config  = initial_config.recursive_merge(config)
+      @parent  = parent
       @id_name = parent.nil? ? config[:name].to_s : "#{parent.id_name}__#{config[:name]}"
       
       @flash = []
@@ -240,7 +240,7 @@ module Netzke
       end
     end
 
-    #### API section
+    #### Interface
     def get_widget(params = {})
       # if browser does not have our component class cached (and all dependencies), send it to him
       components_cache = (JSON.parse(params[:components_cache]) if params[:components_cache]) || []

data/lib/netzke/js_class_builder.rb

@@ -33,10 +33,10 @@ module Netzke
       res.merge!(:id => @id_name)
     
       # include tools and actions
-      res.merge!(:tools => tools) if tools
+      res.merge!(:tools   => tools)   if tools
       res.merge!(:actions => actions) if actions
-      res.merge!(:bbar => tbar) if tbar
-      res.merge!(:tbar => bbar) if bbar
+      res.merge!(:bbar    => tbar)    if tbar
+      res.merge!(:tbar    => bbar)    if bbar
 
       # include permissions
       res.merge!(:permissions => permissions) unless available_permissions.empty?
@@ -123,17 +123,17 @@ module Netzke
       # default config that is always passed into the constructor
       def js_default_config
         {
-          :title => "config.id.humanize()".l,
+          :title     => "config.id.humanize()".l,
           :listeners => js_listeners,
-          :tools => "config.tools".l,
-          :actions => "config.actions".l,
-          :tbar => "config.tbar".l,
-          :bbar => "config.bbar".l,
-          # :items => "config.items".l,
-          # :items => js_items,
-          :height => 400,
-          :width => 800,
-          :border => false
+          :tools     => "config.tools".l,
+          :actions   => "config.actions".l,
+          :tbar      => "config.tbar".l,
+          :bbar      => "config.bbar".l,
+          # :items   => "config.items".l,
+          # :items   => js_items,
+          :height    => 400,
+          :width     => 800,
+          :border    => false
         }
       end
 

data/netzke-core.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{netzke-core}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergei Kozlov"]
-  s.date = %q{2009-01-25}
+  s.date = %q{2009-01-28}
   s.description = %q{Build ExtJS/Rails widgets with minimum effort}
   s.email = %q{sergei@writelesscode.com}
   s.extra_rdoc_files = ["CHANGELOG", "lib/app/controllers/netzke_controller.rb", "lib/app/models/netzke_layout.rb", "lib/app/models/netzke_preference.rb", "lib/netzke/action_view_ext.rb", "lib/netzke/base.rb", "lib/netzke/controller_extensions.rb", "lib/netzke/core_ext.rb", "lib/netzke/feedback_ghost.rb", "lib/netzke/js_class_builder.rb", "lib/netzke/routing.rb", "lib/netzke-core.rb", "lib/vendor/facets/hash/recursive_merge.rb", "LICENSE", "README.mdown", "tasks/netzke_core_tasks.rake"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netzke-core
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-25 00:00:00 -06:00
+date: 2009-01-28 00:00:00 -06:00
 default_executable: 
 dependencies: []