ooor 2.0.1 → 2.0.2

data/bin/ooor

@@ -25,7 +25,15 @@ unless ARGV.empty?
   else
     port = "8069"
   end
-  url = "http://#{base_url}:#{port}/xmlrpc"
+
+  if ARGV[1] == "-s" || ARGV[2] == "-s" #secure mode
+    port = 443 unless port_given
+    protocol = "https"
+  else
+    protocol = "http"
+  end
+
+  url = "#{protocol}://#{base_url}:#{port}/xmlrpc"
   if ARGV[1] && ARGV[1] != "-s"
     password = ARGV[1]
   else
@@ -35,10 +43,6 @@ unless ARGV.empty?
     system "stty echo"
   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

data/lib/ooor/base.rb

@@ -97,7 +97,11 @@ module Ooor
       attributes.each do |key, value|
         skey = key.to_s
         if self.class.associations_keys.index(skey) || value.is_a?(Array) #FIXME may miss m2o with inherits!
-          @associations[skey] = value #the association because we want the method to load the association through method missing
+          if value.is_a?(Ooor::Base) || value.is_a?(Array) && value.all? {|i| i.is_a?(Ooor::Base)}
+            @loaded_associations[skey] = value #we want the method to load the association through method missing
+          else
+            @associations[skey] = value
+          end
         else
           @attributes[skey] = value || nil #don't bloat with false values
         end

data/lib/ooor/errors.rb

@@ -17,7 +17,7 @@ module Ooor
     end
       
     def self.build(faultCode, faultString, method, *args)
-      if faultCode =~ /AttributeError: /
+      if faultCode =~ /AttributeError: / || faultCode =~ /object has no attribute/
         return UnknownAttributeOrAssociationError.new("method: #{method} - args: #{args.inspect}", faultCode, faultString)
       elsif faultCode =~ /TypeError: /
         return TypeError.new(method, faultCode, faultString, *args)

data/lib/ooor/field_methods.rb

@@ -37,7 +37,6 @@ module Ooor
       
       # this is used by fields_for in ActionView FormHelper
       def define_nested_attributes_method(meth)
-        p "define_nested_attributes_method", meth
         unless self.respond_to?(meth)
           self.instance_eval do
             define_method "#{meth}_attributes=" do |*args|

data/lib/ooor/transport/json_client.rb

@@ -25,6 +25,11 @@ module Ooor
         end
 
         def oe_request(session_info, url, params, method, *args)
+          if session_info[:req_id]
+             session_info[:req_id] += 1
+          else
+             session_info[:req_id] = 1
+          end
           if session_info[:sid] # required on v7 but forbidden in v8
             params.merge!({"session_id" => session_info[:session_id]})
           end
@@ -32,7 +37,7 @@ module Ooor
             req.headers['Cookie'] = session_info[:cookie]
             req.url url
             req.headers['Content-Type'] = 'application/json'
-            req.body = {"jsonrpc"=>"2.0","method"=>"call", "params" => params, "id"=>"r42"}.to_json
+            req.body = {"jsonrpc"=>"2.0","method"=>"call", "params" => params, "id"=>session_info[:req_id]}.to_json
           end.body)
           if response["error"]
             faultCode = response["error"]['data']['fault_code'] || response["error"]['data']['debug']
@@ -45,11 +50,8 @@ module Ooor
 
       Faraday::Connection.send :include, OeAdapter
 
-      def self.new(url = nil, options = nil)
-        if defined?(Java) # see http://stackoverflow.com/questions/5711190/how-to-get-rid-of-opensslsslsslerror
-           options ||= {}
-           options[:ssl] = {:verify => false}
-        end
+      def self.new(url = nil, options = {})
+        options[:ssl] = {:verify => false}
         Faraday.new(url, options) # TODO use middlewares
       end
     end

data/lib/ooor/version.rb

@@ -1,7 +1,7 @@
 module Ooor
   MAJOR = 2
   MINOR = 0
-  TINY  = 1
+  TINY  = 2
   PRE   = nil
 
   VERSION = [MAJOR, MINOR, TINY].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooor
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -117,3 +117,4 @@ test_files:
 - spec/helpers/test_helper.rb
 - spec/install_nightly.sh
 - spec/ooor_spec.rb
+has_rdoc: