spiderfw 0.6.15 → 0.6.16

data/CHANGELOG

@@ -1,3 +1,6 @@
+= 0.6.16
+* Bugfixes
+
 = 0.6.15
 == 9 August, 2011
 * Various fixes and enhancements

data/VERSION

@@ -1 +1 @@
-0.6.15
+0.6.16

data/apps/core/auth/controllers/mixins/auth_helper.rb

@@ -45,13 +45,14 @@ module Spider; module Auth
                     user = klass.restore(@request)
                     if user
                         @request.security[:users] << user
-                        if (params[:authentication])
+                        if params[:authentication]
                             user = nil unless user.authenticated?(params[:authentication])
                         elsif (params[:check])
                             begin
                                 c = params[:check].call(user)
                                 user = nil unless c == true
                                 raise Unauthorized.new(c, requested_class) if c.is_a?(String)
+                                break
                             rescue => exc
                                 user = nil
                                 unauthorized_exception = exc
@@ -62,7 +63,9 @@ module Spider; module Auth
                     end
                 end
                 unless user
-                    raise (unauthorized_exception ? unauthorized_exception : Unauthorized).new(_("Please login first"), requested_class)
+                    msg = Spider::GetText.in_domain('spider_auth'){ _("Please login first") }
+                    kl = unauthorized_exception ? unauthorized_exception : Unauthorized
+                    raise kl.new(msg, requested_class)
                 end
                 @request.user = user
             end

data/apps/servant/servant.rb

@@ -37,7 +37,7 @@ module Spider
             h = {}
             apps.each do |k, v|
                 h[k] = {}
-                h[k][:version] = v[:spec].version
+                h[k][:version] = v[:spec].version if v[:spec]
                 h[k][:active] = true if active.include?(k)
             end
             h

data/lib/spiderfw/app.rb

@@ -37,7 +37,7 @@ module Spider
                         @version = Gem::Version.new(@version.to_s) if @version && !@version.is_a?(Gem::Version)
                         spec_path = File.join(@path, "#{@short_name}.appspec")
                         load_spec(spec_path) if File.exists?(spec_path)
-                        @route_url ||= Inflector.underscore(self.short_name)
+                        @route_url ||= Inflector.underscore(self.name)
                         @label ||= @short_name.split('_').each{ |p| p[0] = p[0].chr.upcase }.join(' ')
                         @gettext_parsers ||= []
                         @gettext_dirs ||= ['lib','bin','controllers','models','views','widgets','public']

data/lib/spiderfw/controller/controller.rb

@@ -117,12 +117,16 @@ module Spider
                 return res ? res.path : nil
             end
             
-            def url=(url)
-                @url = url
-            end
-            
-            def url
-                @url || ''
+            # Returns the canonical url for this controller
+            def url(action=nil)
+                u = @default_route || ''
+                u += "/#{action}" if action
+                if @default_dispatcher
+                    u = @default_dispatcher.url + '/' + u
+                elsif self.app
+                    u = self.app.url + '/' + u
+                end
+                u
             end
             
             

data/lib/spiderfw/controller/dispatcher.rb

@@ -197,12 +197,17 @@ module Spider
         end
         
         module ClassMethods
+            attr_accessor :default_route, :default_dispatcher
            
             def add_route(routes, path, dest=nil, options=nil)
                 if ( path.is_a? Hash )
                     path.each {|p,d| add_route(p, d)}
                 else
                     routes << [path, dest, options || {}]
+                    if path.is_a?(String) && dest.respond_to?(:default_dispatcher=)
+                        dest.default_dispatcher = self
+                        dest.default_route = path
+                    end
                 end
             end
             

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

@@ -33,7 +33,7 @@ module Spider; module ControllerMixins
             return url
         end
         
-        # Returns the http path needed to call the current controller & action.
+        # Returns the http path used to call the current controller & action.
         # Reverses any proxy mappings to the Controller#request_path.
         def request_path
             HTTPMixin.reverse_proxy_mapping(super)

data/lib/spiderfw/http/adapters/rack.rb

@@ -84,8 +84,8 @@ module Spider; module HTTP
                 controller_response.server_output = RackIO.new(rack_response_hash, controller_response, w)
             else
                 w = StringIO.new
-                controller_response.server_output = w
                 rack_response_hash = {:body => w}
+                controller_response.server_output = RackIO.new(rack_response_hash, controller_response, w)
             end
 
 

data/lib/spiderfw/model/identity_mapper.rb

@@ -48,6 +48,7 @@ module Spider; module Model
                 has_pks = true if v
                 pks[k.name] = model.prepare_value(k, v)
             end
+            orig_pks = pks.clone
             normalize_pks(model, pks)
             unless has_pks
                 raise IdentityMapperException, "Can't get #{model} from IdentityMapper without all primary keys, #{values.inspect} given"
@@ -59,7 +60,7 @@ module Spider; module Model
                 obj = current
             else
 #                Spider.logger.debug("GETTING NEW #{model} FROM #{pks.inspect}")
-                obj = model.new(pks)
+                obj = model.new(orig_pks)
                 #@objects[model][pks] = obj
             end
             # obj = (@objects[model][pks] ||= model.new(pks))
@@ -152,6 +153,7 @@ module Spider; module Model
             model_pks.each do |k|
                 if keys[k] && keys[k].is_a?(BaseModel)
                     keys[k] = keys[k].class.primary_keys.length > 1 ? keys[k].primary_keys : keys[k].primary_keys[0]
+                    keys[k] = keys[k].first if model.elements[k].type.primary_keys.length && keys[k].is_a?(Array)
                 end
             end
             keys.keys.each do |k|

data/lib/spiderfw/model/storage/db/adapters/oracle.rb

@@ -26,8 +26,8 @@ module Spider; module Model; module Storage; module Db
         def parse_url(url)
             # db:oracle://<username:password>:connect_role@<database>
             # where database is
-            # the net8 connect string or
-            # for Oracle client 10g or later, //hostname_or_ip:port_no/oracle_sid
+            # the net8 connect descriptor (TNS) or
+            # for Oracle client 10g or later, hostname_or_ip:port_no/oracle_sid
             if (url =~ /.+:\/\/(?:(.+):(.+)(?::(.+))?@)?(.+)/)
                 @user = $1
                 @pass = $2

data/lib/spiderfw/model/storage/db/connectors/oci8.rb

@@ -1,9 +1,5 @@
 require 'oci8'
 
-# The default mapping to BigDecimal doesn't seem to work (as of ruby-oci8 2.0.4), reverting to Float until it's fixed
-OCI8::BindType::Mapping[:number_unknown_prec] = OCI8::BindType::Float
-OCI8::BindType::Mapping[:number_no_prec_setting] = OCI8::BindType::Float
-
 module Spider; module Model; module Storage; module Db; module Connectors
 
     module OCI8

data/lib/spiderfw/model/storage.rb

@@ -13,7 +13,7 @@ module Spider; module Model
             matches = url.match(/^(.+?):\/\/(.+)/)
             adapter = matches[1]
             rest = matches[2]
-            if (adapter =~ /(.+):(.+)/)
+            if adapter =~ /(.+):(.+)/
                 connector = $1
                 adapter = $2
                 url = "#{adapter}://#{rest}"
@@ -37,7 +37,7 @@ module Spider; module Model
                         RUBY_PLATFORM =~ /java/ ? 'jdbc' : 'oci8'
                     end
                 end
-                if (connector)
+                if connector
                     conn_mod_name = case connector
                     when 'odbc'
                         :ODBC

data/lib/spiderfw/setup/app_manager.rb

@@ -124,10 +124,19 @@ module Spider
             specs ||= []
             pre_setup(specs, options)
             specs.each do |spec|
-                if spec.git_repo && options[:use_git]
-                    git_install(spec, home_path, options)
+                app_path = File.join(home_path, "apps/#{spec.app_id}")
+                if File.directory?(app_path)
+                    if File.directory?(File.join(app_path, '.git'))
+                        git_update(spec, home_path, options)
+                    else
+                        pack_update(spec, home_path, options)
+                    end
                 else
-                    pack_install(spec, home_path, options)
+                    if spec.git_repo && options[:use_git]
+                        git_install(spec, home_path, options)
+                    else
+                        pack_install(spec, home_path, options)
+                    end
                 end
             end
             post_setup(specs, options)

data/lib/spiderfw/spider.rb

@@ -583,7 +583,7 @@ module Spider
                 elsif (cur_path)
                     if (path[0..1] == './')
                         return Resource.new(first_found(extensions, File.dirname(cur_path)+path[1..-1]), owner_class)
-                    elsif (path[0..1] == '../')
+                    elsif (path[0..2] == '../')
                         return Resource.new(first_found(extensions, File.dirname(File.dirname(cur_path))+path[2..-1]), owner_class)
                     end
                 end

data/lib/spiderfw/templates/template.rb

@@ -528,6 +528,7 @@ module Spider
                 root.search('tpl:include').each do |incl|
                     resource = Spider.find_resource(:views, incl.get_attribute('src'), @path, [@owner.class, @definer_class])
                     src = resource.path
+                    raise "Template #{@path} didn't find included '#{incl.get_attribute('src')}'" unless src
                     @dependencies << src
                     incl_el = self.get_el(src)
                     assets = incl_el.children ? incl_el.children_of_type('tpl:asset') : []

data/lib/spiderfw/utils/json.rb

@@ -38,7 +38,8 @@ class Integer
   end
 end
 
-def BigDecimal
+require 'bigdecimal'
+BigDecimal.class_eval do
    def to_json(options = nil) #:nodoc:
        to_f.to_json
    end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 39
   prerelease: 
   segments: 
   - 0
   - 6
-  - 15
-  version: 0.6.15
+  - 16
+  version: 0.6.16
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 +02:00
+date: 2011-08-22 00:00:00 +02:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency