netzke-core 0.2.11 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,13 @@
+v0.3.0
+Refactor: got rid of NetzkeLayout model, now all layouts are stored in netzke_preferences
+New: persistent_config now has a method for_widget that accepts a block
+autotest compatibility
+New: String#to_b converts a string to true/false
+New: Netzke::Base.session introduced for session data
+New: weak_children_config and strong_children_config can now be declared by a widget, which specifies weak and strong configuration that every child of this widget will receive (e.g. display/hide configuration tool)
+Fix: (degradation) flash message is now shown again in case of erroneous attempt to load a widget
+New: widgets now can check session[:netzke_just_logged_in] and session[:netzke_just_logged_out] automatically set by Netzke after login/logout
+
 v0.2.11
 Introduction of getOwnerWidget()-method to Ext.Component. It provides the Netzke widget this Component belongs to.
 

data/Manifest

@@ -1,13 +1,12 @@
+autotest/discover.rb
 CHANGELOG
 generators/netzke_core/netzke_core_generator.rb
-generators/netzke_core/templates/create_netzke_layouts.rb
 generators/netzke_core/templates/create_netzke_preferences.rb
 generators/netzke_core/USAGE
 init.rb
 install.rb
 javascripts/core.js
 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
@@ -26,7 +25,9 @@ Rakefile
 README.mdown
 stylesheets/core.css
 tasks/netzke_core_tasks.rake
-test/app_root/app/controllers/application.rb
+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
@@ -37,10 +38,15 @@ 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/core_ext_test.rb
-test/netzke_core_test.rb
-test/netzke_preference_test.rb
+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
 TODO
 uninstall.rb

data/TODO

@@ -1 +1 @@
-* Re-factor JS-level inheritance mechanisms
+* Re-factor JS-level inheritance mechanisms

data/autotest/discover.rb

@@ -0,0 +1,3 @@
+Autotest.add_discovery do
+  "rails"
+end

data/generators/netzke_core/netzke_core_generator.rb

@@ -3,13 +3,10 @@ class NetzkeCoreGenerator < Rails::Generator::Base
   def manifest
     record do |m|
       # FIXME: how do we avoid getting the same migration timestamps?
-      # m.migration_template 'create_netzke_preferences.rb', "db/migrate", {:migration_file_name => "create_netzke_preferences"}
-      # m.migration_template 'create_netzke_layouts.rb', "db/migrate", {:migration_file_name => "create_netzke_layouts"}
-
       # Work-around
       time = Time.now.utc.strftime("%Y%m%d%H%M%S")
       m.directory 'db/migrate'
-      m.file 'create_netzke_layouts.rb', "db/migrate/#{time}_create_netzke_layouts.rb"
+      # m.file 'create_netzke_layouts.rb', "db/migrate/#{time}_create_netzke_layouts.rb"
       m.file 'create_netzke_preferences.rb', "db/migrate/#{time.to_i+1}_create_netzke_preferences.rb"
     end
   end

data/javascripts/core.js

@@ -317,7 +317,7 @@ Ext.override(Ext.Panel, {
             
           } else {
             // we didn't get normal response - desplay the flash with eventual errors
-            this.ownerCt.feedback(responseObj.flash);
+            this.getOwnerWidget().feedback(responseObj.flash);
           }
           
           // reenable the panel

data/lib/app/models/netzke_preference.rb

@@ -1,18 +1,19 @@
 #
-# TODO: would be great to support somethnig like:
+# TODO: would be great to support something like this:
 # NetzkePreference["name"].merge!({:a => 1, :b => 2}) # if NetzkePreference["name"] returns a hash
 # or
 # NetzkePreference["name"] << 2 # if NetzkePreference["name"] returns an array
 # etc
 #
 class NetzkePreference < ActiveRecord::Base
-  named_scope :for_current_user, lambda { {:conditions => {:user_id => user_id}} }
+  belongs_to :user
+  belongs_to :role
   
   ELEMENTARY_CONVERTION_METHODS= {'Fixnum' => 'to_i', 'String' => 'to_s', 'Float' => 'to_f', 'Symbol' => 'to_sym'}
   
-  def self.user_id
-    Netzke::Base.user && Netzke::Base.user.id
-  end
+  # def self.user_id
+  #   Netzke::Base.user && Netzke::Base.user.id
+  # end
   
   def self.widget_name=(value)
     @@widget_name = value
@@ -48,25 +49,112 @@ class NetzkePreference < ActiveRecord::Base
   
   def self.[](pref_name)
     pref_name  = normalize_preference_name(pref_name)
-    conditions = {:name => pref_name, :user_id => user_id, :widget_name => self.widget_name}
-    pref       = self.find(:first, :conditions => conditions)
+    pref       = self.pref_to_read(pref_name)
     pref && pref.normalized_value
   end
   
   def self.[]=(pref_name, new_value)
     pref_name  = normalize_preference_name(pref_name)
-    conditions = {:name => pref_name, :user_id => user_id, :widget_name => self.widget_name}
-    pref       = self.find(:first, :conditions => conditions)
+    pref       = self.pref_to_write(pref_name)
     
     # if assigning nil, simply delete the eventually found preference
     if new_value.nil?
       pref && pref.destroy
     else
-      pref ||= self.new(conditions)
+      # pref ||= self.new(conditions(pref_name))
       pref.normalized_value = new_value
       pref.save!
     end
   end
+
+  # execute set/get operation for a specified widget, e.g.:
+  # NetzkePreference.for_widget('my_widget') { |p| p[:key] = "value" }
+  def self.for_widget(widget, &block)
+    raise ArgumentError, "Block is required for #{self.name}\#for_widget" if !block_given?
+    backup_widget_name = self.widget_name
+    self.widget_name = widget
+    res = yield(self)
+    self.widget_name = backup_widget_name
+    res
+  end
+
+  #
+  # Overwrite pref_to_read, pref_to_write methods, and find_all_for_widget if you want a different way of 
+  # identifying the proper preference based on your own authorization strategy.
+  #
+  # The default strategy is:
+  #   1) if no masq_user or masq_role defined
+  #     pref_to_read will search for the preference for user first, then for user's role
+  #     pref_to_write will always find or create a preference for the current user (never for its role)
+  #   2) if masq_user or masq_role is defined
+  #     pref_to_read and pref_to_write will always take the masquerade into account, e.g. reads/writes will go to
+  #     the user/role specified
+  #   
+  def self.pref_to_read(name)
+    name = name.to_s
+    session = Netzke::Base.session
+    cond = {:name => name, :widget_name => self.widget_name}
+    
+    if session[:masq_user]
+      # first, get the prefs for this user it they exist
+      res = self.find(:first, :conditions => cond.merge({:user_id => session[:masq_user].id}))
+      # if it doesn't exist, get them for the user's role
+      res ||= self.find(:first, :conditions => cond.merge({:role_id => session[:masq_user].role.id}))
+    elsif session[:masq_role]
+      res = self.find(:first, :conditions => cond.merge({:role_id => session[:masq_role].id}))
+    elsif session[:user]
+      res = self.find(:first, :conditions => cond.merge({:user_id => session[:user].id}))
+      res ||= self.find(:first, :conditions => cond.merge({:role_id => session[:user].role.try(:id)}))
+    else
+      res = self.find(:first, :conditions => cond)
+    end
+    
+    res      
+  end
+  
+  def self.pref_to_write(name)
+    name = name.to_s
+    session = Netzke::Base.session
+    cond = {:name => name, :widget_name => self.widget_name}
+    
+    if session[:masq_user]
+      cond.merge!({:user_id => session[:masq_user].id})
+      res = self.find(:first, :conditions => cond)
+      res ||= self.new(cond)
+    elsif session[:masq_role]
+      # first, delete all the corresponding preferences for the users that have this role
+      Role.find(session[:masq_role].id).users.each do |u|
+        self.delete_all(cond.merge({:user_id => u.id}))
+      end
+      cond.merge!({:role_id => session[:masq_role].id})
+      res = self.find(:first, :conditions => cond)
+      res ||= self.new(cond)
+    elsif session[:user]
+      res = self.find(:first, :conditions => cond.merge({:user_id => session[:user].id}))
+      res ||= self.new(cond.merge({:user_id => session[:user].id}))
+    else
+      res = self.find(:first, :conditions => cond)
+      res ||= self.new(cond)
+    end
+    res
+  end
+  
+  def self.find_all_for_widget(name)
+    session = Netzke::Base.session
+    cond = {:widget_name => name}
+    
+    if session[:masq_user] || session[:masq_role]
+      cond.merge!({:user_id => session[:masq_user].try(:id), :role_id => session[:masq_role].try(:id)})
+      res = self.find(:all, :conditions => cond)
+    elsif session[:user]
+      res = self.find(:all, :conditions => cond.merge({:user_id => session[:user].id}))
+      res += self.find(:all, :conditions => cond.merge({:role_id => session[:user].role.try(:id)}))
+    else
+      res = self.find(:all, :conditions => cond)
+    end
+    
+    res      
+  end
   
   private
   def self.normalize_preference_name(name)

data/lib/netzke/base.rb

@@ -11,7 +11,6 @@ module Netzke
         :javascripts               => [],
         :stylesheets               => [],
         
-        :layout_manager            => "NetzkeLayout",
         :persistent_config_manager => "NetzkePreference",
         
         :ext_location              => defined?(RAILS_ROOT) && "#{RAILS_ROOT}/public/extjs"
@@ -28,7 +27,7 @@ module Netzke
         self.name.split("::").last
       end
 
-      # Multi-user support
+      # Multi-user support (deprecated in favor of controller sessions)
       def user
         @@user ||= nil
       end
@@ -37,6 +36,25 @@ module Netzke
         @@user = user
       end
 
+      # Access to controller sessions
+      def session
+        @@session ||= {}
+      end
+
+      def session=(s)
+        @@session = s
+      end
+
+      # called by controller at the moment of successfull login
+      def login
+        session[:_netzke_next_request_is_first_after_login] = true
+      end
+      
+      # called by controller at the moment of logout
+      def logout
+        session[:_netzke_next_request_is_first_after_logout] = true
+      end
+
       #
       # Use this class method to declare connection points between client side of a widget and its server side. A method in a widget class with the same name will be (magically) called by the client side of the widget. See Grid widget for an example
       #
@@ -76,12 +94,7 @@ module Netzke
         nil
       end
 
-      def layout_manager_class
-        Netzke::Base.config[:layout_manager].constantize
-      rescue NameError
-        nil
-      end
-      
+
       private
       def set_default_config(default_config)
         @@config ||= {}
@@ -92,12 +105,22 @@ module Netzke
     end
     extend ClassMethods
     
-    attr_accessor :config, :server_confg, :parent, :logger, :id_name, :permissions
+    attr_accessor :config, :server_confg, :parent, :logger, :id_name, :permissions, :session
     attr_reader :pref
 
     def initialize(config = {}, parent = nil)
+      @session = Netzke::Base.session
+
+      # Uncomment for application-wide weak/strong default config for widgets
+      # @config  = (session[:weak_default_config] || {}).
+      #   recursive_merge(initial_config).
+      #   recursive_merge(config).
+      #   recursive_merge(session[:strong_default_config] || {})
+
       @config  = initial_config.recursive_merge(config)
+        
       @parent  = parent
+      
       @id_name = parent.nil? ? config[:name].to_s : "#{parent.id_name}__#{config[:name]}"
       
       @flash = []
@@ -111,6 +134,24 @@ module Netzke
     def logger
       Rails.logger
     end
+
+    # configuration of all children will get recursive_merge'd with strong_children_config
+    def strong_children_config= (c)
+      @strong_children_config = c
+    end
+    
+    def strong_children_config
+      @strong_children_config ||= {}
+    end
+    
+    # configuration of all children will get reverse_recursive_merge'd with weak_children_config
+    def weak_children_config= (c)
+      @weak_children_config = c
+    end
+    
+    def weak_children_config
+      @weak_children_config ||= {}
+    end
     
     def dependency_classes
       res = []
@@ -194,7 +235,15 @@ module Netzke
         short_class_name = aggregator.aggregatees[aggr][:widget_class_name]
         raise ArgumentError, "No widget_class_name specified for aggregatee #{aggr} of #{aggregator.config[:name]}" if short_class_name.nil?
         widget_class = "Netzke::#{short_class_name}".constantize
-        aggregator = widget_class.new(aggregator.aggregatees[aggr].merge(:name => aggr), aggregator)
+
+        conf = weak_children_config.
+          recursive_merge(aggregator.aggregatees[aggr]).
+          recursive_merge(strong_children_config).
+          merge(:name => aggr)
+
+        aggregator = widget_class.new(conf, aggregator) # params: config, parent
+        aggregator.weak_children_config = weak_children_config
+        aggregator.strong_children_config = strong_children_config
       end
       aggregator
     end
@@ -284,10 +333,6 @@ module Netzke
     end
     
     # some convenience for instances
-    def layout_manager_class
-      self.class.layout_manager_class
-    end
-
     def persistent_config_manager_class
       self.class.persistent_config_manager_class
     end

data/lib/netzke/controller_extensions.rb

@@ -2,12 +2,29 @@ module Netzke
   module ControllerExtensions
     def self.included(base)
       base.extend ControllerClassMethods
-      base.send(:before_filter, :set_user)
+      base.send(:before_filter, :set_session_data)
     end
     
-    # pickup 
-    def set_user
-      Netzke::Base.user = current_user if defined?(current_user)
+    def set_session_data
+      Netzke::Base.session = session
+      session[:user] = defined?(current_user) ? current_user : nil
+
+      Netzke::Base.user = session[:user] # for backward compatibility (TODO: eliminate the need for this)
+      
+      # set netzke_just_logged_in and netzke_just_logged_out states (may be used by Netzke widgets)
+      if session[:_netzke_next_request_is_first_after_login]
+        session[:netzke_just_logged_in] = true
+        session[:_netzke_next_request_is_first_after_login] = false
+      else
+        session[:netzke_just_logged_in] = false
+      end
+
+      if session[:_netzke_next_request_is_first_after_logout]
+        session[:netzke_just_logged_out] = true
+        session[:_netzke_next_request_is_first_after_logout] = false
+      else
+        session[:netzke_just_logged_out] = false
+      end
     end
     
     def method_missing(method_name)

data/lib/netzke/core_ext.rb

@@ -29,6 +29,18 @@ class Hash
       h
     end
   end
+
+  # Javascrit-like access to Hash values
+  def method_missing(method, *args)
+    if method.to_s =~ /=$/ 
+      method_base = method.to_s.sub(/=$/,'').to_sym
+      key = self[method_base.to_s].nil? ? method_base : method_base.to_s
+      self[key] = args.first
+    else
+      key = self[method.to_s].nil? ? method : method.to_s
+      self[key]
+    end
+  end
   
 end
 
@@ -72,6 +84,11 @@ class String
     regexp = /^\s*\n/
     self.gsub!(regexp, '')
   end
+  
+  # "false" => false, "whatever_else" => true
+  def to_b
+    self != "false"
+  end
 end
 
 class Symbol

data/lib/netzke/feedback_ghost.rb

@@ -20,7 +20,7 @@ module Netzke
             }
 
             var showBox = function(msg, lvl){
-              if (!lvl) lvl = 'notice';
+              if (!lvl) {lvl = 'notice'};
               var msgCt = Ext.DomHelper.insertFirst(document.body, {'class':'netzke-feedback'}, true);
               var m = Ext.DomHelper.append(msgCt, {html:createBox(msg,lvl)}, true);
               m.slideIn('t').pause(2).ghost("b", {remove:true});
@@ -30,10 +30,10 @@ module Netzke
               var compoundMsg = "";
               Ext.each(msg, function(m){
                 compoundMsg += m.msg + '<br>';
-              })
-              if (compoundMsg != "") showBox(compoundMsg, null) // the second parameter will be level
+              });
+              if (compoundMsg != "") showBox(compoundMsg, null); // the second parameter will be level
             } else {
-              showBox(msg)
+              showBox(msg);
             }
         	}
         JS

data/netzke-core.gemspec

@@ -2,27 +2,27 @@
 
 Gem::Specification.new do |s|
   s.name = %q{netzke-core}
-  s.version = "0.2.11"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergei Kozlov"]
-  s.date = %q{2009-04-17}
+  s.date = %q{2009-05-07}
   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/base_extras/interface.rb", "lib/netzke/base_extras/js_builder.rb", "lib/netzke/controller_extensions.rb", "lib/netzke/core_ext.rb", "lib/netzke/feedback_ghost.rb", "lib/netzke/routing.rb", "lib/netzke-core.rb", "lib/vendor/facets/hash/recursive_merge.rb", "LICENSE", "README.mdown", "tasks/netzke_core_tasks.rake", "TODO"]
-  s.files = ["CHANGELOG", "generators/netzke_core/netzke_core_generator.rb", "generators/netzke_core/templates/create_netzke_layouts.rb", "generators/netzke_core/templates/create_netzke_preferences.rb", "generators/netzke_core/USAGE", "init.rb", "install.rb", "javascripts/core.js", "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/base_extras/interface.rb", "lib/netzke/base_extras/js_builder.rb", "lib/netzke/controller_extensions.rb", "lib/netzke/core_ext.rb", "lib/netzke/feedback_ghost.rb", "lib/netzke/routing.rb", "lib/netzke-core.rb", "lib/vendor/facets/hash/recursive_merge.rb", "LICENSE", "Manifest", "netzke-core.gemspec", "Rakefile", "README.mdown", "stylesheets/core.css", "tasks/netzke_core_tasks.rake", "test/app_root/app/controllers/application.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/script/console", "test/core_ext_test.rb", "test/netzke_core_test.rb", "test/netzke_preference_test.rb", "test/test_helper.rb", "TODO", "uninstall.rb"]
+  s.extra_rdoc_files = ["CHANGELOG", "lib/app/controllers/netzke_controller.rb", "lib/app/models/netzke_preference.rb", "lib/netzke/action_view_ext.rb", "lib/netzke/base.rb", "lib/netzke/base_extras/interface.rb", "lib/netzke/base_extras/js_builder.rb", "lib/netzke/controller_extensions.rb", "lib/netzke/core_ext.rb", "lib/netzke/feedback_ghost.rb", "lib/netzke/routing.rb", "lib/netzke-core.rb", "lib/vendor/facets/hash/recursive_merge.rb", "LICENSE", "README.mdown", "tasks/netzke_core_tasks.rake", "TODO"]
+  s.files = ["autotest/discover.rb", "CHANGELOG", "generators/netzke_core/netzke_core_generator.rb", "generators/netzke_core/templates/create_netzke_preferences.rb", "generators/netzke_core/USAGE", "init.rb", "install.rb", "javascripts/core.js", "lib/app/controllers/netzke_controller.rb", "lib/app/models/netzke_preference.rb", "lib/netzke/action_view_ext.rb", "lib/netzke/base.rb", "lib/netzke/base_extras/interface.rb", "lib/netzke/base_extras/js_builder.rb", "lib/netzke/controller_extensions.rb", "lib/netzke/core_ext.rb", "lib/netzke/feedback_ghost.rb", "lib/netzke/routing.rb", "lib/netzke-core.rb", "lib/vendor/facets/hash/recursive_merge.rb", "LICENSE", "Manifest", "netzke-core.gemspec", "Rakefile", "README.mdown", "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", "TODO", "uninstall.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://writelesscode.com}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Netzke-core", "--main", "README.mdown"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{netzke-core}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.2}
   s.summary = %q{Build ExtJS/Rails widgets with minimum effort}
-  s.test_files = ["test/core_ext_test.rb", "test/netzke_core_test.rb", "test/netzke_preference_test.rb"]
+  s.test_files = ["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
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else

data/test/app_root/app/models/role.rb

@@ -0,0 +1,3 @@
+class Role < ActiveRecord::Base
+  has_many :users
+end

data/test/app_root/app/models/user.rb

@@ -0,0 +1,3 @@
+class User < ActiveRecord::Base
+  belongs_to :role
+end

data/test/app_root/config/boot.rb

@@ -47,6 +47,7 @@ module Rails
     def load_initializer
       require "#{RAILS_FRAMEWORK_ROOT}/railties/lib/initializer"
       Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
     end
   end
 
@@ -85,7 +86,7 @@ module Rails
 
       def load_rubygems
         require 'rubygems'
-        min_version = '1.1.1'
+        min_version = '1.3.1'
         unless rubygems_version >= min_version
           $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1

data/test/app_root/config/database.yml

@@ -2,20 +2,30 @@ in_memory:
   adapter: sqlite3
   database: ":memory:"
   verbosity: quiet
+  pool: 5
+  timeout: 5000
 sqlite:
   adapter: sqlite
   dbfile: plugin_test.sqlite.db
+  pool: 5
+  timeout: 5000
 sqlite3:
   adapter: sqlite3
   dbfile: plugin_test.sqlite3.db
+  pool: 5
+  timeout: 5000
 postgresql:
   adapter: postgresql
   username: postgres
   password: postgres
   database: plugin_test
+  pool: 5
+  timeout: 5000
 mysql:
   adapter: mysql
   host: localhost
   username: root
   password:
   database: plugin_test
+  pool: 5
+  timeout: 5000

data/test/app_root/config/environment.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'boot')
 Rails::Initializer.run do |config|
   config.cache_classes = false
   config.whiny_nils = true
-  config.action_controller.session = { :key => "_myapp_session", :secret => "some very long secret phrase required by action pack" }
+  config.action_controller.session = {:key => 'rails_session', :secret => 'd229e4d22437432705ab3985d4d246'}
   config.plugin_locators.unshift(
     Class.new(Rails::Plugin::Locator) do
       def plugins

data/test/app_root/db/migrate/20090423214303_create_roles.rb

@@ -0,0 +1,11 @@
+class CreateRoles < ActiveRecord::Migration
+  def self.up
+    create_table :roles do |t|
+      t.string :name
+    end
+  end
+
+  def self.down
+    drop_table :roles
+  end
+end

data/test/app_root/db/migrate/20090423222114_create_users.rb

@@ -0,0 +1,12 @@
+class CreateUsers < ActiveRecord::Migration
+  def self.up
+    create_table :users do |t|
+      t.string :login
+      t.integer :role_id
+    end
+  end
+
+  def self.down
+    drop_table :users
+  end
+end

data/test/app_root/lib/console_with_fixtures.rb

@@ -0,0 +1,4 @@
+# Loads fixtures into the database when running the test app via the console
+(ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Rails.root, '../fixtures/*.{yml,csv}'))).each do |fixture_file|
+  Fixtures.create_fixtures(File.join(Rails.root, '../fixtures'), File.basename(fixture_file, '.*'))
+end

data/test/app_root/script/console

@@ -3,4 +3,5 @@ libs =  " -r irb/completion"
 libs << " -r test/test_helper"
 libs << " -r console_app"
 libs << " -r console_with_helpers"
+libs << " -r console_with_fixtures"
 exec "#{irb} #{libs} --simple-prompt"

data/test/fixtures/roles.yml

@@ -0,0 +1,7 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+one:
+  name: MyString
+
+two:
+  name: MyString

data/test/fixtures/users.yml

@@ -0,0 +1,9 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+one:
+  login: MyString
+  role_id: 1
+
+two:
+  login: MyString
+  role_id: 1

data/test/test_helper.rb

@@ -9,4 +9,13 @@ require 'test_help'
 silence_warnings {RAILS_ENV = ENV['RAILS_ENV']}
 
 # Run the migrations
-ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
+ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
+
+# Set default fixture loading properties
+ActiveSupport::TestCase.class_eval do
+  self.use_transactional_fixtures = true
+  self.use_instantiated_fixtures = false
+  self.fixture_path = "#{File.dirname(__FILE__)}/fixtures"
+  
+  fixtures :all
+end

data/test/{core_ext_test.rb → unit/core_ext_test.rb}

@@ -30,4 +30,16 @@ class CoreExtTest < ActiveSupport::TestCase
       {:aB => 1, :cDD => [{:lookMa => true},{:wowNow => true}]}
     ],[:a_b => 1, :c_d_d => [{:look_ma => true},{:wow_now => true}]].convert_keys{|k| k.camelize(:lower)})
   end
+  
+  test "javascript-like access to hash data" do
+    a = {}
+    a["key"] = 100
+    assert_equal(100, a.key)
+    
+    a.key = 200
+    assert_equal(200, a["key"])
+    
+    a.another_key = 300
+    assert_equal(300, a[:another_key])
+  end
 end

data/test/{netzke_core_test.rb → unit/netzke_core_test.rb}

@@ -1,8 +1,6 @@
 require 'test_helper'
-
 require 'netzke-core'
 
-# test widgets
 module Netzke
   class Widget < Base
     interface :method_one, :method_two
@@ -46,24 +44,10 @@ module Netzke
   end
 end
 
-# mocking the User class
-class User
-  attr_accessor :id
-  def initialize(id)
-    @id = id
-  end
-end
-
 class NetzkeCoreTest < ActiveSupport::TestCase
   include Netzke
   
   def setup
-    # object = mock()
-    # object.stubs(:normalized_value)
-    # object.stubs(:normalized_value=)
-    # # object.stubs(:save!)
-    # NetzkePreference.stubs(:find).returns(object)
-    
   end
   
   test "base class loaded" do
@@ -134,14 +118,6 @@ class NetzkeCoreTest < ActiveSupport::TestCase
     assert(!widget.dependencies.include?('DeepNestedWidget'))
   end
   
-  # test "dependencies in JS class generators" do
-  #   widget = Widget.new
-  #   assert(widget.js_missing_code.index("Ext.netzke.cache['NestedWidgetOne']"))
-  #   assert(widget.js_missing_code.index("Ext.netzke.cache['NestedWidgetTwo']"))
-  #   assert(widget.js_missing_code.index("Ext.netzke.cache['DeepNestedWidget']"))
-  #   assert(widget.js_missing_code.index("Ext.netzke.cache['Widget']"))
-  # end
-
   test "dependency classes" do
     widget = Widget.new
     # not testing the order
@@ -154,29 +130,10 @@ class NetzkeCoreTest < ActiveSupport::TestCase
     assert('a_widget', widget.config[:name])
   end
 
-  test "class configuration" do
-    assert_equal(NetzkeLayout, Netzke::Base.layout_manager_class)
-  end
-  
   test "js inheritance" do
     widget = JsInheritanceWidget.new
     assert(widget.js_missing_code.index("Ext.netzke.cache.JsInheritanceWidget"))
     assert(widget.js_missing_code.index("Ext.netzke.cache.Widget"))
   end
-  # test "multiuser" do
-  #   Netzke::Base.current_user = User.new(1)
-  #   Widget.new(:prohibit => :all, :name => 'widget')
-  #   
-  #   Netzke::Base.current_user = User.new(2)
-  #   Widget.new(:prohibit => :read, :name => 'widget')
-  #   
-  #   Netzke::Base.current_user = User.new(1)
-  #   widget = Widget.new(:name => 'widget')
-  #   assert_equal({:read => false, :update => false}, widget.permissions)
-  # 
-  #   Netzke::Base.current_user = User.new(2)
-  #   widget = Widget.new(:name => 'widget')
-  #   assert_equal({:read => false, :update => true}, widget.permissions)
-  #   
-  # end
+
 end

data/test/unit/netzke_preference_test.rb

@@ -0,0 +1,103 @@
+require 'test_helper'
+require 'netzke-core'
+class NetzkePreferenceTest < ActiveSupport::TestCase
+  test "pref to read-write" do
+    p = NetzkePreference
+    session = Netzke::Base.session
+    session.clear
+    
+    assert_not_nil(p.pref_to_write(:test))
+    p[:test] = "a value"
+    assert_not_nil(p.pref_to_read(:test))
+  end
+  
+  test "basic values" do
+    an_integer = 1976
+    a_float = 1976.1345
+    a_symbol = :a_symbol
+    a_true = true
+    a_false = false
+    a_nil = nil
+    a_hash = {"a" => an_integer, "b" => a_true, "c" => nil, "d" => a_float}
+    an_array = [1, "a", a_hash, [1,3,4], a_true, a_false, a_nil, a_float]
+    
+  
+    p = NetzkePreference
+    p[:a_hash] = a_hash
+    p["an_integer"] = an_integer
+    p[:a_true] = a_true
+    p[:a_false] = a_false
+    p[:a_nil] = a_nil
+    p[:an_array] = an_array
+    p[:a_symbol] = a_symbol
+    p[:a_float] = a_float
+    
+    assert_equal(a_hash, p[:a_hash])
+    assert_equal(an_integer, p[:an_integer])
+    assert_equal(a_true, p[:a_true])
+    assert_equal(a_false, p[:a_false])
+    assert_equal(an_array, p[:an_array])
+    assert_equal(a_nil, p[:a_nil])
+    assert_equal(a_symbol, p[:a_symbol])
+    assert_equal(a_float, p[:a_float])
+    
+    assert_equal(nil, p[:non_existing])
+  end
+  
+  test "multi-user/multi-role support" do
+    p = NetzkePreference
+    session = Netzke::Base.session
+    
+    admin_role = Role.create(:name => 'admin')
+    user_role = Role.create(:name => 'user')
+    
+    admin1 = User.create(:login => 'admin1', :role => admin_role)
+    user1 = User.create(:login => 'user1', :role => user_role)
+    user2 = User.create(:login => 'user2', :role => user_role)
+
+    #
+    # assign a value for a role, then read it back by users with the same role
+    #
+    session.clear
+    session[:masq_role] = user_role
+    p[:test] = 100
+
+    # first user
+    session.clear
+    session[:user] = user1
+    assert_equal(100, p[:test])
+
+    # second user
+    session.clear
+    session[:user] = user2
+    assert_equal(100, p[:test])
+    
+    #
+    # now overwrite the value for user2
+    #
+    p[:test] = 200
+    assert_equal(200, p[:test])
+    # .. and check that its still the same for user1
+    session.clear
+    session[:user] = user1
+    assert_equal(100, p[:test])
+    
+    #
+    # now overwrite it for user1 by means of masq_user
+    #
+    session.clear
+    session[:masq_user] = user1
+    p[:test] = 300
+    assert_equal(300, p[:test])
+    # .. and check it's still the same for user2
+    session.clear
+    session[:masq_user] = user2
+    assert_equal(200, p[:test])
+    # .. and that a new user with role 'user' will still read the original value assigned for the role
+    user3 = User.create(:login => "user3", :role => user_role)
+    session.clear
+    session[:user] = user3
+    assert_equal(100, p[:test])
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netzke-core
 version: !ruby/object:Gem::Version 
-  version: 0.2.11
+  version: 0.3.0
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-17 00:00:00 -04:00
+date: 2009-05-07 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -22,7 +22,6 @@ extensions: []
 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
@@ -39,16 +38,15 @@ extra_rdoc_files:
 - tasks/netzke_core_tasks.rake
 - TODO
 files: 
+- autotest/discover.rb
 - CHANGELOG
 - generators/netzke_core/netzke_core_generator.rb
-- generators/netzke_core/templates/create_netzke_layouts.rb
 - generators/netzke_core/templates/create_netzke_preferences.rb
 - generators/netzke_core/USAGE
 - init.rb
 - install.rb
 - javascripts/core.js
 - 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
@@ -67,7 +65,9 @@ files:
 - README.mdown
 - stylesheets/core.css
 - tasks/netzke_core_tasks.rake
-- test/app_root/app/controllers/application.rb
+- 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
@@ -78,15 +78,22 @@ files:
 - 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/core_ext_test.rb
-- test/netzke_core_test.rb
-- test/netzke_preference_test.rb
+- 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
 - TODO
 - uninstall.rb
 has_rdoc: true
 homepage: http://writelesscode.com
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -112,11 +119,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: netzke-core
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Build ExtJS/Rails widgets with minimum effort
 test_files: 
-- test/core_ext_test.rb
-- test/netzke_core_test.rb
-- test/netzke_preference_test.rb
+- test/unit/core_ext_test.rb
+- test/unit/netzke_core_test.rb
+- test/unit/netzke_preference_test.rb

data/generators/netzke_core/templates/create_netzke_layouts.rb

@@ -1,14 +0,0 @@
-class CreateNetzkeLayouts < ActiveRecord::Migration
-  def self.up
-    create_table :netzke_layouts do |t|
-      t.string  :widget_name
-      t.string  :items_class
-      t.integer :user_id
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :netzke_layouts
-  end
-end

data/lib/app/models/netzke_layout.rb

@@ -1,40 +0,0 @@
-class NetzkeLayout < ActiveRecord::Base
-  EXT_UNRELATED_ATTRIBUTES = %w{ id layout_id position created_at updated_at }
-
-  # Multi user support
-  def self.user_id
-    Netzke::Base.user && Netzke::Base.user.id
-  end
-  
-  # normal create, but with a user_id merged-in
-  def self.create_with_user(config)
-    create(config.merge(:user_id => user_id))
-  end
-  
-  def items
-    items_class.constantize.find_all_by_layout_id(id, :order => 'position')
-  end
-  
-  def self.by_widget(widget_name)
-    self.find(:first, :conditions => {:widget_name => widget_name.to_s, :user_id => user_id})
-  end
-
-  def move_item(old_index, new_index)
-    layout_item = items[old_index]
-    layout_item.remove_from_list
-    layout_item.insert_at(new_index + 1)
-  end
-
-  def items_arry
-    unrelated_attrs_eraser = EXT_UNRELATED_ATTRIBUTES.inject({}){|h,el| h.merge(el => nil)} # => {:id => nil, :layout_id => nil, ...}
-    items.map(&:attributes).map do |i| 
-      # delete unrelated attributes
-      i.merge(unrelated_attrs_eraser).convert_keys {|k| k.to_sym}
-    end
-  end
-  
-  def items_arry_without_hidden
-    items_arry.reject{|i| i[:hidden] && !i[:name] == :id} # 'id' is exceptional, should always be sent
-  end
-
-end

data/test/netzke_preference_test.rb

@@ -1,36 +0,0 @@
-require 'test_helper'
-require 'netzke-core'
-class NetzkePreferenceTest < ActiveSupport::TestCase
-  test "basic values" do
-    an_integer = 1976
-    a_float = 1976.1345
-    a_symbol = :a_symbol
-    a_true = true
-    a_false = false
-    a_nil = nil
-    a_hash = {"a" => an_integer, "b" => a_true, "c" => nil, "d" => a_float}
-    an_array = [1, "a", a_hash, [1,3,4], a_true, a_false, a_nil, a_float]
-    
-
-    p = NetzkePreference
-    p[:a_hash] = a_hash
-    p["an_integer"] = an_integer
-    p[:a_true] = a_true
-    p[:a_false] = a_false
-    p[:a_nil] = a_nil
-    p[:an_array] = an_array
-    p[:a_symbol] = a_symbol
-    p[:a_float] = a_float
-    
-    assert_equal(a_hash, p[:a_hash])
-    assert_equal(an_integer, p[:an_integer])
-    assert_equal(a_true, p[:a_true])
-    assert_equal(a_false, p[:a_false])
-    assert_equal(an_array, p[:an_array])
-    assert_equal(a_nil, p[:a_nil])
-    assert_equal(a_symbol, p[:a_symbol])
-    assert_equal(a_float, p[:a_float])
-    
-    assert_equal(nil, p[:non_existing])
-  end
-end