kangaroo 0.0.1.pre2 → 0.0.2

data/Gemfile.lock

@@ -1,25 +1,26 @@
 PATH
   remote: .
   specs:
-    kangaroo (0.0.1.pre)
+    kangaroo (0.0.1.pre2)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
+      hirb
       rapuncel (~> 0.0.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.3)
-    arel (2.0.7)
+    activesupport (3.0.5)
+    arel (2.0.9)
     builder (2.1.2)
     columnize (0.3.2)
     cucumber (0.10.0)
@@ -31,6 +32,7 @@ GEM
     diff-lcs (1.1.2)
     gherkin (2.3.3)
       json (~> 1.4.6)
+    hirb (0.3.6)
     i18n (0.5.0)
     json (1.4.6)
     linecache (0.43)
@@ -52,7 +54,7 @@ GEM
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     term-ansicolor (1.0.5)
-    tzinfo (0.3.24)
+    tzinfo (0.3.25)
     yard (0.6.4)
 
 PLATFORMS

data/README.md

@@ -60,6 +60,47 @@ You can use this models like ActiveRecord models:
     
     Oo::Res::Country.create :code => 'DE', :name => 'Germany'
     
+CLI
+---
+
+Kangaroo comes with a console based on IRB, try it:
+    
+    $kang -c spec/test_env/test.yml 
+    I, [2011-04-15T23:19:41.990623 #6834]  INFO -- : Loading Kangaroo configuration "spec/test_env/test.yml"
+    I, [2011-04-15T23:19:41.991091 #6834]  INFO -- : Configured OpenERP database "kangaroo_test_database" at "127.0.0.1"
+    I, [2011-04-15T23:19:41.996197 #6834]  INFO -- : Authenticated user "admin" for OpenERP database "kangaroo_test_database"
+    ruby-1.8.7-p302 :001 > Oo::Res::Country
+     => <Oo::Res::Country id, name, code> 
+    ruby-1.8.7-p302 :002 > Oo::Res::Country.first
+    +---------+------+
+    | name    | code |
+    +---------+------+
+    | Algeria | DZ   |
+    +---------+------+
+    1 row in set
+    
+If you omit the -c command line option, you can initialize your Kangaroo connection from the
+console:
+
+    $kang
+    ruby-1.8.7-p302 :001 > Kang.init "port"=>8069, "database"=>{"name"=>"kangaroo_test_database", "models"=>["res.*"], "password"=>"admin", "user"=>"admin"}, "host"=>"127.0.0.1"
+    I, [2011-04-15T23:23:59.789551 #7017]  INFO -- : Loading Kangaroo configuration {"port"=>8069, "database"=>{"name"=>"kangaroo_test_database", "models"=>["res.*"], "user"=>"admin", "password"=>"admin"}, "host"=>"127.0.0.1"}
+    I, [2011-04-15T23:23:59.789706 #7017]  INFO -- : Configured OpenERP database "kangaroo_test_database" at "127.0.0.1"
+    I, [2011-04-15T23:23:59.794861 #7017]  INFO -- : Authenticated user "admin" for OpenERP database "kangaroo_test_database"
+     => true 
+    ruby-1.8.7-p302 :002 > Oo::Res::Country.limit(5).all
+    +------+-----------------------------+
+    | code | name                        |
+    +------+-----------------------------+
+    | DZ   | Algeria                     |
+    | AS   | American Samoa              |
+    | AD   | Andorra, Principality ofä ß |
+    | AO   | Angola                      |
+    | AI   | Anguilla                    |
+    +------+-----------------------------+
+    5 rows in set
+
+    
 etc.
 Please refer to {file:docs/Usage.md Usage} to learn about limitations/features not yet
 implemented.

data/bin/kang

@@ -0,0 +1,80 @@
+#!/usr/bin/env ruby
+
+begin
+  require 'kangaroo'
+rescue LoadError
+  begin
+    require 'rubygems'
+    require 'kangaroo'
+  rescue LoadError
+    require 'bundler/setup'
+    require 'kangaroo'
+  end
+end
+
+require 'ostruct'
+require 'optparse'
+options = {}
+
+optparse = OptionParser.new do |opts|
+  opts.banner = "Usage: kang -c config_file.yaml"
+  
+  options[:config_file] = nil
+  opts.on '-c', '--config FILE', 'Specify config file' do |file|
+    options[:config_file] = file
+  end   
+  
+  # This displays the help screen, all programs are
+  # assumed to have this option.
+  opts.on( '-h', '--help', 'Display this screen' ) do
+    puts opts
+    exit
+  end
+end
+
+optparse.parse!
+
+Kang = OpenStruct.new
+Kang.logger = Logger.new(STDOUT)
+
+Kang.class_eval do
+  def inspect
+    "Kang console"
+  end
+  
+  def init file_or_hash    
+    Kang.logger.info "Loading Kangaroo configuration #{file_or_hash.inspect}"
+    Kang.config = Kangaroo::Util::Configuration.new file_or_hash, Kang.logger
+    Kang.config.login
+  
+    Kangaroo::Util::Loader.new('res.*', Kang.config.database).load!
+    true
+  end
+end
+
+options[:config_file] && Kang.init(options[:config_file])
+
+require 'irb'
+require 'irb/completion'
+
+Hirb.enable
+IRB.start
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

data/kangaroo.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rapuncel', '~> 0.0.2'
   s.add_dependency "activerecord", ">= 3.0.0"
   s.add_dependency "activesupport", ">= 3.0.0"
+  s.add_dependency "hirb"
   
   s.add_development_dependency 'yard'
   s.add_development_dependency 'rspec'

data/lib/kangaroo.rb

@@ -1,6 +1,7 @@
 require 'kangaroo/railtie' if defined?(Rails)
 require 'kangaroo/util/configuration'
 require 'kangaroo/model/base'
+require 'kangaroo/hirb'
 
 module Kangaroo
 end

data/lib/kangaroo/hirb.rb

@@ -0,0 +1,22 @@
+require 'hirb'
+
+module Hirb::Views::Kangaroo
+  def kangaroo__model__base_view obj
+    { :fields => get_kangaroo_fields(obj) }
+  end
+  
+  def get_kangaroo_fields obj
+    fields = obj.class.attribute_names
+    
+    # if query used select
+    if obj.attributes.keys.sort != obj.class.attribute_names.sort
+      selected_columns = obj.attributes.keys
+      sorted_columns = obj.class.attribute_names.dup.delete_if {|e| !selected_columns.include?(e) }
+      sorted_columns += (selected_columns - sorted_columns)
+      fields = sorted_columns.map {|e| e.to_sym}
+    end
+    fields
+  end
+end
+
+Hirb::DynamicView.add Hirb::Views::Kangaroo, :helper => :auto_table

data/lib/kangaroo/util/client.rb

@@ -54,6 +54,10 @@ module Kangaroo
       def db
         @db_proxy ||= Proxy::Db.new db_service
       end
+      
+      def inspect
+        "#Kangaroo::Util::Client:0x#{hash.to_s(16)}>"
+      end
     end
   end
 end

data/lib/kangaroo/version.rb

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

data/spec/model/open_object_orm_spec.rb

@@ -37,20 +37,20 @@ module Kangaroo
 
       describe '#fields_get' do
         it 'fetches details about fields of this model' do
-          object_service.should_receive(:xmlrpc_call).with('execute', 'some_class', 'fields_get', ['a'], false).
+          object_service.should_receive(:xmlrpc_call).with('execute', 'some_class', 'fields_get', ['a'], {}).
             and_return({:a => {:type => "selection"}})
           @klass.fields_get(:fields => ['a']).first.read_attribute(:type).should == 'selection'
         end
 
         it 'stores the name in the Field model' do
-          object_service.should_receive(:xmlrpc_call).with('execute', 'some_class', 'fields_get', ['a'], false).
+          object_service.should_receive(:xmlrpc_call).with('execute', 'some_class', 'fields_get', ['a'], {}).
             and_return({:a => {:type => "selection"}})
           @klass.fields_get(:fields => ['a']).first.name.should == :a
         end
 
         it 'uses attribute_names as default value for field list' do
           object_service.should_receive(:xmlrpc_call).
-            with('execute', 'some_class', 'fields_get', ['a', 'b'], false).
+            with('execute', 'some_class', 'fields_get', ['a', 'b'], {}).
             and_return({:a => {:type => 'selection'}})
           @klass.fields_get
         end

data/spec/ruby_adapter/class_definition_spec.rb

@@ -7,7 +7,10 @@ module Kangaroo
   module RubyAdapter
     describe ClassDefinition do
       def stub_oo_model name
+        eval('module ::Oo ; end')
         oo_model = mock 'oo_model'
+        oo_model.stub_chain(:class, :namespace).and_return(Oo)
+        oo_model.stub_chain(:class, :database)
         oo_model.stub!('model_class_name').and_return(name)
         oo_model
       end

data/spec/server_helper.rb

@@ -7,6 +7,7 @@ require 'webrick'
 module TestServices
   class ObjectService
     def execute *args
+      puts args.inspect
       xmlrpc_call 'execute', *args
     end
 

data/spec/test_env/test.yml

@@ -7,5 +7,4 @@ database:
   password: admin
   
   models:
-    - res.*
-    - product.product
+    - res.*

data/spec/util/loader_spec.rb

@@ -13,38 +13,22 @@ module Kangaroo
       end
 
       it "replaces wildcards in model names" do
-        loader = Loader.new ['res.*']
+        loader = Loader.new ['res.*'], nil
 
         loader.model_names.should == ['res.%']
       end
 
       it "uses global wildcard if model_names = :all" do
-        loader = Loader.new :all
+        loader = Loader.new :all, nil
 
         loader.model_names.should == ['%']
       end
 
       it 'raises error if model_names = nil or empty' do
-        lambda { Loader.new nil }.should raise_error
-        lambda { Loader.new [] }.should raise_error
+        lambda { Loader.new nil, nil }.should raise_error
+        lambda { Loader.new [], nil }.should raise_error
       end
 
-      it 'loads matching models from OpenERP' do
-        loader = Loader.new ['res.*']
-
-        loaded_model = mock 'loaded_model'
-        loaded_model.stub!('length_of_model_name').and_return(1)
-        ruby_adapter = mock 'ruby_adapter'
-        ruby_adapter.stub! 'to_ruby'
-        RubyAdapter::Base.should_receive(:new).with(loaded_model).and_return(ruby_adapter)
-
-        Oo::Ir::Model = mock 'model'
-        relation = mock 'relation'
-        relation.should_receive(:all).and_return([loaded_model])
-        Oo::Ir::Model.should_receive(:where).with(/res\.%/).and_return(relation)
-
-        loader.load!
-      end
     end
   end
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kangaroo
 version: !ruby/object:Gem::Version 
-  hash: 1923831973
-  prerelease: 6
+  hash: 27
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  - pre
   - 2
-  version: 0.0.1.pre2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Michael Eickenberg
@@ -18,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-27 00:00:00 +01:00
+date: 2011-04-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,7 +68,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: hirb
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -81,10 +79,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: yard
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -98,7 +96,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: rspec
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -112,7 +110,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: ruby-debug
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -125,10 +123,24 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: ActiveRecord-ish OpenObject Wrapper
 email: marian@cice-online.net
-executables: []
-
+executables: 
+- kang
 extensions: []
 
 extra_rdoc_files: []
@@ -142,6 +154,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/kang
 - config/kangaroo.yml.sample
 - docs/AdditionalServices.md
 - docs/Architecture.md
@@ -156,6 +169,7 @@ files:
 - kangaroo.gemspec
 - lib/kangaroo.rb
 - lib/kangaroo/exception.rb
+- lib/kangaroo/hirb.rb
 - lib/kangaroo/model/attributes.rb
 - lib/kangaroo/model/base.rb
 - lib/kangaroo/model/condition_normalizer.rb
@@ -222,14 +236,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: