skozlov-netzke-core 0.4.1 → 0.4.2

data/.autotest

@@ -0,0 +1 @@
+require 'autotest/redgreen'

data/.gitignore

@@ -0,0 +1,4 @@
+*.log
+pkg
+doc
+.DS_Store

data/CHANGELOG

@@ -1,3 +1,11 @@
+v0.4.2
+2009-09-11
+Fix: the API call (at the JavaScript side) was ignoring the callback parameter.
+Impr: if the array of API points is empty, it's not added into js_config anymore.
+New: new testing widgets in netzke_controller.
+Fix: extra CSS includes now take effect.
+New: Support for masquerading as "World". In this mode all the "touched" persistent preferences will be overwritten for all roles and users.
+
 v0.4.1
 2009-09-06
 Version bumb to force github rebuild the gem (Manifest is now included)

data/Rakefile

@@ -1,14 +1,32 @@
-require 'echoe'
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "netzke-core"
+    gemspec.summary = "Build ExtJS/Rails widgets with minimum effort"
+    gemspec.description = "Build ExtJS/Rails widgets with minimum effort"
+    gemspec.email = "sergei@playcode.nl"
+    gemspec.homepage = "http://github.com/skozlov/netzke-core"
+    gemspec.rubyforge_project = "netzke-core"
+    gemspec.authors = ["Sergei Kozlov"]
+  end
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "rdoc"
+  end
+    
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION')
+    version = File.read('VERSION')
+  else
+    version = ""
+  end
 
-Echoe.new("netzke-core") do |p|
-  p.author = "Sergei Kozlov"
-  p.email = "sergei@playcode.nl"
-  p.summary = "Build ExtJS/Rails widgets with minimum effort"
-  p.url = "http://playcode.nl"
-  p.development_dependencies = []
-  p.test_pattern = 'test/**/*_test.rb'
-  p.retain_gemspec = true
-  
-  # fixing the problem with lib/*-* files being removed while doing manifest
-  p.clean_pattern = ["pkg", "doc", 'build/*', '**/coverage', '**/*.o', '**/*.so', '**/*.a', '**/*.log', "{ext,lib}/*.{bundle,so,obj,pdb,lib,def,exp}", "ext/Makefile", "{ext,lib}/**/*.{bundle,so,obj,pdb,lib,def,exp}", "ext/**/Makefile", "pkg", "*.gem", ".config"]
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "netzke-core #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -0,0 +1 @@
+0.4.2

data/javascripts/core.js

@@ -126,9 +126,10 @@ Ext.widgetMixIn = {
       // this.getChildWidget(params.id).ownerCt.enable();
       
       // provide the callback to that widget that was loading the child, passing the child itself
-      if (this.callbackHash[params.id]) {
-        this.callbackHash[params.id].call(params.scope || this, this.getChildWidget(params.id));
-        delete this.callbackHash[params.id];
+      var callbackFn = this.callbackHash[params.id.camelize(true)];
+      if (callbackFn) {
+        callbackFn.call(params.scope || this, this.getChildWidget(params.id));
+        delete this.callbackHash[params.id.camelize(true)];
       }
     }
   },

data/lib/app/controllers/netzke_controller.rb

@@ -54,7 +54,7 @@ class NetzkeController < ActionController::Base
     :ext_config => {
       :html => "Panel 1",  
     },
-    :active => true
+    # :active => true
   },{
     :widget_class_name => "Panel",
     :ext_config => {
@@ -67,8 +67,8 @@ class NetzkeController < ActionController::Base
     :widget_class_name => "Panel",
     :ext_config => {
       :html => "Panel 1",
-    }
-    # :active => true
+    },
+    :active => true
   },{
     :widget_class_name => "Panel",
     :ext_config => {
@@ -79,6 +79,8 @@ class NetzkeController < ActionController::Base
   # BasicApp
   netzke :basic_app
 
+  netzke :panel, :ext_config => {:html => "Panel", :title => "Test panel", :border => true}
+
   def test_widgets
     html = "<h3>Quick primitive widgets tests</h3>"
     

data/lib/app/models/netzke_preference.rb

@@ -85,12 +85,21 @@ class NetzkePreference < ActiveRecord::Base
       # if it doesn't exist, get them for the user's role
       user = User.find(session[:masq_user])
       res ||= self.find(:first, :conditions => cond.merge({:role_id => user.role.id}))
+      # if it doesn't exist either, get them for the World (role_id = 0)
+      res ||= self.find(:first, :conditions => cond.merge({:role_id => 0}))
     elsif session[:masq_role]
+      # first, get the prefs for this role
       res = self.find(:first, :conditions => cond.merge({:role_id => session[:masq_role]}))
+      # if it doesn't exist, get them for the World (role_id = 0)
+      res ||= self.find(:first, :conditions => cond.merge({:role_id => 0}))
     elsif session[:netzke_user_id]
       user = User.find(session[:netzke_user_id])
+      # first, get the prefs for this user
       res = self.find(:first, :conditions => cond.merge({:user_id => user.id}))
+      # if it doesn't exist, get them for the user's role
       res ||= self.find(:first, :conditions => cond.merge({:role_id => user.role.id}))
+      # if it doesn't exist either, get them for the World (role_id = 0)
+      res ||= self.find(:first, :conditions => cond.merge({:role_id => 0}))
     else
       res = self.find(:first, :conditions => cond)
     end
@@ -105,7 +114,9 @@ class NetzkePreference < ActiveRecord::Base
     
     if session[:masq_user]
       cond.merge!({:user_id => session[:masq_user]})
+      # first, try to find the preference for masq_user
       res = self.find(:first, :conditions => cond)
+      # if it doesn't exist, create it
       res ||= self.new(cond)
     elsif session[:masq_role]
       # first, delete all the corresponding preferences for the users that have this role
@@ -115,6 +126,11 @@ class NetzkePreference < ActiveRecord::Base
       cond.merge!({:role_id => session[:masq_role]})
       res = self.find(:first, :conditions => cond)
       res ||= self.new(cond)
+    elsif session[:masq_world]
+      # first, delete all the corresponding preferences for all users and roles
+      self.delete_all(cond)
+      # then, create the new preference for the World (role_id = 0)
+      res = self.new(cond.merge(:role_id => 0))
     elsif session[:netzke_user_id]
       res = self.find(:first, :conditions => cond.merge({:user_id => session[:netzke_user_id]}))
       res ||= self.new(cond.merge({:user_id => session[:netzke_user_id]}))

data/lib/netzke/base.rb

@@ -495,7 +495,7 @@ module Netzke
       
       [{
         :js => widget.js_missing_code(cache), 
-        :css => css_missing_code(cache)
+        :css => widget.css_missing_code(cache)
       }, {
         :render_widget_in_container => {
           :container => params[:container], 

data/lib/netzke/base_js.rb

@@ -41,7 +41,8 @@ module Netzke
       end
   
       # Api (besides the default "load_aggregatee_with_cache" - JavaScript side already knows about it)
-      res.merge!(:api => self.class.api_points.reject{ |p| p == :load_aggregatee_with_cache })
+      api_points = self.class.api_points.reject{ |p| p == :load_aggregatee_with_cache }
+      res.merge!(:api => api_points) unless api_points.empty?
   
       # Widget class name. Needed for dynamic instantiation in javascript.
       res.merge!(:widget_class_name => short_widget_class_name)
@@ -166,31 +167,29 @@ module Netzke
         end
       end
       
-      def css_include(*args)
-        included_css = read_inheritable_attribute(:included_css) || []
-        args.each do |inclusion|
-          if inclusion.is_a?(Hash)
-            # we are signalized a non-default file location (e.g. Ext examples)
-            case inclusion.keys.first
-            when :ext_examples
-              location = Netzke::Base.config[:ext_location] + "/examples/"
-            end
-            files = inclusion.values.first
-          else
-            location = ""
-            files = inclusion
-          end
-          
-          files = [files] if files.is_a?(String)
-          
-          for f in files
-            included_css << location + f
-          end
-        end
-        write_inheritable_attribute(:included_css, included_css)
+      #
+      # Extra JavaScript
+      # 
+      
+      # Override this method. Must return an array of paths to javascript files that we depend on. 
+      # This javascript code will be loaded along with the widget's class, and before it.
+      def include_js
+        []
       end
+      
+      # Returns all extra JavaScript-code (as string) required by this widget's class
+      def js_included
+        res = ""
 
-      # all JS code needed for this class, including one from the ancestor widget
+        include_js.each do |path|
+          f = File.new(path)
+          res << f.read << "\n"
+        end
+
+        res
+      end
+      
+      # All JavaScript code needed for this class, including one from the ancestor widget
       def js_code(cached_dependencies = [])
         res = ""
 
@@ -205,40 +204,28 @@ module Netzke
         res
       end
 
+      #
+      # Extra CSS
+      # 
 
-      # Override this method. Must return an array of paths to javascript files that we depend on. 
-      # This javascript code will be loaded along with the widget's class, and before it.
-      def include_js
+      # Override this method. Must return an array of paths to css files that we depend on. 
+      def include_css
         []
       end
-
-      # returns all extra js-code (as string) required by this widget's class
-      def js_included
-        res = ""
-
-        include_js.each do |path|
-          f = File.new(path)
-          res << f.read << "\n"
-        end
-
-        res
-      end
-
       
-      # returns all extra js-code (as string) required by this widget's class
+      # Returns all extra CSS code (as string) required by this widget's class
       def css_included
         res = ""
         
-        included_css = read_inheritable_attribute(:included_css) || []
-        res << included_css.inject("") do |r, path|
+        include_css.each do |path|
           f = File.new(path)
-          r << f.read
+          res << f.read << "\n"
         end
 
         res
       end
       
-      # all JS code needed for this class including the one from the ancestor widget
+      # All CSS code needed for this class including the one from the ancestor widget
       def css_code(cached_dependencies = [])
         res = ""
 
@@ -250,7 +237,11 @@ module Netzke
         res
       end
 
+      
+      # Little helper
       def this; "this".l; end
+
+      # Little helper
       def null; "null".l; end
     
     end

data/netzke-core.gemspec

@@ -1,23 +1,103 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{netzke-core}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergei Kozlov"]
-  s.date = %q{2009-09-06}
+  s.date = %q{2009-09-11}
   s.description = %q{Build ExtJS/Rails widgets with minimum effort}
   s.email = %q{sergei@playcode.nl}
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc", "TODO", "lib/app/controllers/netzke_controller.rb", "lib/app/models/netzke_preference.rb", "lib/netzke-core.rb", "lib/netzke/action_view_ext.rb", "lib/netzke/base.rb", "lib/netzke/base_js.rb", "lib/netzke/controller_extensions.rb", "lib/netzke/core_ext.rb", "lib/netzke/feedback_ghost.rb", "lib/netzke/routing.rb", "tasks/netzke_core_tasks.rake"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "TODO", "autotest/discover.rb", "generators/netzke_core/USAGE", "generators/netzke_core/netzke_core_generator.rb", "generators/netzke_core/templates/create_netzke_preferences.rb", "init.rb", "install.rb", "javascripts/core.js", "lib/app/controllers/netzke_controller.rb", "lib/app/models/netzke_preference.rb", "lib/netzke-core.rb", "lib/netzke/action_view_ext.rb", "lib/netzke/base.rb", "lib/netzke/base_js.rb", "lib/netzke/controller_extensions.rb", "lib/netzke/core_ext.rb", "lib/netzke/feedback_ghost.rb", "lib/netzke/routing.rb", "netzke-core.gemspec", "stylesheets/core.css", "tasks/netzke_core_tasks.rake", "test/app_root/app/controllers/application_controller.rb", "test/app_root/app/models/role.rb", "test/app_root/app/models/user.rb", "test/app_root/config/boot.rb", "test/app_root/config/database.yml", "test/app_root/config/environment.rb", "test/app_root/config/environments/in_memory.rb", "test/app_root/config/environments/mysql.rb", "test/app_root/config/environments/postgresql.rb", "test/app_root/config/environments/sqlite.rb", "test/app_root/config/environments/sqlite3.rb", "test/app_root/config/routes.rb", "test/app_root/db/migrate/20081222035855_create_netzke_preferences.rb", "test/app_root/db/migrate/20090423214303_create_roles.rb", "test/app_root/db/migrate/20090423222114_create_users.rb", "test/app_root/lib/console_with_fixtures.rb", "test/app_root/script/console", "test/fixtures/roles.yml", "test/fixtures/users.yml", "test/test_helper.rb", "test/unit/core_ext_test.rb", "test/unit/netzke_core_test.rb", "test/unit/netzke_preference_test.rb", "uninstall.rb"]
-  s.homepage = %q{http://playcode.nl}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Netzke-core", "--main", "README.rdoc"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".autotest",
+     ".gitignore",
+     "CHANGELOG",
+     "LICENSE",
+     "Manifest",
+     "README.rdoc",
+     "Rakefile",
+     "TODO",
+     "VERSION",
+     "autotest/discover.rb",
+     "generators/netzke_core/USAGE",
+     "generators/netzke_core/netzke_core_generator.rb",
+     "generators/netzke_core/templates/create_netzke_preferences.rb",
+     "init.rb",
+     "install.rb",
+     "javascripts/core.js",
+     "lib/app/controllers/netzke_controller.rb",
+     "lib/app/models/netzke_preference.rb",
+     "lib/netzke-core.rb",
+     "lib/netzke/action_view_ext.rb",
+     "lib/netzke/base.rb",
+     "lib/netzke/base_js.rb",
+     "lib/netzke/controller_extensions.rb",
+     "lib/netzke/core_ext.rb",
+     "lib/netzke/feedback_ghost.rb",
+     "lib/netzke/routing.rb",
+     "netzke-core.gemspec",
+     "stylesheets/core.css",
+     "tasks/netzke_core_tasks.rake",
+     "test/app_root/app/controllers/application_controller.rb",
+     "test/app_root/app/models/role.rb",
+     "test/app_root/app/models/user.rb",
+     "test/app_root/config/boot.rb",
+     "test/app_root/config/database.yml",
+     "test/app_root/config/environment.rb",
+     "test/app_root/config/environments/in_memory.rb",
+     "test/app_root/config/environments/mysql.rb",
+     "test/app_root/config/environments/postgresql.rb",
+     "test/app_root/config/environments/sqlite.rb",
+     "test/app_root/config/environments/sqlite3.rb",
+     "test/app_root/config/routes.rb",
+     "test/app_root/db/migrate/20081222035855_create_netzke_preferences.rb",
+     "test/app_root/db/migrate/20090423214303_create_roles.rb",
+     "test/app_root/db/migrate/20090423222114_create_users.rb",
+     "test/app_root/lib/console_with_fixtures.rb",
+     "test/app_root/script/console",
+     "test/fixtures/roles.yml",
+     "test/fixtures/users.yml",
+     "test/test_helper.rb",
+     "test/unit/core_ext_test.rb",
+     "test/unit/netzke_core_test.rb",
+     "test/unit/netzke_preference_test.rb",
+     "uninstall.rb"
+  ]
+  s.homepage = %q{http://github.com/skozlov/netzke-core}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{netzke-core}
   s.rubygems_version = %q{1.3.4}
   s.summary = %q{Build ExtJS/Rails widgets with minimum effort}
-  s.test_files = ["test/unit/core_ext_test.rb", "test/unit/netzke_core_test.rb", "test/unit/netzke_preference_test.rb"]
+  s.test_files = [
+    "test/app_root/app/controllers/application_controller.rb",
+     "test/app_root/app/models/role.rb",
+     "test/app_root/app/models/user.rb",
+     "test/app_root/config/boot.rb",
+     "test/app_root/config/environment.rb",
+     "test/app_root/config/environments/in_memory.rb",
+     "test/app_root/config/environments/mysql.rb",
+     "test/app_root/config/environments/postgresql.rb",
+     "test/app_root/config/environments/sqlite.rb",
+     "test/app_root/config/environments/sqlite3.rb",
+     "test/app_root/config/routes.rb",
+     "test/app_root/db/migrate/20081222035855_create_netzke_preferences.rb",
+     "test/app_root/db/migrate/20090423214303_create_roles.rb",
+     "test/app_root/db/migrate/20090423222114_create_users.rb",
+     "test/app_root/lib/console_with_fixtures.rb",
+     "test/test_helper.rb",
+     "test/unit/core_ext_test.rb",
+     "test/unit/netzke_core_test.rb",
+     "test/unit/netzke_preference_test.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: skozlov-netzke-core
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-06 00:00:00 -07:00
+date: 2009-09-11 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -20,28 +20,18 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- CHANGELOG
 - LICENSE
 - README.rdoc
-- TODO
-- lib/app/controllers/netzke_controller.rb
-- lib/app/models/netzke_preference.rb
-- lib/netzke-core.rb
-- lib/netzke/action_view_ext.rb
-- lib/netzke/base.rb
-- lib/netzke/base_js.rb
-- lib/netzke/controller_extensions.rb
-- lib/netzke/core_ext.rb
-- lib/netzke/feedback_ghost.rb
-- lib/netzke/routing.rb
-- tasks/netzke_core_tasks.rake
 files: 
+- .autotest
+- .gitignore
 - CHANGELOG
 - LICENSE
 - Manifest
 - README.rdoc
 - Rakefile
 - TODO
+- VERSION
 - autotest/discover.rb
 - generators/netzke_core/USAGE
 - generators/netzke_core/netzke_core_generator.rb
@@ -87,16 +77,11 @@ files:
 - test/unit/netzke_preference_test.rb
 - uninstall.rb
 has_rdoc: false
-homepage: http://playcode.nl
+homepage: http://github.com/skozlov/netzke-core
 licenses: 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Netzke-core
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -109,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
+      version: "0"
   version: 
 requirements: []
 
@@ -119,6 +104,22 @@ signing_key:
 specification_version: 3
 summary: Build ExtJS/Rails widgets with minimum effort
 test_files: 
+- test/app_root/app/controllers/application_controller.rb
+- test/app_root/app/models/role.rb
+- test/app_root/app/models/user.rb
+- test/app_root/config/boot.rb
+- test/app_root/config/environment.rb
+- test/app_root/config/environments/in_memory.rb
+- test/app_root/config/environments/mysql.rb
+- test/app_root/config/environments/postgresql.rb
+- test/app_root/config/environments/sqlite.rb
+- test/app_root/config/environments/sqlite3.rb
+- test/app_root/config/routes.rb
+- test/app_root/db/migrate/20081222035855_create_netzke_preferences.rb
+- test/app_root/db/migrate/20090423214303_create_roles.rb
+- test/app_root/db/migrate/20090423222114_create_users.rb
+- test/app_root/lib/console_with_fixtures.rb
+- test/test_helper.rb
 - test/unit/core_ext_test.rb
 - test/unit/netzke_core_test.rb
 - test/unit/netzke_preference_test.rb