netzke-core 0.5.4 → 0.5.5

data/.gitignore

@@ -4,4 +4,5 @@ doc
 Manifest
 .DS_Store
 rdoc
-netzke-core.gemspec
+netzke-core.gemspec
+*.tmproj

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+= v0.5.5 - 2010-09-08
+* Merge with pschyska/netzke-core - relative_root_url, jsmin
+* Detecting actions in config now works on any level
+
 = v0.5.4 - 2010-08-11
 * New: added Netzke.pre name space for pre-built static JS code
 

data/README.rdoc

@@ -37,6 +37,14 @@ Here's how to embed a Netzke widget into your Rails view.
     
 (here we use the GridPanel widget from the netzke-basepack project)
 
+== Running in production
+
+1. There is some basic JS minification when running in production. This uses JSMin to strip comments, whitespace etc.
+
+It can also manually configured by setting :minify_js
+
+Netzke::Base.configure :minify_js=>true
+
 == More info
 Introduction to Netzke framework and wiki: http://github.com/skozlov/netzke
 

data/Rakefile

@@ -1,7 +1,7 @@
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
-    gemspec.version = "0.5.4"
+    gemspec.version = "0.5.5"
     gemspec.name = "netzke-core"
     gemspec.summary = "Build ExtJS/Rails widgets with minimum effort"
     gemspec.description = "Allows building ExtJS/Rails reusable code in a DRY way"
@@ -9,6 +9,7 @@ begin
     gemspec.homepage = "http://github.com/skozlov/netzke-core"
     gemspec.rubyforge_project = "netzke-core"
     gemspec.authors = ["Sergei Kozlov"]
+    gemspec.add_dependency("jsmin", ">=1.0.1")    
     gemspec.post_install_message = <<-MESSAGE
 
 ========================================================================

data/install.rb

@@ -1 +1 @@
-# Install hook code here
+# Install hook code here

data/javascripts/core.js

@@ -390,6 +390,27 @@ Ext.widgetMixIn = {
     return res;
   },
   
+  locateMenus : function(o) {
+    var keyWords = ["bbar", "tbar", "fbar"];
+    if (Ext.isObject(o)) {
+      Ext.each(keyWords, function(key){
+        if (o[key]) { 
+          o[key] = this.normalizeMenuItems(o[key], this); 
+        };
+      }, this);
+      
+      for (var key in o) {
+        if (keyWords.indexOf(key) == -1) {
+          this.locateMenus(o[key]);
+        }
+      }
+    } else if (Ext.isArray(o)) {
+      Ext.each(o, function(el){
+        this.locateMenus(el);
+      }, this);
+    }
+    
+  },
 
   // Code run before calling Ext's constructor - normalizing config to provide Netzke additional functionality
   commonBeforeConstructor : function(config){
@@ -421,9 +442,11 @@ Ext.widgetMixIn = {
       config.actions = this.actions;
     }
     
-    config.bbar = config.bbar && this.normalizeMenuItems(config.bbar, this);
-    config.tbar = config.tbar && this.normalizeMenuItems(config.tbar, this);
-    config.fbar = config.fbar && this.normalizeMenuItems(config.fbar, this);
+    this.locateMenus(config);
+    
+    // config.bbar = config.bbar && this.normalizeMenuItems(config.bbar, this);
+    // config.tbar = config.tbar && this.normalizeMenuItems(config.tbar, this);
+    // config.fbar = config.fbar && this.normalizeMenuItems(config.fbar, this);
     config.contextMenu = config.contextMenu && this.normalizeMenuItems(config.contextMenu, this);
 
     config.menu = config.menu && this.normalizeMenuItems(config.menu, this);

data/lib/netzke/action_view_ext.rb

@@ -26,13 +26,26 @@ module Netzke
     
     # JavaScript for all Netzke classes in this view, and Ext.onReady which renders all Netzke widgets in this view
     def netzke_js
-      javascript_tag <<-END_OF_JAVASCRIPT
-        Ext.Ajax.extraParams = {authenticity_token: '#{form_authenticity_token}'}; // Rails' forgery protection
+      js="Ext.Ajax.extraParams = {authenticity_token: '#{form_authenticity_token}'}; // Rails' forgery protection\n"
+
+
+      js << <<-END_OF_JAVASCRIPT if(!ActionController::Base.relative_url_root.blank?)
+        // apply relative URL root, if set
+        Ext.widgetMixIn.buildApiUrl= function(apip){
+          return "#{ActionController::Base.relative_url_root}/netzke/" + this.id + "__" + apip;
+        };
+        Ext.BLANK_IMAGE_URL = "#{ActionController::Base.relative_url_root}/extjs/resources/images/default/s.gif";
+      END_OF_JAVASCRIPT
+
+      js << <<-END_OF_JAVASCRIPT
         #{@content_for_netzke_js_classes}
         Ext.onReady(function(){
           #{@content_for_netzke_on_ready}
         });
       END_OF_JAVASCRIPT
+
+      javascript_tag js
+      
     end
     
     # Wrapper for all the above. Use it in your layout.

data/lib/netzke/base.rb

@@ -47,6 +47,8 @@ module Netzke
     # Class-level Netzke::Base configuration. The defaults also get specified here.
     def self.config
       set_default_config({
+        # Set to true, if you want generated JS to be minified
+        :minify_js                 => Rails.env.production?,
         # Which javascripts and stylesheets must get included at the initial load (see netzke-core.rb)
         :javascripts               => [],
         :stylesheets               => [],
@@ -60,7 +62,7 @@ module Netzke
         :ext_location              => defined?(RAILS_ROOT) && "#{RAILS_ROOT}/public/extjs",
         
         # Default location of icons, relative to the root of the domain
-        :icons_uri                 => "/images/icons/",
+        :icons_uri                 => ActionController::Base.relative_url_root.to_s+"/images/icons/" ,
         
         # Default instance config
         :default_config => {
@@ -86,7 +88,6 @@ module Netzke
         # first arg is hash
         config.deep_merge!(args.first)
       end
-      
       # widget may implement some kind of control for configuration consistency
       enforce_config_consistency if respond_to?(:enforce_config_consistency)
     end

data/lib/netzke/base_js.rb

@@ -204,7 +204,7 @@ module Netzke
       # to be reused at the moment of widget instantiation)
       def js_class(cached = [])
         # Defining the scope if it isn't known yet
-        res = %Q{
+        res = js_full_scope == "Netzke.classes" ? "" : %Q{
           if (!#{js_full_scope}) {
             Ext.ns("#{js_full_scope}");
           }
@@ -227,7 +227,6 @@ module Netzke
           })
           
           res << <<-END_OF_JAVASCRIPT
-          // Register our xtype
           Ext.reg("#{js_xtype}", #{js_full_class_name});
           END_OF_JAVASCRIPT
           
@@ -248,7 +247,6 @@ module Netzke
             this.commonAfterConstructor(config);
           };
           Ext.extend(#{js_full_class_name}, #{js_base_class}, Ext.applyIf(#{js_extend_properties.to_nifty_json}, Ext.widgetMixIn));
-          // Register xtype
           Ext.reg("#{js_xtype}", #{js_full_class_name});
           END_OF_JAVASCRIPT
         end

data/lib/netzke/core_ext.rb

@@ -111,14 +111,9 @@ class String
     LiteralString.new(self)
   end
   
-  # removes JS-comments (both single- and multi-line) from the string
+  # removes JS-comments from the string and minfy it
   def strip_js_comments
-    regexp = /\/\/.*$|(?m:\/\*.*?\*\/)/
-    self.gsub!(regexp, '')
-
-    # also remove empty lines
-    regexp = /^\s*\n/
-    self.gsub!(regexp, '')
+    Netzke::Base.config[:minify_js] ? JSMin.minify(self) : self
   end
   
   # "false" => false, "whatever_else" => true

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: netzke-core
 version: !ruby/object:Gem::Version 
-  hash: 3
   prerelease: false
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -15,10 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 +02:00
+date: 2010-09-08 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: jsmin
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  type: :runtime
+  version_requirements: *id001
 description: Allows building ExtJS/Rails reusable code in a DRY way
 email: sergei@playcode.nl
 executables: []
@@ -84,21 +97,9 @@ has_rdoc: true
 homepage: http://github.com/skozlov/netzke-core
 licenses: []
 
-post_install_message: |+
-  
-  ========================================================================
-  
-             Thanks for installing Netzke Core!
-             
-    Don't forget to run "./script/generate netzke_core" for each Rails 
-    app that will be using this gem.
-  
-    Netzke home page:     http://netzke.org
-    Netzke Google Groups: http://groups.google.com/group/netzke
-    Netzke tutorials:     http://blog.writelesscode.com
-  
-  ========================================================================
-  
+post_install_message: "\n\
+  ========================================================================\n\n           Thanks for installing Netzke Core!\n           \n  Don't forget to run \"./script/generate netzke_core\" for each Rails \n  app that will be using this gem.\n\n  Netzke home page:     http://netzke.org\n  Netzke Google Groups: http://groups.google.com/group/netzke\n  Netzke tutorials:     http://blog.writelesscode.com\n\n\
+  ========================================================================\n\n"
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -108,7 +109,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -117,7 +117,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"