netzke-core 0.6.4 → 0.6.5

data/spec/component/base_spec.rb

@@ -22,4 +22,15 @@ describe Netzke::Base do
     Parent.with_feature.should == "maybe"
     Child.with_feature.should == "no"
   end
+
+  it "should return correct i18n_id" do
+    module Netzke
+      module MyComponents
+        class CoolComponent < Netzke::Base
+        end
+      end
+    end
+
+    Netzke::MyComponents::CoolComponent.new.i18n_id.should == "netzke.my_components.cool_component"
+  end
 end

data/spec/component/javascript_spec.rb

@@ -8,8 +8,9 @@ module Netzke
     class InheritedComponent < SomeComponent
     end
 
-    describe "extends_netzke_component?" do
-      InheritedComponent.extends_netzke_component?.should == true
+    it "should be indicated by extends_netzke_component? if we're extending a Netzke component" do
+      SomeComponent.send(:"extends_netzke_component?").should == false
+      InheritedComponent.send(:"extends_netzke_component?").should == true
     end
   end
 end

data/spec/component/state_spec.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'netzke-core'
+
+module Netzke
+  describe State do
+    it "should be possible to save component's state" do
+      component = Base.new(:name => 'some_component', :persistence => true)
+      component.state.should == {}
+
+      component.update_state(:value_to_remember, 42)
+      component.state.should == {:value_to_remember => 42}
+
+      component.update_state(:more_to_remember => "a string", :and_yet_more => "another string")
+      component.state.should == {:value_to_remember => 42, :more_to_remember => "a string", :and_yet_more => "another string"}
+
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -26,7 +26,7 @@ RSpec.configure do |config|
   config.mock_with :rspec
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  # config.fixture_path = "#{::Rails.root}/spec/fixtures"
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false

data/test/rails_app/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.1'
+gem 'rails', '3.0.3'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -30,7 +30,8 @@ group :development, :test do
   gem 'database_cleaner'
   gem 'cucumber-rails'
   gem 'cucumber'
-  gem 'rspec-rails', "~>2.0.0"
+  gem 'rspec-rails'
   gem 'spork'
   gem 'launchy'    # So you can do Then show me the page
+  gem 'netzke-persistence'
 end

data/test/rails_app/Gemfile.lock

@@ -2,34 +2,33 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.1)
-      actionpack (= 3.0.1)
-      mail (~> 2.2.5)
-    actionpack (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-    activesupport (3.0.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.6)
     builder (2.1.2)
     capybara (0.4.0)
       celerity (>= 0.7.9)
@@ -40,86 +39,88 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
       xpath (~> 0.1.2)
-    celerity (0.8.2)
-    childprocess (0.1.3)
+    celerity (0.8.7)
+    childprocess (0.1.6)
       ffi (~> 0.6.3)
-    configuration (1.1.0)
-    cucumber (0.9.3)
-      builder (~> 2.1.2)
+    configuration (1.2.0)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
       diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.9)
+      gherkin (~> 2.3.2)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
-    culerity (0.2.12)
-    database_cleaner (0.5.2)
+    culerity (0.2.14)
+    database_cleaner (0.6.0)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     ffi (0.6.3)
       rake (>= 0.8.7)
-    gherkin (2.2.9)
+    gherkin (2.3.3)
       json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    i18n (0.4.1)
+    i18n (0.5.0)
     json (1.4.6)
     json_pure (1.4.6)
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
-    mail (2.2.7)
+    mail (2.2.14)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
-    nokogiri (1.4.3.1)
+    netzke-persistence (0.1.1)
+    nokogiri (1.4.4)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.1)
-      actionmailer (= 3.0.1)
-      actionpack (= 3.0.1)
-      activerecord (= 3.0.1)
-      activeresource (= 3.0.1)
-      activesupport (= 3.0.1)
-      bundler (~> 1.0.0)
-      railties (= 3.0.1)
-    railties (3.0.1)
-      actionpack (= 3.0.1)
-      activesupport (= 3.0.1)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-    rspec-rails (2.0.1)
-      rspec (~> 2.0.0)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    rspec-rails (2.4.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.4.0)
     rubyzip (0.9.4)
-    selenium-webdriver (0.0.29)
-      childprocess (>= 0.0.7)
+    selenium-webdriver (0.1.2)
+      childprocess (~> 0.1.5)
       ffi (~> 0.6.3)
       json_pure
       rubyzip
     spork (0.8.4)
-    sqlite3-ruby (1.3.1)
+    sqlite3-ruby (1.3.2)
     term-ansicolor (1.0.5)
-    thor (0.14.3)
-    treetop (1.4.8)
+    thor (0.14.6)
+    treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
-    xpath (0.1.2)
+    xpath (0.1.3)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -131,7 +132,8 @@ DEPENDENCIES
   cucumber-rails
   database_cleaner
   launchy
-  rails (= 3.0.1)
-  rspec-rails (~> 2.0.0)
+  netzke-persistence
+  rails (= 3.0.3)
+  rspec-rails
   spork
   sqlite3-ruby

data/test/rails_app/app/components/component_loader.rb

@@ -16,6 +16,8 @@ class ComponentLoader < Netzke::Base
     :lazy_loading => true
   }
 
+  component :some_composite, :lazy_loading => true
+
   js_method :on_load_with_feedback, <<-JS
     function(){
       this.loadComponent({name: 'simple_component', callback: function(){
@@ -28,10 +30,14 @@ class ComponentLoader < Netzke::Base
 
   action :load_window_with_simple_component
 
+  action :load_composite
+
+  action :load_with_params
+
   js_properties(
     :title => "Component Loader",
     :layout => "fit",
-    :bbar => [{:text => "Load component", :ref => "../button"}, {:text => "Load in window", :ref => "../loadInWindowButton"}, :load_with_feedback.action, :load_window_with_simple_component.action]
+    :bbar => [{:text => "Load component", :ref => "../button"}, {:text => "Load in window", :ref => "../loadInWindowButton"}, :load_with_feedback.action, :load_window_with_simple_component.action, :load_composite.action, :load_with_params.action]
   )
 
   js_method :on_load_window_with_simple_component, <<-JS
@@ -40,6 +46,18 @@ class ComponentLoader < Netzke::Base
     }
   JS
 
+  js_method :on_load_composite, <<-JS
+    function(params){
+      this.loadComponent({name: "some_composite"});
+    }
+  JS
+
+  js_method :on_load_with_params, <<-JS
+    function(params){
+      this.loadComponent({name: "simple_component", params: {html: "Simple Component with changed HTML"}});
+    }
+  JS
+
   js_method :init_component, <<-JS
     function(){
       #{js_full_class_name}.superclass.initComponent.call(this);
@@ -49,11 +67,28 @@ class ComponentLoader < Netzke::Base
       }, this);
 
       this.loadInWindowButton.on('click', function(){
-        var w = new Ext.Window({width: 500, height: 400, modal: true, layout:'fit'});
+        var w = new Ext.Window({
+          width: 500, height: 400, modal: true, layout:'fit',
+          items: [{xtype: 'panel'}]
+        });
         w.show(null, function(){
-          this.loadComponent({name: 'component_loaded_in_window', container: w.getId()});
+          this.loadComponent({name: 'component_loaded_in_window', container: w.items.first().getId()});
         }, this);
       }, this);
     }
   JS
-end
+
+  def deliver_component_endpoint(params)
+    if params[:name] == "simple_component" && params[:html]
+      components[:simple_component].merge!(:html => params[:html])
+    end
+    super
+  end
+
+  # For visual testing purposes
+  # def deliver_component_endpoint(params)
+  #   sleep 2
+  #   super
+  # end
+
+end

data/test/rails_app/app/components/component_with_custom_css.rb

@@ -2,7 +2,7 @@
 class ComponentWithCustomCss < Netzke::Base
   js_property :title, "ComponentWithCustomCss"
 
-  js_property :html, "A component with the header hidden by means of custom CSS"
+  js_property :html, "A component with the body hidden by means of custom CSS"
 
-  css_include "#{File.dirname(__FILE__)}/custom.css"
+  css_include :custom
 end

data/test/rails_app/app/components/component_with_js_mixin/javascripts/extra_one.js

@@ -0,0 +1,2 @@
+// Some included JS code
+actionOneMessage = "Action " + "One triggered!";

data/test/rails_app/app/components/component_with_js_mixin/javascripts/extra_two.js

@@ -0,0 +1,2 @@
+// Some included JS code
+actionTwoMessage = "Action " + "Two triggered!";

data/test/rails_app/app/components/component_with_js_mixin/javascripts/method_set_one.js

@@ -0,0 +1,6 @@
+// Some comments should be ok here
+{
+  onActionTwo: function() {
+    this.setTitle(actionTwoMessage);
+  }
+}

data/test/rails_app/app/components/component_with_js_mixin/javascripts/method_set_two.js

@@ -0,0 +1,5 @@
+{
+  onActionOne: function() {
+    this.setTitle(actionOneMessage);
+  }
+}

data/test/rails_app/app/components/component_with_js_mixin.rb

@@ -0,0 +1,8 @@
+class ComponentWithJsMixin < Netzke::Base
+  js_property :title, "ComponentWithJsMixin"
+  js_include :extra_one, :extra_two
+  js_mixin :method_set_one, :method_set_two
+  action :action_one
+  action :action_two
+  js_property :bbar, [:action_one.action, :action_two.action]
+end

data/test/rails_app/app/components/component_with_session_persistence.rb

@@ -1,8 +1,14 @@
 class ComponentWithSessionPersistence < Netzke::Base
-  js_property :title, "No Title (yet!)"
+  js_property :title, "Default Title"
   js_property :bbar, [{:text => "Tell server to store new title", :ref => "../button"}]
 
-  config :default, :session_persistence => true
+  def default_config
+    super.merge(:session_persistence => true)
+  end
+
+  def configuration
+    super.merge(:html => component_session[:html_content] || "Default HTML")
+  end
 
   js_method :bug_server, <<-JS
     function(){
@@ -18,7 +24,8 @@ class ComponentWithSessionPersistence < Netzke::Base
   JS
 
   endpoint :whats_up do |params|
-    update_session_options(:title => "New Title!")
+    update_session_options(:title => "Title From Session") # setting a value in session_options, which will get auto-merged into +config+
+    component_session[:html_content] = "HTML from session" # setting some custom session key/value, which we use manually in +configuration+
     {}
   end
 

data/test/rails_app/app/components/extended_component_with_js_mixin/javascripts/some_method_set.js

@@ -0,0 +1,5 @@
+{
+  onActionThree: function() {
+    this.setTitle("Action " + "Three triggered!");
+  }
+}

data/test/rails_app/app/components/extended_component_with_js_mixin.rb

@@ -0,0 +1,7 @@
+class ExtendedComponentWithJsMixin < ComponentWithJsMixin
+  js_mixin :some_method_set
+  action :action_three
+
+  js_property :title, "ExtendedComponentWithJsMixin"
+  js_property :bbar, superclass.js_properties[:bbar] + [:action_three.action]
+end