spiderfw 0.6.16 → 0.6.17

data/lib/spiderfw/i18n/i18n.rb

@@ -125,6 +125,15 @@ module Spider
                 end
 
             end
+
+            def list(enumerable, locale=Spider.locale)
+                return enumerable.first.to_s if enumerable.length < 2
+                p = provider(locale)
+                unless p && p.respond_to?(:list)
+                    return enumerable.join(', ')
+                end
+                return p.list(enumerable)
+            end
             
             # from Rails
             def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false)

data/lib/spiderfw/i18n/javascript_parser.rb

@@ -49,6 +49,6 @@ module Spider; module I18n
 
     end
     
-    GetText::RGetText.add_parser(JavascriptParser)
+    ::GetText::RGetText.add_parser(JavascriptParser)
 
 end; end

data/lib/spiderfw/i18n/shtml_parser.rb

@@ -36,6 +36,6 @@ module Spider; module I18n
 
     end
     
-    GetText::RGetText.add_parser(SHTMLParser)
+    ::GetText::RGetText.add_parser(SHTMLParser)
 
 end; end

data/lib/spiderfw/model/base_model.rb

@@ -1592,7 +1592,7 @@ module Spider; module Model
             element = self.class.elements[name]
             element.type.check(val) if (element.type.respond_to?(:check))
             if (checks = element.attributes[:check])
-                checks = {(_("'%s' is not in the correct format") % element.label) => checks} unless checks.is_a?(Hash)
+                checks = {("'%s' is not in the correct format") => checks} unless checks.is_a?(Hash)
                 checks.each do |msg, check|
                     test = case check
                     when Regexp

data/lib/spiderfw/model/inline_model.rb

@@ -49,7 +49,19 @@ module Spider; module Model
             return self.class.mapper
         end
         
-        
+        def ==(val)
+            return super unless self.class.primary_keys.length == 1
+            pk = self.class.primary_keys.first
+            if pk.type == String || pk.type == Symbol
+                if val.is_a?(String) || val.is_a?(Symbol)
+                    return val.to_s == self.get(pk).to_s
+                end
+            elsif val.is_a?(pk.type)
+                return val == self.get(pk)
+            end
+            return super
+            
+        end
         
     end
     

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

@@ -973,6 +973,11 @@ module Spider; module Model; module Mappers
             return schema
         end
 
+        # Resets the schema, so that it is regenerated on the next call
+        def reset_schema
+            @schema = nil
+        end
+
         def storage_column_type(type, attributes)
             @storage.column_type(type, attributes)
         end

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

@@ -281,14 +281,14 @@ module Spider; module Model
         
         # Deletes all associations from the given object to the element.
         def delete_element_associations(obj, element, associated=nil)
-            if (element.attributes[:junction])
+            if element.attributes[:junction]
                 condition = {element.attributes[:reverse] => obj.primary_keys}
                 condition[element.attributes[:junction_their_element]] = associated if associated
                 element.mapper.delete(condition)
             else
-                if (element.multiple?)
+                if element.multiple?
                     condition = Condition.and
-                    if (associated)
+                    if associated
                         condition = associated.keys_to_condition
                     else
                         condition[element.reverse] = obj
@@ -298,7 +298,7 @@ module Spider; module Model
                     #     element.model.primary_keys.each{ |el| condition_row.set(el.name, '<>', child.get(el))}
                     #     condition << condition_row
                     # end
-                    if (element.owned?)
+                    if element.owned? || (element.reverse && element.model.elements[element.reverse].primary_key?)
                         element.mapper.delete(condition)
                     else
                         element.mapper.bulk_update({element.reverse => nil}, condition)
@@ -1175,6 +1175,7 @@ module Spider; module Model
                 obj.define_schema &@schema_define_proc if @schema_define_proc
                 obj.with_schema &@schema_proc if @schema_proc
                 obj.no_map(*@no_map_elements.keys) if @no_map_elements
+                @model_proc.call(obj.model) if @model_proc
             end
             
             def no_map(*els)
@@ -1190,6 +1191,10 @@ module Spider; module Model
             def with_schema(&proc)
                 @schema_proc = proc
             end
+
+            def with_model(&proc)
+                @model_proc = proc
+            end
         
         end
         

data/lib/spiderfw/model/migrations/drop_element.rb

@@ -0,0 +1,26 @@
+module Spider; module Migrations
+
+    class DropElement < IrreversibleMigration
+
+        def initialize(model, element, options={})
+            @model = model
+            @element = element
+            @options = options
+        end
+
+        def run
+            field = @options[:field_name]
+            if !field
+                schema_field = @model.mapper.schema.field(@element)
+                field = schema_field.name
+            end
+            field ||= @model.mapper.storage.column_name(@element)
+            desc = @model.mapper.storage.describe_table(@model.mapper.schema.table)
+            if desc[:columns][field]
+                @model.mapper.storage.drop_field(@model.mapper.schema.table, field)
+            end
+        end
+
+    end
+
+end; end

data/lib/spiderfw/model/migrations/irreversible_migration.rb

@@ -0,0 +1,9 @@
+module Spider; module Migrations
+
+	class IrreversibleMigration < Migration
+		def undo
+			raise "IrreversibleMigration, can't undo"
+		end
+	end
+
+end; end

data/lib/spiderfw/model/migrations/migration.rb

@@ -0,0 +1,7 @@
+module Spider; module Migrations
+    
+    class Migration
+    end
+    
+    
+end; end

data/lib/spiderfw/model/migrations/replace.rb

@@ -0,0 +1,32 @@
+module Spider; module Migrations
+    
+    class Replace < Migration
+        
+        def initialize(model, element, values)
+            @model = model
+            @element = element
+            @values = values
+        end
+        
+        def run
+            field = @model.mapper.schema.field(@model.get_element(@element).name)
+            table = @model.mapper.schema.table
+            raise "Table #{table} does not have a field #{field}" unless field
+            @values.each do |from, to|
+                save = {
+                    :table => table, 
+                    :values => {field => to},
+                    :condition => {:values => [[field, '=', from]]}
+                }
+                sql, bind_vars = @model.storage.sql_update(save)
+                return @model.storage.execute(sql, *bind_vars)                
+            end
+        end
+        
+        def undo
+            Replace.new(@model, @element, @values.invert).run
+        end
+        
+    end
+    
+end; end

data/lib/spiderfw/model/migrations.rb

@@ -0,0 +1,21 @@
+require 'spiderfw/model/migrations/migration'
+require 'spiderfw/model/migrations/irreversible_migration'
+require 'spiderfw/model/migrations/replace'
+require 'spiderfw/model/migrations/drop_element'
+
+module Spider
+    
+    module Migrations
+        
+        def self.replace(model, element, values)
+            Spider::Migrations::Replace.new(model, element, values)
+        end
+
+        def self.drop_element!(model, element, options={})
+        	Spider::Migrations::DropElement.new(model, element, options={})
+        end
+        
+        
+    end
+    
+end

data/lib/spiderfw/model/model.rb

@@ -276,7 +276,10 @@ module Spider
             
             
             def to_s
-                @message % @value
+                label = @element.label
+                Spider::GetText.in_domain('spider'){
+                    _(@message) % label
+                }
             end
             
         end

data/lib/spiderfw/model/storage/db/db_storage.rb

@@ -328,7 +328,7 @@ module Spider; module Model; module Storage; module Db
                     sql_condition_value(v[0], v[1], v[2])
                 end
             end
-            return mapped.select{ |p| p != nil}.join(' '+condition[:conj]+' '), bind_vars
+            return mapped.select{ |p| p != nil}.join(' '+(condition[:conj] || 'and')+' '), bind_vars
         end
         
         # Returns the SQL for a condition comparison.