kangaroo 0.0.3 → 0.1.0.alpha1

data/lib/kangaroo/model/associations/many2one.rb

@@ -0,0 +1,43 @@
+module Kangaroo
+  module Model
+    module Associations
+      module Many2one
+        extend ActiveSupport::Concern
+        
+        def read_many2one_id_for field
+          field_value = send field.name
+          
+          if Array === field_value
+            field_value.first
+          else
+            field_value
+          end
+        end
+        
+        def write_many2one_id_for field, id
+          send field.setter_name, id
+        end
+        
+        def read_many2one_name_for field
+          field_value = send field.name
+          
+          if Array === field_value
+            field_value.last
+          else
+            read_many2one_obj_for(field).try :name
+          end
+        end
+        
+        def read_many2one_obj_for field
+          id = read_many2one_id_for(field)
+          
+          field.relation_class.find_by_id id
+        end
+        
+        def write_many2one_obj_for field, obj
+          write_many2one_id_for field, obj.id
+        end
+      end
+    end
+  end
+end

data/lib/kangaroo/model/associations/one2many.rb

@@ -0,0 +1,41 @@
+module Kangaroo
+  module Model
+    module Associations
+      module One2many
+        extend ActiveSupport::Concern
+        
+        def read_one2many_ids_for field
+          field_value = send field.name
+          return unless Array === field_value
+          
+          if Array === field_value.first
+            field_value.first.last
+          else
+            field_value
+          end
+        end
+        
+        def write_one2many_ids_for field, ids
+          send field.setter_name, coerce_one2many_ids(ids)
+        end
+        
+        def read_one2many_objs_for field
+          ids = read_one2many_ids_for field
+          
+          field.relation_class.where(:id => ids)
+        end
+        
+        def write_one2many_objs_for field, objs
+          ids = objs.map &:id
+          
+          write_one2many_ids_for field, ids
+        end
+        
+        protected
+        def coerce_one2many_ids ids
+          [[6, 0, ids]]
+        end
+      end
+    end
+  end
+end

data/lib/kangaroo/model/attributes.rb

@@ -1,122 +1,117 @@
 require 'active_model/dirty'
+require 'active_support/core_ext/class/attribute'
 
 module Kangaroo
-  module Attributes
-    # @private
-    def self.included base
-      base.send :include, ActiveModel::Dirty
-      base.extend ClassMethods
-    end
-
-    # Read an attribute value by name
-    #
-    # @param [String, Symbol] name attribute name
-    # @return attribute value
-    def read_attribute name
-      @attributes[name.to_s]
-    end
-
-    # Write an attribute by name
-    #
-    # @param [String, Symbol] name attribute name
-    # @param value attribute value to set
-    # @return attribute value
-    def write_attribute name, value
-      attribute_will_change! name.to_s
-      @attributes[name.to_s] = value
-    end
-
-    # Mass set attributes. Attribute values are set via setters, not directly stored
-    # in the @attributes Hash.
-    #
-    # @param [Hash] attributes Hash of attribute names and values
-    # @return [Hash] attributes
-    def attributes= attributes
-      attributes.except('id', :id).map do |key_value|
-        __send__ "#{key_value.first}=", key_value.last
+  module Model
+    module Attributes
+      extend ActiveSupport::Concern
+      
+      included do
+        include ActiveModel::Dirty
+        class_attribute :attribute_names
       end
 
-      self.attributes
-    end
-
-    # Read all attributes. Attributes are read via getters.
-    #
-    # @return [Hash] attributes
-    def attributes
-      {}.tap do |attributes|
-        self.class.attribute_names.each do |key|
-          attributes[key] = send(key)
-        end
+      # Read an attribute value by name
+      #
+      # @param [String, Symbol] name attribute name
+      # @return attribute value
+      def read_attribute name
+        @attributes[name.to_s]
       end
-    end
 
-    # Freeze this object
-    def freeze
-      @changed_attributes.freeze
-      @attributes.freeze
-      super
-    end
-
-    module ClassMethods
-      # If you need to customize your models, e.g. add attributes
-      # not covered by fields_get, you can call {extend_attribute_methods}
+      # Write an attribute by name
       #
-      # @param [Array] attributes list of attribute names to define accessors for
-      def extend_attribute_methods *attributes
-        attributes.flatten.each do |attr|
-          next if attribute_names.include?(attr.to_s)
-          define_accessors attr
-        end
+      # @param [String, Symbol] name attribute name
+      # @param value attribute value to set
+      # @return attribute value
+      def write_attribute name, value
+        name = name.to_s
+        attribute_will_change! name unless @attributes[name] == value
+        @attributes[name] = value
       end
 
-      # Define getters for attributes
+      # Mass set attributes. Attribute values are set via setters, not directly stored
+      # in the @attributes Hash.
       #
-      # @param [Array] attribute_names
-      def define_getters *attribute_names
-        attribute_names.flatten.each do |name|
-          define_getter name
+      # @param [Hash] attributes Hash of attribute names and values
+      # @return [Hash] attributes
+      def attributes= attributes
+        attributes.except('id', :id).map do |key_value|
+          __send__ "#{key_value.first}=", key_value.last
         end
+
+        self.attributes
       end
 
-      # Define getter
+      # Read all attributes. Attributes are read via getters.
       #
-      # @param [String, Symbol] attribute_name
-      def define_getter attribute_name
-        define_method attribute_name do
-          read_attribute attribute_name
+      # @return [Hash] attributes
+      def attributes
+        {}.tap do |attributes|
+          attribute_names.each do |key|
+            attributes[key] = send(key)
+          end
         end
       end
 
-      # Get a list of available attributes
-      #
-      # @return [Array] attribute names
-      def attribute_names
-        @attribute_names ||= []
+      # Freeze this object
+      def freeze
+        @changed_attributes.freeze
+        @attributes.freeze
+        super
       end
 
-      # Define getter and setter for an attribute
-      #
-      # @param [String, Symbol] attribute_name
-      def define_accessors attribute_name
-        define_method attribute_name do
-          read_attribute attribute_name
+      module ClassMethods
+        # If you need to customize your models, e.g. add attributes
+        # not covered by fields_get, you can call {extend_attribute_methods}
+        #
+        # @param [Array] attributes list of attribute names to define accessors for
+        def extend_attribute_methods *attributes
+          attributes.flatten.each do |attr|
+            next if attribute_names.include?(attr.to_s)
+            define_accessors attr
+          end
         end
 
-        define_method "#{attribute_name}=" do |value|
-          write_attribute attribute_name, value
+        # Define setter
+        #
+        # @param [String, Symbol] attribute_name
+        def define_setter attribute_name
+          define_method "#{attribute_name}=" do |value|
+            write_attribute attribute_name, value
+          end
         end
 
-        attribute_names << attribute_name.to_s
-      end
+        # Define getter
+        #
+        # @param [String, Symbol] attribute_name
+        def define_getter attribute_name
+          define_method attribute_name do
+            read_attribute attribute_name
+          end
+        end
 
-      # Define getters and setters for attributes
-      #
-      # @param [Array] attribute_names
-      def define_multiple_accessors *attribute_names
-        define_attribute_methods attribute_names.map(&:to_s)
+        # Define getter and setter for an attribute
+        #
+        # @param [String, Symbol] attribute_name
+        def define_accessors attribute_name
+          define_getter attribute_name
+          define_setter attribute_name
+
+          self.attribute_names ||= []
+          attribute_names << attribute_name.to_s
+          attribute_names.uniq!
+        end
+
+        # Define getters and setters for attributes
+        #
+        # @param [Array] attribute_names
+        def define_multiple_accessors *attribute_names
+          define_attribute_methods attribute_names.map(&:to_s)
 
-        attribute_names.each do |attribute_name|
-          define_accessors attribute_name
+          attribute_names.each do |attribute_name|
+            define_accessors attribute_name
+          end
         end
       end
     end

data/lib/kangaroo/model/base.rb

@@ -1,3 +1,6 @@
+require 'active_model'
+require 'active_support/core_ext/class'
+
 require 'kangaroo/model/relation'
 require 'kangaroo/model/attributes'
 require 'kangaroo/model/default_attributes'
@@ -6,13 +9,18 @@ require 'kangaroo/model/persistence'
 require 'kangaroo/model/open_object_orm'
 require 'kangaroo/model/finder'
 require 'kangaroo/model/remote_execute'
-require 'active_model/callbacks'
-require 'active_support/core_ext/class'
+require 'kangaroo/model/readonly_attributes'
+require 'kangaroo/model/required_attributes'
+require 'kangaroo/model/data_import'
+require 'kangaroo/model/dynamic_finder'
+require 'kangaroo/model/associations'
+require 'kangaroo/model/mass_import'
+require 'kangaroo/util/loader/namespace'
 
 module Kangaroo
   module Model
     class Base
-      class_attribute :database
+      class_attribute :database, :namespace, :oo_name, :oo_model
       class_inheritable_array :field_names
 
       extend ActiveModel::Callbacks
@@ -22,10 +30,17 @@ module Kangaroo
       include Persistence
       include DefaultAttributes
       include Inspector
-      extend OpenObjectOrm
-      extend Finder
+      extend  OpenObjectOrm
+      extend  Finder
       include RemoteExecute
-
+      extend  ReadonlyAttributes
+      include RequiredAttributes
+      extend  DataImport
+      extend  DynamicFinder
+      include Associations
+      include MassImport
+      extend Util::Loader::Namespace
+      
       attr_reader :id
 
       # Initialize a new object, and set attributes
@@ -44,19 +59,22 @@ module Kangaroo
       def remote
         self.class.remote
       end
+      
+      def == other
+        if new_record?
+          false
+        else
+          self.class === other and id == other.id
+        end
+      end
 
       class << self
-        def fields
-          @fields ||= fields_get
-        end
-        
-        def namespace
-          ("::" + name.match(/^(?:\:\:)?([^\:]+)/)[1]).constantize
+        def fields_hash
+          @fields_hash ||= fields_to_hash(fields_get)
         end
         
-        # Return this models OpenObject name
-        def oo_name
-          namespace.ruby_to_oo self.name
+        def fields
+          @fields ||= fields_hash.values
         end
 
         # Send method calls via xmlrpc to OpenERP
@@ -64,6 +82,17 @@ module Kangaroo
         def remote
           @remote ||= database.object oo_name
         end
+        
+        protected
+        def fields_to_hash fields
+          return nil if fields.nil?
+          
+          {}.tap do |h|
+            fields.each do |field|
+              h[field.name] = field
+            end
+          end
+        end
       end
     end
   end

data/lib/kangaroo/model/condition_normalizer.rb

@@ -13,7 +13,7 @@ module Kangaroo
           Array(conditions)
         end
 
-        conditions.map do |condition|
+        conditions.sum([]) do |condition|
           normalize_condition condition
         end
       end
@@ -21,7 +21,7 @@ module Kangaroo
       def normalize_condition condition
         case condition
         when Array
-          condition
+          [condition]
         when Hash
           convert_hash_condition condition
         when String
@@ -32,8 +32,8 @@ module Kangaroo
       end
 
       def convert_hash_condition condition
-        condition.sum([]) do |key_val|
-          convert_key_value_condition *key_val
+        condition.map do |key_val|
+          convert_key_value_condition(*key_val)
         end
       end
 
@@ -42,7 +42,7 @@ module Kangaroo
           value = value.map &:to_s
           'in'
         else
-          value = value.to_s
+          value = value
           '='
         end
 
@@ -53,9 +53,9 @@ module Kangaroo
         # Ugly workaround, if you know how to make 'not in' work along the other operators
         # with a single RegExp, please let me now
         if (key_val = string.split("not in")).length > 1
-          [key_val.first.strip, 'not in', key_val.last.strip]
+          [[key_val.first.strip, 'not in', key_val.last.strip]]
         else
-          CONDITION_PATTERN.match(string).try(:captures) || string
+          [CONDITION_PATTERN.match(string).try(:captures) || string]
         end
       end
     end

data/lib/kangaroo/model/data_import.rb

@@ -0,0 +1,28 @@
+module Kangaroo
+  module Model
+    module DataImport
+      def import_all records, options = {}
+        fields = changed_fields_in records
+        datas = map_fields_in records, fields
+        
+        fields << '.id'
+        import_data fields, datas, options
+      end
+      
+      protected
+      def changed_fields_in records
+        records.sum([]) do |record|
+          record.changed
+        end.uniq
+      end
+      
+      def map_fields_in records, fields
+        records.map do |record|
+          fields.map do |field|
+            record.read_attribute field
+          end + [record.id]
+        end
+      end
+    end
+  end
+end