netzke-core 0.12.2 → 0.12.3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.12.3 - 2015-08-09
+* Get rid of Ext's viewport warning
+* Uglify components' JS when not in the test/development env
+* Fix stack overflow issue in certain cases
+* Implement inline nesting of components
+* xtype of Netzke components receives additional "netzke" prefix (may potentially break things if you explicitely refer to xtypes)
+
 # v0.12.2 - 2015-06-06
 * Fix loading multi-instance components
 

data/Gemfile

@@ -17,5 +17,5 @@ end
 group :development, :test do
   gem 'web-console', '~> 2.0'
   gem 'pry-rails'
-  gem 'netzke-testing', github: 'netzke/netzke-testing'
+  gem 'netzke-testing', github: 'netzke/netzke-testing', branch: 'master'
 end

data/javascripts/ext.js

@@ -204,7 +204,7 @@ Ext.define(null, {
     var parent = this;
     while (parent) {
       var cfg = Ext.clone(parent.netzkeClientConfig);
-      cfg.id = parent.id;
+      cfg.component_id = parent.id;
       this._parentClientConfig.unshift(cfg);
       parent = parent.netzkeGetParentComponent();
     }

data/lib/netzke/base.rb

@@ -143,6 +143,8 @@ module Netzke
       # Build complete component configuration
       configure(config)
 
+      normalize_config
+
       # Check whether the config is valid
       validate_config(config)
     end

data/lib/netzke/core/actions.rb

@@ -118,10 +118,26 @@ module Netzke::Core
     end
 
     def extend_item(item)
-      super detect_and_normalize(:action, item)
+      super detect_and_normalize_action(item)
     end
 
   private
+
+    def detect_and_normalize_action(item)
+      item = {action: item} if item.is_a?(Symbol) && actions[item]
+      if item.is_a?(Hash) && action_name = item[:action]
+        cfg = actions[action_name]
+        cfg.merge!(item)
+        if cfg[:excluded]
+          {excluded: true}
+        else
+          item.merge(netzke_action: cfg[:action])
+        end
+      else
+        item
+      end
+    end
+
     def uri_to_icon(icon)
       self.class.uri_to_icon(icon)
     end

data/lib/netzke/core/client_class.rb

@@ -153,7 +153,7 @@ module Netzke
       # Builds this component's xtype
       # E.g.: netzkebasepackwindow, netzkebasepackgridpanel
       def xtype
-        @klass.name.gsub("::", "").downcase
+        "netzke" + @klass.name.gsub("::", "").downcase
       end
 
       # Component's JavaScript class declaration.

data/lib/netzke/core/component_config.rb

@@ -7,7 +7,7 @@ module Netzke::Core
 
     def set_defaults!
       self.item_id ||= name # default item_id
-      self.klass ||= name.camelize.constantize # default klass
+      self.klass ||= self.class_name.try(:constantize) || name.camelize.constantize # default klass
     end
   end
 end

data/lib/netzke/core/composition.rb

@@ -83,6 +83,8 @@ module Netzke::Core
       # Declares Base.component, for declaring child componets, and Base#components, which returns a [Hash] of all component configs by name
       declare_dsl_for :components, config_class: Netzke::Core::ComponentConfig
 
+      attr_accessor :components_in_config
+
       # Loads a component on browser's request. Every Netzke component gets this endpoint.
       # +params+ should contain:
       #   [cache] an array of component classes cached at the browser
@@ -116,29 +118,29 @@ module Netzke::Core
       @eagerly_loaded_components ||= components.select{|k,v| components_in_config.include?(k) || v[:eager_loading]}
     end
 
-    # @return [Array<Symbol>] components (by name) referred in config (and thus, required to be instantiated)
-    def components_in_config
-      @components_in_config || (normalize_config || true) && @components_in_config
-    end
-
     # Instantiates a child component by its name.
     # +params+ can contain:
     #   [client_config] a config hash passed from the client class
     #   [item_id] overridden item_id (used in case of multi-instance loading)
     def component_instance(name, options = {})
-      return nil if !respond_to?("#{name}_component")
-
-      cfg = ComponentConfig.new(name, self)
-      cfg.client_config = options[:client_config] || {}
-      cfg.item_id = options[:item_id]
-      cfg.js_id = options[:js_id]
-      send("#{name}_component", cfg)
-      cfg.set_defaults!
-      component_instance_from_config(cfg)
+      if respond_to?(:"#{name}_component")
+        cfg = ComponentConfig.new(name, self)
+        cfg.client_config = options[:client_config] || {}
+        cfg.item_id = options[:item_id]
+        cfg.js_id = options[:js_id]
+        send("#{name}_component", cfg)
+        cfg.set_defaults!
+      else
+        cfg = ComponentConfig.new(name, self)
+        cfg.merge!(components[name.to_sym])
+      end
+
+      component_instance_from_config(cfg) if cfg
     end
 
     def component_instance_from_config(c)
-      c.klass.new(c, self)
+      klass = c.klass || c.class_name.constantize
+      klass.new(c, self)
     end
 
     # @return [Array<Class>] All component classes that we depend on (used to render all necessary javascripts and stylesheets)
@@ -154,8 +156,8 @@ module Netzke::Core
     end
 
     def extend_item(item)
-      item = detect_and_normalize(:component, item)
-      @components_in_config << item[:netzke_component] if include_component?(item)
+      item = detect_and_normalize_component(item)
+      components_in_config << item[:netzke_component] if include_component?(item)
       super item
     end
 
@@ -167,5 +169,26 @@ module Netzke::Core
         cmp_config[:eager_loading] != false &&
         !cmp_config[:excluded]
     end
+
+    def detect_and_normalize_component(item)
+      item = {component: item} if item.is_a?(Symbol) && components[item]
+      if item.is_a?(Hash) && component_name = item[:component]
+        cfg = components[component_name]
+        cfg.merge!(item)
+        if cfg[:excluded]
+          {excluded: true}
+        else
+          # cfg.merge(item).merge(netzke_component: item.delete(:component))
+          item.merge(netzke_component: cfg[:component]) # TODO: TEST THIS
+        end
+      elsif item.is_a?(Hash) && (item[:klass] || item[:class_name])
+        # declare component on the fly
+        component_name = :"component_#{@implicit_component_index += 1}"
+        components[component_name] = item.merge(eager_loading: true) unless item[:excluded]
+        {netzke_component: component_name}
+      else
+        item
+      end
+    end
   end
 end

data/lib/netzke/core/configuration.rb

@@ -102,33 +102,19 @@ module Netzke::Core
       item.is_a?(Hash) && item[:excluded] ? nil : item
     end
 
-    # Used for detecting actions and components referred by symbols. For example, say, action +do_something+ is
-    # declared. Then:
-    #
-    #     item #=> :do_something
-    #     item = detect_and_normalize :action, item
-    #     item #=> {netzke_action: :do_something, text: 'Do it'} # uses action declaration
-    def detect_and_normalize(thing, item)
-      if item.is_a?(Symbol) && thing_config = send(thing.to_s.pluralize)[item]
-        item = {:"netzke_#{thing}" => item, excluded: thing_config[:excluded]}
-      elsif item.is_a?(Hash)
-        # replace `action` key with `netzke_action`, which will be looked for at the JS side
-        item[:"netzke_#{thing}"] = item.delete(thing) if item[thing]
-      end
-      item
-    end
-
     # We'll build a couple of useful instance variables here:
     #
     # +components_in_config+ - an array of components (by name) referred in items
     # +normalized_config+ - a config that has all the config extensions applied
     def normalize_config
+      # @actions = @components = {} # in v1.0 this should replace DSL definition
       @components_in_config = []
+      @implicit_component_index = 0
       c = config.dup
       config.each_pair do |k, v|
         c.delete(k) if self.class.server_side_config_options.include?(k.to_sym)
         if v.is_a?(Array)
-          c[k] = v.netzke_deep_map{|el| extend_item(el)}
+          c[k] = v.netzke_deep_replace{|el| extend_item(el)}
         end
       end
       @normalized_config = c

data/lib/netzke/core/dynamic_assets.rb

@@ -1,3 +1,5 @@
+require 'uglifier'
+
 module Netzke
   module Core
     module DynamicAssets
@@ -16,7 +18,7 @@ module Netzke
             res << f.read
           end
 
-          strip_js_comments(res)
+          minify_js(res)
         end
 
         def ext_css
@@ -31,8 +33,12 @@ module Netzke
           res
         end
 
-        def strip_js_comments(js_string)
-          js_string
+        def minify_js(js_string)
+          if ::Rails.env.test? || ::Rails.env.development?
+            js_string
+          else
+            Uglifier.compile(js_string)
+          end
         end
 
       private

data/lib/netzke/core/javascript.rb

@@ -106,7 +106,7 @@ module Netzke::Core
       code = dependency_classes.inject("") do |r,k|
         cached.include?(k.js_config.xtype) ? r : r + k.js_config.code_with_dependencies
       end
-      code.blank? ? nil : Netzke::Core::DynamicAssets.strip_js_comments(code)
+      code.blank? ? nil : Netzke::Core::DynamicAssets.minify_js(code)
     end
 
   private

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

@@ -1,9 +1,6 @@
-require 'netzke/core/railz/action_view_ext/ext'
 module Netzke
   module Railz
     module ActionViewExt
-      include Ext
-
       # A helper to load Netzke and Ext JS files. Usually used in the layout.
       #
       # Params:
@@ -23,11 +20,10 @@ module Netzke
       #   Whether to include minified JS and styleshetes. By default is +false+ for Rails development env,
       #   +true+ otherwise
       def load_netzke(params = {})
-        Netzke::Core.platform = params[:platform] || :ext
         params[:minified] = !Rails.env.development? if params[:minified].nil?
         params[:theme] ||= "crisp"
 
-        raw([netzke_css_include(params), netzke_css(params), netzke_js_include(params), netzke_js(params)].join("\n"))
+        raw([netzke_html, netzke_css_include(params), netzke_css(params), netzke_js_include(params), netzke_js(params)].join("\n"))
       end
 
       # Use this helper in your views to embed Netzke components. E.g.:
@@ -64,30 +60,62 @@ module Netzke
         raw(cmp.js_component_html)
       end
 
-      protected
-
-        # Link tags for all the required stylsheets
-        def netzke_css_include(params)
-          send :"netzke_#{Netzke::Core.platform}_css_include", params
-        end
-
-        # Inline CSS specific for the page
-        def netzke_css(params)
-          %{
-    <style type="text/css" media="screen">
-      #{content_for(:netzke_css)}
-    </style>} if content_for(:netzke_css).present?
-        end
-
-        # Script tags for all the required JavaScript
-        def netzke_js_include(params)
-          send :"netzke_#{Netzke::Core.platform}_js_include", params
-        end
-
-        # Inline JavaScript for all Netzke classes on the page, as well as Ext.onReady, which renders Netzke components in this view after the page is loaded
-        def netzke_js(params = {})
-          send :"netzke_#{Netzke::Core.platform}_js", params
-        end
+      private
+
+      def netzke_html
+        %{
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+        }
+      end
+
+      # 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"]
+
+        # Netzke-related dynamic css
+        res << netzke_ext_path
+
+        res += Netzke::Core.external_ext_css
+
+        stylesheet_link_tag(*res)
+      end
+
+      # Inline CSS specific for the page
+      def netzke_css(params)
+        %{
+  <style type="text/css" media="screen">
+    #{content_for(:netzke_css)}
+  </style>} if content_for(:netzke_css).present?
+      end
+
+      # Script tags for all the required JavaScript
+      def netzke_js_include(params)
+        res = []
+
+        # ExtJS
+        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
+
+        # Netzke-related dynamic JavaScript
+        res << netzke_ext_path
+
+        javascript_include_tag(*res)
+      end
+
+      # Inline JavaScript for all Netzke classes on the page, as well as Ext.onReady, which renders Netzke components in this view after the page is loaded
+      def netzke_js(params = {})
+        res = []
+        res << content_for(:netzke_js_classes)
+
+        res << "Ext.onReady(function(){"
+        res << content_for(:netzke_on_ready)
+        res << "});"
+
+        javascript_tag(res.join("\n"))
+      end
 
     end
 

data/lib/netzke/core/ruby_ext/array.rb

@@ -3,6 +3,18 @@ class Array
     self.map{ |el| el.respond_to?(:netzke_deep_map) ? block.call(el.netzke_deep_map(&block)) : block.call(el) }.compact
   end
 
+  def netzke_deep_replace(&block)
+    self.map do |el|
+      res = yield(el)
+      if res == el
+        el.respond_to?(:netzke_deep_replace) ? el.netzke_deep_replace(&block) : el
+        # el.respond_to?(:netzke_deep_replace) ? block.call(el.netzke_deep_replace(&block)) : block.call(el)
+      else
+        res
+      end
+    end.compact
+  end
+
   def netzke_jsonify
     self.map{ |el| el.is_a?(Array) || el.is_a?(Hash) ? el.netzke_jsonify : el }
   end

data/lib/netzke/core/ruby_ext/hash.rb

@@ -7,6 +7,25 @@ class Hash
     end
   end
 
+  def netzke_deep_replace(&block)
+    self.dup.tap do |h|
+      h.each_pair do |k,v|
+        if v.is_a?(Hash)
+          res = yield(v)
+          if res == v # no changes, need to go further down
+            h[k] = v.netzke_deep_replace(&block) if v.respond_to?('netzke_deep_replace')
+          else
+            h[k] = res
+          end
+        else
+          if v.is_a?(Array)
+            h[k] = v.netzke_deep_replace(&block)
+          end
+        end
+      end
+    end
+  end
+
   def netzke_jsonify
     self.inject({}) do |h,(k,v)|
       new_key = if k.is_a?(Netzke::Core::JsonLiteral)
@@ -19,7 +38,14 @@ class Hash
                   k
                 end
 
-      new_value = v.is_a?(Array) || v.is_a?(Hash) ? v.netzke_jsonify : v
+      new_value = case v
+                  when Array, Hash
+                    v.netzke_jsonify
+                  when Class, Proc
+                    v.to_s
+                  else
+                    v
+                  end
 
       h.merge(new_key => new_value)
     end

data/lib/netzke/core/services.rb

@@ -119,7 +119,7 @@ module Netzke::Core
 
         if components[child_component]
           client_config = configs.shift || {}
-          js_id = client_config.delete("id")
+          js_id = client_config.delete("component_id")
           cmp_strong_config = {client_config: client_config, js_id: js_id}
           component_instance(child_component, cmp_strong_config).invoke_endpoint(action, params, configs)
         else

data/lib/netzke/core/version.rb

@@ -1,5 +1,5 @@
 module Netzke
   module Core
-    VERSION = "0.12.2"
+    VERSION = "0.12.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netzke-core
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-06 00:00:00.000000000 Z
+date: 2015-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uglifier
@@ -72,7 +72,6 @@ files:
 - lib/netzke/core/json_literal.rb
 - lib/netzke/core/panel.rb
 - lib/netzke/core/plugins.rb
-- lib/netzke/core/railz/action_view_ext/ext.rb
 - lib/netzke/core/railz/action_view_ext.rb
 - lib/netzke/core/railz/controller_extensions.rb
 - lib/netzke/core/railz/engine.rb

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

@@ -1,49 +0,0 @@
-module Netzke
-  module Railz
-    module ActionViewExt
-      # Implementation of Ext-specific Netzke helpers
-      module Ext
-
-      private
-
-        def netzke_ext_css_include(params)
-          # ExtJS base
-          res = ["#{Netzke::Core.ext_uri}/packages/ext-theme-#{params[:theme]}/build/resources/ext-theme-#{params[:theme]}-all.css"]
-
-          # Netzke-related dynamic css
-          res << netzke_ext_path
-
-          res += Netzke::Core.external_ext_css
-
-          stylesheet_link_tag(*res)
-        end
-
-        def netzke_ext_js_include(params)
-          res = []
-
-          # ExtJS
-          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
-
-          # Netzke-related dynamic JavaScript
-          res << netzke_ext_path
-
-          javascript_include_tag(*res)
-        end
-
-        def netzke_ext_js(params)
-          res = []
-          res << content_for(:netzke_js_classes)
-
-          res << "Ext.onReady(function(){"
-          res << content_for(:netzke_on_ready)
-          res << "});"
-
-          javascript_tag(res.join("\n"))
-        end
-      end
-    end
-  end
-end