six-updater-web 0.24.8 → 0.24.9

data/lib/six-updater-web/vendor/plugins/render_component/lib/components.rb

@@ -1,142 +1,142 @@
-module Components
-  def self.included(base) #:nodoc:
-    base.class_eval do
-      include InstanceMethods
-      extend ClassMethods
-      helper HelperMethods
-
-      # If this controller was instantiated to process a component request,
-      # +parent_controller+ points to the instantiator of this controller.
-      attr_accessor :parent_controller
-
-      alias_method_chain :process_cleanup, :render_component
-      alias_method_chain :session=, :render_component
-      alias_method_chain :flash, :render_component
-      alias_method_chain :assign_shortcuts, :render_component
-      alias_method_chain :send_response, :render_component
-
-      alias_method :component_request?, :parent_controller
-    end
-  end
-
-  module ClassMethods
-    # Track parent controller to identify component requests
-    def process_with_components(request, response, parent_controller = nil) #:nodoc:
-      controller = new
-      controller.parent_controller = parent_controller
-      controller.process(request, response)
-    end
-  end
-
-  module HelperMethods
-    def render_component(options)
-      @controller.__send__(:render_component_as_string, options)
-    end
-  end
-
-  module InstanceMethods
-    # Extracts the action_name from the request parameters and performs that action.
-    def process_with_components(request, response, method = :perform_action, *arguments) #:nodoc:
-      flash.discard if component_request?
-      process_without_components(request, response, method, *arguments)
-    end
-    
-    def send_response_with_render_component
-      response.prepare! unless component_request?
-      response
-    end
-
-    protected
-      # Renders the component specified as the response for the current method
-      def render_component(options) #:doc:
-        component_logging(options) do
-          render_for_text(component_response(options, true).body, response.headers["Status"])
-        end
-      end
-
-      # Returns the component response as a string
-      def render_component_as_string(options) #:doc:
-        component_logging(options) do
-          response = component_response(options, false)
-
-          if redirected = response.redirected_to
-            render_component_as_string(redirected)
-          else
-            response.body
-          end
-        end
-      end
-
-      def flash_with_render_component(refresh = false) #:nodoc:
-        if !defined?(@_flash) || refresh
-          @_flash =
-            if defined?(@parent_controller)
-              @parent_controller.flash
-            else
-              flash_without_render_component
-            end
-        end
-        @_flash
-      end
-
-    private
-      def component_response(options, reuse_response)
-        klass    = component_class(options)
-        request  = request_for_component(klass.controller_path, options)
-        new_response = reuse_response ? response : response.dup
-
-        klass.process_with_components(request, new_response, self)
-      end
-
-      # determine the controller class for the component request
-      def component_class(options)
-        if controller = options[:controller]
-          controller.is_a?(Class) ? controller : "#{controller.camelize}Controller".constantize
-        else
-          self.class
-        end
-      end
-
-      # Create a new request object based on the current request.
-      # The new request inherits the session from the current request,
-      # bypassing any session options set for the component controller's class
-      def request_for_component(controller_path, options)
-        new_request         = request.dup
-        new_request.session = request.session
-
-        new_request.instance_variable_set(
-          :@parameters,
-          (options[:params] || {}).with_indifferent_access.update(
-            "controller" => controller_path, "action" => options[:action], "id" => options[:id]
-          )
-        )
-
-        new_request
-      end
-
-      def component_logging(options)
-        if logger
-          logger.info "Start rendering component (#{options.inspect}): "
-          result = yield
-          logger.info "\n\nEnd of component rendering"
-          result
-        else
-          yield
-        end
-      end
-
-      def session_with_render_component=(options = {})
-        session_without_render_component=(options) unless component_request?
-      end
-
-      def process_cleanup_with_render_component
-        process_cleanup_without_render_component unless component_request?
-      end
-      
-      def assign_shortcuts_with_render_component(request, response)
-        assign_shortcuts_without_render_component(request, response)
-        flash(:refresh)
-        flash.sweep if @_session && !component_request?
-      end
-  end
+module Components
+  def self.included(base) #:nodoc:
+    base.class_eval do
+      include InstanceMethods
+      extend ClassMethods
+      helper HelperMethods
+
+      # If this controller was instantiated to process a component request,
+      # +parent_controller+ points to the instantiator of this controller.
+      attr_accessor :parent_controller
+
+      alias_method_chain :process_cleanup, :render_component
+      alias_method_chain :session=, :render_component
+      alias_method_chain :flash, :render_component
+      alias_method_chain :assign_shortcuts, :render_component
+      alias_method_chain :send_response, :render_component
+
+      alias_method :component_request?, :parent_controller
+    end
+  end
+
+  module ClassMethods
+    # Track parent controller to identify component requests
+    def process_with_components(request, response, parent_controller = nil) #:nodoc:
+      controller = new
+      controller.parent_controller = parent_controller
+      controller.process(request, response)
+    end
+  end
+
+  module HelperMethods
+    def render_component(options)
+      @controller.__send__(:render_component_as_string, options)
+    end
+  end
+
+  module InstanceMethods
+    # Extracts the action_name from the request parameters and performs that action.
+    def process_with_components(request, response, method = :perform_action, *arguments) #:nodoc:
+      flash.discard if component_request?
+      process_without_components(request, response, method, *arguments)
+    end
+    
+    def send_response_with_render_component
+      response.prepare! unless component_request?
+      response
+    end
+
+    protected
+      # Renders the component specified as the response for the current method
+      def render_component(options) #:doc:
+        component_logging(options) do
+          render_for_text(component_response(options, true).body, response.headers["Status"])
+        end
+      end
+
+      # Returns the component response as a string
+      def render_component_as_string(options) #:doc:
+        component_logging(options) do
+          response = component_response(options, false)
+
+          if redirected = response.redirected_to
+            render_component_as_string(redirected)
+          else
+            response.body
+          end
+        end
+      end
+
+      def flash_with_render_component(refresh = false) #:nodoc:
+        if !defined?(@_flash) || refresh
+          @_flash =
+            if defined?(@parent_controller)
+              @parent_controller.flash
+            else
+              flash_without_render_component
+            end
+        end
+        @_flash
+      end
+
+    private
+      def component_response(options, reuse_response)
+        klass    = component_class(options)
+        request  = request_for_component(klass.controller_path, options)
+        new_response = reuse_response ? response : response.dup
+
+        klass.process_with_components(request, new_response, self)
+      end
+
+      # determine the controller class for the component request
+      def component_class(options)
+        if controller = options[:controller]
+          controller.is_a?(Class) ? controller : "#{controller.camelize}Controller".constantize
+        else
+          self.class
+        end
+      end
+
+      # Create a new request object based on the current request.
+      # The new request inherits the session from the current request,
+      # bypassing any session options set for the component controller's class
+      def request_for_component(controller_path, options)
+        new_request         = request.dup
+        new_request.session = request.session
+
+        new_request.instance_variable_set(
+          :@parameters,
+          (options[:params] || {}).with_indifferent_access.update(
+            "controller" => controller_path, "action" => options[:action], "id" => options[:id]
+          )
+        )
+
+        new_request
+      end
+
+      def component_logging(options)
+        if logger
+          logger.info "Start rendering component (#{options.inspect}): "
+          result = yield
+          logger.info "\n\nEnd of component rendering"
+          result
+        else
+          yield
+        end
+      end
+
+      def session_with_render_component=(options = {})
+        session_without_render_component=(options) unless component_request?
+      end
+
+      def process_cleanup_with_render_component
+        process_cleanup_without_render_component unless component_request?
+      end
+      
+      def assign_shortcuts_with_render_component(request, response)
+        assign_shortcuts_without_render_component(request, response)
+        flash(:refresh)
+        flash.sweep if @_session && !component_request?
+      end
+  end
 end

data/lib/six-updater-web/vendor/plugins/render_component/test/abstract_unit.rb

@@ -1,8 +1,8 @@
-require 'rubygems'
-require 'test/unit'
-require 'action_controller'
-require 'action_controller/test_process'
-ActionController::Routing::Routes.reload rescue nil
-
-$: << File.dirname(__FILE__) + "/../lib"
-require File.dirname(__FILE__) + "/../init"
+require 'rubygems'
+require 'test/unit'
+require 'action_controller'
+require 'action_controller/test_process'
+ActionController::Routing::Routes.reload rescue nil
+
+$: << File.dirname(__FILE__) + "/../lib"
+require File.dirname(__FILE__) + "/../init"

data/lib/six-updater-web/vendor/plugins/render_component/test/components_test.rb

@@ -1,140 +1,140 @@
-require File.dirname(__FILE__) + '/abstract_unit'
-
-class CallerController < ActionController::Base
-  def calling_from_controller
-    render_component(:controller => "callee", :action => "being_called")
-  end
-
-  def calling_from_controller_with_params
-    render_component(:controller => "callee", :action => "being_called", :params => { "name" => "David" })
-  end
-
-  def calling_from_controller_with_different_status_code
-    render_component(:controller => "callee", :action => "blowing_up")
-  end
-
-  def calling_from_template
-    render :inline => "Ring, ring: <%= render_component(:controller => 'callee', :action => 'being_called') %>"
-  end
-
-  def internal_caller
-    render :inline => "Are you there? <%= render_component(:action => 'internal_callee') %>"
-  end
-
-  def internal_callee
-    render :text => "Yes, ma'am"
-  end
-
-  def set_flash
-    render_component(:controller => "callee", :action => "set_flash")
-  end
-
-  def use_flash
-    render_component(:controller => "callee", :action => "use_flash")
-  end
-
-  def calling_redirected
-    render_component(:controller => "callee", :action => "redirected")
-  end
-
-  def calling_redirected_as_string
-    render :inline => "<%= render_component(:controller => 'callee', :action => 'redirected') %>"
-  end
-
-  def rescue_action(e) raise end
-end
-
-class CalleeController < ActionController::Base
-  def being_called
-    render :text => "#{params[:name] || "Lady"} of the House, speaking"
-  end
-
-  def blowing_up
-    render :text => "It's game over, man, just game over, man!", :status => 500
-  end
-
-  def set_flash
-    flash[:notice] = 'My stoney baby'
-    render :text => 'flash is set'
-  end
-
-  def use_flash
-    render :text => flash[:notice] || 'no flash'
-  end
-
-  def redirected
-    redirect_to :controller => "callee", :action => "being_called"
-  end
-
-  def rescue_action(e) raise end
-end
-
-class ComponentsTest < Test::Unit::TestCase
-  def setup
-    @controller = CallerController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
-  def test_calling_from_controller
-    get :calling_from_controller
-    assert_equal "Lady of the House, speaking", @response.body
-  end
-
-  def test_calling_from_controller_with_params
-    get :calling_from_controller_with_params
-    assert_equal "David of the House, speaking", @response.body
-  end
-
-  def test_calling_from_controller_with_different_status_code
-    get :calling_from_controller_with_different_status_code
-    assert_equal 500, @response.response_code
-  end
-
-  def test_calling_from_template
-    get :calling_from_template
-    assert_equal "Ring, ring: Lady of the House, speaking", @response.body
-  end
-
-  def test_etag_is_set_for_parent_template_when_calling_from_template
-    get :calling_from_template
-    expected_etag = etag_for("Ring, ring: Lady of the House, speaking")
-    assert_equal expected_etag, @response.headers['ETag']
-  end
-
-  def test_internal_calling
-    get :internal_caller
-    assert_equal "Are you there? Yes, ma'am", @response.body
-  end
-
-  def test_flash
-    get :set_flash
-    assert_equal 'My stoney baby', flash[:notice]
-    get :use_flash
-    assert_equal 'My stoney baby', @response.body
-    get :use_flash
-    assert_equal 'no flash', @response.body
-  end
-
-  def test_component_redirect_redirects
-    get :calling_redirected
-
-    assert_redirected_to :controller=>"callee", :action => "being_called"
-  end
-
-  def test_component_multiple_redirect_redirects
-    test_component_redirect_redirects
-    test_internal_calling
-  end
-
-  def test_component_as_string_redirect_renders_redirected_action
-    get :calling_redirected_as_string
-
-    assert_equal "Lady of the House, speaking", @response.body
-  end
-
-  protected
-    def etag_for(text)
-      %("#{Digest::MD5.hexdigest(text)}")
-    end
-end
+require File.dirname(__FILE__) + '/abstract_unit'
+
+class CallerController < ActionController::Base
+  def calling_from_controller
+    render_component(:controller => "callee", :action => "being_called")
+  end
+
+  def calling_from_controller_with_params
+    render_component(:controller => "callee", :action => "being_called", :params => { "name" => "David" })
+  end
+
+  def calling_from_controller_with_different_status_code
+    render_component(:controller => "callee", :action => "blowing_up")
+  end
+
+  def calling_from_template
+    render :inline => "Ring, ring: <%= render_component(:controller => 'callee', :action => 'being_called') %>"
+  end
+
+  def internal_caller
+    render :inline => "Are you there? <%= render_component(:action => 'internal_callee') %>"
+  end
+
+  def internal_callee
+    render :text => "Yes, ma'am"
+  end
+
+  def set_flash
+    render_component(:controller => "callee", :action => "set_flash")
+  end
+
+  def use_flash
+    render_component(:controller => "callee", :action => "use_flash")
+  end
+
+  def calling_redirected
+    render_component(:controller => "callee", :action => "redirected")
+  end
+
+  def calling_redirected_as_string
+    render :inline => "<%= render_component(:controller => 'callee', :action => 'redirected') %>"
+  end
+
+  def rescue_action(e) raise end
+end
+
+class CalleeController < ActionController::Base
+  def being_called
+    render :text => "#{params[:name] || "Lady"} of the House, speaking"
+  end
+
+  def blowing_up
+    render :text => "It's game over, man, just game over, man!", :status => 500
+  end
+
+  def set_flash
+    flash[:notice] = 'My stoney baby'
+    render :text => 'flash is set'
+  end
+
+  def use_flash
+    render :text => flash[:notice] || 'no flash'
+  end
+
+  def redirected
+    redirect_to :controller => "callee", :action => "being_called"
+  end
+
+  def rescue_action(e) raise end
+end
+
+class ComponentsTest < Test::Unit::TestCase
+  def setup
+    @controller = CallerController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  def test_calling_from_controller
+    get :calling_from_controller
+    assert_equal "Lady of the House, speaking", @response.body
+  end
+
+  def test_calling_from_controller_with_params
+    get :calling_from_controller_with_params
+    assert_equal "David of the House, speaking", @response.body
+  end
+
+  def test_calling_from_controller_with_different_status_code
+    get :calling_from_controller_with_different_status_code
+    assert_equal 500, @response.response_code
+  end
+
+  def test_calling_from_template
+    get :calling_from_template
+    assert_equal "Ring, ring: Lady of the House, speaking", @response.body
+  end
+
+  def test_etag_is_set_for_parent_template_when_calling_from_template
+    get :calling_from_template
+    expected_etag = etag_for("Ring, ring: Lady of the House, speaking")
+    assert_equal expected_etag, @response.headers['ETag']
+  end
+
+  def test_internal_calling
+    get :internal_caller
+    assert_equal "Are you there? Yes, ma'am", @response.body
+  end
+
+  def test_flash
+    get :set_flash
+    assert_equal 'My stoney baby', flash[:notice]
+    get :use_flash
+    assert_equal 'My stoney baby', @response.body
+    get :use_flash
+    assert_equal 'no flash', @response.body
+  end
+
+  def test_component_redirect_redirects
+    get :calling_redirected
+
+    assert_redirected_to :controller=>"callee", :action => "being_called"
+  end
+
+  def test_component_multiple_redirect_redirects
+    test_component_redirect_redirects
+    test_internal_calling
+  end
+
+  def test_component_as_string_redirect_renders_redirected_action
+    get :calling_redirected_as_string
+
+    assert_equal "Lady of the House, speaking", @response.body
+  end
+
+  protected
+    def etag_for(text)
+      %("#{Digest::MD5.hexdigest(text)}")
+    end
+end

data/lib/six-updater-web/vendor/plugins/six-app_manager/lib/six/appmanager.rb

@@ -9,7 +9,7 @@
 =end
 
 case RUBY_PLATFORM
-  when /-mingw32$/, /-mswin32$/
+  when /-mingw32$/
     require 'win32/process'
   # required already in six-updater-web.rb
   #require 'win32/registry'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 24
-  - 8
-  version: 0.24.8
+  - 9
+  version: 0.24.9
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-04 00:00:00 +01:00
+date: 2010-12-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency