spiderfw 0.6.25 → 0.6.26.pre1

data/lib/spiderfw/controller/http_controller.rb

@@ -43,10 +43,12 @@ module Spider
                 @request.params = Spider::HTTP.parse_query(@request.env['QUERY_STRING'])
                 @request.get = @request.params
             end
-            if @request.env['REQUEST_METHOD'] == 'POST' && @request.env['HTTP_CONTENT_TYPE']
+            if ['POST', 'PUT', 'DELETE'].include?(@request.env['REQUEST_METHOD']) && @request.env['HTTP_CONTENT_TYPE']
                 if @request.env['HTTP_CONTENT_TYPE'].include?('application/x-www-form-urlencoded')
-                    @request.post = Spider::HTTP.parse_query(@request.read_body)
-                    @request.params.merge!(@request.post)
+                    data = Spider::HTTP.parse_query(@request.read_body)
+                    req_meth = @request.env['REQUEST_METHOD'].downcase
+                    @request.send(:"#{req_meth}=", data)
+                    @request.params.merge!(@request.send(:"#{req_meth}"))
                 elsif @request.env['HTTP_CONTENT_TYPE'] =~ Spider::HTTP::MULTIPART_REGEXP
                     multipart_params, multipart_files = Spider::HTTP.parse_multipart(@request.body, $1, @request.env['CONTENT_LENGTH'].to_i)
                     @request.params.merge!(multipart_params)
@@ -176,7 +178,7 @@ module Spider
         end
         
         module HTTPRequest
-            attr_accessor :http_method, :http_host, :domain, :port, :post, :get
+            attr_accessor :http_method, :http_host, :domain, :port, :post, :get, :put, :delete
             
             # Returns PATH_INFO reversing any proxy mappings if needed.
             def path
@@ -228,6 +230,10 @@ module Spider
             def get
                 @get ||= {}
             end
+
+            def put
+                @put ||= {}
+            end
             
             def post?
                 self.http_method == :POST
@@ -236,6 +242,14 @@ module Spider
             def get?
                 self.http_method == :GET
             end
+
+            def put?
+                self.http_method == :PUT
+            end
+
+            def delete?
+                self.http_method == :DELETE
+            end
             
         end
     

data/lib/spiderfw/controller/mixins/http_mixin.rb

@@ -12,6 +12,11 @@ module Spider; module ControllerMixins
             klass.extend(ClassMethods)
         end
         
+        # Sets the headers to redirect the browser to the given url, and calls
+        # {Controller#done} to terminate the execution of the Controller chain
+        # @param [String] url
+        # @param [Fixnum] code HTTP status to send
+        # @return void
         def redirect(url, code=Spider::HTTP::SEE_OTHER)
             debug "REDIRECTING TO #{url}"
             @request.session.persist if @request.session # It might be too late afterwards
@@ -22,30 +27,35 @@ module Spider; module ControllerMixins
             done
         end
         
-        def self.reverse_proxy_mapping(url)
-            return '' unless url
+        # Takes a url path that the framework would accept, and transforms it
+        # into the url path the webserver would send, given the settings in http.proxy_mapping
+        # @param [Strint] url_path
+        # @return [String] The transformed url path
+        def self.reverse_proxy_mapping(url_path)
+            return '' unless url_path
             if (maps = Spider.conf.get('http.proxy_mapping'))
                 maps.each do |proxy, spider|
                     spider ||= ''
-                    return proxy + url[spider.length..-1] if (spider == "" || url[0..spider.length-1] == spider)
+                    return proxy + url_path[spider.length..-1] if (spider == "" || url_path[0..spider.length-1] == spider)
                 end
             end
-            return url
+            return url_path
         end
         
         # Returns the http path used to call the current controller & action.
         # Reverses any proxy mappings to the Controller#request_path.
+        # @return [String]
         def request_path
             HTTPMixin.reverse_proxy_mapping(super)
         end
         
-        # Returns the request_path prefixed with http:// and the current host.
+        # @return [String] the request_path prefixed with http:// and the current host.
         def request_url
             return request_path unless @request.env['HTTP_HOST']
             'http://'+@request.env['HTTP_HOST']+request_path
         end
         
-        # Returns the request_url with query params, if any
+        # @return [String] the request_url with query params, if any
         def request_full_url
             url = request_url
             if (@request.env['QUERY_STRING'] && !@request.env['QUERY_STRING'].empty?)
@@ -54,11 +64,18 @@ module Spider; module ControllerMixins
             return url
         end
         
-        def self.output_charset(val)
+        # Sets or returns the charset for the controller
+        # @param [String|nil] The charset
+        # @return [String] The charset in use
+        def self.output_charset(val=nil)
             @output_charset = val if val
             @output_charset || Spider.conf.get('http.charset')
         end
         
+        # Sets a Content type
+        # @param [String|Symbol] Content type, or a symbol representing it
+        #                        (Can be :text, :json, :js, :javascript, :html, :xml)
+        # @return [String] The value of the "Content-Type" header
         def content_type(ct)
             if ct.is_a?(Symbol)
                 ct = {
@@ -73,6 +90,9 @@ module Spider; module ControllerMixins
             @response.headers["Content-Type"] = "#{ct};charset=utf-8"
         end
         
+        # 
+        # @param [String] action
+        # @param [*Object] arguments
         def before(action='', *arguments)
             return super if self.is_a?(Spider::Widget)
              # FIXME: the Spider::Widget check
@@ -89,14 +109,17 @@ module Spider; module ControllerMixins
             super
         end
         
+        # @return [String] the base URL to which the installation responds
         def self.base_url
             HTTPMixin.reverse_proxy_mapping("")
         end
         
+        # @return [String] the base URL to which the installation responds
         def base_url
             HTTPMixin.base_url
         end
 
+
         def prepare_scene(scene)
             scene = super
             scene.base_url = base_url
@@ -212,13 +235,17 @@ module Spider; module ControllerMixins
             end
             
             
-            def http_url(action=nil)
-                return nil unless Spider.site
+            def url(action=nil)
+                return super unless Spider.site
                 u = "http://#{Spider.site.domain}"
                 u += ":#{Spider.site.port}" unless Spider.site.port == 80
-                u += HTTPMixin.reverse_proxy_mapping(self.url(action))
+                u += HTTPMixin.reverse_proxy_mapping(super(action))
                 u
             end
+
+            def http_url(action=nil)
+                url(action)
+            end
             
         end
         

data/lib/spiderfw/controller/mixins/visual.rb

@@ -39,9 +39,9 @@ module Spider; module ControllerMixins
             return super unless action_target?
             format = nil
             req_format = self.is_a?(Widget) && @is_target && @request.params['_wf'] ? @request.params['_wf'].to_sym : @request.format
-            if (req_format && self.class.output_formats[@executed_method])
+            if req_format && self.class.output_formats[@executed_method]
                 format = req_format if self.class.output_format?(@executed_method, req_format)
-                if (format)
+                if format
                     format_params = self.class.output_format_params(@executed_method, format)
                 end
                 if @executed_method && !format || (format_params && format_params[:widgets] && !target_mode?)
@@ -50,6 +50,11 @@ module Spider; module ControllerMixins
             end
             format ||= self.class.output_format(@executed_method)
             format_params ||= self.class.output_format_params(@executed_method, format)
+            
+            unless !format_params || format_params[:http_method].blank?
+                format_params[:http_method] = [format_params[:http_method]] unless format_params[:http_method].is_a?(Enumerable)
+                raise Forbidden unless format_params[:http_method].include?(@request.http_method)
+            end
             output_format_headers(format)
             @executed_format = format
             @executed_format_params = format_params
@@ -100,7 +105,7 @@ module Spider; module ControllerMixins
             @is_target = false if target_mode? && !self.is_a?(Spider::Widget)
             if (self.is_a?(Widget) && @is_target && @request.params['_wp'])
                 params = @request.params['_wp']
-            elsif (@visual_params.is_a?(Hash) && @visual_params[:params])
+            elsif @visual_params.is_a?(Hash) && @visual_params[:params]
                 p_first, p_rest = action.split('/')
                 params = format_params[:params].call(p_rest) if p_rest
             end
@@ -192,7 +197,11 @@ module Spider; module ControllerMixins
                 template._widget_action = @request.params['_action']
             else
                 template._action_to = options[:action_to]
-                template._action = @controller_action
+                template_action = @current_action.to_s.split('/')
+                if template_action.first == @executed_method.to_s
+                    template_action = template_action[1..-1]
+                end
+                template._action = template_action.join('/')
             end
             return template
         end
@@ -462,7 +471,7 @@ module Spider; module ControllerMixins
                     @output_formats[method] << format
                     @output_format_params[method] ||= {}
                     @output_format_params[method][format] = params
-                    controller_actions(method)
+                    controller_action(method, params)
                     return format
                 end
                 return @default_output_format unless @output_formats[method] && @output_formats[method][0]

data/lib/spiderfw/http/http.rb

@@ -15,6 +15,11 @@ module Spider
         FILENAME_REGEX     = /Content-Disposition:.* filename="?([^\";]*)"?/ni.freeze
         CRLF               = "\r\n".freeze
         EOL                = CRLF
+
+        METHODS = [
+            :GET, :POST, :PUT, :DELETE, :HEAD, :TRACE, :CONNECT,
+            :PROPFIND, :PROPPATCH, :MKCOL, :COPY, :MOVE, :LOCK, :UNLOCK
+        ]
         
         module StatusCodes
         

data/lib/spiderfw/model/base_model.rb

@@ -52,6 +52,7 @@ module Spider; module Model
     #   p salmon_lovers[0].name
     #     => 'Cat'
     class BaseModel
+        include App::AppClass
         include Spider::Logger
         include DataTypes
         include Spider::QueryFuncs
@@ -138,17 +139,6 @@ module Spider; module Model
             @subclasses || []
         end
         
-        # Returns the parent Spider::App of the module
-        # @return [Spider::App]
-        def self.app
-            return @app if @app
-            app = self
-            while app && !app.include?(Spider::App)
-                app = app.parent_module
-            end
-            @app = app
-        end
-        
         
         #######################################
         #   Model definition methods          #

data/lib/spiderfw/model/condition.rb

@@ -110,6 +110,9 @@ module Spider; module Model
             @comparisons = {}
             @subconditions = []
             params.reject!{ |p| p.nil? }
+            if params[0].is_a?(Proc)
+                params[0] = params[0].call
+            end
             if (params.length == 1 && params[0].is_a?(Hash) && !params[0].is_a?(Condition))
                 params[0].each do |k, v|
                     set(k, '=', v)
@@ -193,14 +196,14 @@ module Spider; module Model
         end
         
         # Adds a subcondtion.
-        # @param [Condition] condition
+        # @param [Condition|Hash|Proc|String] condition
         # @return [void]
         def <<(condition)
-            if (condition.class == self.class)
+            if condition.class == self.class
                 @subconditions << condition
-            elsif (condition.is_a?(Hash))
+            elsif condition.is_a?(Hash) || condition.is_a?(Proc)
                 @subconditions << self.class.new(condition)
-            elsif (condition.class == String)
+            elsif condition.class == String
                 key, val, comparison = parse_comparison(condition)
                 set(key, val, comparison)
             end

data/lib/spiderfw/model/mappers/mapper.rb

@@ -1113,8 +1113,8 @@ module Spider; module Model
                         rescue TypeError => exc
                             raise TypeError, "Can't convert #{v} to #{element.type} for element #{k} (#{exc.message})"
                         end
-                    elsif element.type == DateTime && v && !v.is_a?(Date) && !v.is_a?(Time)
-                        v = DateTime.parse(v)
+                    elsif [DateTime, Date].include?(element.type) && v && !v.is_a?(Date) && !v.is_a?(Time)
+                        v = element.type.parse(v)
                         changed_v = true
                     elsif element.model? && v.is_a?(Spider::Model::Condition)
                         unless v.primary_keys_only?(element.model)

data/lib/spiderfw/requires.rb

@@ -27,6 +27,7 @@ require 'spiderfw/utils/http_client'
 require 'spiderfw/utils/gems'
 require 'spiderfw/config/configuration'
 require 'spiderfw/config/configurable'
+require 'spiderfw/app'
 require 'spiderfw/model/model'
 require 'spiderfw/home'
 require 'spiderfw/site'

data/lib/spiderfw/setup/app_manager.rb

@@ -90,8 +90,8 @@ module Spider
                     do_update(spec, options)
                 end
                 post_update(specs[:update], options)
-            rescue => exc
-                rollback_update
+            rescue
+                rollback_update unless options[:no_rollback]
                 raise
             end
             unless options[:no_activate]
@@ -496,6 +496,11 @@ module Spider
 
         private
 
+        def git_command(command)
+            #`GIT_SSH='ssh -i #{File.join(Spider.paths[:data], 'keys', 'spider.rsa')}' git #{command}`
+            `git #{command}`
+        end
+
         def reset_git_env
             ENV['GIT_WORK_TREE'] = nil
             ENV["GIT_INDEX_FILE"] = nil

data/lib/spiderfw/setup/setup_task.rb

@@ -142,7 +142,7 @@ module Spider
         def warn(msg)
             puts msg
             print "\n"+_("Press any key to continue ")
-            $stdin.getch
+            $stdin.getc
             print "\n"
         end
 

data/lib/spiderfw/setup/spider_setup_wizard.rb

@@ -69,7 +69,7 @@ module Spider
 
                 print prompt
             
-                res = $stdin.gets.strip
+                res = $stdin.gets.strip.downcase
                 
                 good = true
                 if options[:type] == Spider::Bool

data/lib/spiderfw/spider.rb

@@ -154,7 +154,10 @@ module Spider
             @runmode = nil
             self.runmode = $SPIDER_RUNMODE if $SPIDER_RUNMODE
             load_configuration File.join($SPIDER_PATH, 'config')
-            user_rc = File.join(Etc.getpwuid.dir, '.spider.conf.yml')
+            begin
+                user_rc = File.join(Etc.getpwuid.dir, '.spider.conf.yml')
+            rescue NoMethodError # No getpwuid under windows
+            end
             if File.file?(user_rc)
                 load_configuration_file(user_rc)
             end

data/lib/spiderfw/templates/layout.rb

@@ -270,9 +270,14 @@ module Spider
                             compiler.compile(ass[:path], dest)
                         rescue Exception
                             if ext == '.less'
-                                Spider.logger.error("Unable to compile LESS. Please ensure you have a JS backend
-                                 (see https://github.com/sstephenson/execjs)")
-                            else
+                                msg = "Unable to compile LESS file #{ass[:path]}."
+                                msg += "Please ensure you have a JS backend (see https://github.com/sstephenson/execjs)"
+                            elsif ext == '.scss' || ext == '.sass'
+                                msg = "Unable to compile SASS file #{ass[:path]}."
+                                msg += "Please ensure that you have the 'sass' (and optionally 'compass') gems installed."
+                            end
+                            Spider.logger.error(msg)
+                            unless File.exist?(dest)
                                 raise
                             end
                         end

data/lib/spiderfw/templates/template.rb

@@ -405,7 +405,8 @@ module Spider
             ass[:app] = asset_owner.app if asset_owner.respond_to?(:app)
             # FIXME! @definer_class is not correct for Spider::HomeController
             raise "Asset type not given for #{src}" unless type
-            search_classes = [asset_owner, @definer_class]
+            search_classes = [asset_owner]
+            search_classes << @definer_class if @definer_class
             dfnr = @definer_class.superclass if @definer_class && @definer_class.respond_to?(:superclass)
             while dfnr && dfnr < Spider::Widget
                 search_classes << dfnr

data/lib/spiderfw/test/rack_tester.rb

@@ -0,0 +1,10 @@
+require 'rack/test'
+
+class RackTester
+    include Rack::Test::Methods
+
+    def app
+        Spider::HTTP::RackApplication.new
+    end
+
+end

data/lib/spiderfw/widget/widget_plugin.rb

@@ -50,6 +50,13 @@ module Spider
                 end
                 @controller_actions
             end
+
+            def controller_action(method, params)
+                @controller_actions ||= []
+                @controller_actions << method
+                @controller_action_params ||= {}
+                @controller_action_params[method] = params
+            end
             
             def controller_action?(method)
                 @controller_actions && @controller_actions.include?(method)
@@ -59,4 +66,4 @@ module Spider
         
     end
     
-end
+end