ooor 1.5.1 → 1.5.2

data/bin/ooor

@@ -0,0 +1,57 @@
+#!/usr/bin/ruby
+
+puts "*** OOOR - OpenObject on Rails! is published under the AGPL license by Akretion.com ***"
+
+require 'irb'
+require 'rubygems'
+require 'ooor'
+
+begin
+  #require 'bond' #auto-completion
+  #Bond.start
+  require 'irb/completion'
+rescue
+  require 'irb/completion'
+end
+
+  
+unless ARGV.empty?
+  username = ARGV[0].split(".")[0]
+  database = ARGV[0].split(".")[1].split("@")[0]
+  if ARGV[0].index("@")
+    base_url = ARGV[0].split("@")[1]
+  else
+    base_url = "localhost"
+    end  
+  port_given = false
+  if base_url.index(":") #port in URL
+    t = base_url.split(":")
+    base_url = t[0]
+    port = t[1]
+    port_given = true
+  else
+    port = "8069"
+  end
+  url = "http://#{base_url}:#{port}/xmlrpc"
+  if ARGV[1] && ARGV[1] != "-s"
+    password = ARGV[1]
+  else
+    puts "password?"
+    password = $stdin.gets.chomp!
+  end
+  
+  if ARGV[1] == "-s" || ARGV[2] == "-s" #secure mode
+    url.gsub!("http", "https")
+    url.gsub!("8069", "8071") unless port_given
+  end
+else
+  puts "USAGE: ooor admin.database@host\nor ooor admin.database@host:port\nor ooor admin.database for localhost\nyou can specify the password with ooor admin.database@host password\nyou can use the -s option for secure HTTPS mode"
+  exit 0
+end
+
+ARGV = []
+ARGV << '--readline' << '--prompt' << 'inf-ruby'
+
+ooor = Ooor.new(:url => url, :database => database || 'demo', :username => username || 'admin', :password => password || 'admin')
+
+IRB.start(__FILE__)

data/lib/app/models/open_object_resource.rb

@@ -124,7 +124,16 @@ module Ooor
       end
 
       def rpc_execute_with_object(object, method, *args)
-        rpc_execute_with_all(@database || @ooor.config[:database], @user_id || @ooor.config[:user_id], @password || @ooor.config[:password], object, method, *args)
+        if args[-1].is_a? Hash #context
+          user_id = args[-1].delete(:user_id) || args[-1].delete('user_id') || @user_id || @ooor.config[:user_id]
+          password = args[-1].delete(:password) || args[-1].delete('password') || @password || @ooor.config[:password]
+          database = args[-1].delete(:database) || args[-1].delete('database') || @database || @ooor.config[:database]
+        else
+          user_id = @user_id || @ooor.config[:user_id] #TODO @user_id useless?
+          password = @password || @ooor.config[:password]
+          database = @database || @ooor.config[:database]
+        end
+        rpc_execute_with_all(database, user_id, password, object, method, *args)
       end
 
       #corresponding method for OpenERP osv.execute(self, db, uid, obj, method, *args, **kw) method
@@ -232,7 +241,7 @@ module Ooor
     attr_accessor :associations, :loaded_associations, :ir_model_data_id, :object_session
 
     def object_db; object_session[:database] || self.class.database || self.class.ooor.config[:database]; end
-    def object_uid;object_session[:user_id] || self.class.user_id || self.class.ooor.config[:user_id]; end
+    def object_uid; object_session[:user_id] || self.class.user_id || self.class.ooor.config[:user_id]; end
     def object_pass; object_session[:password] || self.class.password || self.class.ooor.config[:password]; end
 
     #try to wrap the object context inside the query.

data/lib/app/models/type_casting.rb

@@ -40,6 +40,8 @@ module Ooor
             map[k] = "#{v.year}-#{v.month}-#{v.day} #{v.hour}:#{v.min}:#{v.sec}"
           elsif !v.is_a?(Numeric) && !v.is_a?(Integer) && v.respond_to?(:day) && v.respond_to?(:year)#really ensure that's a date type
             map[k] = "#{v.year}-#{v.month}-#{v.day}"
+          elsif v == "false" #may happen with OOORBIT
+            map[k] = false
           end
         end
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 1
-  version: 1.5.1
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - Raphael Valyi - www.akretion.com
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 -03:00
+date: 2011-03-31 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,8 +34,8 @@ dependencies:
   version_requirements: *id001
 description: OOOR exposes business object proxies to your Ruby (Rails or not) application, that map seamlessly to your remote OpenObject/OpenERP server using webservices. It extends the standard ActiveResource API.
 email: rvalyi@akretion.com
-executables: []
-
+executables: 
+- ooor
 extensions: []
 
 extra_rdoc_files: []
@@ -58,6 +58,7 @@ files:
 - lib/app/ui/form_model.rb
 - lib/app/ui/menu.rb
 - spec/ooor_spec.rb
+- bin/ooor
 has_rdoc: true
 homepage: http://github.com/rvalyi/ooor
 licenses: []