netzke-basepack 0.6.3 → 0.6.4

data/lib/netzke/basepack/search_window.rb

@@ -0,0 +1,64 @@
+module Netzke
+  module Basepack
+    class SearchWindow < Netzke::Basepack::Window
+
+      action :search do
+        { :text => I18n.t('netzke.basepack.search_window.action.search') }
+      end
+
+      action :cancel do
+        { :text => I18n.t('netzke.basepack.search_window.action.search') }
+      end
+
+      js_properties :width => "50%",
+                    :auto_height => true,
+                    :close_action => "hide",
+                    :buttons => [:search.action, :cancel.action],
+                    :modal => true
+
+      def configuration
+        super.tap do |s|
+          s[:items] = [:search_panel.component(:header => false)]
+          s[:title] = I18n.t('netzke.basepack.search_window.title')
+        end
+      end
+
+      component :search_panel do
+        {
+          :class_name => "Netzke::Basepack::QueryBuilder",
+          :model => config[:model]
+        }
+      end
+
+      js_method :init_component, <<-JS
+        function(){
+          Netzke.classes.Basepack.SearchWindow.superclass.initComponent.call(this);
+
+          this.on('show', function(){
+            this.closeRes = 'cancel';
+          });
+        }
+      JS
+
+      js_method :get_query, <<-JS
+        function(){
+          return this.items.first().getQuery();
+        }
+      JS
+
+      js_method :on_search, <<-JS
+        function(){
+          this.closeRes = 'search';
+          this.hide();
+        }
+      JS
+
+      js_method :on_cancel, <<-JS
+        function(){
+          this.hide();
+        }
+      JS
+
+    end
+  end
+end

data/lib/netzke/basepack/simple_app.rb

@@ -14,7 +14,7 @@ module Netzke
 
       js_include Netzke::Core.ext_location.join("examples", "ux/statusbar/StatusBar.js"), :statusbar_ext
 
-      js_mixin :main
+      js_mixin :simple_app
 
       def configuration
         super.merge(

data/lib/netzke/basepack/tab_panel.rb

@@ -4,7 +4,6 @@ module Netzke
     #
     # Features:
     # * Dynamically loads components for the tabs that get activated for the first time
-    # * Is loaded along with the active component - saves a request to the server
     # * (TODO) Provides the method markTabsOutdated to mark all inactive tabs as 'outdated', and calls "update" method on components in tabs when they get activated
     # * (TODO) Stores the last active tab in persistent_config
     #
@@ -16,7 +15,7 @@ module Netzke
 
       js_base_class "Ext.TabPanel"
 
-      js_mixin :main
+      js_mixin :tab_panel
     end
   end
 end

data/lib/netzke/basepack/version.rb

@@ -3,7 +3,7 @@ module Netzke
     module Version
       MAJOR = 0
       MINOR = 6
-      PATCH = 3
+      PATCH = 4
 
       STRING = [MAJOR, MINOR, PATCH].compact.join('.')
     end

data/locales/en.yml

@@ -1,9 +1,6 @@
 en:
   netzke:
     basepack:
-      generic:
-        confirm: Confirmation
-        are_you_sure: Are you sure?
       grid_panel:
         actions:
           add: Add
@@ -13,10 +10,80 @@ en:
           add_in_form: Add in form
           edit_in_form: Edit in form
           search: Search
+
         deleted_n_records: "Deleted %{n} record(s)"
         cannot_delete: "You don't have permissions to delete data"
+        confirmation: Confirmation
+        are_you_sure: Are you sure?
+
+        empty_msg: Empty
+        first_text: First page
+        prev_text: Previous page
+        next_text: Next page
+        last_text: Last page
+        before_page_text: Page
+        after_page_text: "of {0}"
+        refresh_text: Refresh
+        display_msg: "Displaying {0} - {1} of {2}"
+
+        record_form_window:
+          actions:
+            ok: OK
+            cancel: Cancel
+
+      search_window:
+        title: Extended search
+        actions:
+          search: Search
+          cancel: Cancel
+
+      form_panel:
+        actions:
+          edit: Edit
+          edit_tooltip: Edit
+          cancel: Cancel
+          cancel_tooltip: Cancel editing
+          apply: Apply
+          apply_tooltip: Apply changes
+
+      search_panel:
+        presets: Presets
+        equals: Equals
+        greater_than: Greater than
+        less_than: Less than
+        contains: Contains
+        matches: Matches
+        date_equals: "On"
+        before: Before
+        after: After
+
+      paging_form_panel:
+        actions:
+          search: Search
+          search_tooltip: Extended search
+
+      query_builder:
+        presets: Presets
+        preset_saved: Preset successfully saved
+        preset_deleted: Preset successfully deleted
+        overwrite_confirm: "Are you sure you want to overwrite preset '{0}'?"
+        overwrite_confirm_title: "Overwriting preset"
+        delete_confirm: "Are you sure you want to delete preset '{0}'?"
+        delete_confirm_title: "Deleting preset"
+        actions:
+          clear_all: Clear
+          clear_all_tooltip: Clear all conditions
+          reset: Reset
+          reset_tooltip: Reset condition values
+          save_preset: Save preset
+          save_preset_tooltip: Save preset
+          delete_preset: Delete preset
+          delete_preset_tooltip: Delete preset
+          apply: Apply
+          apply_tooltip: Apply updated conditions
+
 
     formats:
       date: Y-m-d
       datetime: Y-m-d H:i:s
-      time: H:i:s
+      time: H:i:s

data/netzke-basepack.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{netzke-basepack}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergei Kozlov"]
-  s.date = %q{2011-01-14}
+  s.date = %q{2011-02-26}
   s.description = %q{A set of full-featured extendible Netzke components (such as FormPanel, GridPanel, Window, BorderLayoutPanel, etc) which can be used as building block for your RIA}
   s.email = %q{sergei@playcode.nl}
   s.extra_rdoc_files = [
@@ -34,10 +34,12 @@ Gem::Specification.new do |s|
     "features/grid_panel.feature",
     "features/i18n.feature",
     "features/nested_attributes.feature",
+    "features/paging_form_panel.feature",
     "features/search_in_grid.feature",
     "features/simple_app.feature",
     "features/simple_panel.feature",
     "features/step_definitions/accordion_steps.rb",
+    "features/step_definitions/form_panel_steps.rb",
     "features/step_definitions/generic_steps.rb",
     "features/step_definitions/grid_panel_steps.rb",
     "features/step_definitions/pickle_steps.rb",
@@ -46,15 +48,17 @@ Gem::Specification.new do |s|
     "features/support/paths.rb",
     "features/support/pickle.rb",
     "features/tab_panel.feature",
+    "features/validations_in_grid.feature",
     "features/virtual_attributes.feature",
     "features/window.feature",
     "from_05_to_06.rdoc",
-    "generators/netzke_basepack/netzke_basepack_generator.rb",
-    "generators/netzke_basepack/templates/create_netzke_field_lists.rb",
-    "generators/netzke_basepack/templates/public_assets/ts-checkbox.gif",
     "init.rb",
     "install.rb",
     "javascripts/basepack.js",
+    "javascripts/datetimefield.js",
+    "lib/generators/netzke/basepack_generator.rb",
+    "lib/generators/netzke/templates/assets/ts-checkbox.gif",
+    "lib/generators/netzke/templates/create_netzke_field_lists.rb",
     "lib/netzke-basepack.rb",
     "lib/netzke/active_record.rb",
     "lib/netzke/active_record/attributes.rb",
@@ -65,42 +69,44 @@ Gem::Specification.new do |s|
     "lib/netzke/basepack/auth_app.rb",
     "lib/netzke/basepack/basic_app.rb",
     "lib/netzke/basepack/border_layout_panel.rb",
+    "lib/netzke/basepack/data_accessor.rb",
     "lib/netzke/basepack/form_panel.rb",
     "lib/netzke/basepack/form_panel/fields.rb",
     "lib/netzke/basepack/form_panel/javascripts/comma_list_cbg.js",
     "lib/netzke/basepack/form_panel/javascripts/display_mode.js",
-    "lib/netzke/basepack/form_panel/javascripts/main.js",
+    "lib/netzke/basepack/form_panel/javascripts/form_panel.js",
     "lib/netzke/basepack/form_panel/javascripts/n_radio_group.js",
     "lib/netzke/basepack/form_panel/javascripts/netzkefileupload.js",
+    "lib/netzke/basepack/form_panel/javascripts/readonly_mode.js",
     "lib/netzke/basepack/form_panel/services.rb",
+    "lib/netzke/basepack/form_panel/stylesheets/readonly_mode.css",
     "lib/netzke/basepack/grid_panel.rb",
     "lib/netzke/basepack/grid_panel/columns.rb",
     "lib/netzke/basepack/grid_panel/javascripts/advanced_search.js",
     "lib/netzke/basepack/grid_panel/javascripts/edit_in_form.js",
-    "lib/netzke/basepack/grid_panel/javascripts/main.js",
+    "lib/netzke/basepack/grid_panel/javascripts/grid_panel.js",
     "lib/netzke/basepack/grid_panel/javascripts/misc.js",
     "lib/netzke/basepack/grid_panel/javascripts/rows-dd.js",
     "lib/netzke/basepack/grid_panel/multi_edit_form.rb",
     "lib/netzke/basepack/grid_panel/record_form_window.rb",
-    "lib/netzke/basepack/grid_panel/search_window.rb",
     "lib/netzke/basepack/grid_panel/services.rb",
     "lib/netzke/basepack/paging_form_panel.rb",
     "lib/netzke/basepack/panel.rb",
+    "lib/netzke/basepack/query_builder.rb",
+    "lib/netzke/basepack/query_builder/javascripts/query_builder.js",
     "lib/netzke/basepack/search_panel.rb",
+    "lib/netzke/basepack/search_panel/javascripts/condition_field.js",
+    "lib/netzke/basepack/search_panel/javascripts/search_panel.js",
+    "lib/netzke/basepack/search_window.rb",
     "lib/netzke/basepack/simple_app.rb",
-    "lib/netzke/basepack/simple_app/javascripts/main.js",
+    "lib/netzke/basepack/simple_app/javascripts/simple_app.js",
     "lib/netzke/basepack/simple_app/javascripts/statusbar_ext.js",
     "lib/netzke/basepack/tab_panel.rb",
-    "lib/netzke/basepack/tab_panel/javascripts/main.js",
+    "lib/netzke/basepack/tab_panel/javascripts/tab_panel.js",
     "lib/netzke/basepack/version.rb",
     "lib/netzke/basepack/window.rb",
     "lib/netzke/basepack/wrap_lazy_loaded.rb",
     "lib/netzke/basepack/wrapper.rb",
-    "lib/netzke/data_accessor.rb",
-    "lib/netzke/ext.rb",
-    "lib/netzke/fields_configurator.rb",
-    "lib/netzke/json_array_editor.rb",
-    "lib/netzke/masquerade_selector.rb",
     "lib/tasks/netzke_basepack_tasks.rake",
     "locales/en.yml",
     "netzke-basepack.gemspec",
@@ -111,6 +117,7 @@ Gem::Specification.new do |s|
     "spec/factories.rb",
     "spec/spec_helper.rb",
     "stylesheets/basepack.css",
+    "stylesheets/datetimefield.css",
     "test/console_with_fixtures.rb",
     "test/fixtures/books.yml",
     "test/fixtures/categories.yml",
@@ -127,17 +134,26 @@ Gem::Specification.new do |s|
     "test/rails_app/Rakefile",
     "test/rails_app/app/components/author_grid.rb",
     "test/rails_app/app/components/book_form.rb",
+    "test/rails_app/app/components/book_form_with_custom_fields.rb",
+    "test/rails_app/app/components/book_form_with_nested_attributes.rb",
     "test/rails_app/app/components/book_grid.rb",
+    "test/rails_app/app/components/book_grid_loader.rb",
+    "test/rails_app/app/components/book_grid_with_custom_columns.rb",
     "test/rails_app/app/components/book_grid_with_default_values.rb",
     "test/rails_app/app/components/book_grid_with_nested_attributes.rb",
     "test/rails_app/app/components/book_grid_with_virtual_attributes.rb",
     "test/rails_app/app/components/book_paging_form_panel.rb",
     "test/rails_app/app/components/book_presentation.rb",
+    "test/rails_app/app/components/book_query_builder.rb",
+    "test/rails_app/app/components/book_search_panel.rb",
+    "test/rails_app/app/components/book_search_panel/javascripts/i18n_de.js",
     "test/rails_app/app/components/books_bound_to_author.rb",
+    "test/rails_app/app/components/double_book_grid.rb",
     "test/rails_app/app/components/form_without_model.rb",
     "test/rails_app/app/components/generic_user_form.rb",
     "test/rails_app/app/components/lockable_book_form.rb",
     "test/rails_app/app/components/lockable_user_form.rb",
+    "test/rails_app/app/components/paging_form_with_search.rb",
     "test/rails_app/app/components/simple_accordion.rb",
     "test/rails_app/app/components/simple_panel.rb",
     "test/rails_app/app/components/simple_tab_panel.rb",
@@ -146,7 +162,6 @@ Gem::Specification.new do |s|
     "test/rails_app/app/components/some_accordion_panel.rb",
     "test/rails_app/app/components/some_auth_app.rb",
     "test/rails_app/app/components/some_border_layout.rb",
-    "test/rails_app/app/components/some_search_panel.rb",
     "test/rails_app/app/components/some_simple_app.rb",
     "test/rails_app/app/components/some_tab_panel.rb",
     "test/rails_app/app/components/user_form.rb",
@@ -182,15 +197,15 @@ Gem::Specification.new do |s|
     "test/rails_app/config/initializers/netzke.rb",
     "test/rails_app/config/initializers/secret_token.rb",
     "test/rails_app/config/initializers/session_store.rb",
+    "test/rails_app/config/locales/de.yml",
     "test/rails_app/config/locales/es.yml",
     "test/rails_app/config/routes.rb",
-    "test/rails_app/db/development_structure.sql",
-    "test/rails_app/db/migrate/20100905214933_create_netzke_preferences.rb",
     "test/rails_app/db/migrate/20100914104207_create_users.rb",
     "test/rails_app/db/migrate/20100914104236_create_roles.rb",
     "test/rails_app/db/migrate/20101026185816_create_authors.rb",
     "test/rails_app/db/migrate/20101026190021_create_books.rb",
     "test/rails_app/db/migrate/20110101143818_create_addresses.rb",
+    "test/rails_app/db/migrate/20110213213050_create_netzke_component_states.rb",
     "test/rails_app/db/schema.rb",
     "test/rails_app/db/seeds.rb",
     "test/rails_app/features/support/paths.rb",
@@ -207,6 +222,7 @@ Gem::Specification.new do |s|
     "test/rails_app/public/javascripts/effects.js",
     "test/rails_app/public/javascripts/prototype.js",
     "test/rails_app/public/javascripts/rails.js",
+    "test/rails_app/public/netzke/basepack/ts-checkbox.gif",
     "test/rails_app/public/robots.txt",
     "test/rails_app/public/stylesheets/.gitkeep",
     "test/rails_app/script/rails",
@@ -238,6 +254,9 @@ Gem::Specification.new do |s|
 
            Thanks for installing netzke-basepack!
 
+  Don't forget to run "rails generate netzke:baspack" to copy necessary
+  assets to your public folder!
+
   Netzke home page:     http://netzke.org
   Netzke Google Groups: http://groups.google.com/group/netzke
   Netzke tutorials:     http://blog.writelesscode.com
@@ -246,7 +265,7 @@ Gem::Specification.new do |s|
 
 }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Pre-built Rails + ExtJS components for your RIA}
   s.test_files = [
     "spec/active_record/attributes_spec.rb",
@@ -258,17 +277,25 @@ Gem::Specification.new do |s|
     "test/console_with_fixtures.rb",
     "test/rails_app/app/components/author_grid.rb",
     "test/rails_app/app/components/book_form.rb",
+    "test/rails_app/app/components/book_form_with_custom_fields.rb",
+    "test/rails_app/app/components/book_form_with_nested_attributes.rb",
     "test/rails_app/app/components/book_grid.rb",
+    "test/rails_app/app/components/book_grid_loader.rb",
+    "test/rails_app/app/components/book_grid_with_custom_columns.rb",
     "test/rails_app/app/components/book_grid_with_default_values.rb",
     "test/rails_app/app/components/book_grid_with_nested_attributes.rb",
     "test/rails_app/app/components/book_grid_with_virtual_attributes.rb",
     "test/rails_app/app/components/book_paging_form_panel.rb",
     "test/rails_app/app/components/book_presentation.rb",
+    "test/rails_app/app/components/book_query_builder.rb",
+    "test/rails_app/app/components/book_search_panel.rb",
     "test/rails_app/app/components/books_bound_to_author.rb",
+    "test/rails_app/app/components/double_book_grid.rb",
     "test/rails_app/app/components/form_without_model.rb",
     "test/rails_app/app/components/generic_user_form.rb",
     "test/rails_app/app/components/lockable_book_form.rb",
     "test/rails_app/app/components/lockable_user_form.rb",
+    "test/rails_app/app/components/paging_form_with_search.rb",
     "test/rails_app/app/components/simple_accordion.rb",
     "test/rails_app/app/components/simple_panel.rb",
     "test/rails_app/app/components/simple_tab_panel.rb",
@@ -277,7 +304,6 @@ Gem::Specification.new do |s|
     "test/rails_app/app/components/some_accordion_panel.rb",
     "test/rails_app/app/components/some_auth_app.rb",
     "test/rails_app/app/components/some_border_layout.rb",
-    "test/rails_app/app/components/some_search_panel.rb",
     "test/rails_app/app/components/some_simple_app.rb",
     "test/rails_app/app/components/some_tab_panel.rb",
     "test/rails_app/app/components/user_form.rb",
@@ -309,12 +335,12 @@ Gem::Specification.new do |s|
     "test/rails_app/config/initializers/secret_token.rb",
     "test/rails_app/config/initializers/session_store.rb",
     "test/rails_app/config/routes.rb",
-    "test/rails_app/db/migrate/20100905214933_create_netzke_preferences.rb",
     "test/rails_app/db/migrate/20100914104207_create_users.rb",
     "test/rails_app/db/migrate/20100914104236_create_roles.rb",
     "test/rails_app/db/migrate/20101026185816_create_authors.rb",
     "test/rails_app/db/migrate/20101026190021_create_books.rb",
     "test/rails_app/db/migrate/20110101143818_create_addresses.rb",
+    "test/rails_app/db/migrate/20110213213050_create_netzke_component_states.rb",
     "test/rails_app/db/schema.rb",
     "test/rails_app/db/seeds.rb",
     "test/rails_app/features/support/paths.rb",
@@ -339,7 +365,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/active_record/attributes_spec.rb

@@ -13,14 +13,14 @@ describe Netzke::ActiveRecord::Attributes do
   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 tags rating)
+    Book.netzke_attributes.map{ |a| a[:name] }.should == %w(id author__name title exemplars digitized notes tags rating created_at updated_at)
     Book.netzke_attributes.detect{ |a| a[:name] == "author__name" }[:attr_type].should == :string
   end
 
-  it "should be possible to read author name via a book using association attribute" do
+  it "should be possible to access author's id via a book using association attribute" do
     author = Factory(:author)
     book = Factory(:book, :author => author)
-    book.value_for_attribute({:name => :author__first_name}).should == "Carlos"
+    book.value_for_attribute({:name => :author__first_name}).should == author.id
   end
 
   it "should be possible to assign author's name via a book using association attribute" do
@@ -34,11 +34,11 @@ describe Netzke::ActiveRecord::Attributes do
     author_carlos = Factory(:author, :first_name => "Carlos")
     author_herman = Factory(:author, :first_name => "Herman")
     book = Factory(:book, :author => author_carlos)
-    book.set_value_for_attribute({:name => :author__first_name}, "Herman")
-    book.author.should == author_herman
+    book.set_value_for_attribute({:name => :author__first_name}, author_herman.id)
+    book.author_id.should == author_herman.id
   end
 
-  it "should be possible to change address of a user via association attribute (without specifying :nested_attribute)" do
+  it "should be possible to change address of a user (has_one association) via association attribute without specifying :nested_attribute => true" do
     address = Factory(:address)
     user = Factory(:user, :address => address)
     user.set_value_for_attribute({:name => :address__city}, "Hidden Treasures")