ooor_finders 0.1 → 0.1.2

data/README.md

@@ -9,6 +9,8 @@ find_by_xml_id or alias find_by_oid
 
 So we can do
 
+require "ooor_finders"
+
 ResUsers.find_by_xml_id('module.xml_id').id
 ResUsers.find_by_id(23).id
 ResUsers.find_by_name('Administrator').id
@@ -20,6 +22,11 @@ ResUsers.find_last_by_name('Administrator')
 ResUsers.find_last_by_name_and_login('Administrator', 'admin')
 ResUsers.find_by_name_and_login('Administrator', 'admin')
 
+Plus the create mode 
+
+ResUsers.find_or_create_by_login_and_name_and_oid 'toto', 'toto', 'base.toto'
+ResUsers.find_or_create_by_login_and_name'toto', 'toto'
+
 Other options are supported
 
 ResUsers.find_all_by_name('Administrator', :fields=>['id'], :limit=>20)

data/lib/open_object_resource.rb

@@ -1,19 +1,42 @@
 require 'rubygems'
 require 'ooor'
-
 module Ooor
   class OpenObjectResource
     class << self
       alias_method :method_missing_original, :method_missing
       
-      def _dynamic_find(match, arguments)
+      def _instanciate_by_attributes(match, arguments)
+        # TODO check relation and send a warning        
+        res = self.new
+        attributes = match.attribute_names
+        xml_id = nil
+        attributes.length.times do |index|
+          if ['xml_id', 'oid'].include? attributes[index]
+            xml_id = arguments[index]
+          elsif attributes[index] == 'id'
+            raise "find_or_create_by_id is not supported"
+          else
+            eval("res.#{attributes[index]} = arguments[index]")
+          end
+        end
+        res.create
+        if xml_id
+          res.ir_model_data_id = xml_id
+          res.save
+        end
+        return res
+      end
+      
+      def _find_or_instantiator_by_attributes(match, arguments)
+        unique_keys = ['xml_id', 'id', 'oid']
         options = {}
         if arguments.last.is_a? Hash
           options = arguments.last
         end
         attributes = match.attribute_names
-        if attributes[0] == 'xml_id' || attributes[0] == 'id' || attributes[0] == 'oid'
-          return self.find(arguments[0], options)
+        unique_index = attributes.index{|x| unique_keys.include? x}
+        if unique_index
+          res = self.find(arguments[unique_index], options)
         else
           domain = []
           attributes.length.times do | index |
@@ -21,21 +44,24 @@ module Ooor
           end
           options.merge!({:domain => domain})
           res = self.find(match.finder, options)
-          if match.bang?
+          if match.bang? && !match.instantiator?
             unless res
               raise "Could not find #{self.class} with for domain #{domain.inspect}"
             end
           end
-          return res
         end
+        if match.instantiator and not res
+          return _instanciate_by_attributes(match, arguments)
+        end
+        return res
       end
       
       def method_missing(method_symbol, *arguments)
         match = DynamicFinderMatch.match(method_symbol.to_s)
         if match
-          return send(:_dynamic_find, match, arguments)
+          return send(:_find_or_instantiator_by_attributes, match, arguments)
         end
-        return method_missing_original
+        return method_missing_original(method_symbol, arguments)
       end
     end
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ooor_finders
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  version: "0.1"
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Nicolas Bessi - Camptocamp