netzke-basepack 0.7.7 → 0.8.0

data/test/basepack_test_app/app/components/user_form_with_default_fields.rb

@@ -1,8 +1,7 @@
-class UserFormWithDefaultFields < Netzke::Basepack::FormPanel
-  config do
-    {
-      :model => 'User',
-      :record_id => User.first.id
-    }
+class UserFormWithDefaultFields < Netzke::Basepack::Form
+  def configure(c)
+    c.model = "User"
+    c.record = User.first
+    super
   end
 end

data/test/basepack_test_app/app/components/user_grid.rb

@@ -1,8 +1,13 @@
-class UserGrid < Netzke::Basepack::GridPanel
-  title "Users"
-  model "User"
+class UserGrid < Netzke::Basepack::Grid
+  def configure(c)
+    c.model = "User"
+    c.title = "Users"
+    super
+  end
 
-  add_form_config :class_name => "UserForm"
-  edit_form_config :class_name => "UserForm"
-  multi_edit_form_config :class_name => "UserForm"
+  # The way to make the grid use a custom form
+  def preconfigure_record_window(c)
+    super
+    c.form_config.klass = UserForm
+  end
 end

data/test/basepack_test_app/app/components/user_grid_with_customized_form_fields.rb

@@ -1,6 +1,8 @@
-class UserGridWithCustomizedFormFields < Netzke::Basepack::GridPanel
-  js_property :title, "Users"
-  config :model => "User"
+class UserGridWithCustomizedFormFields < Netzke::Basepack::Grid
+  def configure(c)
+    c.title = "Users"
+    c.model = "User"
+  end
 
   def default_fields_for_forms
     [

data/test/basepack_test_app/app/components/window_component_loader.rb

@@ -1,27 +1,31 @@
 class WindowComponentLoader < Netzke::Base
-  component :some_window, {
-    :persistence => true,
-    :class_name => "Netzke::Basepack::Window",
-    :title => "Some Window Component",
-    :lazy_loading => true,
-    :width => 400,
-    :height => 300,
-    :modal => true,
-    :items => [{
-      :class_name => "Netzke::Basepack::GridPanel",
-      :model => "User"
-    }]
-  }
+
+  component :some_window do |c|
+    c.persistence = true
+    c.klass = Netzke::Basepack::Window
+    c.title = "Some Window Component"
+    c.width = 300
+    c.height = 200
+    c.x = 100
+    c.y = 80
+    c.modal = true
+  end
 
   action :load_window
 
-  js_property :bbar, [:load_window.action]
+  def configure(c)
+    super
+    c.bbar = [:load_window]
+  end
+
+  js_configure do |c|
+    c.on_load_window = <<-JS
+      function(params){
+        this.netzkeLoadComponent("some_window", {callback: function(w){
+          w.show();
+        }});
+      }
+    JS
+  end
 
-  js_method :on_load_window, <<-JS
-    function(params){
-      this.loadNetzkeComponent({name: "some_window", callback: function(w){
-        w.show();
-      }});
-    }
-  JS
 end

data/test/basepack_test_app/app/models/address.rb

@@ -1,29 +1,3 @@
-if defined? DataMapper::Resource
-
-class Address
-  include DataMapper::Resource
-  property :id, Serial
-  belongs_to :user
-  property :street, String
-  property :city, String
-  property :postcode, String
-  property :created_at, DateTime
-  property :updated_at, DateTime
-end
-
-elsif defined? Sequel::Model
-
-class Address < Sequel::Model
-  # although this is one_to_one, according to Sequel docs,
-  # the model containing the foreign key should have many_to_one
-  # and the other model should have one_to_one
-  many_to_one :user
-end
-
-else
-
 class Address < ActiveRecord::Base
   belongs_to :user
 end
-
-end

data/test/basepack_test_app/app/models/author.rb

@@ -1,38 +1,7 @@
-if defined? DataMapper::Resource
-
-class Author
-  include DataMapper::Resource
-  property :id, Serial
-  property :first_name, String
-  property :last_name, String
-  property :created_at, DateTime
-  property :updated_at, DateTime
-  has n, :books
-end
-
-
-elsif defined? Sequel::Model
-
-class Author < Sequel::Model
-  one_to_many :books
-end
-
-else
-
 class Author < ActiveRecord::Base
   has_many :books
-end
-
-end
-
-# ORM-agnostic bits
-class Author
-
   # virtual attribute
   def name
     "#{last_name}, #{first_name}"
   end
-
-  netzke_attribute :name
-
 end

data/test/basepack_test_app/app/models/book.rb

@@ -1,49 +1,8 @@
-if defined? DataMapper::Resource
-
-class Book
-  include DataMapper::Resource
-  property :id, Serial
-  belongs_to :author, :required => false
-  validates_presence_of :title, :message => "Title can't be blank"
-  property :title, String
-  property :exemplars, Integer
-  property :digitized, Boolean
-  property :notes, Text
-  property :tags, String
-  property :rating, Integer
-  property :created_at, DateTime
-  property :updated_at, DateTime
-  property :last_read_at, DateTime
-  property :published_on, Date
-
-  def self.sorted_by_author_name dir
-    all :order => [ author.last_name.send(dir), author.first_name.send(dir) ], :links => [ relationships[:author].inverse ]
-  end
-
-end
-
-elsif defined? Sequel::Model
-
-class Book < Sequel::Model
-  many_to_one :author
-
-  def_dataset_method(:sorted_by_author_name) do |dir|
-    eager_graph(:author).order_append(:author__last_name.send(dir), :author__first_name.send(dir))
-  end
-
-  def validate
-    validates_presence :title, :message => "can't be blank"
-  end
-
-end
-
-else
-
 class Book < ActiveRecord::Base
   belongs_to :author
   validates_presence_of :title
 
   scope :sorted_by_author_name, lambda { |dir| joins(:author).order("authors.last_name #{dir}, authors.first_name #{dir}") }
-end
 
+  attr_protected :exemplars, :author_id, :as => :user
 end

data/test/basepack_test_app/app/models/book_with_custom_primary_key.rb

@@ -1,26 +1,4 @@
-if defined? DataMapper::Resource
-
-class BookWithCustomPrimaryKey
-  include DataMapper::Resource
-  property :uid, Serial
-  belongs_to :author
-  property :title, String
-  property :created_at, DateTime
-  property :updated_at, DateTime
-end
-
-elsif defined? Sequel::Model
-
-class BookWithCustomPrimaryKey < Sequel::Model
-  set_primary_key :uid
-  many_to_one :author
-end
-
-else
-
 class BookWithCustomPrimaryKey < ActiveRecord::Base
-  set_primary_key 'uid'
+  self.primary_key = 'uid'
   belongs_to :author
 end
-
-end

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

@@ -1,24 +1,3 @@
-if defined? DataMapper::Resource
-
-class Role
-  include DataMapper::Resource
-  property :id, Serial
-  property :name, String
-  has n, :users
-  property :created_at, DateTime
-  property :updated_at, DateTime
-end
-
-elsif defined? Sequel::Model
-
-class Role < Sequel::Model
-  one_to_many :users
-end
-
-else
-
 class Role < ActiveRecord::Base
   has_many :users
 end
- 
-end

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

@@ -1,29 +1,5 @@
-if defined? DataMapper::Resource
-
-class User
-  include DataMapper::Resource
-  property :id, Serial
-  property :first_name, String
-  property :last_name, String
-  belongs_to :role, :required => false
-  has 1, :address
-  property :created_at, DateTime
-  property :updated_at, DateTime
-end
-
-elsif defined? Sequel::Model
-
-class User < Sequel::Model
-  many_to_one :role
-  one_to_one :address
-end
-
-else
-
 class User < ActiveRecord::Base
   # scope :latest, lambda {|param| where(:created_at.gt => param)}
   belongs_to :role
   has_one :address
 end
-
-end

data/test/basepack_test_app/app/views/layouts/components.html.erb

@@ -3,7 +3,7 @@
 <head>
   <title>Netzke Basepack Test App</title>
   <%= csrf_meta_tag %>
-  <%= netzke_init %>
+  <%= load_netzke %>
 </head>
 <body>
 

data/test/basepack_test_app/config/application.rb

@@ -48,7 +48,7 @@ module RailsApp
     # config.netzke.basepack.grid_panel.extended_search_available = false
 
     # to build links to the code on github
-    config.repo_root = "https://github.com/nomadcoder/netzke-basepack/blob/master/test/basepack_test_app"
+    config.repo_root = "https://github.com/netzke/netzke-basepack/blob/master/test/basepack_test_app"
 
     # Enable the asset pipeline
     config.assets.enabled = true

data/test/basepack_test_app/config/database.yml.travis

@@ -3,13 +3,9 @@
 # Do not set this db to the same as development or production.
 test: &test
   adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: nbt_test
+  database: basepack_test_app_test
   pool: 5
-  username:
-  # DM
-  uri: mysql://127.0.0.1/nbt_test?user=&encoding=UTF-8
+  timeout: 5000
 
 cucumber:
   <<: *test

data/test/basepack_test_app/config/initializers/netzke.rb

@@ -1,9 +1,4 @@
-Netzke::Basepack.setup do |config|
-  # config.icons_uri = "/images/icons"
-end
-
 Netzke::Core.setup do |config|
   # config.ext_uri = "/extjs4"
-  # config.ext3_compat_uri = "/extjs-compatibility"
   config.js_direct_max_retries = 0
-end
+end

data/test/basepack_test_app/db/schema.rb

@@ -19,22 +19,22 @@ ActiveRecord::Schema.define(:version => 20110909071740) do
     t.string   "city"
     t.string   "postcode"
     t.integer  "country_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "authors", :force => true do |t|
     t.string   "first_name"
     t.string   "last_name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "book_with_custom_primary_keys", :primary_key => "uid", :force => true do |t|
     t.string   "title"
     t.integer  "author_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "books", :force => true do |t|
@@ -45,8 +45,8 @@ ActiveRecord::Schema.define(:version => 20110909071740) do
     t.text     "notes"
     t.string   "tags"
     t.integer  "rating"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                      :null => false
+    t.datetime "updated_at",                      :null => false
     t.datetime "last_read_at"
     t.date     "published_on"
   end
@@ -56,8 +56,8 @@ ActiveRecord::Schema.define(:version => 20110909071740) do
     t.integer  "user_id"
     t.integer  "role_id"
     t.text     "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   add_index "netzke_component_states", ["component"], :name => "index_netzke_component_states_on_component"
@@ -66,16 +66,16 @@ ActiveRecord::Schema.define(:version => 20110909071740) do
 
   create_table "roles", :force => true do |t|
     t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "users", :force => true do |t|
     t.string   "first_name"
     t.string   "last_name"
     t.integer  "role_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
 end

data/test/basepack_test_app/features/accordion_panel.feature

@@ -5,8 +5,8 @@ Feature: Accordion panel
 
 @javascript
 Scenario: Lazy loading of a component into a panel when the latter gets expanded
-  Given I am on the SimpleAccordion test page
+  Given I am on the SomeAccordion test page
   When I expand "Panel Two"
   Then I should see "Original HTML"
   When I press "Update html"
-  Then I should see "Update for Panel Two"
+  Then I should see "Update for Panel Two"

data/test/basepack_test_app/features/form_panel.feature

@@ -58,7 +58,7 @@ Scenario: UserFormWithDefaultFields should render properly
   And I should see "writer"
 
 @javascript
-Scenario: FormPanel should be functional without model provided
+Scenario: Form should be functional without model provided
   Given I am on the FormWithoutModel test page
   When I fill in "Text field:" with "Some text"
   And I fill in "Number field:" with "42"
@@ -92,7 +92,7 @@ Scenario: Editing and immediately submitting the form
   Then the form should show author__name: "Castaneda, Carlos"
 
   When I press "Apply"
-  And I wait for the response from the server
+  And I wait for response from server
   Then the form should show author__name: "Castaneda, Carlos"
 
 # @javascript
@@ -102,7 +102,7 @@ Scenario: Editing and immediately submitting the form
 #   And I check ext checkbox "recommend"
 #   And I check ext checkbox "cool"
 #   And I press "Apply"
-#   And I wait for the response from the server
+#   And I wait for response from server
 #   Then ext "cool" checkbox should be checked
 #   And ext "recommend" checkbox should be checked
 #   But ext "read" checkbox should not be checked
@@ -114,12 +114,12 @@ Scenario: Editing and immediately submitting the form
   When I go to the BookForm test page
   And I fill in "Title:" with ""
   And I press "Apply"
-  And I wait for the response from the server
+  And I wait for response from server
   Then I should see "Title can't be blank"
   But I should not see "Success!"
   When I fill in "Title:" with "Not Blank"
   And I press "Apply"
-  And I wait for the response from the server
+  And I wait for response from server
   Then I should not see "Title can't be blank"
   But I should see "Success!"
 
@@ -129,7 +129,7 @@ Scenario: Editing and immediately submitting the form
     When I go to the BookFormWithDefaults test page
     Then I fill in "Published on" with "2005-01-23"
     And I press "Apply"
-    And I wait for the response from the server
+    And I wait for response from server
     Then a book should exist with published_on: "2005-01-23"
 
 @javascript
@@ -138,5 +138,5 @@ Scenario: Editing and immediately submitting the form
     When I go to the BookFormWithDefaults test page
     Then I fill in Ext field "Last read at" with "2005-01-23 11:12:13"
     And I press "Apply"
-    And I wait for the response from the server
+    And I wait for response from server
     Then a book should exist with last_read_at: "2005-01-23 11:12:13"