cucumber-openerpscenario 0.1.7 → 0.1.8

data/cucumber-openerp.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{cucumber-openerpscenario}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
   s.date = %q{2013-03-06}
   s.authors = ["Nicolas Bessi - Camptocamp"]
   s.summary = %q{cucumber on OpenERP}

data/lib/cucumber/lib/ERPConnector.rb

@@ -1,7 +1,7 @@
 ###############################################################################
 #
 #    OERPScenario, OpenERP Functional Tests
-#    Author Nicolas Bessi 2009 
+#    Author Nicolas Bessi 2009
 #    Copyright Camptocamp SA
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -43,7 +43,7 @@ class ScenarioUtils
 
   def get_config
     my_config = ParseConfig.new(config_path)
-
+    # TODO When ruby 1.8 obsolete use dict syntax
     {# ooor options
      :port => my_config.get_value('port'),
      :user => my_config.get_value('user'),
@@ -51,7 +51,7 @@ class ScenarioUtils
      :pwd => my_config.get_value('password'),
      :host => my_config.get_value('host'),
      :log_level => Logger::ERROR,
-
+     :rpc_timeout => my_config.get_value('rpc_timeout').nil? ? nil : my_config.get_value('rpc_timeout').to_i,
      # sequel options
      :db_host => my_config.get_value('db_host'),
      :db_port => my_config.get_value('db_port'),
@@ -59,4 +59,4 @@ class ScenarioUtils
      :db_password => my_config.get_value('db_password')}
   end
   private :get_config
-end
+end

data/lib/cucumber/lib/utils/ooor_utils.rb

@@ -45,7 +45,7 @@ module OoorUtils
     rescue Exception => e
       $helperlogger.warn('can not load scenario helpers')
     end
-    
+
   end
   def create_ooor_connection(params={})
     ooor.open_connection(config.merge(params))
@@ -92,6 +92,7 @@ class OoorProxy < BasicObject
                   :database => params[:dbname],
                   :username => params[:user],
                   :password => params[:pwd],
+                  :rpc_timeout => params[:rpc_timeout],
                   :log_level => params[:log_level]})
     end
     private :init_ooor_connection
@@ -131,4 +132,4 @@ class OoorProxy < BasicObject
     end
     protected :method_missing
 
-end
+end

data/lib/cucumber/openerp/dsl.rb

@@ -24,12 +24,12 @@ def get_items(action, qty, model, args)
   else
     qty = ''
   end
-  command_map = {'create' => 'new', 'need' => 'find_or_initialize_by_', 'shoud_have' => "find_#{qty}by_", 'find' => "find_#{qty}by_", 'find or create' => 'find_or_initialize_by_'}
+  command_map = {'create' => 'new', 'need' => 'find_or_initialize_by_', 'should have' => "find_#{qty}by_", 'find' => "find_#{qty}by_", 'find or create' => 'find_or_initialize_by_'}
   comm_ext, arguments = prepare_args(args)
   arguments.push({:fields=>['id']})
   if command_map[action] == 'create'
     if oclass.send(('find_by_'+comm_ext).to_sym, *arguments)
-      raise "Error object allerady exist if this is not the wished behavior please use need keyword"
+      raise "Error. This object already exists, if you want to update or use it, you have to use the sentence starting with \"I need...\" or \"I should have\""
     end
   end
   res = oclass.send((command_map[action]+comm_ext).to_sym, *arguments) # I know in case or create we do 2 search but as there should be nul it cost almost nothing
@@ -56,35 +56,44 @@ def _manage_col_search(field_def, value)
   return oid
 end
 
+def _item_value(relations, field_name, input_value, value_type)
+  return input_value if %w(char text).include?(value_type)
+
+  # we want to empty the data
+  return false if input_value.match(/^(false|0|no|f|n|nil)$/i)
+
+  # the field is a relation
+  if relations[field_name]
+    rel_item = _manage_col_search(relations[field_name], input_value)
+    return rel_item.id
+  end
+
+  # other data types
+  value = case value_type
+          when 'integer' then Integer(input_value)
+          when 'float' then Float(input_value)
+          when 'boolean' then true  # false values are already trapped
+          when 'date', 'datetime' then
+            input_value.include?('%') ? Time.new.strftime(input_value) : input_value
+          else
+            input_value
+          end
+  value
+end
+
 def manage_item_table(item, table)
-  fields = {}
-  fields.merge! item.class.many2one_associations
-  fields.merge! item.class.one2many_associations
-  fields.merge! item.class.many2many_associations
-  
+  relations = {}
+  relations.merge! item.class.many2one_associations
+  relations.merge! item.class.one2many_associations
+  relations.merge! item.class.many2many_associations
+
   table.hashes.each do |dict|
-    if fields[dict['name']]
-      rel_item = _manage_col_search(fields[dict['name']], dict['value'])
-      eval "item.#{dict['name']} = rel_item.id"
-    else
-      value = dict['value']
-      v_type = item.class.fields.fetch(dict['name'],{}).fetch('type', nil)
-      if v_type == 'integer'
-        value = Integer(value)
-      elsif v_type == 'float'
-        value = Float(value)
-      elsif v_type == 'boolean'
-        if [nil, 0, false, ''].include? value
-          value = false
-        end
-      elsif ['date', 'datetime'].include? v_type
-        if value.include? "%"
-          value = Time.new().strftime(value) 
-        end
-      end
-      eval "item.#{dict['name']} = value"
-    end
-  end    
+    field_name = dict['name']
+    value = dict['value']
+    value_type = item.class.fields.fetch(field_name, {}).fetch('type', '')
+
+    item.send("#{field_name}=".to_sym, _item_value(relations, field_name, value, value_type))
+  end
 end
 
 Given /^I (create|need|should have|find|find or create) (a|all|last) "([^"]*)" with (.*)$/ do |action, qty, model, args|

metadata

@@ -2,7 +2,7 @@
 name: cucumber-openerpscenario
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Nicolas Bessi - Camptocamp
@@ -83,6 +83,7 @@ files:
 - bin/cucumber-openerp
 - cucumber-openerp.gemspec
 - cucumber-openerpscenario-0.1.6.gem
+- cucumber-openerpscenario-0.1.7.gem
 - lib/.DS_Store
 - lib/cucumber/.DS_Store
 - lib/cucumber/lib/.DS_Store