netzke-basepack 0.9.0.rc1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c90d8002f07f239a7c21fbaece95d28b626a11a3
-  data.tar.gz: 528ac9f660584658074cf09640bd9b650854bd7d
+  metadata.gz: 7efff735638e53b2d16a815c6d2c34e7e0cb12ae
+  data.tar.gz: 4472d0094ce1ab7692814140edcba271fedee812
 SHA512:
-  metadata.gz: c041285c3001a8077d7e49f02f4fc75043d89938e42d2fab180f886b04ff65fe16f85e948677bd847eb18f2f90414fb7b6e6e25090d074b1e937bb19e9f21623
-  data.tar.gz: 97c07cf67984943c5e29e06b27040506a1c8811370b84d8e2cbb6bc5ad579abc3555ad4135498c05f2d12a1d1739b6523c9c581842c2d97c5e69648a6a580920
+  metadata.gz: b02239f65587e5c3ea3209ba9d17f4f0072048e4009d613c7d49f2282383dbc6df793f6f812c80ac9a4408c1c6dd4e66fb65ea384bfdc456eef8cb259221a93a
+  data.tar.gz: f46a8460b5e5fa9dd86fb3c04a4cc4f5dbcd07dfcad77d7184e1f76ea240d7f00b92e2b022535734c41471844bf0de4dbfd738cc56bb979dd8e14c9d2dac6829

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-# 0.9.0 - WIP
+# 0.9.0 - 2014-02-08
 * new
   * GridLiveSearch plugin - implements flexible "live" search on any grid
   * Implement multi-sorting support in grids

data/Gemfile

@@ -2,12 +2,9 @@ source 'http://rubygems.org'
 
 gemspec
 
-# use unreleased version of netzke-core
-gem 'netzke-core', github: 'netzke/netzke-core'
-gem 'netzke-testing'
+# unreleased version of netzke-core
+# gem 'netzke-core', github: 'netzke/netzke-core'
 
-# for local testing
-# gem 'netzke-testing', path: '~/code/netzke/netzke-testing'
 # gem 'netzke-core', path: '~/code/netzke/netzke-core'
 
 gem 'carrierwave'
@@ -24,4 +21,5 @@ end
 
 group :test, :development do
   gem 'pry-rails'
+  gem 'netzke-testing'
 end

data/README.md

@@ -1,4 +1,4 @@
-# Netzke Basepack [![Gem Version](https://badge.fury.io/rb/netzke-basepack.png)](http://badge.fury.io/rb/netzke-basepack) [![Build Status](https://travis-ci.org/netzke/netzke-basepack.png?branch=master)](https://travis-ci.org/netzke/netzke-basepack) [![Code Climate](https://codeclimate.com/github/netzke/netzke-basepack.png)](https://codeclimate.com/github/netzke/netzke-basepack)
+# Netzke Basepack [![Gem Version](https://badge.fury.io/rb/netzke-basepack.png)](http://badge.fury.io/rb/netzke-basepack) [![Build Status](https://travis-ci.org/netzke/netzke-basepack.png?branch=0-9)](https://travis-ci.org/netzke/netzke-basepack) [![Code Climate](https://codeclimate.com/github/netzke/netzke-basepack.png)](https://codeclimate.com/github/netzke/netzke-basepack)
 
 [RDocs](http://rdoc.info/github/netzke/netzke-basepack)
 
@@ -23,7 +23,7 @@ enhancing any grid with live search functionality
 
 ## Requirements
 
-* Ruby ~> 1.9.2
+* Ruby >= 1.9.3
 * Rails ~> 3.2.0
 * Ext JS ~> 4.2.0
 
@@ -35,7 +35,7 @@ In your Gemfile:
 
 For the "edge" stuff, instruct bundler to get the gem straight from GitHub:
 
-    gem 'netzke-basepack', git: "netzke/netzke-basepack"
+    gem 'netzke-basepack', github: "netzke/netzke-basepack"
 
 ## Basic usage
 

data/Rakefile

@@ -3,7 +3,7 @@ require "bundler/gem_tasks"
 require "./lib/netzke/basepack/version"
 
 YARD::Rake::YardocTask.new do |t|
-  t.options = ['--title', "Netzke Basepack #{Netzke::Basepack::Version::STRING}"]
+  t.options = ['--title', "Netzke Basepack #{Netzke::Basepack::VERSION}"]
 end
 
 namespace :yard do

data/lib/netzke/basepack/data_adapters/active_record_adapter.rb

@@ -238,6 +238,10 @@ module Netzke::Basepack::DataAdapters
         else
           r.send("#{assoc.options[:foreign_key] || assoc.name.to_s.foreign_key}")
         end
+      # the composite_primary_keys gem produces [Key1,Key2...] and [Value1,Value2...]
+      # on primary_key and id requests. Basepack::AttrConfig converts the keys-array to an String.
+      elsif r.class.primary_key.try(:to_s) == a[:name]
+        r.id # return 'val1,val2...' on 'key1,key2...' composite_primary_keys
       end
 
       # a work-around for to_json not taking the current timezone into account when serializing ActiveSupport::TimeWithZone

data/lib/netzke/basepack/grid.rb

@@ -375,15 +375,7 @@ module Netzke
       delegates_to_dsl :model
 
       def configure(c)
-        # Defaults. The nil? checks are needed because these can be already set in a subclass
-        c.enable_edit_in_form = self.class.edit_in_form_available if c.enable_edit_in_form.nil?
-        c.enable_edit_inline = self.class.edit_inline_available if c.enable_edit_inline.nil?
-        c.enable_extended_search = self.class.advanced_search_available if c.enable_extended_search.nil?
-        c.enable_column_filters = self.class.column_filters_available if c.enable_column_filters.nil?
-        c.enable_pagination = true if c.enable_pagination.nil?
-        c.rows_per_page = 30 if c.rows_per_page.nil?
-        c.tools = %w{ refresh } if c.tools.nil?
-
+        set_defaults(c)
         super
       end
 
@@ -522,7 +514,25 @@ module Netzke
         c.fields = attributes_for_search
       end
 
-    protected
+      protected
+
+      # Override from Base. Ensures the model is provided.
+      def validate_config(c)
+        raise ArgumentError, "Grid requires a model" if c.model.nil?
+      end
+
+      private
+
+      def set_defaults(c)
+        # The nil? checks are needed because these can be already set in a subclass
+        c.enable_edit_in_form = self.class.edit_in_form_available if c.enable_edit_in_form.nil?
+        c.enable_edit_inline = self.class.edit_inline_available if c.enable_edit_inline.nil?
+        c.enable_extended_search = self.class.advanced_search_available if c.enable_extended_search.nil?
+        c.enable_column_filters = self.class.column_filters_available if c.enable_column_filters.nil?
+        c.enable_pagination = true if c.enable_pagination.nil?
+        c.rows_per_page = 30 if c.rows_per_page.nil?
+        c.tools = %w{ refresh } if c.tools.nil?
+      end
 
       def preconfigure_record_window(c)
         c.klass = RecordFormWindow

data/lib/netzke/basepack/grid/endpoints.rb

@@ -23,7 +23,7 @@ module Netzke
 
               feedback = errors
               if destroyed_ids.present?
-                feedback << I18n.t('netzke.basepack.grid.deleted_n_records', :n => destroyed_ids.size)
+                feedback << I18n.t('netzke.basepack.grid.deleted_n_records', :count => destroyed_ids.size)
                 on_data_changed
               end
               this.netzke_feedback(feedback)

data/lib/netzke/basepack/grid/services.rb

@@ -69,7 +69,7 @@ module Netzke
           params[:filters] = normalize_filters(params[:filters]) if params[:filters]
           params[:query] = normalize_query(params[:query]) if params[:query].present?
           if config[:enable_pagination]
-            params[:limit] = config[:rows_per_page] 
+            params[:limit] = config[:rows_per_page]
           else
             params.delete(:limit)
           end

data/lib/netzke/basepack/grid_live_search.rb

@@ -4,7 +4,7 @@ module Netzke
     # attribute, and assign the search operator. The grid will be updated on changing those fields, to reflect the
     # query.
     #
-    # See GridWithLiveSearch for a usage example.
+    # See Grid::LiveSearch in spec/rails_app for a usage example.
     #
     # == Configuration:
     #

data/lib/netzke/basepack/version.rb

@@ -1,12 +1,5 @@
 module Netzke
   module Basepack
-    module Version
-      MAJOR = 0
-      MINOR = 9
-      PATCH = 0
-      PRE   = 'rc1'
-
-      STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
-    end
+    VERSION = "0.9.0"
   end
 end

data/locales/de.yml

@@ -5,20 +5,29 @@ de:
         actions:
           add:
             text: Hinzufügen
+            tooltip: Hinzufügen
           edit:
             text: Bearbeiten
+            tooltip: Bearbeiten
           del:
             text: Löschen
+            tooltip: Löschen
           apply:
             text: Anwenden
+            tooltip: Anwenden
           add_in_form:
             text: extern Hinzufügen
+            tooltip: extern Hinzufügen
           edit_in_form:
             text: extern Bearbeiten
+            tooltip: extern Bearbeiten
           search:
             text: Suche
+            tooltip: Suche
 
-        deleted_n_records: "Deleted %{n} record(s)"
+        deleted_n_records:
+         one: "1 Datensatz wurde gelöscht"
+         other:  "%{count} Datensätze wurden gelöscht"
         cannot_delete: "Du hast keine Berechtigung die Daten zu löschen"
         confirmation: Bestätigung
         are_you_sure: Bist du sicher?

data/locales/en.yml

@@ -19,7 +19,9 @@ en:
           search:
             text: Search
 
-        deleted_n_records: "Deleted %{n} record(s)"
+        deleted_n_records:
+         one: "Deleted 1 record"
+         other: "Deleted %{count} records"
         cannot_create: "You don't have permissions to create data"
         cannot_read: "You don't have permissions to read data"
         cannot_update: "You don't have permissions to update data"

data/locales/es.yml

@@ -19,7 +19,9 @@ es:
           search:
             text: Buscar
 
-        deleted_n_records: "Se han eliminado %{n} registro(s)"
+        deleted_n_records:
+         one: "Se ha eliminado 1 registro"
+         other: "Se han eliminado %{count} registro(s)"
         cannot_delete: "Usted no tiene permiso para borrar los datos"
         confirmation: Confirmación
         are_you_sure: ¿Está seguro?

data/locales/nl.yml

@@ -19,7 +19,9 @@ nl:
           search:
             text: Zoeken
 
-        deleted_n_records: "%{n} objecten verwijderd"
+        deleted_n_records:
+         one: "1 object verwijderd"
+         other: "%{count} objecten verwijderd"
         cannot_delete: "Je hebt geen toestemming om data te verwijderen"
         confirmation: Bevestiging
         are_you_sure: Weet je het zeker?

data/locales/ru.yml

@@ -19,7 +19,9 @@ ru:
           search:
             text: Искать
 
-        deleted_n_records: "Записей удалено: %{n}"
+        deleted_n_records:
+         one: "1 запись удалена"
+         other: "Записей удалено: %{count}"
         cannot_delete: "У вас недостаточно прав для удаления"
         confirmation: Подтверждение
         are_you_sure: Вы уверены?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netzke-basepack
 version: !ruby/object:Gem::Version
-  version: 0.9.0.rc1
+  version: 0.9.0
 platform: ruby
 authors:
 - Max Gorin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netzke-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0.rc1
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0.rc1
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A set of feature-rich extendible Netzke components (such as Form, Grid,
   Window, TabPanel, etc) and component extensions which can be used as building blocks
   for your RIA
@@ -147,9 +161,7 @@ files:
 - lib/netzke/basepack/search_panel/javascripts/search_panel.js
 - lib/netzke/basepack/search_panel.rb
 - lib/netzke/basepack/search_window.rb
-- lib/netzke/basepack/simple_app/javascripts/simple_app.js
 - lib/netzke/basepack/simple_app/javascripts/statusbar_ext.js
-- lib/netzke/basepack/simple_app.rb
 - lib/netzke/basepack/tab_panel/javascripts/tab_panel.js
 - lib/netzke/basepack/tab_panel.rb
 - lib/netzke/basepack/version.rb

data/lib/netzke/basepack/simple_app.rb

@@ -1,101 +0,0 @@
-module Netzke
-  module Basepack
-    # Basis for a Ext.container.Viewport-based one-page application.
-    #
-    # == Features:
-    # * dynamic loading of components
-    # * browser history support (press the "Back"-button to go to the previously loaded component)
-    # * AJAX activity indicator
-    #
-    # == Extending SimpleApp
-    # You may want to extend SimpleApp to provide a custom layout. Make sure you create three regions with predefined itemId's that will be used by SimpleApp. You can use the following methods defined by SimpleApp: main_panel_config, status_bar_config, and menu_bar_config, e.g.:
-    #
-    #     class MySimpleApp < Netzke::Basepack::SimpleApp
-    #
-    #       def configuration
-    #         super.merge(
-    #           :items => [my_custom_navigation_config, main_panel_config, menu_bar_config, status_bar_config]
-    #         )
-    #       end
-    #
-    #       def my_custom_navigation_config
-    #         {
-    #           :item_id => 'navigation',
-    #           :region => :east,
-    #           :width => 200
-    #         }
-    #       end
-    #
-    #       ...
-    #     end
-    #
-    # The JS side of the component will have those regions referenced as this.mainPanel, this.statusBar, and this.menuBar.
-    class SimpleApp < Base
-      js_configure do |c|
-        c.extend = "Ext.container.Viewport"
-        c.layout = :border
-        c.require Netzke::Core.ext_path.join("examples", "ux/statusbar/StatusBar.js"), :statusbar_ext
-        c.mixin
-      end
-
-      def configure(c)
-        super
-        c.items = [main_panel_config, menu_bar_config, status_bar_config]
-      end
-
-      # In Ext 4.1 calling `render` on a viewport causes an error
-      def js_component_render
-        ""
-      end
-
-      # Override for custom menu
-      def menu
-        []
-      end
-
-      # Config for the main panel, which will contain dynamically loaded components.
-      def main_panel_config(overrides = {})
-        {
-          :itemId => 'main_panel',
-          :region => 'center',
-          :layout => 'fit'
-        }.merge(overrides)
-      end
-
-      # Config for the status bar
-      def status_bar_config(overrides = {})
-        {
-          :itemId => 'status_bar',
-          :xtype => 'statusbar',
-          :region => 'south',
-          :height => 22,
-          :statusAlign => 'right',
-          :busyText => 'Busy...',
-          :default_text => "Ready",
-          :default_icon_cls => ""
-        }.merge(overrides)
-      end
-
-      # Config for the menu bar
-      def menu_bar_config(overrides = {})
-        {
-          :itemId => 'menu_bar',
-          :xtype => 'toolbar',
-          :region => 'north',
-          :height => 28,
-          :items => menu
-        }.merge(overrides)
-      end
-
-      # Html required for Ext.History to work
-      def js_component_html
-        super << %Q{
-  <form id="history-form" class="x-hidden">
-      <input type="hidden" id="x-history-field" />
-      <iframe id="x-history-frame"></iframe>
-  </form>
-        }
-      end
-    end
-  end
-end

data/lib/netzke/basepack/simple_app/javascripts/simple_app.js

@@ -1,58 +0,0 @@
-{
-  initComponent: function(){
-    this.callParent();
-
-    this.mainPanel = this.down('panel[itemId="main_panel"]');
-    this.menuBar   = this.down('container[itemId="menu_bar"]');
-    var statusBar = this.statusBar = this.down('container[itemId="status_bar"]');
-
-    Ext.util.History.on('change', this.processHistory, this);
-
-    // Setting the "busy" indicator for Ajax requests
-    Ext.Ajax.on('beforerequest',    function(){ statusBar.showBusy(); });
-    Ext.Ajax.on('requestcomplete',  function(){ statusBar.hideBusy(); });
-    Ext.Ajax.on('requestexception', function(){ statusBar.hideBusy(); });
-
-    // Initialize history
-    Ext.util.History.init();
-  },
-
-  afterRender: function(){
-    this.callParent();
-
-    // If we are given a token, load the corresponding component, otherwise load the last loaded component
-    var currentToken = Ext.util.History.getToken();
-    if (currentToken != "") {
-      this.processHistory(currentToken);
-    } else {
-      var lastLoaded = this.initialConfig.componentToLoad; // passed from the server
-      if (lastLoaded) Ext.util.History.add(lastLoaded);
-    }
-  },
-
-  processHistory: function(token){
-    if (token){
-      this.mainPanel.removeAll();
-      this.netzkeLoadComponent(token, {container: this.mainPanel});
-    } else {
-      this.mainPanel.removeAll();
-    }
-  },
-
-  // instantiateComponent: function(config){
-  //   this.mainPanel.instantiateChild(config);
-  // },
-
-  appLoadComponent: function(name){
-    Ext.util.History.add(name);
-  },
-
-  netzkeLoadComponentByAction: function(action){
-    var componentName = action.component || action.name;
-    if (componentName) this.appLoadComponent(componentName);
-  },
-
-  onToggleConfigMode: function(params){
-    this.toggleConfigMode();
-  }
-}