spiderfw 0.6.18 → 0.6.19

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 0.6.19
+== 21 September, 2011
+* Fixes: DbMapper join logic, configuration editor, js files compilation, Rack set_body_io (used by SOAP)
+
 = 0.6.18
 == 16 September, 2011
 * Thread management (keeps track of threads to wait for when exiting)

data/VERSION

@@ -1 +1 @@
-0.6.18
+0.6.19

data/apps/core/components/assets.rb

@@ -43,7 +43,7 @@ Spider::Template.define_named_asset 'jquery-ui-core', [
     [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.mouse.js', Spider::Components],
     [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.position.js', Spider::Components],
     [:css, 'js/jquery/jquery-ui-1.8.11/css/Aristo/jquery-ui.custom.css', Spider::Components]
-]
+], :depends => ['jquery']
 
 Spider::Template.define_named_asset 'jquery-ui-draggable', [
     [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.draggable.js', Spider::Components]

data/lib/spiderfw/config/configuration_editor.rb

@@ -113,7 +113,7 @@ module Spider
                             end
                             add_next = nil
                         end
-                        if line =~ /(\s*)(\w[^:]+):\s*(.+)?$/
+                        if line =~ /^(\s*)(\w[^:]+):\s*(.+)?$/
                             indent = $1
                             key = $2
                             value = $3
@@ -175,6 +175,8 @@ module Spider
                             end
                             curr = data
                             res << line
+                        elsif line =~ /^\s*#/
+                            res << line
                         else # value line
                             curr_val << line
                         end
@@ -200,4 +202,4 @@ module Spider
         
     end
     
-end
+end

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

@@ -55,7 +55,11 @@ module Spider; module HTTP
         
         def set_body_io(io)
             return super if headers_sent?
-            @response.body = io
+            begin
+                @response[:body].close
+            rescue => exc
+            end
+            @response[:body] = io
             send_headers
         end
 

data/lib/spiderfw/model/condition.rb

@@ -34,7 +34,7 @@ module Spider; module Model
             return c
         end
         
-        @comparison_operators = %w{= > < >= <= <> != like}
+        @comparison_operators = %w{= > < >= <= <> like}
         @comparison_operators_regexp = @comparison_operators.inject('') do |str, op|
             str += '|' unless str.empty? 
             str += Regexp.quote(op)
@@ -173,11 +173,11 @@ module Spider; module Model
                 value = value.to_a
             end
             if value.is_a?(Array) && comparison != 'between'
-                or_cond = self.class.or
+                multi_cond = comparison == '<>' ? self.class.and : self.class.or
                 value.uniq.each do |v|
-                    or_cond.set(field, comparison, v)
+                    multi_cond.set(field, comparison, v)
                 end
-                @subconditions << or_cond
+                @subconditions << multi_cond
                 return self
             end
             parts = []
@@ -454,7 +454,7 @@ module Spider; module Model
                         :== => '=',
                         :not => '<>'
                     }
-                    if (replace[op])
+                    if replace[op]
                         op = replace[op]
                     end
                     op = op.to_s

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

@@ -494,7 +494,7 @@ module Spider; module Model; module Mappers
             cond[:values] = []
             
 
-            
+            # Returns an hash of elements that need an "inner" join
             def get_join_info(model, condition)
                 join_info = {}
                 condition.each_with_comparison do |k, v, comp|
@@ -503,31 +503,50 @@ module Spider; module Model; module Mappers
                     next unless element
                     next unless model.mapper.mapped?(element)
                     next unless element.model?
-                    join_info[k.to_s] = true if !v.nil? || (comp != '=' && comp != 'like' && comp != 'ilike')
+                    join_info[k.to_s] = if v.nil?
+                        comp == '<>' ? true : false
+                    else
+                        comp == '<>' ? false : true
+                    end
                     if v.is_a?(Spider::Model::Condition)
                         el_join_info = get_join_info(element.model, v) 
+                        has_true = false
+                        has_false = false
                         el_join_info.each do |jk, jv|
                             join_info["#{k}.#{jk}"] = jv
+                            has_true = true if jv
+                            has_false = true unless jv
+                        end
+                        if (v.conjunction == :and && has_true) || (has_true && !has_false)
+                            join_info[k.to_s] = true
+                        elsif (v.conjunction == :or && has_false) || (has_false && !has_true)
+                            join_info[k.to_s] = false
                         end
                     end
                 end
+                sub = {}
                 condition.subconditions.each do |sub_cond|
+                    next if sub_cond.empty?
                     sub_join_info = get_join_info(model, sub_cond)
-                    if condition.conjunction == :or
-                        join_info.each_key do |k|
-                            join_info.delete(k) unless sub_join_info[k]
+                    sub_join_info.each_key do |k|
+                        if condition.conjunction == :or
+                            sub[k] = true if sub_join_info[k] && sub[k] != false
+                            sub[k] = false unless sub_join_info
+                        else
+                            sub[k] = true if sub_join_info[k]
                         end
-                    else
-                        join_info.merge!(sub_join_info)
                     end
                 end
+                join_info.merge!(sub)
                 join_info
             end
+
+            
             
             join_info = options[:join_info]
             join_info ||= get_join_info(@model, condition)
 
-                        
+
             condition.each_with_comparison do |k, v, comp|
                 if k.is_a?(QueryFuncs::Function)
                     field = prepare_queryfunc(k)
@@ -541,7 +560,7 @@ module Spider; module Model; module Mappers
                     el_join_info = {}
                     join_info.each do |jk, jv|
                         if jk.index(k.to_s+'.') == 0
-                            el_join_info[jk[k.to_s.length..-1]] = jv
+                            el_join_info[jk[k.to_s.length+1..-1]] = jv
                         end
                     end
                     if (v && model.mapper.have_references?(element.name) && v.select{ |key, value| 
@@ -557,7 +576,7 @@ module Spider; module Model; module Mappers
                         end
                         cond[:values] << element_cond
                     else
-                        if (element.storage == model.mapper.storage)
+                        if element.storage == model.mapper.storage
                             join_type = join_info[element.name.to_s] ? :inner : :left
                             sub_join = model.mapper.get_join(element, join_type)
                             # FIXME! cleanup, and apply the check to joins acquired in other places, too (maybe pass the current joins to get_join)
@@ -566,6 +585,7 @@ module Spider; module Model; module Mappers
                             had_join = false
                             existent.each do |j|
                                 if sub_join[:to] == j[:to] && sub_join[:keys] == j[:keys] && sub_join[:conditions] == j[:conditions]
+                                    # if any condition allows a left join, then a left join should be used here as well
                                     j[:type] = :left if sub_join[:type] == :left
                                     sub_join = j
                                     had_join = true
@@ -595,7 +615,6 @@ module Spider; module Model; module Mappers
                                 end
                                 cond[:values] << element_cond
                             elsif v
-                                v = element.model.mapper.preprocess_condition(v)                          
                                 sub_condition, sub_joins = element.mapper.prepare_condition(v, :table => sub_join[:as], :joins => joins, :join_info => el_join_info)
                                 sub_condition[:table] = sub_join[:as] if sub_join[:as]
                                 joins = sub_joins

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

@@ -345,7 +345,7 @@ module Spider; module Model
                         if element.attributes[:junction_id]
                             val.each do |row|
                                 next unless row_id = row.get(element.attributes[:junction_id])
-                                condition.set(:id, '<>', row_id)
+                                condition.set(element.attributes[:junction_id], '<>', row_id)
                             end
                         end
                         element.model.mapper.delete(condition)
@@ -930,25 +930,33 @@ module Spider; module Model
                 condition.conditions_array.each do |k, v, c|
                     next if k.is_a?(Spider::QueryFuncs::Function)
                     next unless element = model.elements[k]
-                    if (element.integrated?)
-                        condition.delete(k)
-                        integrated_from = element.integrated_from
-                        integrated_from_element = element.integrated_from_element
-                        condition.set("#{integrated_from.name}.#{integrated_from_element}", c, v)
-                    elsif (element.junction? && !v.is_a?(BaseModel) && !v.is_a?(Hash) && !v.nil?) # conditions on junction id don't make sense
-                        condition.delete(k)
-                        condition.set("#{k}.#{element.attributes[:junction_their_element]}", c, v)
-                    end
-                    if (element.type < Spider::DataType && !v.is_a?(element.type))
+                    changed_v = false
+                    if element.type < Spider::DataType && !v.is_a?(element.type)
                         condition.delete(k)
                         begin
-                            condition.set(k, c, element.type.from_value(v))
+                            v = element.type.from_value(v)
+                            changed_v = true
                         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)
+                        changed_v = true
+                    elsif element.model? && v.is_a?(Spider::Model::Condition)
+                        v = element.mapper.preprocess_condition(v)
+                        changed_v = true
+                    end
+                    if element.integrated?
+                        condition.delete(k)
+                        integrated_from = element.integrated_from
+                        integrated_from_element = element.integrated_from_element
+                        condition.set("#{integrated_from.name}.#{integrated_from_element}", c, v)
+                    elsif element.junction? && !v.is_a?(BaseModel) && !v.is_a?(Hash) && !v.nil? # conditions on junction id don't make sense
+                        condition.delete(k)
+                        condition.set("#{k}.#{element.attributes[:junction_their_element]}", c, v)
+                    elsif changed_v
                         condition.delete(k)
-                        condition.set(k, c, DateTime.parse(v))
+                        condition.set(k, c, v)
                     end
                 end
             end

data/lib/spiderfw/templates/layout.rb

@@ -233,8 +233,8 @@ module Spider
             curr = Dir.glob(pub_dest+"/._#{name}.*.js")
             unless curr.empty?
                 curr.each do |f|
-                    name = File.basename(f)
-                    if name =~ /(\d+)\.js$/
+                    currname = File.basename(f)
+                    if currname =~ /(\d+)\.js$/
                         version = $1.to_i if $1.to_i > version
                         File.unlink(f)
                     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: 
   segments: 
   - 0
   - 6
-  - 18
-  version: 0.6.18
+  - 19
+  version: 0.6.19
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 +02:00
+date: 2011-09-21 00:00:00 +02:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency