netzke-core 1.0.1.0 → 6.5.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5625e5b8c41cdcbe1a42398968f2690302f8a23f
-  data.tar.gz: 6a9440742423fca06ffa20e3eb303d2d6265b3e8
+  metadata.gz: 364a0ced50530abfe4cd40c8476fd1488f38c36f
+  data.tar.gz: 9246a6f3e5d5ad641d42676cc90bd1eb48978eb0
 SHA512:
-  metadata.gz: a8b1c61d559f9bff94e344741048c30894553013656602a81562664d01571d9e7f124332efa8f30efa944f092a09c0bd3a28ffc8a86242540a3b3f33fe29bdc5
-  data.tar.gz: 7570d49b12911111e3c1f17bdb1768f82e9bf7dbcdb57f9d8494a3af125e8e5e4112d6bcd2ecfd5964f29ec26096d5b8e0ed442749728541dd874a3074275c99
+  metadata.gz: d3d0e972371a38f2c2c091a5f5d398e8c9f0eb66f793e78c68abcc894dc6720cee2bd766b0c1f7b41916e959748ee8bb0f8ae4d1721b0e1060703dd56e95cce2
+  data.tar.gz: ec16ea789abd4c62c8a22fb4c6bfb816e927f3a5ed6d4558da0b2ca196c84bdc9ac1701e0c84a2f42e94a4befb6406c1d62a3ad5d55b2a5138264fa4d5ea6d9e

data/CHANGELOG.md

@@ -1,128 +1,13 @@
-# v1.0.1.0 - 2016-05-01
-
-*   New `Netzke::Core.default_routes` config option.
-
-# v1.0.0.0 - 2016-01-04
-
-## New and improved
-
-*   Routing (see README)
-
-*   Introduce `Base#f` method that defines an inline wrapper for the client-side function that gets called in the scope of the component. This simplifies, for example, specifying handlers for buttons and tools, but also can be used in a few other occasions, where an Ext JS configuration option requires a function. See `spec/rails_app/app/components/actions.rb` for an example.
-
-*   Introduce `Base#l` method that converts the passed string to JSON literal; useful for asigning JS functions inline
-    (see below).
-
-*   There's no longer need to call `netzke` in routes.rb unless you want to modify routing defaults.
-
-*   The `action` DSL method now also accepts a list of endpoints, e.g.:
-
-            action :do_something, :do_something_else
-
-*   `netzkeNotify` (former `netzkeFeedback`) now accepts the `title` option
-
-*   Calling `callParent` in JS functions from the "mixins" will now properly call the previous override if that was defined; see `spec/rails_app/app/components/js_mixins.rb` for an example.
-
-## Breaking changes
-
-*   A component's subfolders for client-class scripts and stylesheets have been consolidated from `javascripts`/`stylesheets` into `client`
-
-*   The client methods for endpoints are now created on the `this.server` object, so, you need to prefix the endpoint calls with `.server`, e.g. `this.server.doSomething()`. For details, see the updated "Client-server interaction" section in the README.
-
-*   `Base#js_configure` has been renamed to `Base#configure_client`
-
-*   `Base.js_configure` has been renamed to `Base.client_class`. There's also no longer need to call it just for the purpose of including the default mixin (which is now `<component_name>/client/<component_name>.js`).
-
-*   Assigning inline JS functions inside the `client_class` (former `js_configure`) block no longer automatically makes a JSON literal
-    of them; instead, you need to wrap it with the `l` method accessible for all components:
-
-            client_class do |c|
-              c.netzke_on_refresh = l(<<-JS)
-                function(){
-                  this.setTitle("Refresh tool clicked");
-                }
-              JS
-            end
-
-*   `Base.css_configure` has been renamed to `Base.client_styles`.
-
-*   The `mixin` method in the former `js_configure` block (now `client_class`) has been renamed to `include`.
-
-*   Changes to endpoints API.
-
-    *   Droped the `this` parameter from endpoint block on server side. Instead, use the `client` accessor, implicitely defined for you, for example:
-
-            endpoint :do_something do |arg1|
-              client.set_title("Recieved #{arg1}")
-            end
+# v6.5.0.0 - WIP
 
-    *   Endpoint calls now accept any number of arguments (including zero), with client-side signature matching the server-side `endpoint` block, for example:
+* Support for Ext JS 6.5
+* Support for Rails 5.1
+* New version convention: the first 2 numbers correspond to the major Ext JS and Rails versions respectively.
 
-            # server side
-            endpoint :assign_user do |user_id, table_id|
-            end
-
-            // client side
-            this.server.assignUser(userId, tableId)
-
-            ---
-
-            # server side (0 arguments)
-            endpoint :clear_data do
-            end
-
-            // client side
-            this.server.clearData()
-
-    *   Whatever endpoint's server-side block returns will become the argument for the client-side callback function, for example:
-
-            # server side
-            endpoint :get_data do |params|
-              [1, 2, 3]
-            end
-
-            // client side
-            this.server.getData(params, function(result) {
-              // result equals [1, 2, 3]
-            })
-
-*   Internal rework of component loading, which also changes some API and behavior.
-
-    *   If the loaded component is a window, its `show` method is called after loading. This can be prevented by the callback function returning `false` (which will also prevent other types of loaded components to be inserted into the container).
-
-    *   On the client, the `clientConfig` config option has been renamed to `serverConfig`.
-
-    *   To specify that a child component is eagerly loaded, the option is moved out of the block into the DSL `component` method parameter (also renamed to `eager_load`):
-
-            # BEFORE
-            component :foo do |c|
-              c.eager_loading = true
-              ...
-            end
-
-            # NOW
-            component :foo, eager_load: true do |c|
-              ...
-            end
-
-        Unless a component is declared as eagerly loaded, its config is no longer accessible on the client side (which means component is meant to be dynamically loadable).
-
-*   Specifying `bbar` and other toolbars in `configure_client` (former `js_configure`) no longer works. They must now be in the main `configure` method.
-
-*   Default handler name for actions is now prefixed with `netzkeOn` instead of `on`. E.g., for `action :do_something`, the handler
-    must be called `netzkeOnDoSomething`.
-
-*   `netzkeFeedback` has been renamed to `netzkeNotify`
-
-*   `Core.js_feedback_delay` has been renamed to `Core.client_notification_delay`
-
-*   `onNetzkeSessionExpired` has been renamed to `netzkeOnSessionExpired`
-
-*   Experimental support for HAML removed
-
-*   Drop possibility to list panel tools merely as symbols, as this was too limiting (e.g. Netzke was overriding the handler signature). As of now, use the `Base#f` method to specify the handler (will no longer be automatically set for you); see `spec/rails_app/app/components/tools.rb` for an example.
+# v1.0.1.0 - 2016-05-01
 
-*   `Base::Plugin` won't set `this.cmp` for you any longer, but rather receive it as a parameter for `init()`
+*   New `Netzke::Core.default_routes` config option.
 
 ---
-Please check [0-12](https://github.com/netzke/netzke-core/blob/0-12/CHANGELOG.md) for previous changes.
+
+Please check [1-0-0](https://github.com/netzke/netzke-core/blob/1-0-0/CHANGELOG.md) for previous changes.

data/Gemfile

@@ -2,16 +2,18 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'rails', '~>4.2.0'
+gem 'rails', '~>5.1.0'
 gem 'sqlite3'
 gem 'yard'
 gem 'rake'
 
 group :test do
   gem 'rspec'
-  gem 'rspec-rails'
+  gem 'rspec-rails', '~> 3.5.0'
   gem 'capybara'
-  gem 'selenium-webdriver'
+  gem 'capybara-selenium'
+  gem 'selenium-webdriver', '~> 3.4.4'
+  gem 'chromedriver-helper'
 end
 
 group :development do
@@ -20,5 +22,5 @@ end
 
 group :development, :test do
   gem 'pry-rails'
-  gem 'netzke-testing', github: 'netzke/netzke-testing', branch: 'master'
+  gem 'netzke-testing', git: 'https://github.com/netzke/netzke-testing', branch: '6-5-0'
 end

data/README.md

@@ -264,9 +264,9 @@ You can access the instance of the Netzke controller via `Netzke::Base.controlle
 
 ## Requirements
 
-* Ruby >= 1.9.3
-* Rails ~> 4.2.0
-* Ext JS = 5.1.1
+* Ruby >= 2.3.0
+* Rails ~> 5.1.0
+* Ext JS = 6.5.1
 
 ## Installation
 
@@ -317,4 +317,4 @@ If you feel particularily generous, you can support the author by donating a cou
 * [Twitter](http://twitter.com/netzke) - latest news about the framework
 
 ---
-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)
+Copyright (c) 2009-2017 [Good Bit Labs](http://goodbitlabs.com/), released under the same license as [Ext JS](https://www.sencha.com/legal/#Sencha_Ext_JS)

data/config/routes.rb

@@ -1,6 +1,5 @@
 Rails.application.routes.draw do
-  if Netzke::Core.default_routes &&
-      !Rails.application.routes.named_routes.routes[:netzke]
-    netzke
+  if Netzke::Core.default_routes
+    netzke unless Rails.application.routes.named_routes.key? :netzke
   end
 end

data/javascripts/core.js

@@ -25,8 +25,8 @@ Netzke.exception = function(msg) {
 
 // Check Ext JS version: both major and minor versions must be the same
 (function(){
-  var requiredVersionMajor = 5,
-      requiredVersionMinor = 1,
+  var requiredVersionMajor = 6,
+      requiredVersionMinor = 5,
       extVersion = Ext.getVersion('extjs'),
       currentVersionMajor = extVersion.getMajor(),
       currentVersionMinor = extVersion.getMinor(),

data/javascripts/routing.js

@@ -47,7 +47,7 @@ Ext.define('Netzke.Core.Routing', {
 
   netzkeTriggerInitialRoute: function(){
     var initToken = Ext.util.History.getToken();
-    if (initToken) this.netzkeRouter.redirectTo(initToken, true);
+    if (initToken) { this.netzkeRouter.redirectTo(initToken, true); }
   },
 
   netzkeGetRoutes: function(){
@@ -56,8 +56,9 @@ Ext.define('Netzke.Core.Routing', {
       var handlerName = this.netzkeRoutes[route],
           handler = this[handlerName];
       if (!handler) Netzke.exception("Route handler " + handlerName + " is not defined");
-      out[route] = handler.bind(this);
+      out[route] = { action: handler.bind(this) };
     }
     return out;
   }
 });
+

data/lib/netzke/base.rb

@@ -12,6 +12,7 @@ require 'netzke/core/actions'
 require 'netzke/core/session'
 require 'netzke/core/core_i18n'
 require 'netzke/core/inheritance'
+require 'netzke/core/support'
 
 module Netzke
   # The base class for every Netzke component. Its main responsibilities include:
@@ -83,7 +84,8 @@ module Netzke
       @item_id = conf[:item_id] || @name
 
       # Make +client_config+ accessible in +configure+ before calling +super+
-      config.client_config = HashWithIndifferentAccess.new(conf.delete(:client_config))
+      client_config = Netzke::Support.permit_hash_params(conf.delete(:client_config))
+      config.client_config = HashWithIndifferentAccess.new(client_config)
 
       # Build complete component configuration
       configure(config)

data/lib/netzke/core/composition.rb

@@ -121,7 +121,13 @@ module Netzke::Core
         component_name = params[:name].underscore.to_sym
 
         item_id = params[:item_id]
-        cmp_instance = component_instance(component_name, {item_id: item_id, client_config: params[:client_config]})
+        cmp_instance = component_instance(
+          component_name,
+          {
+            item_id: item_id,
+            client_config: Netzke::Support.permit_hash_params(params[:client_config])
+          }
+        )
 
         if cmp_instance
           js, css = cmp_instance.js_missing_code(cache), cmp_instance.css_missing_code(cache)
@@ -156,7 +162,7 @@ module Netzke::Core
       component_name = component_name.to_sym
 
       ComponentConfig.new(component_name, self).tap do |cfg|
-        cfg.client_config = HashWithIndifferentAccess.new(overrides[:client_config])
+        cfg.client_config = HashWithIndifferentAccess.new(Netzke::Support.permit_hash_params(overrides[:client_config]))
         cfg.item_id = overrides[:item_id]
 
         if respond_to?(:"#{component_name}_component")

data/lib/netzke/core/railz/action_view_ext.rb

@@ -21,7 +21,7 @@ module Netzke
       #   +true+ otherwise
       def load_netzke(params = {})
         params[:minified] = !Rails.env.development? if params[:minified].nil?
-        params[:theme] ||= "crisp"
+        params[:theme] ||= "triton"
 
         raw([netzke_html, netzke_css_include(params), netzke_css(params), netzke_js_include(params), netzke_js(params)].join("\n"))
       end
@@ -71,7 +71,7 @@ module Netzke
       # Link tags for all the required stylsheets
       def netzke_css_include(params)
         # ExtJS base
-        res = ["#{Netzke::Core.ext_uri}/packages/ext-theme-#{params[:theme]}/build/resources/ext-theme-#{params[:theme]}-all.css"]
+        res = ["#{Netzke::Core.ext_uri}/build/classic/theme-#{params[:theme]}/resources/theme-#{params[:theme]}-all.css"]
 
         # Netzke-related dynamic css
         res << netzke_ext_path
@@ -97,7 +97,7 @@ module Netzke
         res << (params[:minified] ? "#{Netzke::Core.ext_uri}/build/ext-all.js" : "#{Netzke::Core.ext_uri}/build/ext-all-debug.js")
 
         # Ext I18n
-        res << "#{Netzke::Core.ext_uri}/packages/ext-locale/build/ext-locale-#{I18n.locale}" if I18n.locale != :en
+        res << "#{Netzke::Core.ext_uri}/build/classic/locale/locale-#{I18n.locale}" if I18n.locale != :en
 
         # Netzke-related dynamic JavaScript
         res << netzke_ext_path

data/lib/netzke/core/railz/controller_extensions.rb

@@ -33,14 +33,14 @@ module Netzke
 
         # raw arguments from the client
         def remoting_args
-          @_remoting_args ||= HashWithIndifferentAccess.new(@params.to_hash)[:data]
+          @_remoting_args ||= HashWithIndifferentAccess.new(data: @params[:data])[:data]
         end
       end
 
       extend ActiveSupport::Concern
 
       included do
-        send(:before_filter, :set_controller_and_session)
+        send(:before_action, :set_controller_and_session)
       end
 
       module ClassMethods
@@ -63,18 +63,18 @@ module Netzke
           response = direct_response(direct_request, invoke_endpoint(direct_request))
         end
 
-        render text: response.to_json, layout: false
+        render plain: response.to_json, layout: false
       end
 
       # On-the-fly generation of public/netzke/ext.[js|css]
       def ext
         respond_to do |format|
           format.js {
-            render :text => Netzke::Core::DynamicAssets.ext_js(form_authenticity_token)
+            render js: Netzke::Core::DynamicAssets.ext_js(form_authenticity_token)
           }
 
           format.css {
-            render :text => Netzke::Core::DynamicAssets.ext_css
+            render html: Netzke::Core::DynamicAssets.ext_css, content_type: 'text/css'
           }
         end
       end
@@ -124,9 +124,9 @@ module Netzke
           cmp_config[:client_config] = ActiveSupport::JSON.decode(params[:configs]).shift || {}
           component_instance = Netzke::Base.instance_by_config(cmp_config)
 
-          render text: component_instance.invoke_endpoint(sub_components.join("__"), [params]).netzke_jsonify.to_json, layout: false
+          render plain: component_instance.invoke_endpoint(sub_components.join("__"), [params]).netzke_jsonify.to_json, layout: false
         else
-          render text: { netzke_on_session_expired: [] }.to_json, layout: false
+          render plain: { netzke_on_session_expired: [] }.to_json, layout: false
         end
       end
 

data/lib/netzke/core/support.rb

@@ -0,0 +1,7 @@
+module Netzke::Support
+  def self.permit_hash_params(params)
+    return params unless params
+    return params unless params.respond_to? :to_unsafe_h
+    params.to_unsafe_h
+  end
+end

data/lib/netzke/core/version.rb

@@ -1,5 +1,5 @@
 module Netzke
   module Core
-    VERSION = "1.0.1.0"
+    VERSION = "6.5.0.0.rc1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netzke-core
 version: !ruby/object:Gem::Version
-  version: 1.0.1.0
+  version: 6.5.0.0.rc1
 platform: ruby
 authors:
 - Max Gorin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-01 00:00:00.000000000 Z
+date: 2017-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uglifier
@@ -106,6 +106,7 @@ files:
 - lib/netzke/core/session.rb
 - lib/netzke/core/state.rb
 - lib/netzke/core/stylesheets.rb
+- lib/netzke/core/support.rb
 - lib/netzke/core/version.rb
 - lib/netzke/plugin.rb
 - lib/tasks/netzke_core_tasks.rake
@@ -131,9 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.4
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Client-server UI components with Sencha Ext JS and Ruby on Rails
 test_files: []
-has_rdoc: