kangaroo 0.0.1.pre → 0.0.1.pre2

data/.gitignore

@@ -1 +1,2 @@
-.yardoc
+.yardoc
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kangaroo (0.0.1)
+    kangaroo (0.0.1.pre)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
       rapuncel (~> 0.0.2)

data/features/configuration.feature

@@ -0,0 +1,10 @@
+Feature: Configuration
+  Scenario: Connect to an OpenERP server
+    Given i have a configuration file
+    When i setup a configuration
+    Then i should be able to login
+    
+  Scenario: Load models
+    Given i'm connected to an OpenERP server
+    When i load models matching "res.*"
+    Then "Oo::Res::Country" should be defined

data/features/step_definitions/basic_steps.rb

@@ -4,15 +4,9 @@ Given /^i'm connected to an OpenERP server$/ do
   @config.login
 end
 
-Given /^setup a proxy to "([^"]*)"$/ do |service|  
-  proxy = Kangaroo::Util::Proxy.const_get(service.camelize).new @config.client.send("#{service}_service")
-  self.instance_variable_set "@#{service}", proxy
-end
-
 When /^i call (.*)\.(.*)$/ do |service, method|
-  proxy = instance_variable_get "@#{service}"
+  proxy = Kangaroo::Util::Proxy.const_get(service.camelize).new @config.client.send("#{service}_service")
   @result = proxy.__send__ method
-  puts @result.inspect
 end
 
 Then /^i should see "([^"]*)"$/ do |arg1|

data/features/step_definitions/{connection_steps.rb → configuration_steps.rb}

@@ -3,7 +3,7 @@ Given /^i have a configuration file$/ do
 end
 
 When /^i setup a configuration$/ do
-  @logger = Logger.new(STDERR)
+  @logger = Logger.new(File.open("/dev/null", 'w'))
   @config = Kangaroo::Util::Configuration.new @config_hash, @logger
 end
 
@@ -11,3 +11,11 @@ Then /^i should be able to login$/ do
   @logger.should_not_receive :warn
   @config.login
 end
+
+When /^i load models matching "([^"]*)"$/ do |arg1|
+  Kangaroo::Util::Loader.new('res.*', @config.database).load!
+end
+
+Then /^"([^"]*)" should be defined$/ do |arg1|
+  lambda { arg1.constantize }.should_not raise_error
+end

data/features/utility_services.feature

@@ -1,38 +1,32 @@
 Feature: Utility Services
   Scenario: Get server information
     Given i'm connected to an OpenERP server
-    And setup a proxy to "common"
     When i call common.about
     Then i should see "OpenERP"
     
   Scenario: Get server environment
     Given i'm connected to an OpenERP server
-    And setup a proxy to "common"
     When i call common.get_server_environment
     Then i should see "OpenERP-Server Version : 6"
     And i should see "Python Version : 2.6"
     
   Scenario: Get server stats
     Given i'm connected to an OpenERP server
-    And setup a proxy to "common"
     When i call common.get_stats
     Then i should see "HTTPd: running"
     
   Scenario: List available HTTP services
     Given i'm connected to an OpenERP server
-    And setup a proxy to "common"
     When i call common.list_http_services
     Then the list should include "service.http_server.XMLRPCRequestHandler"
     
   Scenario: List available databases
     Given i'm connected to an OpenERP server
-    And setup a proxy to "db"
     When i call db.list
     Then the list should include "kangaroo_test_database"
     
   Scenario: List available languages
     Given i'm connected to an OpenERP server
-    And setup a proxy to "db"
     When i call db.list_lang
     Then the list should include "English"
     

data/lib/kangaroo/model/field.rb

@@ -6,15 +6,21 @@ module Kangaroo
       include Attributes
 
       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
+                                
       def initialize name, attributes = {}
         @attributes = {}
         @name = name
-
+        
         attributes.each do |key, val|
           write_attribute key, val
         end
       end
     end
   end
-end
+end
+

data/lib/kangaroo/util/configuration.rb

@@ -31,7 +31,7 @@ module Kangaroo
         end
 
         login
-        Loader.new(@database, models).load!
+        Loader.new(models, @database).load!
         logger.info "Loaded OpenERP models matching #{models.inspect}."
       rescue Exception => e
         logger.error "Loading of OpenERP models failed.\n#{e.inspect}"

data/lib/kangaroo/util/loader.rb

@@ -81,6 +81,8 @@ module Kangaroo
           raise 'No models specified.'
         when :all
           ['%']
+        when String
+          [replace_wildcard(@model_names)]
         when Array
           @model_names.map do |model_name|
             replace_wildcard model_name

data/lib/kangaroo/util/proxy/object.rb

@@ -6,7 +6,6 @@ module Kangaroo
       # @param name function name to call
       # @return returned value
       def call! name, *args
-        puts "#{name.to_s.upcase}: #{args.inspect}"
         super :execute, name, *args
       end
 

data/lib/kangaroo/version.rb

@@ -1,3 +1,3 @@
 module Kangaroo
-  VERSION = "0.0.1.pre"
+  VERSION = "0.0.1.pre2"
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: kangaroo
 version: !ruby/object:Gem::Version 
-  hash: 961915968
+  hash: 1923831973
   prerelease: 6
   segments: 
   - 0
   - 0
   - 1
   - pre
-  version: 0.0.1.pre
+  - 2
+  version: 0.0.1.pre2
 platform: ruby
 authors: 
 - Michael Eickenberg
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-13 00:00:00 +01:00
+date: 2011-02-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -146,10 +147,10 @@ files:
 - docs/Architecture.md
 - docs/Installation.md
 - docs/Usage.md
-- features/connection.feature
+- features/configuration.feature
 - features/env.rb
 - features/step_definitions/basic_steps.rb
-- features/step_definitions/connection_steps.rb
+- features/step_definitions/configuration_steps.rb
 - features/support/test.yml
 - features/utility_services.feature
 - kangaroo.gemspec
@@ -237,10 +238,10 @@ signing_key:
 specification_version: 3
 summary: Kang! ActiveRecord-ish OpenObject
 test_files: 
-- features/connection.feature
+- features/configuration.feature
 - features/env.rb
 - features/step_definitions/basic_steps.rb
-- features/step_definitions/connection_steps.rb
+- features/step_definitions/configuration_steps.rb
 - features/support/test.yml
 - features/utility_services.feature
 - spec/model/attributes_spec.rb

data/features/connection.feature

@@ -1,5 +0,0 @@
-Feature: Connection
-  Scenario: Connect to an OpenERP server
-    Given i have a configuration file
-    When i setup a configuration
-    Then i should be able to login