netzke-core 0.3.1 → 0.4.2

data/lib/netzke/feedback_ghost.rb

@@ -9,7 +9,7 @@ module Netzke
 
     def self.js_extend_properties
       {
-        :show_feedback => <<-JS.l,
+        :show_feedback => <<-END_OF_JAVASCRIPT.l,
           function(msg){
             var createBox = function(s, l){
                 return ['<div class="msg">',
@@ -36,7 +36,7 @@ module Netzke
               showBox(msg);
             }
         	}
-        JS
+        END_OF_JAVASCRIPT
       }
     end
   end

data/netzke-core.gemspec

@@ -1,24 +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.3.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-05-07}
+  s.date = %q{2009-09-11}
   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_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.email = %q{sergei@playcode.nl}
+  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.2}
+  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

data/test/unit/core_ext_test.rb

@@ -2,13 +2,6 @@ require 'test_helper'
 require 'netzke/core_ext'
 
 class CoreExtTest < ActiveSupport::TestCase
-  test "to_js" do
-    assert_equal({"aProperty" => true}, ActiveSupport::JSON.decode({:a_property => true}.to_js))
-    assert_equal({"aProperty" => true}, ActiveSupport::JSON.decode({:a_property => true, :nil_property => nil}.to_js))
-    assert_equal([{"aProperty" => true}, {"anotherProperty" => false}], ActiveSupport::JSON.decode([{:a_property => true}, {:another_property => false}].to_js))
-    assert_equal([{"aProperty" => true}, {"anotherProperty" =>false}], ActiveSupport::JSON.decode([{:a_property => true, :nil_property => nil}, {:another_property => false}].to_js))
-  end
-  
   test "recursive delete if nil" do
     assert_equal({:a => 1, :b => {:c => 4, :d => 5}}, {:a => 1, :aa => nil, :b => {:c => 4, :d => 5, :cc => nil}}.recursive_delete_if_nil)
 
@@ -42,4 +35,32 @@ class CoreExtTest < ActiveSupport::TestCase
     a.another_key = 300
     assert_equal(300, a[:another_key])
   end
+  
+  test "jsonify" do
+    assert_equal({:aB => 1, "cD" => [[1, {:eF => "stay_same"}], {"literal_symbol" => :should_not_change, "literal_string".l => "also_should_not"}]}, {:a_b => 1, "c_d" => [[1, {:e_f => "stay_same"}], {:literal_symbol.l => :should_not_change, "literal_string".l => "also_should_not"}]}.jsonify)
+  end
+  
+  # test "flatten" do
+  #   assert_equal([{
+  #     :name => :one, :value => 1 
+  #   },{
+  #     :name => :two, :value => 2 
+  #   },{
+  #     :name => :three__four, :value => 4 
+  #   },{
+  #     :name => :three__five__six, :value => 6
+  #   }], 
+  #   {
+  #     :one => 1,
+  #     :two => 2,
+  #     :three => {
+  #       :four => 4,
+  #       :five => {
+  #         :six => 6
+  #       }
+  #     }
+  #   }.flatten
+  #   )
+  # end
+  
 end

data/test/unit/netzke_core_test.rb

@@ -3,7 +3,15 @@ require 'netzke-core'
 
 module Netzke
   class Widget < Base
-    interface :method_one, :method_two
+    api :method_one, :method_two
+    
+    def self.config
+      super.merge({
+        :pref_one => 1,
+        :pref_two => 2
+      })
+    end
+    
     def initial_aggregatees
       {
         :nested_one => {:widget_class_name => 'NestedWidgetOne'},
@@ -15,7 +23,7 @@ module Netzke
       %w(read update)
     end
     
-    def initial_config
+    def default_config
       {
         :config_uno => true,
         :config_dos => false
@@ -37,9 +45,14 @@ module Netzke
   class DeepNestedWidget < Base
   end
 
-  class JsInheritanceWidget < Base
-    def self.js_base_class
-      Widget
+  class JsInheritanceWidget < Widget
+  end
+  
+  class InheritedWidget < Widget
+    def self.config
+      super.merge({
+        :pref_one => -1
+      })
     end
   end
 end
@@ -58,9 +71,9 @@ class NetzkeCoreTest < ActiveSupport::TestCase
     assert_equal 'Widget', Widget.short_widget_class_name
   end
   
-  test "interface" do
+  test "api" do
     widget_class = Widget
-    assert_equal [:get_widget, :method_one, :method_two], widget_class.interface_points
+    assert_equal [:load_aggregatee_with_cache, :method_one, :method_two], widget_class.api_points
   end
 
   test "aggregatees" do
@@ -83,32 +96,32 @@ class NetzkeCoreTest < ActiveSupport::TestCase
     assert_equal 'my_widget__nested_two__nested', deep_nested_widget.id_name
   end
   
-  test "permissions" do
-    widget = Widget.new
-    assert_equal({:read => true, :update => true}, widget.permissions)
-
-    widget = Widget.new(:prohibit => :all)
-    assert_equal({:read => false, :update => false}, widget.permissions)
-
-    widget = Widget.new(:prohibit => :read)
-    assert_equal({:read => false, :update => true}, widget.permissions)
-
-    widget = Widget.new(:prohibit => [:read, :update])
-    assert_equal({:read => false, :update => false}, widget.permissions)
-
-    widget = Widget.new(:prohibit => :all, :allow => :read)
-    assert_equal({:read => true, :update => false}, widget.permissions)
-
-    widget = Widget.new(:prohibit => :all, :allow => [:read, :update])
-    assert_equal({:read => true, :update => true}, widget.permissions)
-  end
+  # test "permissions" do
+  #   widget = Widget.new
+  #   assert_equal({:read => true, :update => true}, widget.permissions)
+  # 
+  #   widget = Widget.new(:prohibit => :all)
+  #   assert_equal({:read => false, :update => false}, widget.permissions)
+  # 
+  #   widget = Widget.new(:prohibit => :read)
+  #   assert_equal({:read => false, :update => true}, widget.permissions)
+  # 
+  #   widget = Widget.new(:prohibit => [:read, :update])
+  #   assert_equal({:read => false, :update => false}, widget.permissions)
+  # 
+  #   widget = Widget.new(:prohibit => :all, :allow => :read)
+  #   assert_equal({:read => true, :update => false}, widget.permissions)
+  # 
+  #   widget = Widget.new(:prohibit => :all, :allow => [:read, :update])
+  #   assert_equal({:read => true, :update => true}, widget.permissions)
+  # end
   
   test "default config" do
     widget = Widget.new
-    assert_equal({:ext_config => {}, :config_uno => true, :config_dos => false}, widget.config)
+    assert_equal({:config_uno => true, :config_dos => false}, widget.config)
 
     widget = Widget.new(:name => 'widget', :config_uno => false)
-    assert_equal({:name => 'widget', :ext_config => {}, :config_uno => false, :config_dos => false}, widget.config)
+    assert_equal({:name => 'widget', :config_uno => false, :config_dos => false}, widget.config)
   end
 
   test "dependencies calculated based on aggregations" do
@@ -127,7 +140,7 @@ class NetzkeCoreTest < ActiveSupport::TestCase
   test "widget instance by config" do
     widget = Netzke::Base.instance_by_config({:widget_class_name => 'Widget', :name => 'a_widget'})
     assert(Widget, widget.class)
-    assert('a_widget', widget.config[:name])
+    assert('a_widget', widget.name)
   end
 
   test "js inheritance" do
@@ -136,4 +149,19 @@ class NetzkeCoreTest < ActiveSupport::TestCase
     assert(widget.js_missing_code.index("Ext.netzke.cache.Widget"))
   end
 
+  test "class-level configuration" do
+    # predefined defaults
+    assert(1, Netzke::Widget.config[:pref_one])
+    assert(2, Netzke::Widget.config[:pref_two])
+    assert(-1, Netzke::InheritedWidget.config[:pref_one])
+    assert(2, Netzke::InheritedWidget.config[:pref_two])
+
+    Netzke::Widget.config[:pref_for_widget] = 1
+    Netzke::InheritedWidget.config[:pref_for_widget] = 2
+    
+    assert(1, Netzke::Widget.config[:pref_for_widget])
+    assert(2, Netzke::InheritedWidget.config[:pref_for_widget])
+    
+  end
+
 end

data/test/unit/netzke_preference_test.rb

@@ -59,17 +59,17 @@ class NetzkePreferenceTest < ActiveSupport::TestCase
     # assign a value for a role, then read it back by users with the same role
     #
     session.clear
-    session[:masq_role] = user_role
+    session[:masq_role] = user_role.id
     p[:test] = 100
 
     # first user
     session.clear
-    session[:user] = user1
+    session[:netzke_user_id] = user1.id
     assert_equal(100, p[:test])
 
     # second user
     session.clear
-    session[:user] = user2
+    session[:netzke_user_id] = user2.id
     assert_equal(100, p[:test])
     
     #
@@ -79,24 +79,24 @@ class NetzkePreferenceTest < ActiveSupport::TestCase
     assert_equal(200, p[:test])
     # .. and check that its still the same for user1
     session.clear
-    session[:user] = user1
+    session[:netzke_user_id] = user1.id
     assert_equal(100, p[:test])
     
     #
     # now overwrite it for user1 by means of masq_user
     #
     session.clear
-    session[:masq_user] = user1
+    session[:masq_user] = user1.id
     p[:test] = 300
     assert_equal(300, p[:test])
     # .. and check it's still the same for user2
     session.clear
-    session[:masq_user] = user2
+    session[:masq_user] = user2.id
     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
+    session[:netzke_user_id] = user3.id
     assert_equal(100, p[:test])
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netzke-core
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -9,60 +9,47 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 -05:00
+date: 2009-09-11 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
 description: Build ExtJS/Rails widgets with minimum effort
-email: sergei@writelesscode.com
+email: sergei@playcode.nl
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE
+- README.rdoc
+files: 
+- .autotest
+- .gitignore
 - 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
+- Manifest
+- README.rdoc
+- Rakefile
 - TODO
-files: 
+- VERSION
 - autotest/discover.rb
-- CHANGELOG
+- generators/netzke_core/USAGE
 - 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-core.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/base_js.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
@@ -88,20 +75,14 @@ files:
 - 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
+homepage: http://github.com/skozlov/netzke-core
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Netzke-core
-- --main
-- README.mdown
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -114,16 +95,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
+      version: "0"
   version: 
 requirements: []
 
 rubyforge_project: netzke-core
-rubygems_version: 1.3.2
+rubygems_version: 1.3.4
 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