netzke-core 0.7.5 → 0.7.6

data/lib/netzke/core_ext.rb

@@ -2,4 +2,5 @@ require "netzke/core_ext/array"
 require "netzke/core_ext/hash"
 require "netzke/core_ext/string"
 require "netzke/core_ext/symbol"
-require "netzke/core_ext/time_with_zone"
+require "netzke/core_ext/time_with_zone"
+

data/lib/netzke/inheritance.rb

@@ -12,18 +12,18 @@ module Netzke
         end
       end
 
-      # Same as +read_inheritable_attribute+ returning a hash, but returns empty hash when it's equal to superclass's
-      def read_clean_inheritable_hash(attr_name)
-        res = read_inheritable_attribute(attr_name) || {}
-        # We don't want here any values from the superclass (which is the consequence of using inheritable attributes).
-        res == self.superclass.read_inheritable_attribute(attr_name) ? {} : res
+      # Same as +class_attribute+ returning a hash, but returns empty hash when it's equal to superclass's
+      def clean_class_attribute_hash(attr_name)
+        res = self.send(attr_name)
+        # We don't want here any values from the superclass (which is the consequence of using class attributes).
+        res == self.superclass.send(attr_name) ? {} : res
       end
 
-      # Same as +read_inheritable_attribute+ returning a hash, but returns empty hash when it's equal to superclass's
-      def read_clean_inheritable_array(attr_name)
-        res = read_inheritable_attribute(attr_name) || []
-        # We don't want here any values from the superclass (which is the consequence of using inheritable attributes).
-        res == self.superclass.read_inheritable_attribute(attr_name) ? [] : res
+      # Same as +class_attribute+ returning an array, but returns empty array when it's equal to superclass's
+      def clean_class_attribute_array(attr_name)
+        res = self.send(attr_name) || []
+        # We don't want here any values from the superclass (which is the consequence of using class attributes).
+        res == self.superclass.send(attr_name) ? [] : res
       end
 
     end

data/lib/netzke/javascript.rb

@@ -20,6 +20,23 @@ module Netzke
 
       class_attribute :js_included_files
       self.js_included_files = []
+
+      # Returns all JS method definitions in a hash
+      class_attribute :js_methods_attr
+      self.js_methods_attr = {}
+
+      class_attribute :js_properties_attr
+      self.js_properties_attr = {}
+
+      # Returns all objects to be mixed in (as array of strings)
+      class_attribute :js_mixins_attr
+      self.js_mixins_attr = []
+
+      class_attribute :js_translated_properties_attr
+      self.js_translated_properties_attr = {}
+
+      class_attribute :js_base_class_attr
+      self.js_base_class_attr = 'Ext.panel.Panel'
     end
 
     module ClassMethods
@@ -32,7 +49,7 @@ module Netzke
       #
       # If called without parameters, returns the JS base class declared for the component.
       def js_base_class(class_name = nil)
-        class_name.nil? ? (read_inheritable_attribute(:js_base_class) || "Ext.panel.Panel") : write_inheritable_attribute(:js_base_class, class_name)
+        class_name.nil? ? self.js_base_class_attr : self.js_base_class_attr = class_name
       end
 
       # Use it to define a public method of the component's JavaScript class, e.g.:
@@ -46,14 +63,13 @@ module Netzke
       # This will effectively result in definition of a public method called +doSomething+ in the JavaScript class (note the conversion from underscore_name to camelCaseName).
       def js_method(name, definition = nil)
         definition = yield.l if block_given?
-        current_js_methods = read_clean_inheritable_hash(:js_methods)
-        current_js_methods.merge!(name => definition.l)
-        write_inheritable_attribute(:js_methods, current_js_methods)
+        current_js_methods = clean_class_attribute_hash(:js_methods_attr).dup
+        self.js_methods_attr = current_js_methods.merge(name => definition.l)
       end
 
       # Returns all JS method definitions in a hash
       def js_methods
-        read_clean_inheritable_hash(:js_methods)
+        clean_class_attribute_hash(:js_methods_attr)
       end
 
       # Use it to specify JS files to be loaded before this component's JS code. Useful when using external extensions required by this component.
@@ -72,7 +88,7 @@ module Netzke
       def js_include(*args)
         callr = caller.first
 
-        self.js_included_files += args.map{ |a| a.is_a?(Symbol) ? expand_js_include_path(a, callr) : a }
+        self.js_included_files |= args.map{ |a| a.is_a?(Symbol) ? expand_js_include_path(a, callr) : a }
       end
 
       # Used to define default properties of the JavaScript class, e.g.:
@@ -87,11 +103,10 @@ module Netzke
       # Note, that not all the configuration options can be defined on the prototype of the class. For example, defining +items+ on the prototype won't take any effect, so, +items+ should be passed as a configuration option at the moment of instantiation (see Netzke::Base#configuration and Netzke::Base#default_config).
       def js_properties(hsh = nil)
         if hsh.nil?
-          read_clean_inheritable_hash(:js_properties)
+          clean_class_attribute_hash(:js_properties_attr)
         else
-          current_js_properties = read_clean_inheritable_hash(:js_properties)
-          current_js_properties.merge!(hsh)
-          write_inheritable_attribute(:js_properties, current_js_properties)
+          current_js_properties = clean_class_attribute_hash(:js_properties_attr).dup
+          self.js_properties_attr = current_js_properties.merge(hsh)
         end
       end
 
@@ -100,11 +115,11 @@ module Netzke
       def js_property(name, value = nil)
         name = name.to_sym
         if value.nil?
-          (read_inheritable_attribute(:js_properties) || {})[name]
+          clean_class_attribute_hash(:js_properties_attr)[name]
         else
-          current_js_properties = read_clean_inheritable_hash(:js_properties)
+          current_js_properties = clean_class_attribute_hash(:js_properties_attr).dup
           current_js_properties[name] = value
-          write_inheritable_attribute(:js_properties, current_js_properties)
+          self.js_properties_attr = current_js_properties
         end
       end
 
@@ -122,9 +137,9 @@ module Netzke
       # TODO: make the name of the root property configurable
       def js_translate(*properties)
         if properties.empty?
-          read_clean_inheritable_hash(:js_translated_properties)
+          clean_class_attribute_hash(:js_translated_properties_attr)
         else
-          current_translated_properties = read_clean_inheritable_hash(:js_translated_properties)
+          current_translated_properties = clean_class_attribute_hash(:js_translated_properties_attr).dup
           properties.each do |p|
             if p.is_a?(Hash)
               # TODO: make it possible to nest translated objects
@@ -133,7 +148,7 @@ module Netzke
             end
           end
 
-          write_inheritable_attribute(:js_translated_properties, current_translated_properties)
+          self.js_translated_properties_attr = current_translated_properties
         end
       end
 
@@ -160,15 +175,15 @@ module Netzke
       # With no parameters, will assume :component_class_name_underscored.
       def js_mixin(*args)
         args << name.split("::").last.underscore.to_sym if args.empty? # if no args provided, component_class_underscored_name is assumed
-        current_mixins = read_clean_inheritable_array(:js_mixins) || []
+        current_mixins = clean_class_attribute_array(:js_mixins_attr)
         callr = caller.first
         args.each{ |a| current_mixins << (a.is_a?(Symbol) ? File.read(expand_js_include_path(a, callr)) : File.read(a))}
-        write_inheritable_attribute(:js_mixins, current_mixins)
+        self.js_mixins_attr = current_mixins
       end
 
       # Returns all objects to be mixed in (as array of strings)
       def js_mixins
-        read_clean_inheritable_array(:js_mixins) || []
+        clean_class_attribute_array(:js_mixins_attr)
       end
 
       # Builds this component's xtype
@@ -286,84 +301,82 @@ Netzke.cache.push('#{js_xtype}');
 
     end
 
-    module InstanceMethods
-      # The result of this method (a hash) is converted to a JSON object and passed as options
-      # to the constructor of our JavaScript class. Override it when you want to pass any extra configuration
-      # to the JavaScript side.
-      def js_config
-        {}.tap do |res|
-          # Unique id of the component
-          res[:id] = global_id
-
-          # Non-lazy-loaded components
-          comp_hash = {}
-          eager_loaded_components.each_pair do |comp_name, comp_config|
-            comp_instance = component_instance(comp_name.to_sym)
-            comp_instance.before_load
-            comp_hash[comp_name] = comp_instance.js_config
-          end
+    # The result of this method (a hash) is converted to a JSON object and passed as options
+    # to the constructor of our JavaScript class. Override it when you want to pass any extra configuration
+    # to the JavaScript side.
+    def js_config
+      {}.tap do |res|
+        # Unique id of the component
+        res[:id] = global_id
+
+        # Non-lazy-loaded components
+        comp_hash = {}
+        eager_loaded_components.each_pair do |comp_name, comp_config|
+          comp_instance = component_instance(comp_name.to_sym)
+          comp_instance.before_load
+          comp_hash[comp_name] = comp_instance.js_config
+        end
 
-          # Configuration for all of our non-lazy-loaded children specified here. We can refer to them in +items+ so they get instantiated by Ext.
-          res[:netzke_components] = comp_hash unless comp_hash.empty?
+        # Configuration for all of our non-lazy-loaded children specified here. We can refer to them in +items+ so they get instantiated by Ext.
+        res[:netzke_components] = comp_hash unless comp_hash.empty?
 
-          # Endpoints (besides the default "deliver_component" - JavaScript side already knows about it)
-          endpoints = self.class.endpoints.keys - [:deliver_component]
-          res[:endpoints] = endpoints unless endpoints.empty?
+        # Endpoints (besides the default "deliver_component" - JavaScript side already knows about it)
+        endpoints = self.class.endpoints.keys - [:deliver_component]
+        res[:endpoints] = endpoints unless endpoints.empty?
 
-          # Inform the JavaScript side if persistent_config is enabled
-          # res[:persistent_config] = persistence_enabled?
+        # Inform the JavaScript side if persistent_config is enabled
+        # res[:persistent_config] = persistence_enabled?
 
-          # Include our xtype
-          res[:xtype] = self.class.js_xtype
+        # Include our xtype
+        res[:xtype] = self.class.js_xtype
 
-          # Include our alias: Ext.createByAlias may be used to instantiate the component.
-          res[:alias] = self.class.js_alias
+        # Include our alias: Ext.createByAlias may be used to instantiate the component.
+        res[:alias] = self.class.js_alias
 
-          # Merge with the rest of config options, besides those that are only meant for the server side
-          res.merge!(config.reject{ |k,v| self.class.server_side_config_options.include?(k.to_sym) })
+        # Merge with the rest of config options, besides those that are only meant for the server side
+        res.merge!(config.reject{ |k,v| self.class.server_side_config_options.include?(k.to_sym) })
 
-          if config[:ext_config].present?
-            ::ActiveSupport::Deprecation.warn("Using ext_config option is deprecated. All config options must be specified at the same level in the hash.", caller)
-            res.merge!(config[:ext_config])
-          end
+        if config[:ext_config].present?
+          ::ActiveSupport::Deprecation.warn("Using ext_config option is deprecated. All config options must be specified at the same level in the hash.", caller)
+          res.merge!(config[:ext_config])
+        end
 
-          # Items (nested Ext/Netzke components)
-          res[:items] = items unless items.blank?
+        # Items (nested Ext/Netzke components)
+        res[:items] = items unless items.blank?
 
-          # So we can use getComponent(<component_name>) to retrieve a child component
-          res[:item_id] ||= name
+        # So we can use getComponent(<component_name>) to retrieve a child component
+        res[:item_id] ||= name
 
-          res[:i18n] = js_translate_properties if js_translate_properties.present?
+        res[:i18n] = js_translate_properties if js_translate_properties.present?
 
-          res[:netzke_plugins] = plugins.map{ |p| p.to_s.camelcase(:lower) } if plugins.present?
-        end
+        res[:netzke_plugins] = plugins.map{ |p| p.to_s.camelcase(:lower) } if plugins.present?
       end
+    end
 
-      # All the JS-code required by this instance of the component to be instantiated in the browser.
-      # It includes JS-classes for the parents, non-lazy-loaded child components, and itself.
-      def js_missing_code(cached = [])
-        code = dependency_classes.inject("") do |r,k|
-          cached.include?(k.js_xtype) ? r : r + k.js_code#.strip_js_comments
-        end
-        code.blank? ? nil : code
+    # All the JS-code required by this instance of the component to be instantiated in the browser.
+    # It includes JS-classes for the parents, non-lazy-loaded child components, and itself.
+    def js_missing_code(cached = [])
+      code = dependency_classes.inject("") do |r,k|
+        cached.include?(k.js_xtype) ? r : r + k.js_code#.strip_js_comments
       end
+      code.blank? ? nil : code
+    end
 
-      # DEPRECATED. Helper to access config[:ext_config].
-      def ext_config
-        ::ActiveSupport::Deprecation.warn("Using ext_config is deprecated. All config options must be specified at the same level in the hash.", caller)
-        config[:ext_config] || {}
-      end
+    # DEPRECATED. Helper to access config[:ext_config].
+    def ext_config
+      ::ActiveSupport::Deprecation.warn("Using ext_config is deprecated. All config options must be specified at the same level in the hash.", caller)
+      config[:ext_config] || {}
+    end
 
-      private
+    private
 
-        # Merges all the translations in the class hierarchy
-        def js_translate_properties
-          @js_translate_properties ||= self.class.class_ancestors.inject({}) do |r,klass|
-            hsh = klass.js_translate.keys.inject({}) { |h,t| h.merge(t => I18n.t("#{klass.i18n_id}.#{t}")) }
-            r.merge(hsh)
-          end
+      # Merges all the translations in the class hierarchy
+      def js_translate_properties
+        @js_translate_properties ||= self.class.class_ancestors.inject({}) do |r,klass|
+          hsh = klass.js_translate.keys.inject({}) { |h,t| h.merge(t => I18n.t("#{klass.i18n_id}.#{t}")) }
+          r.merge(hsh)
         end
+      end
 
-    end
   end
 end

data/lib/netzke/plugins.rb

@@ -2,6 +2,12 @@ module Netzke
   module Plugins
     extend ActiveSupport::Concern
 
+    included do
+      # Returns registered plugins
+      class_attribute :registered_plugins
+      self.registered_plugins = []
+    end
+
     module ClassMethods
       # Defines a plugin
       def plugin(name, config = {}, &block)
@@ -11,15 +17,9 @@ module Netzke
 
       # Register a plugin
       def register_plugin(name)
-        current_plugins = read_inheritable_attribute(:plugins) || []
-        current_plugins << name
-        write_inheritable_attribute(:plugins, current_plugins.uniq)
+        self.registered_plugins |= [name]
       end
 
-      # Returns registered plugins
-      def registered_plugins
-        read_inheritable_attribute(:plugins) || []
-      end
     end
 
     def plugins

data/lib/netzke/services.rb

@@ -3,6 +3,12 @@ module Netzke
   module Services
     extend ActiveSupport::Concern
 
+    included do
+       # Returns all endpoints as a hash
+      class_attribute :endpoints
+      self.endpoints = {}
+    end
+
     module ClassMethods
       # Defines an endpoint - a connection point between the client side of a component and its server side. For example:
       #
@@ -44,11 +50,6 @@ module Netzke
         end
       end
 
-      # Returns all endpoints as a hash
-      def endpoints
-        read_inheritable_attribute(:endpoints) || {}
-      end
-
       def api(*api_points) #:nodoc:
         ::ActiveSupport::Deprecation.warn("Using the 'api' call has no longer effect. Define endpoints instead.", caller)
       end
@@ -57,9 +58,7 @@ module Netzke
 
       # Registers an endpoint
       def register_endpoint(ep, options)
-        current_endpoints = read_inheritable_attribute(:endpoints) || {}
-        current_endpoints.merge!(ep => options)
-        write_inheritable_attribute(:endpoints, current_endpoints)
+        self.endpoints = self.endpoints.dup.merge(ep => options)
       end
 
     end

data/lib/netzke/stylesheets.rb

@@ -54,14 +54,12 @@ module Netzke
 
     end
 
-    module InstanceMethods
-      def css_missing_code(cached = [])
-        code = dependency_classes.inject("") do |r,k|
-          cached.include?(k.js_xtype) ? r : r + k.css_code(cached)
-        end
-        code.blank? ? nil : code
+    def css_missing_code(cached = [])
+      code = dependency_classes.inject("") do |r,k|
+        cached.include?(k.js_xtype) ? r : r + k.css_code(cached)
       end
-
+      code.blank? ? nil : code
     end
+
   end
-end
+end

data/netzke-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "netzke-core"
-  s.version = "0.7.5"
+  s.version = "0.7.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["NomadCoder"]
-  s.date = "2012-03-05"
+  s.date = "2012-07-27"
   s.description = "Allows building DRY ExtJS/Rails applications by enabling modular development"
   s.email = "nmcoder@gmail.com"
   s.extra_rdoc_files = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".autotest",
+    ".travis.yml",
     "CHANGELOG.rdoc",
     "LICENSE",
     "Manifest",
@@ -25,6 +26,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "TODO.md",
     "app/controllers/netzke_controller.rb",
+    "config/ci/before-travis.sh",
     "init.rb",
     "install.rb",
     "javascripts/base.js",
@@ -71,6 +73,7 @@ Gem::Specification.new do |s|
     "netzke-core.gemspec",
     "stylesheets/core.css",
     "test/core_test_app/.gitignore",
+    "test/core_test_app/.powrc",
     "test/core_test_app/.rvmrc",
     "test/core_test_app/Gemfile",
     "test/core_test_app/Gemfile.lock",
@@ -150,6 +153,7 @@ Gem::Specification.new do |s|
     "test/core_test_app/config/application.rb",
     "test/core_test_app/config/boot.rb",
     "test/core_test_app/config/database.yml",
+    "test/core_test_app/config/database.yml.travis",
     "test/core_test_app/config/environment.rb",
     "test/core_test_app/config/environments/development.rb",
     "test/core_test_app/config/environments/production.rb",
@@ -192,6 +196,8 @@ Gem::Specification.new do |s|
     "test/core_test_app/features/support/env.rb",
     "test/core_test_app/features/support/paths.rb",
     "test/core_test_app/features/touch.feature",
+    "test/core_test_app/gemfiles/rails3_1.gemfile",
+    "test/core_test_app/gemfiles/rails3_2.gemfile",
     "test/core_test_app/lib/tasks/.gitkeep",
     "test/core_test_app/public/404.html",
     "test/core_test_app/public/422.html",
@@ -212,12 +218,9 @@ Gem::Specification.new do |s|
     "test/core_test_app/spec/spec_helper.rb",
     "test/core_test_app/tmp/restart.txt",
     "test/core_test_app/vendor/plugins/.gitkeep",
-    "test/fixtures/roles.yml",
-    "test/fixtures/users.yml",
     "test/test_helper.rb",
     "test/unit/core_ext_test.rb",
     "test/unit/netzke_core_test.rb",
-    "test/unit/netzke_preference_test.rb",
     "uninstall.rb"
   ]
   s.homepage = "http://netzke.org"

data/test/core_test_app/.powrc

@@ -0,0 +1,4 @@
+if [ -f "$rvm_path/scripts/rvm" ] && [ -f ".rvmrc" ]; then
+  source "$rvm_path/scripts/rvm"
+  source ".rvmrc"
+fi

data/test/core_test_app/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2
+rvm 1.9.3

data/test/core_test_app/Gemfile

@@ -1,6 +1,7 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.0'
+gem 'rails', '3.2.3'
+gem 'netzke-persistence'
 
 gem 'sqlite3'
 
@@ -22,10 +23,10 @@ gem 'sqlite3'
 # Bundle gems for the local environment. Make sure to
 # put test-only gems in this group so their generators
 # and rake tasks are available in development mode:
-group :development, :test do
+group :test do
   gem 'capybara'
   gem 'database_cleaner'
-  gem 'cucumber-rails'
+  gem 'cucumber-rails', :require => false
   gem 'cucumber'
   gem 'rspec-rails'
   gem 'spork'