netzke-basepack 0.6.0 → 0.6.1

data/spec/active_record/attributes_spec.rb

@@ -4,11 +4,16 @@ describe Netzke::ActiveRecord::Attributes do
   it "should return Netzke attributes in natural order" do
     User.send(:netzke_attrs_in_natural_order).map{ |a| a[:name] }.should == %w(id first_name last_name role__name created_at updated_at)
   end
-  
+
   it "should return exposed Netzke attributes" do
     class UserExt < User
       netzke_expose_attributes :first_name, :created_at
     end
     UserExt.netzke_attributes.map{ |a| a[:name] }.should == %w(id first_name created_at)
   end
+
+  it "should return Netzke attributes including an association attribute represented by a virtual method" do
+    Book.netzke_attributes.map{ |a| a[:name] }.should == %w(id author__name title exemplars digitized notes created_at updated_at)
+    Book.netzke_attributes.detect{ |a| a[:name] == "author__name" }[:attr_type].should == :string
+  end
 end

data/spec/active_record/relation_extensions_spec.rb

@@ -6,31 +6,31 @@ describe Netzke::ActiveRecord::RelationExtensions do
     10.times do |i|
       Factory(:user, :first_name => "First Name #{i}", :role_id => i)
     end
-    
+
     User.scope(:role_id_gt_7, User.where(["role_id > ?", 7]))
     User.scope(:role_id_gt, lambda{ |param| User.where(["role_id > ?", param]) })
-    
+
     # Tests
     User.where({}).extend_with(["role_id >= ?", 5]).count.should == 5
-    
+
     User.where({}).extend_with(:role_id_gt_7).count.should == 2
-    
+
     User.where({}).extend_with(:role_id_gt, 2).count.should == 7
-    
+
     User.where({}).extend_with([:role_id_gt, 3]).count.should == 6
-    
+
     User.where({}).extend_with(:role_id => 5).first.first_name.should == "First Name 5"
-    
+
     User.where(["role_id < ?", 7]).extend_with(lambda{ |relation| relation.where(["role_id > ?", 4]) }).count.should == 2
-    
+
     # User.where({}).extend_with("select * from users where role_id > 6").all.size.should == 3
-    
+
   end
-  
+
   it "should be extendable with extend_with_netzke_conditions" do
     # Preparations
     roles = [Factory(:role, :name => "admin"), Factory(:role, :name => "user"), Factory(:role, :name => "superadmin")]
-    
+
     # 3 users of each role
     9.times do |i|
       Factory(:user, :role_id => roles[i%3].id)

data/spec/components/form_panel_spec.rb

@@ -5,49 +5,49 @@ describe Netzke::Basepack::FormPanel do
     form = Netzke::Basepack::FormPanel.new(:model => 'User')
     form.fields_from_model.keys.map(&:to_s).sort.should == %w(created_at first_name id last_name role__name updated_at)
   end
-  
+
   it "should extract fields from config" do
     form = Netzke::Basepack::FormPanel.new(:model => 'User', :items => [{:xtype => 'fieldset', :items => [:first_name, {:name => "last_name"}]}, :created_at, {:name => :updated_at}])
-    
+
     form.fields_from_config.keys.map(&:to_s).sort.should == %w(created_at first_name id last_name updated_at)
   end
-  
+
   it "should set correct xtype for columns" do
     form = Netzke::Basepack::FormPanel.new(:model => 'User', :items => [:first_name, :created_at, :role__name])
-    
+
     form.fields[:first_name][:xtype].should == :textfield
     form.fields[:created_at][:xtype].should == :xdatetime
     form.fields[:role__name][:xtype].should == :combobox
   end
-  
+
   it "should set correct default field labels" do
     form = Netzke::Basepack::FormPanel.new(:model => 'User', :items => [:first_name, :created_at, :role__name])
-    
+
     form.fields[:first_name][:field_label].should == "First name"
     form.fields[:created_at][:field_label].should == "Created at"
     form.fields[:role__name][:field_label].should == "Role name"
   end
-  
+
   it "should set correct field values" do
     role = Factory(:role, :name => "warrior")
     user = Factory(:user, :first_name => "Carlos", :last_name => "Castaneda", :role => role)
-    
+
     form = Netzke::Basepack::FormPanel.new(:model => 'User', :record => user, :items => [:first_name, :last_name, :role__name])
-    
+
     form.fields[:first_name][:value].should == "Carlos"
     form.fields[:last_name][:value].should == "Castaneda"
     form.fields[:role__name][:value].should == "warrior"
   end
-  
+
   it "should add primary key field automatically when omitted" do
     form = Netzke::Basepack::FormPanel.new(:model => 'User', :items => [:first_name, :last_name, :role__name])
     form.fields[:id].should_not be_nil
   end
-  
+
   it "should pass normalized items to JS" do
     form = Netzke::Basepack::FormPanel.new(:model => 'User', :items => [
       {:xtype => 'fieldset', :items => [
-        :first_name, 
+        :first_name,
         {:name => "last_name"}
       ]},
       :created_at,
@@ -60,11 +60,5 @@ describe Netzke::Basepack::FormPanel do
     form.items[2][:name].should == "created_at"
     form.items[3][:name].should == "updated_at"
   end
-  
-  it "should detect association column" do
-    form = Netzke::Basepack::FormPanel.new(:model => 'User', :items => [:role_id])
-    
-    form.items[1][:name].should == "role__name"
-  end
-  
+
 end

data/spec/components/grid_panel_spec.rb

@@ -4,7 +4,7 @@ describe Netzke::Basepack::GridPanel do
   it "should have correct amount of default columns" do
     u1 = Factory(:user)
     grid = Netzke::Basepack::GridPanel.new(:model => 'User')
-    
+
     grid.columns.size.should == 6
   end
 end

data/test/rails_app/Gemfile

@@ -1,8 +1,9 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.0'
+gem 'rails', '3.0.1'
 
-gem 'netzke-core', '~>0.6.0.beta', :git => "git@github.com:skozlov/netzke-core.git", :branch => "rails3"
+gem 'netzke-core'#, :git => "~/code/netzke/netzke-core"
+gem 'netzke-persistence'#, :git => "~/code/netzke/netzke-persistence"
 
 gem 'will_paginate', '3.0.pre2'
 gem 'meta_where'
@@ -28,5 +29,5 @@ end
 group :test do
   gem 'sqlite3-ruby', :require => 'sqlite3'
   gem 'pickle'
-  gem 'database_cleaner', :git => 'http://github.com/bmabey/database_cleaner.git'
+  gem 'database_cleaner'#, :git => 'http://github.com/bmabey/database_cleaner.git'
 end

data/test/rails_app/Gemfile.lock

@@ -1,27 +1,13 @@
-GIT
-  remote: git@github.com:skozlov/netzke-core.git
-  revision: b3ffaf6
-  branch: rails3
-  specs:
-    netzke-core (0.6.0.beta)
-      activesupport (>= 3.0.0)
-
-GIT
-  remote: http://github.com/bmabey/database_cleaner.git
-  revision: 474b226
-  specs:
-    database_cleaner (0.6.0.rc.3)
-
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
+    actionmailer (3.0.1)
+      actionpack (= 3.0.1)
       mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionpack (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)
@@ -29,19 +15,19 @@ GEM
       rack-mount (~> 0.6.12)
       rack-test (~> 0.5.4)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       arel (~> 1.0.0)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
+    activeresource (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+    activesupport (3.0.1)
     acts_as_list (0.1.2)
     arel (1.0.1)
       activesupport (~> 3.0.0)
@@ -59,15 +45,16 @@ GEM
     childprocess (0.1.3)
       ffi (~> 0.6.3)
     configuration (1.1.0)
-    cucumber (0.9.2)
+    cucumber (0.9.3)
       builder (~> 2.1.2)
       diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.5)
+      gherkin (~> 2.2.9)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
     culerity (0.2.12)
+    database_cleaner (0.6.0)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -77,24 +64,28 @@ GEM
     gherkin (2.2.9)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
-    i18n (0.4.1)
+    i18n (0.4.2)
     json (1.4.6)
     json_pure (1.4.6)
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
-    mail (2.2.7)
+    mail (2.2.9)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (~> 0.4.1)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     meta_where (0.9.6)
       activerecord (~> 3.0.0)
       activesupport (~> 3.0.0)
       arel (~> 1.0.1)
     mime-types (1.16)
     mysql2 (0.2.6)
+    netzke-core (0.6.4)
+      activesupport (>= 3.0.1)
+    netzke-persistence (0.0.1)
     nokogiri (1.4.3.1)
-    pickle (0.4.2)
+    pickle (0.4.3)
       cucumber (>= 0.8)
       rake
       rspec (>= 1.3)
@@ -105,17 +96,17 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.6)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
+    rails (3.0.1)
+      actionmailer (= 3.0.1)
+      actionpack (= 3.0.1)
+      activerecord (= 3.0.1)
+      activeresource (= 3.0.1)
+      activesupport (= 3.0.1)
       bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
+      railties (= 3.0.1)
+    railties (3.0.1)
+      actionpack (= 3.0.1)
+      activesupport (= 3.0.1)
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
@@ -138,9 +129,9 @@ GEM
       json_pure
       rubyzip
     spork (0.8.4)
-    sqlite3-ruby (1.3.1)
+    sqlite3-ruby (1.3.2)
     term-ansicolor (1.0.5)
-    thor (0.14.3)
+    thor (0.14.4)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
@@ -157,14 +148,15 @@ DEPENDENCIES
   capybara
   cucumber
   cucumber-rails
-  database_cleaner!
+  database_cleaner
   factory_girl
   launchy
   meta_where
   mysql2
-  netzke-core (~> 0.6.0.beta)!
+  netzke-core
+  netzke-persistence
   pickle
-  rails (= 3.0.0)
+  rails (= 3.0.1)
   rspec-rails (~> 2.0.0)
   spork
   sqlite3-ruby

data/test/rails_app/app/components/book_grid.rb

@@ -0,0 +1,4 @@
+class BookGrid < Netzke::Basepack::GridPanel
+  js_property :title, "Books"
+  config :model => "Book"
+end

data/test/rails_app/app/components/generic_user_form.rb

@@ -1,5 +1,5 @@
 class GenericUserForm < Netzke::Basepack::FormPanel
-  
+
   config do
     {
       :model => 'User',
@@ -8,5 +8,5 @@ class GenericUserForm < Netzke::Basepack::FormPanel
       :items => [:id, :first_name]
     }
   end
-  
+
 end

data/test/rails_app/app/components/simple_basic_app.rb

@@ -2,15 +2,15 @@ class SimpleBasicApp < Netzke::Basepack::BasicApp
   def menu
     [:simple_accordion.action, :user_grid.action, :simple_tab_panel.action] + super
   end
-  
+
   action :simple_accordion, :icon => :application_tile_vertical, :handler => :load_component_by_action
   action :user_grid, :icon => :table, :handler => :load_component_by_action
   action :simple_tab_panel, :icon => :table_multiple, :handler => :load_component_by_action
-  
+
   component :user_grid
   component :simple_accordion
   component :simple_tab_panel, :active_tab => 0
-  
+
   # Wrapping up original layout into a border-layout with the north panel being a fancy header
   def final_config
     orig = super

data/test/rails_app/app/components/simple_panel.rb

@@ -1,6 +1,6 @@
 class SimplePanel < Netzke::Basepack::Panel
   action :update_html
-  
+
   js_properties :title  => "SimplePanel",
                 :html => "Original HTML",
                 :bbar => [:update_html.action]

data/test/rails_app/app/components/some_border_layout.rb

@@ -1,24 +1,25 @@
 class SomeBorderLayout < Netzke::Basepack::BorderLayoutPanel
-  def config
-    {
-      :items => [
-        {:title => "Who", :class_name => "Basepack::GridPanel", :region => :center, :model => "User", :name => :user_grid},
-        {:title => "Item Two", :class_name => "Basepack::GridPanel", :region => :west, :width => 500, :split => true, :model => "Role", :name => :role_grid}
-      ],
-      :bbar => [:update_center_region.action, :update_west_region.action]
-    }.deep_merge(super)
-  end
+  config :items => [
+            {:title => "Who", :class_name => "Basepack::GridPanel", :region => :center, :model => "User", :name => :user_grid},
+            {:title => "Item Two", :class_name => "Basepack::GridPanel", :region => :west, :width => 500, :split => true, :collapsible => true, :model => "Role", :name => :role_grid}
+          ],
+          :bbar => [:update_center_region.action, :update_west_region.action]
+
+  action :update_center_region
+  action :update_west_region
   
+  # config :default, :persistence => true
+
   js_method :on_update_west_region, <<-JS
     function(){
       this.getChildComponent('user_grid').body.update('Updated West Region Content');
     }
   JS
-  
+
   js_method :on_update_center_region, <<-JS
     function(){
       this.getChildComponent('role_grid').body.update('Updated Center Region Content');
     }
   JS
-  
+
 end

data/test/rails_app/app/components/some_search_panel.rb

@@ -9,9 +9,9 @@ class SomeSearchPanel < Netzke::Basepack::FormPanel
   end
 
   def normalize_field(f)
-    f = if f.is_a?(Symbol) || f.is_a?(String) 
+    f = if f.is_a?(Symbol) || f.is_a?(String)
       {:name => f.to_s, :operator => default_operator}
-    else 
+    else
       search_condition = f[:name]
       if search_condition.is_a?(MetaWhere::Column)
         {:name => search_condition.column, :operator => search_condition.method}
@@ -19,14 +19,14 @@ class SomeSearchPanel < Netzke::Basepack::FormPanel
         {:name => search_condition.to_s, :operator => default_operator}
       end
     end
-    
+
     f[:disabled] = primary_key_attr?(f)
-    
+
     f = super(f)
 
     f.merge(:name => [f[:name], "__", f[:operator]].join)
   end
-  
+
   private
     def default_operator
       "gt"