netzke-basepack 1.0.0.0.pre3 → 1.0.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad64e5a6aee6a6028818e5dc859b0bbb1dbad699
-  data.tar.gz: 7d0f81226d8023eebc9792beb5d5dbfd5c4f2c66
+  metadata.gz: e7b071b17635f26304174a2ce41906a80151f5dd
+  data.tar.gz: 87a442885af7cdbbba3bf8c8758c687f8cf58d66
 SHA512:
-  metadata.gz: 6a53878200a155e9d0a08937b9537746eb6d1ea3afa9e8ae6ca2e2eeae23429721fef6d074ab12973db10a6f7ff357198ed394d4b228930e9a44df18d5d6fdf9
-  data.tar.gz: d764bb984b4d608950f13630e2aa9a63027ab40062fa1077f5876a518089644748d3dd5fe5f9268537c77360a3e37589d1530d3f1e188c496a1a1b43083e32a8
+  metadata.gz: a9fcdb725adaec959082a2f9b9cc638dbbd424c329f13ff2086dfdd4a710d46f359544aa9f2831f9000a2246612f3c6a80c2e53993b0156a61439f1f154ef243
+  data.tar.gz: 0ccc9d5f7a241e02a00de6048e0c2dc74ebb0c30fab519bc27a3ead1769d60fe6239646418ca12757ba608c858dfab709824ce7ec5b99b21d67d4106640a8019

data/CHANGELOG.md

@@ -1,12 +1,14 @@
-### Components changed/renamed
+# v1.0.0.0 - 2016-01-04
+
+## Components changed/renamed
 
 *   Base classes of main componens have been renamed from `Netzke::Basepack::{Grid|Form|Tree|Window|Viewport}` to `Netzke::{Grid|Form|Tree|Window|Viewport}::Base`.
 
-*   `Netzke::Basepack::TapPanel` and `Netzke::Basepack::Accordion` have been removed. The only purpose for them was dynamic loading of child components, which didn't prove that useful.
+*   `Netzke::Basepack::TabPanel` and `Netzke::Basepack::Accordion` have been removed. The only purpose for them was dynamic loading of child components, which didn't prove that useful.
 
-### Form, Grid, Tree
+## Form, Grid, Tree
 
-#### Breaking changes
+### Breaking changes
 
 *   `strong_default_attrs` config option has been renamed to `strong_values`.
 
@@ -14,15 +16,15 @@
 
 *   The new `attribute` DSL method and the accompanying `attribute_overrides` config option allow reconfiguring the way specific model attributes are presented by both the grid and the form. The `column` DSL method has been left for configuring what's specific for a column. For details, see [Netzke::Basepack::Attributes](http://www.rubydoc.info/github/netzke/netzke-basepack/Netzke/Basepack/Attributes).
 
-### Form
+## Form
 
-#### Breaking changes
+### Breaking changes
 
 *   The `netzkeSubmit` and `netzkeLoad` endpoints have been renamed to `submit` and `load` respectively; keep this in mind if you override them in your app.
 
-### Grid
+## Grid
 
-#### Breaking changes
+### Breaking changes
 
 *   Column/field label for association no longer includes association method name by default. For example, for
     `author__name` attribute it'll now be "Author", not "Author  name".
@@ -44,15 +46,15 @@
 
 *   The endpoints dropped their prefix `server`; additionally, `serverDelete` has become `destroy`; keep this in mind if you override endpoints in your app.
 
-*   All scope-related configs (including those of the columns) now only accept a Proc object.
+*   All scope-related configs (including those of the columns) now only accept a Proc or a Hash.
 
-*   Class-level configuration is gone (its sole purpose was to allow reducing the amount of generated JS code - not worth it).
+*   Class-level component configuration is gone (its sole purpose was to allow reducing the amount of generated JS code - not worth it).
 
 *   `enable_edit_in_form`, `enable_edit_inline`, `enable_pagination` options are gone.
 
 *   `enable_extended_search` option is gone.
 
-#### Non-breaking changes
+### New and improved
 
 *   By default, Grid now uses form to add/edit records. Set `edit_inline` to true to use inline editing when possible (implicitly sets `paging` to `true`).
 
@@ -62,15 +64,11 @@
 
 *   Buttons previously disabled due to permissions are now not added to the bottom bar alltogether.
 
-#### Added
-
 *   Override new `configure_form` method to specify extra configuration to the forms
 
 *   Warn the user at an attempt to change the page when there are unapplied changes; disable the warning by setting `disable_dirty_page_warning` to `true`.
 
-*   Proper support for decimal datatype
-
-#### Bugfixes
+*   Proper support for decimal datatype was added
 
 *   Multiediting of reconds now works properly with boolean fields (a tristate selector was implemented).
 

data/LICENSE

@@ -1,3 +1,3 @@
 Copyright (c) 2009-2015 Good Bit Labs Limited
 
-GPLv3 License: http://www.gnu.org/licenses/gpl-3.0.en.html
+The same license as Ext JS: https://www.sencha.com/legal/#Sencha_Ext_JS

data/README.md

@@ -103,4 +103,4 @@ If you feel particularily generous, you can donate a couple of bucks weekly at [
 * [Twitter](http://twitter.com/netzke) - latest news about the framework
 
 ---
-Copyright (c) 2009-2015 [Good Bit Labs](http://goodbitlabs.com/), released under the GPLv3 license
+Copyright (c) 2009-2016 [Good Bit Labs](http://goodbitlabs.com/), released under the same license as [Ext JS](https://www.sencha.com/legal/#Sencha_Ext_JS)

data/javascripts/grid/event_handlers.js

@@ -92,16 +92,6 @@ Ext.define("Netzke.Grid.EventHandlers", {
     }
   },
 
-  // Not a very clean approach to clean-up. The problem is that this way the advanced search functionality stops being really pluggable. With Ext JS 4 find the way to make it truely so.
-  netzkeOnDestroy: function(){
-    this.callParent();
-
-    // Destroy the search window (here's the problem: we are not supposed to know it exists)
-    if (this.searchWindow) {
-      this.searchWindow.destroy();
-    }
-  },
-
   netzkeOnAddInForm: function(){
     this.netzkeLoadComponent("add_window", {
       callback: function(w) {
@@ -167,6 +157,10 @@ Ext.define("Netzke.Grid.EventHandlers", {
       }});
   },
 
+  /**
+   * Reloads store
+   * @method netzkeReloadStore
+   */
   netzkeReloadStore: function(){
     var store = this.getStore();
 
@@ -177,7 +171,7 @@ Ext.define("Netzke.Grid.EventHandlers", {
   },
 
   /**
-   * Process selectionchange event to enable/disable actions.
+   * Processes selectionchange event to enable/disable actions.
    * @method netzkeSetActionEvents
    * @private
    */

data/lib/netzke/basepack/attributes.rb

@@ -70,13 +70,13 @@ module Netzke
     #
     # [scope]
     #
-    #   The scope for association attribute. Same syntax applies as for scoping out records for the grid.
+    #   A Proc or a Hash used to scope out one-to-many association options. Same syntax applies as for scoping out records in the grid.
     #
     # [filter_association_with]
     #
     #   A Proc object that receives the relation and the value to filter by. Example:
     #
-    #     column :author__name do |c|
+    #     attribute :author__name do |c|
     #       c.filter_association_with = lambda {|rel, value| rel.where("first_name like ? or last_name like ?", "%#{value}%", "%#{value}%" ) }
     #     end
     #

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

@@ -89,7 +89,8 @@ module Netzke::Basepack::DataAdapters
         # Options for an asssociation attribute
 
         relation = assoc.klass.all
-        relation = attr[:scope].call(relation) if attr[:scope].is_a?(Proc)
+
+        relation = extend_relation_with_scope(relation, attr[:scope])
 
         if attr[:filter_association_with]
           relation = attr[:filter_association_with].call(relation, query).to_a
@@ -316,11 +317,7 @@ module Netzke::Basepack::DataAdapters
         relation = relation.where(predicates_for_and_conditions(and_query))
       end
 
-      if params[:scope].is_a?(Proc)
-        relation = params[:scope].call(relation)
-      else
-        raise ArgumentError, "Expected scope to be a Proc, got #{params[:scope].class}" unless params[:scope].nil?
-      end
+      relation = extend_relation_with_scope(relation, params[:scope])
 
       @relation = relation
     end
@@ -443,6 +440,19 @@ module Netzke::Basepack::DataAdapters
 
     private
 
+    def extend_relation_with_scope(relation, scope)
+      case scope
+      when Proc
+        scope.call(relation)
+      when Hash
+        relation.where(scope)
+      when NilClass
+        relation
+      else
+        raise ArgumentError, "Expected scope to be a Proc or a Hash, got #{scope.class}"
+      end
+    end
+
     def logger
       Netzke::Base.logger
     end

data/lib/netzke/basepack/version.rb

@@ -1,5 +1,5 @@
 module Netzke
   module Basepack
-    VERSION = "1.0.0.0.pre3"
+    VERSION = "1.0.0.0"
   end
 end

data/lib/netzke/grid/base.rb

@@ -79,17 +79,27 @@ module Netzke
     #
     # [scope]
     #
-    #   A Proc object used to scope out grid data. Receives the current relation as a parameter and must return the
-    #   modified relation. For example:
+    #   A Proc or a Hash used to scope out grid data. The Proc will receive the current relation as a parameter and must
+    #   return the modified relation. For example:
     #
     #      class Books < Netzke::Basepack::Grid
     #        def configure(c)
-    #          c.model = "Book"
     #          super
+    #          c.model = Book
     #          c.scope = lambda {|r| r.where(author_id: 1) }
     #        end
     #      end
     #
+    #   Hash is being accepted for conivience, it will be directly passed to `where`. So the above can be rewritten as:
+    #
+    #      class Books < Netzke::Basepack::Grid
+    #        def configure(c)
+    #          super
+    #          c.model = Book
+    #          c.scope = {author_id: 1}
+    #        end
+    #      end
+    #
     # [strong_values]
     #
     #   A hash of attributes to be merged atop of every created/updated record, e.g. +role_id: 1+

data/lib/netzke/grid/endpoints.rb

@@ -84,7 +84,7 @@ module Netzke
 
       # Attempts a given operation on the data. Checks permissions first.
       # @param [Symbol] Operation: :create, :read, :update, or :delete
-      # @param [Array] Workload of operation data
+      # @param [Array|Hash] Workload of operation data
       # @param [Netzke::Core::EndpointResponse] Object collecting response to the client
       def attempt_operation(op, data, client)
         if allowed_to?(op)

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: netzke-basepack
 version: !ruby/object:Gem::Version
-  version: 1.0.0.0.pre3
+  version: 1.0.0.0
 platform: ruby
 authors:
 - Max Gorin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-01 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies: []
-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
+description: A set of feature-rich extendible Netzke components (such as Grid, Tree,
+  Form, Window) and component extensions which can be used as building blocks for
+  your apps
 email: max@goodbitlabs.com
 executables: []
 extensions: []