netzke-basepack 0.7.7 → 0.8.0

data/test/basepack_test_app/Gemfile.lock

@@ -1,69 +1,52 @@
 GIT
-  remote: git://github.com/NZX/pickle.git
-  revision: 71421eb9de6aaa81268fb9aa73682c05d3b4cb74
+  remote: git://github.com/nomadcoder/netzke-core.git
+  revision: 74e19672cd7c270415714f1805f09b3262e577bc
   specs:
-    pickle (0.4.4)
-      cucumber (>= 0.8)
-      rake
-      rspec (>= 1.3)
-      yard
-
-PATH
-  remote: vendor/gems/netzke-core
-  specs:
-    netzke-core (0.7.6)
+    netzke-core (0.8.0)
       activesupport (>= 3.0.0)
 
-PATH
-  remote: vendor/gems/netzke-persistence
-  specs:
-    netzke-persistence (0.1.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
-      mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
+    actionmailer (3.2.9)
+      actionpack (= 3.2.9)
+      mail (~> 2.4.4)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
+    activeresource (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
     arel (3.0.2)
-    builder (3.0.3)
-    capybara (1.1.2)
+    builder (3.0.4)
+    capybara (1.1.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    capybara-screenshot (0.2.2)
-      capybara (>= 1.0)
-    childprocess (0.3.5)
+    childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
-    coderay (1.0.8)
     cucumber (1.2.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -73,14 +56,12 @@ GEM
       capybara (>= 1.1.2)
       cucumber (>= 1.1.8)
       nokogiri (>= 1.5.0)
-    daemons (1.1.9)
     database_cleaner (0.9.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    eventmachine (1.0.0)
     factory_girl (4.1.0)
       activesupport (>= 3.0.0)
-    ffi (1.1.5)
+    ffi (1.2.0)
     gherkin (2.11.5)
       json (>= 1.4.6)
     hike (1.2.1)
@@ -89,22 +70,20 @@ GEM
     json (1.7.5)
     launchy (2.1.2)
       addressable (~> 2.3)
-    libwebsocket (0.1.5)
-      addressable
+    libwebsocket (0.1.6.1)
+      websocket
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.8)
     mime-types (1.19)
-    multi_json (1.3.6)
+    multi_json (1.3.7)
     mysql2 (0.3.11)
     nokogiri (1.5.5)
+    pickle (0.4.11)
+      cucumber (>= 0.8)
+      rake
     polyglot (0.3.3)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -112,72 +91,62 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
+    rails (3.2.9)
+      actionmailer (= 3.2.9)
+      actionpack (= 3.2.9)
+      activerecord (= 3.2.9)
+      activeresource (= 3.2.9)
+      activesupport (= 3.2.9)
       bundler (~> 1.0)
-      railties (= 3.2.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+      railties (= 3.2.9)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
+    rspec-core (2.12.0)
+    rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    rspec-rails (2.11.4)
+    rspec-mocks (2.12.0)
+    rspec-rails (2.12.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.11.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.25.0)
+    selenium-webdriver (2.26.0)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    slop (3.3.3)
     spork (0.9.2)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    thin (1.5.0)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thor (0.14.6)
+    thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.11)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
+    websocket (1.0.4)
     xpath (0.1.4)
       nokogiri (~> 1.3)
-    yard (0.8.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara
-  capybara-screenshot
+  capybara (~> 1)
   cucumber
   cucumber-rails
   database_cleaner
@@ -185,12 +154,8 @@ DEPENDENCIES
   launchy
   mysql2
   netzke-core!
-  netzke-persistence!
-  pickle!
-  pry
-  rails (= 3.2.1)
+  pickle
+  rails (~> 3.2.0)
   rspec-rails
   selenium-webdriver
   spork
-  sqlite3-ruby
-  thin

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

@@ -1,9 +1,12 @@
 # Warning: this component participates in i18n.feature, careful with adding new fields!
-class AuthorForm < Netzke::Basepack::FormPanel
-  js_property :title, Author.model_name.human
+class AuthorForm < Netzke::Basepack::Form
+  js_configure do |c|
+    c.title = Author.model_name.human
+  end
 
-  def configuration
-    super.merge(
+  def configure(c)
+    super
+    c.merge!(
       :model => "Author",
       # :record => Author.first,
       # :items => [
@@ -22,7 +25,7 @@ class AuthorForm < Netzke::Basepack::FormPanel
 
   # js_method :init_component, <<-JS
   #   function(){
-  #     Netzke.classes.AuthorForm.superclass.initComponent.call(this);
+  #     this.callParent();
 
   #     this.on('submitsuccess', function(){ this.feedback('Suc'+'cess!')}, this);
   #   }

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

@@ -1,3 +1,3 @@
-class AuthorGrid < Netzke::Basepack::GridPanel
+class AuthorGrid < Netzke::Basepack::Grid
   model "Author"
-end
+end

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

@@ -1,38 +1,41 @@
 # Warning: this component participates in i18n.feature, careful with adding new fields!
-class BookForm < Netzke::Basepack::FormPanel
-  extend Extras::BookPresentation
+class BookForm < Netzke::Basepack::Form
+  include Extras::BookPresentation
 
-  title Book.model_name.human
+  def configure(c)
+    c.record = Book.first
 
-  model "Book"
+    super
 
-  record_id Book.first.try(:id)
+    c.model = "Book"
+    c.title Book.model_name.human
+    c.items = [
+      :title,
+      {:name => :author__first_name, :setter => author_first_name_setter},
+      :author__name,
+      {:name => :author__last_name, :xtype => :displayfield},
+      {:name => :rating, :xtype => :combo, :store => [[1, "Good"], [2, "Average"], [3, "Poor"]]},
+      {:name => :author__updated_at, :editable => false},
+      :digitized,
+      :exemplars,
+      {:name => :in_abundance, :getter => in_abundance_getter, :xtype => :displayfield},
+      {:name => :updated_at},
+      :last_read_at,
+      :published_on
 
-  items [
-    :title,
-    {:name => :author__first_name, :setter => author_first_name_setter},
-    :author__name,
-    {:name => :author__last_name, :xtype => :displayfield},
-    {:name => :rating, :xtype => :combo, :store => [[1, "Good"], [2, "Average"], [3, "Poor"]]},
-    {:name => :author__updated_at, :editable => false},
-    :digitized,
-    :exemplars,
-    {:name => :in_abundance, :getter => in_abundance_getter, :xtype => :displayfield},
-    {:name => :updated_at},
-    :last_read_at,
-    :published_on
-
-    # WIP: commalistcbg is kind of broken, giving an Ext error
-    # {:name => :tags, :xtype => :commalistcbg, :options => %w(read cool recommend buy)},
-    # WIP: waithing on nradiogroup
-    # {:name => :rating, :xtype => :nradiogroup, :options => [[1, "Good"], [2, "Average"], [3, "Poor"]]}
-  ]
-
-  js_method :init_component, <<-JS
-    function(){
-      this.callParent();
-      this.on('submitsuccess', function(){ this.netzkeFeedback('Suc'+'cess!')}, this);
-    }
-  JS
+      # WIP: commalistcbg is kind of broken, giving an Ext error
+      # {:name => :tags, :xtype => :commalistcbg, :options => %w(read cool recommend buy)},
+      # WIP: waithing on nradiogroup
+      # {:name => :rating, :xtype => :nradiogroup, :options => [[1, "Good"], [2, "Average"], [3, "Poor"]]}
+    ]
+  end
 
+  js_configure do |c|
+    c.on_submit_success = <<-JS
+      function(){
+        this.callParent();
+        this.netzkeFeedback('Suc'+'cess!');
+      }
+    JS
+  end
 end

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

@@ -1,8 +1,7 @@
-class BookFormWithDefaults < Netzke::Basepack::FormPanel
-  def configuration
-    super.tap do |c|
-      c[:model] = "Book"
-      c[:record_id] = Book.first.id
-    end
+class BookFormWithDefaults < Netzke::Basepack::Form
+  def configure(c)
+    c.record = Book.first
+    super
+    c.model = "Book"
   end
-end
+end

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

@@ -0,0 +1,10 @@
+class BookFormWithFileUpload < Netzke::Basepack::Form
+  def configure(c)
+    super
+    c.model = "Book"
+  end
+
+  def items
+    [{name: 'cover', xtype: :filefield}, *super]
+  end
+end

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

@@ -1,8 +1,8 @@
-class BookFormWithNestedAttributes < Netzke::Basepack::FormPanel
-  js_property :title, Book.model_name.human
-
-  def default_config
-    super.merge(
+# TODO: not used atm
+class BookFormWithNestedAttributes < Netzke::Basepack::Form
+  def configure(c)
+    c.merge!(
+      :title => Book.model_name.human,
       :model => "Book",
       :record => Book.first,
       :items => [
@@ -14,5 +14,4 @@ class BookFormWithNestedAttributes < Netzke::Basepack::FormPanel
       ]
     )
   end
-
 end

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

@@ -1,12 +1,23 @@
-class BookGrid < Netzke::Basepack::GridPanel
-  title I18n.t('books', :default => "Books")
+class BookGrid < Netzke::Basepack::Grid
+  def configure(c)
+    c.model = "Book"
+    c.title = I18n.t('books', :default => "Books")
 
-  model "Book"
+    super
+  end
 
-  add_form_config :class_name => "BookForm"
-  edit_form_config :class_name => "BookForm"
-  multi_edit_form_config :class_name => "BookForm"
+  column :author__name do |c|
+    c.sorting_scope = :sorted_by_author_name
+  end
 
-  # We need to specify how we want to sort on this virtual column:
-  override_column :author__name, :sorting_scope => :sorted_by_author_name
+  # crafting a static combobox column; TODO: include a prebuilt one in Basepack
+  column :rating do |c|
+    c.editor = {
+      :trigger_action => :all,
+      :xtype => :combo,
+      :store => [[0, "---"], [1, "Good"], [2, "Average"], [3, "Poor"]]
+    }
+
+    c.renderer = "function(v){return ['', 'Good', 'Average', 'Poor'][v];}"
+  end
 end

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

@@ -1,10 +1,7 @@
-class BookGridFiltering < Netzke::Basepack::GridPanel
+class BookGridFiltering < Netzke::Basepack::Grid
   model "Book"
 
-  column :title
-  column :author__first_name
-  column :exemplars
-  column :notes
-  column :last_read_at
-  column :digitized
+  def columns
+    [ :title, :author__first_name, :exemplars, :notes, :last_read_at, :digitized ]
+  end
 end