spiderfw 0.5.14 → 0.5.15

data/CHANGELOG

@@ -1,3 +1,9 @@
+= 0.5.15
+== 26 November, 2010
+* BaseModel.from_hash_dump, :reverse option in extend_model
+* Spider.http_client util
+* Bugfixes
+
 = 0.5.14
 == 24 November, 2010
 * App management, setup wizard, configuration editor

data/VERSION

@@ -1 +1 @@
-0.5.14
+0.5.15

data/lib/spiderfw/cmd/cmd.rb

@@ -34,6 +34,9 @@ module Spider; module CommandLine
                     $SPIDER_RUNMODE = 'devel'
                     Spider.runmode = 'devel' if Spider && Spider.respond_to?(:runmode=)
                 end
+                opt.on("--http-proxy [PROXY]", _("Proxy server to use for http operations (http://user:pass@host:port)")){ |p|
+                    ENV['http_proxy'] = p
+                }
             end
 
             @cmd.add_command(CmdParse::HelpCommand.new, true)

data/lib/spiderfw/cmd/commands/app.rb

@@ -8,10 +8,10 @@ class AppCommand < CmdParse::Command
         @server_url = 'http://www.soluzionipa.it/euroservizi/spider/app_server'
         
         self.options = CmdParse::OptionParserWrapper.new do |opt|
-            opt.on("--proxy", _("Proxy server to use (http://user:pass@host:port)"), "-p"){ |p|
+            opt.on("--proxy [SERVER]", _("Proxy server to use (http://user:pass@host:port)"), "-p"){ |p|
                 ENV['http_proxy'] = p
             }
-            opt.on("--server", _("App server"), "-s") { |s|
+            opt.on("--server [SERVER]", _("App server"), "-s") { |s|
                 @server_url = s
             }
         end

data/lib/spiderfw/model/base_model.rb

@@ -740,6 +740,7 @@ module Spider; module Model
             attributes[:hidden] = true unless (params[:hide_integrated] == false)
             attributes[:delete_cascade] = params[:delete_cascade]
             attributes[:extended_model] = true
+            attributes[:add_reverse] = params[:reverse]
             integrated = element(integrated_name, model, attributes)
             integrate_options = {:keep_pks => true}.merge((params[:integrate_options] || {}))
             integrate(integrated_name, integrate_options)
@@ -2463,6 +2464,25 @@ module Spider; module Model
             h
         end
         
+        def self.from_hash_dump(h)
+            obj = self.static
+            h.each do |key, val|
+                el = self.elements[key.to_sym]
+                next unless el
+                if el.multiple? && val
+                    qs = obj.get(el)
+                    val.each do |v|
+                        v = el.model.from_hash_dump(v) if v.is_a?(Hash)
+                        qs << v
+                    end
+                else
+                    val = el.model.from_hash_dump(val) if val.is_a?(Hash)
+                    obj.set(el, val)
+                end
+            end
+            obj
+        end
+        
         def dump_to_all_data_hash(options={}, h={}, seen={})
             Spider::Model.with_identity_mapper do |im|
                 clname = self.class.name.to_sym

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

@@ -1076,7 +1076,7 @@ module Spider; module Model; module Mappers
 
         # Modifies the storage according to the schema.
         def sync_schema(force=false, options={})
-            compute_foreign_key_constraints
+            compute_foreign_key_constraints unless options[:no_foreign_key_constraints] || !storage.supports?(:foreign_keys)
             schema_description = schema.get_schemas
             sequences = {}
             sequences[schema.table] = schema.sequences

data/lib/spiderfw/requires.rb

@@ -23,6 +23,7 @@ require 'spiderfw/utils/profiling'
 require 'spiderfw/utils/ordered_hash'
 require 'spiderfw/utils/memory'
 require 'spiderfw/utils/secure_random'
+require 'spiderfw/utils/http_client'
 require 'spiderfw/config/configuration'
 require 'spiderfw/config/configurable'
 require 'spiderfw/model/model'

data/lib/spiderfw/setup/app_server_client.rb

@@ -20,7 +20,14 @@ module Spider
         def http_get(url)
             uri = URI.parse(url)
             proxy = uri.find_proxy
-            klass = proxy ? Net::HTTP::Proxy(proxy.host, proxy.port) : Net::HTTP
+            klass = nil
+            if proxy
+                proxy_user, proxy_pass = nil
+                proxy_user, proxy_pass = proxy.userinfo.split(/:/) if proxy.userinfo
+                klass = Net::HTTP::Proxy(proxy.host, proxy.port, proxy_user, proxy_pass)
+            else
+                klass = Net::HTTP
+            end
             result = klass.get_response(uri)
             raise "#{result.code} #{result.message} #{uri}" if result.is_a?(Net::HTTPClientError)
             result.body
@@ -47,9 +54,11 @@ module Spider
         end
         
         def fetch_app(app_id)
-            tmp = Tempfile.open("spider-app-archive")
+            tmp = Tempfile.new("spider-app-archive")
+            tmp.binmode
             res = http_get(@url+"/pack/#{app_id}")
             tmp << res
+            tmp.flush
             tmp.path
         end
         

data/lib/spiderfw/utils/http_client.rb

@@ -0,0 +1,16 @@
+module Spider
+
+    def self.http_client
+        uri = URI.parse('http://www.test.com')
+        proxy = uri.find_proxy
+        klass = nil
+        if proxy
+            proxy_user, proxy_pass = nil
+            proxy_user, proxy_pass = proxy.userinfo.split(/:/) if proxy.userinfo
+            Net::HTTP::Proxy(proxy.host, proxy.port, proxy_user, proxy_pass)
+        else
+            Net::HTTP
+        end
+    end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 5
-  - 14
-  version: 0.5.14
+  - 15
+  version: 0.5.15
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 +01:00
+date: 2010-11-26 00:00:00 +01:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -1058,6 +1058,7 @@ files:
 - lib/spiderfw/utils/events/event_source.rb
 - lib/spiderfw/utils/fork.rb
 - lib/spiderfw/utils/hash_comparison.rb
+- lib/spiderfw/utils/http_client.rb
 - lib/spiderfw/utils/inflector.rb
 - lib/spiderfw/utils/json.rb
 - lib/spiderfw/utils/logger.rb