kangaroo 0.0.3 → 0.1.0.alpha1

data/lib/kangaroo/model/default_attributes.rb

@@ -1,21 +1,27 @@
 module Kangaroo
-  module DefaultAttributes
-    # @private
-    def self.included klass
-      klass.extend ClassMethods
+  module Model
+    module DefaultAttributes
+      extend ActiveSupport::Concern
+      
+      included do
+        before_initialize do
+          return true if persisted?
+          
+          default_attributes = self.class.default_attributes
+          if default_attributes.blank?
+            return true
+          end
 
-      klass.before_initialize do
-        return true if persisted?
-
-        self.class.default_attributes.each do |name, value|
-          write_attribute name, value
-        end
+          default_attributes.each do |name, value|
+            write_attribute name, value
+          end
+        end        
       end
-    end
 
-    module ClassMethods
-      def default_attributes
-        default_get :fields => attribute_names
+      module ClassMethods
+        def default_attributes
+          default_get :fields => attribute_names
+        end
       end
     end
   end

data/lib/kangaroo/model/dynamic_finder.rb

@@ -0,0 +1,42 @@
+module Kangaroo
+  module Model
+    module DynamicFinder
+      
+      def respond_to? name, *args
+        case name.to_s
+        when /^find_(all|first|last|)_?by_(.+)$/
+          true
+        else
+          super
+        end
+      end
+      
+      protected
+      def method_missing name, *args
+        name = name.to_s
+        case name
+        when /^find_(all|first|last|)_?by_(.+)$/
+          finder = $1.blank? ? :first : $1
+          fields = $2.split '_and_'
+          define_dynamic_finder name, fields do |relation|
+            relation.send finder
+          end
+          send name, *args
+        else
+          super
+        end
+      end
+      
+      def define_dynamic_finder name, keys
+        singleton_class.send :define_method, name do |*values|
+          conditions = {}
+          keys.each_with_index do |key, i|
+            conditions[key] = values[i]
+          end
+          
+          yield where(conditions)
+        end
+      end
+    end
+  end
+end

data/lib/kangaroo/model/field.rb

@@ -3,14 +3,42 @@ require 'kangaroo/model/attributes'
 module Kangaroo
   module Model
     class Field
+      AssociationTypes = %w(many2one one2many one2one many2many)
+      autoload :Readonly, 'kangaroo/model/field/readonly'
+      
       include Attributes
+      include Readonly
 
       attr_accessor :name
       define_multiple_accessors :change_default, :context, :digits, :domain, :fnct_inv, :fnct_inv_arg, 
                                 :fnct_search, :func_method, :func_obj, :function, :help, :invisible, 
                                 :readonly, :related_columns, :relation, :required, :select, :selectable, 
                                 :selection, :size, :states, :store, :string, :third_table, :translate, 
-                                :type
+                                :type, :namespace
+                                
+      def selection?
+        type == 'selection'
+      end
+      
+      def char?
+        type == 'char'
+      end
+      
+      def float?
+        type == 'float'
+      end
+      
+      def functional?
+        !!function
+      end
+      
+      def selectable?
+        !!selectable
+      end
+      
+      def association?
+        AssociationTypes.include? type
+      end
                                 
       def initialize name, attributes = {}
         @attributes = {}
@@ -19,6 +47,29 @@ module Kangaroo
         attributes.each do |key, val|
           write_attribute key, val
         end
+        
+        self.states = attributes[:states] if attributes[:states]
+      end
+      
+      def setter_name
+        "#{name}="
+      end
+      
+      def required?
+        !!required
+      end
+      
+      def states= states
+        coerced_states = {}
+        
+        states.each do |name, effects|
+          coerced_states[name.to_s] = Hash[effects]
+        end
+        write_attribute :states, coerced_states
+      end
+      
+      def relation_class
+        @relation_class ||= namespace.class_for relation rescue nil
       end
     end
   end

data/lib/kangaroo/model/field/readonly.rb

@@ -0,0 +1,39 @@
+module Kangaroo
+  module Model
+    class Field
+      module Readonly
+        def readonly?
+          !!readonly
+        end
+      
+        def eventually_readonly?
+          !!readonly || (states.present? && states.any? { |key, value|
+            !!value['readonly']
+          })
+        end
+      
+        def always_readonly?
+          readonly? && (states.blank? || states.all? { |key, value|
+            value['readonly'].nil? || value['readonly'] == true
+          })
+        end
+      
+        def readonly_in? state
+          return true if always_readonly?
+        
+          s = states && states[state.to_s]
+        
+          if readonly?
+            return true unless s
+          
+            s['readonly'] == true
+          else
+            return false unless s
+          
+            s['readonly'] == false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kangaroo/model/finder.rb

@@ -5,6 +5,10 @@ module Kangaroo
     module Finder
       RELATION_DELEGATES = %w(where limit offset order select context reverse)
       delegate *(RELATION_DELEGATES + [:to => :relation])
+      
+      def find_in_batches batch_size = 100
+        relation.find_in_batches(batch_size)
+      end
 
       # Retrieve all records
       #
@@ -69,7 +73,7 @@ module Kangaroo
       def search_and_read conditions, search_options = {}, read_options = {}
         ids = search conditions, search_options.merge(:count => false)
         return [] if ids.blank?
-
+        
         read ids, read_options
       end
 
@@ -85,7 +89,7 @@ module Kangaroo
 
       # @private
       def relation
-        Relation.new self
+        @relation ||= Relation.new self
       end
     end
   end

data/lib/kangaroo/model/inspector.rb

@@ -1,10 +1,7 @@
 module Kangaroo
   module Model
     module Inspector
-      # @private
-      def self.included klass
-        klass.extend ClassMethods
-      end
+      extend ActiveSupport::Concern
 
       # @private
       def inspect

data/lib/kangaroo/model/mass_import.rb

@@ -0,0 +1,42 @@
+module Kangaroo
+  module Model
+    module MassImport
+      extend ActiveSupport::Concern
+      
+      module ClassMethods
+        def mass_import objects, options = {}
+          batch_size = options[:batch_size]
+          objects = objects.select { |o| self === o }
+          
+          if batch_size
+            until objects.empty?
+              batch_objects = objects.slice! 0, batch_size
+              
+              import_data *prepare_mass_import(batch_objects)
+            end
+          else
+            import_data *prepare_mass_import(objects)
+          end
+        end
+        
+        protected
+        def prepare_mass_import objects
+          changed_fields = objects.sum [], &:changed
+          changed_values = []
+          
+          changed_fields.uniq!
+          objects.each do |object|
+            attrs = object.instance_variable_get '@attributes'
+            
+            values = [object.id] + attrs.values_at(*changed_fields)
+            changed_values << values
+          end
+          
+          changed_fields = %w(.id) + changed_fields
+          
+          [changed_fields, changed_values]
+        end
+      end
+    end
+  end
+end

data/lib/kangaroo/model/open_object_orm.rb

@@ -38,14 +38,21 @@ module Kangaroo
       # @option options [Hash] context
       # @return [Array] list of Kangaroo::Model::Base instances
       def read ids, options = {}
-        fields = options[:fields]
-        fields = attribute_names if options[:fields].blank?
+        fields = if options[:fields].present?
+          options[:fields] & attribute_names
+        else
+          attribute_names
+        end
+        
         context = options[:context]
+        ids = ids.reverse if options[:reverse_flag]
 
         [].tap do |result|
           remote.read(ids, fields, context).each do |attributes|
             position = ids.index(attributes[:id].to_i)
-            result[position] = instantiate attributes, context
+            result[position] = instantiate(attributes, context).tap do |record|
+              record.attribute_names = fields.map &:to_s
+            end
           end
         end
       end
@@ -63,7 +70,7 @@ module Kangaroo
         }.merge(options)
 
         remote.fields_get(options[:fields], options[:context]).map do |key, val|
-          Field.new key, val
+          Field.new key, val.merge(:namespace => namespace)
         end
       end
 
@@ -86,7 +93,8 @@ module Kangaroo
       # @return [Hash] default values
       def default_get options = {}
         options = {
-          :fields => attribute_names
+          :fields => attribute_names,
+          :context => {}
         }.merge(options)
 
         remote.default_get options[:fields], options[:context]
@@ -112,6 +120,44 @@ module Kangaroo
       def unlink ids, options = {}
         remote.unlink ids, options[:context]
       end
+      
+      # Get values from information repository for this model
+      # e.g.
+      #     
+      #     Oo::Product::Product.ir_get 'default'
+      #     # => {:supplier_taxes_id => [1], :taxes_id => [2]}
+      #
+      # @param [Symbol] key1
+      # @param [Symbol] key2
+      # @return values
+      def ir_get key1, key2 = false
+        namespace.ir_get key1, key2, self
+      end
+      
+      # Export data via OpenERPs export_data method
+      # (which is used by OpenERP to export to CSV)
+      #
+      # @param [Array] ids
+      # @param [Array] fields
+      # @param [Hash] context
+      # @option options [boolean] import_comp Force import compatibility
+      def export_data ids, fields = attribute_names, context = {}
+        remote.export_data(ids, fields, context)[:datas]
+      end
+      
+      # Import data via OpenERPs import data method
+      # (which is used by OpenERP to import by CSV)
+      #
+      # @param [Array] fields
+      # @param [Array<Array>] datas
+      # @param [Hash] options
+      # @option options mode "init" or "update", defaults to "init"
+      # @option options current_module
+      # @option options [boolean] noupdate, defaults to false
+      # @option options filename optional file to store partial import state for recovery
+      def import_data fields, datas, options = {}
+        remote.import_data(fields, datas, options)
+      end
     end
   end
 end

data/lib/kangaroo/model/persistence.rb

@@ -4,22 +4,43 @@ require 'active_support/core_ext/hash'
 module Kangaroo
   module Model
     module Persistence
-      # @private
-      def self.included klass
-        klass.extend ClassMethods
-        klass.define_model_callbacks :destroy, :save, :update, :create, :find
-        klass.after_destroy :mark_destroyed
-        klass.after_create :mark_persisted
-        klass.after_save :reload
-
-        klass.send :attr_accessor, :context
-
-        klass.before_initialize do
+      extend ActiveSupport::Concern
+      
+      included do
+        define_model_callbacks :destroy, :save, :update, :create, :find
+        after_destroy :mark_destroyed
+        after_create :mark_persisted
+        after_save :reload
+
+        attr_accessor :context
+
+        before_initialize do
+          @context    ||= {}
           @destroyed  = false
           @readonly   = false
           @new_record = !@id
         end
       end
+      
+      def update_attribute key, val
+        self.send "#{key}=", val
+        save
+      end
+      
+      def update_attribute! key, val
+        self.send "#{key}=", val
+        save!
+      end
+      
+      def update_attributes attributes
+        self.attributes = attributes
+        save
+      end
+      
+      def update_attributes! attributes
+        self.attributes = attributes
+        save!
+      end
 
       # Check if this record hasnt been persisted yet
       #
@@ -32,7 +53,7 @@ module Kangaroo
       #
       # @return [boolean] true/false
       def persisted?
-        !@new_record
+        !new_record? and !destroyed?
       end
 
       # Check if this record has been destroyed
@@ -69,7 +90,7 @@ module Kangaroo
       # @param [Hash] options unused
       # @return [boolean] true
       def save! options = {}
-        save options ||
+        save(options) ||
         raise(RecordSavingFailed)
       end
 
@@ -92,9 +113,11 @@ module Kangaroo
         # @param [Hash] attributes
         # @return saved record
         def create attributes = {}
-          new(attributes).tap do |new_record|
-            new_record.save
-          end
+          new(attributes).tap &:save
+        end
+        
+        def create! attributes = {}
+          new(attributes).tap &:save!
         end
 
         # Retrieve a record by id
@@ -104,7 +127,7 @@ module Kangaroo
         # @raise RecordNotFound
         def find id
           Array === id ?
-          find_every(ids) :
+          find_every(id) :
           find_single(id)
         end
 
@@ -123,7 +146,8 @@ module Kangaroo
             instance.instance_exec(attributes.stringify_keys, context) do |attributes, context|
               @attributes = attributes.except 'id'
               @id = attributes['id']
-              @context = context
+              @context = context || {}
+              
               raise InstantiatedRecordNeedsIDError if @id.nil?
 
               @new_record = false
@@ -139,7 +163,7 @@ module Kangaroo
 
       protected
       def attributes_for_update
-        @attributes
+        @attributes.slice(*changed)
       end
 
       def attributes_for_create