sugarcrm 0.9.11 → 0.9.12

data/test/connection/test_login.rb

@@ -3,8 +3,7 @@ require 'helper'
 class TestLogin < ActiveSupport::TestCase
   context "A SugarCRM.connection" do
     should "login and set session id" do
-      assert (SugarCRM.connection.session_id.class == String)
-      assert_equal SugarCRM.connection.session.id, SugarCRM.connection.session_id
+      assert SugarCRM.connection.sugar_session_id.class == String
     end
   end
 end

data/test/connection/test_set_document_revision.rb

@@ -0,0 +1,28 @@
+require 'helper'
+
+class TestSetDocumentRevision < ActiveSupport::TestCase
+  context "A SugarCRM.connection" do
+    should "Update a document revision" do
+      file = File.read("test/config_test.yaml")
+      # Create a new document, no file is attached or uploaded at this stage.
+      d = SugarCRM::Document.create(
+        :revision     => 1, 
+        :active_date  => Date.today,
+        :filename     => "config_test.yaml", 
+        :document_name=> "config_test.yaml",
+        :uploadfile   => "config_test.yaml"
+      )
+      # Did we succeed?
+      assert !d.new?
+      # Create a new document revision, attaching the file to the document_revision, and associating the document
+      # revision with parent document
+      assert SugarCRM.connection.set_document_revision(d.id, d.revision + 1, {:file => file, :file_name => "config_test.yaml"})
+      # Delete the document
+      assert d.delete
+      # Remove any document revisions associated with that document
+      SugarCRM::DocumentRevision.find_all_by_document_id(d.id).each do |dr|
+        assert dr.delete
+      end
+    end
+  end
+end

data/test/helper.rb

@@ -12,5 +12,5 @@ class ActiveSupport::TestCase
   # put your credentials into a YAML file in the test directory
   # the format should be identical to the config_test.yaml found in the same directory
   raise "test/config.yaml file not found. See README for instructions on setting up a testing environment" unless File.exists? CONFIG_PATH
-  SugarCRM::Session.new_from_file(CONFIG_PATH)
+  SugarCRM::Session.from_file(CONFIG_PATH)
 end

data/test/test_connection_pool.rb

@@ -0,0 +1,33 @@
+require 'helper'
+
+class TestConnectionPool < ActiveSupport::TestCase
+  context "A SugarCRM::ConnectionPool instance" do
+    should "have a default pool size of 1 if Rails isn't defined" do
+      assert_equal 1, SugarCRM.session.connection_pool.size
+    end
+    
+    should "be able to specify its pool size" do
+      config = SugarCRM.session.config
+      sess = SugarCRM::Session.new(config[:base_url], config[:username], config[:password], {:connection_pool => {:size => 3}})
+      
+      begin
+        assert_equal 3, sess.connection_pool.size
+      ensure
+        sess.disconnect!
+      end
+    end
+    
+    should "be able to specify its timeout" do
+      assert_equal 5, SugarCRM.session.connection_pool.timeout # test default
+      
+      config = SugarCRM.session.config
+      sess = SugarCRM::Session.new(config[:base_url], config[:username], config[:password], {:connection_pool => {:wait_timeout => 3}})
+      
+      begin
+        assert_equal 3, sess.connection_pool.timeout
+      ensure
+        sess.disconnect!
+      end
+    end
+  end
+end

data/test/test_session.rb

@@ -1,5 +1,17 @@
 require 'helper'
 
+CONFIG_TEST_PATH = File.join(File.dirname(__FILE__), 'config_test.yaml')
+
+# contents of config_test.yaml
+CONFIG_CONTENTS = { 
+  :config => {
+    :base_url => 'http://127.0.0.1/sugarcrm',
+    :username => 'admin',
+    :password => 'letmein'
+  }
+}
+CONFIG_CONTENTS.freeze
+
 class TestSession < ActiveSupport::TestCase
   context "The SugarCRM::Session class" do
     should "raise SugarCRM::MissingCredentials if at least one of url/username/password is missing" do
@@ -8,14 +20,26 @@ class TestSession < ActiveSupport::TestCase
     
     should "assign namespaces in a way that prevents collisions" do
       # Namespae0 already assigned (linked to the current connection)
-      One = SugarCRM::Session.new_from_file(CONFIG_PATH)
-      Two = SugarCRM::Session.new_from_file(CONFIG_PATH)
+      One = SugarCRM::Session.from_file(CONFIG_PATH)
+      Two = SugarCRM::Session.from_file(CONFIG_PATH)
       One.disconnect!
-      Three = SugarCRM::Session.new_from_file(CONFIG_PATH)
+      Three = SugarCRM::Session.from_file(CONFIG_PATH)
       assert_not_equal Two, Three # namespaces must be different
       Two.disconnect!
       Three.disconnect!
     end
+    
+    should "parse config parameters from a file" do
+      assert_equal CONFIG_CONTENTS, SugarCRM::Session.parse_config_file(CONFIG_PATH)
+    end
+    
+    should "create a session from a config file" do
+      assert_difference('SugarCRM.namespaces.size') do
+        SugarCRM::Session.from_file(CONFIG_PATH)
+      end
+      
+      SugarCRM.const_get(SugarCRM.namespaces.last).disconnect
+    end
   end
 
   context "A SugarCRM::Session instance" do
@@ -32,15 +56,8 @@ class TestSession < ActiveSupport::TestCase
     end
     
     should "load config file" do
-      SugarCRM.load_config File.join(File.dirname(__FILE__), 'config_test.yaml')
-      config_contents = { 
-        :config => {
-          :base_url => 'http://127.0.0.1/sugarcrm',
-          :username => 'admin',
-          :password => 'letmein'
-        }
-      }
-      config_contents[:config].each{|k,v| assert_equal v, SugarCRM.config[k]}
+      SugarCRM.load_config CONFIG_TEST_PATH
+      CONFIG_CONTENTS[:config].each{|k,v| assert_equal v, SugarCRM.config[k]}
     end
     
     should "be able to disconnect, and log in to Sugar automatically if credentials are present in config file" do
@@ -52,7 +69,7 @@ class TestSession < ActiveSupport::TestCase
       
       assert_raise(SugarCRM::NoActiveSession){ SugarCRM.current_user }
       
-      SugarCRM::Session.new_from_file(CONFIG_PATH)
+      SugarCRM::Session.from_file(CONFIG_PATH)
       
       assert_nothing_raised{ SugarCRM.current_user }
       assert SugarCRM.sessions.size == 1
@@ -75,7 +92,7 @@ class TestSession < ActiveSupport::TestCase
       assert_equal 1, SugarCRM.namespaces.size
       
       assert_difference('SugarCRM.namespaces.size') do
-        OneA = SugarCRM::Session.new_from_file(CONFIG_PATH)
+        OneA = SugarCRM::Session.from_file(CONFIG_PATH)
       end
       
       assert_difference('SugarCRM.namespaces.size', -1) do
@@ -85,7 +102,7 @@ class TestSession < ActiveSupport::TestCase
     
     should "add a used namespace on each new connection" do
       assert_difference('SugarCRM.used_namespaces.size') do
-        OneB = SugarCRM::Session.new_from_file(CONFIG_PATH)
+        OneB = SugarCRM::Session.from_file(CONFIG_PATH)
       end
       
       # connection (and namespace) is reused => no used namespace should be added
@@ -99,7 +116,7 @@ class TestSession < ActiveSupport::TestCase
     end
     
     should "not allow access to methods on SugarCRM if there are multiple active connections" do
-      OneC = SugarCRM::Session.new_from_file(CONFIG_PATH)
+      OneC = SugarCRM::Session.from_file(CONFIG_PATH)
       
       assert_raise(SugarCRM::MultipleSessions){ SugarCRM.current_user }
       

data/test/test_sugarcrm.rb

@@ -2,11 +2,6 @@ require 'helper'
 
 class TestSugarCRM < ActiveSupport::TestCase
   context "A SugarCRM::Base instance" do
-    
-    should "establish a connection when Base#establish_connection" do
-      # Base#establish_connection was called automatically when loading config file containing connection params
-      assert SugarCRM.connection.connected?
-    end
   
     should "return the module name" do
       assert_equal "Users", SugarCRM::User._module.name
@@ -68,6 +63,7 @@ class TestSugarCRM < ActiveSupport::TestCase
 
     should "create, modify, and delete a record" do
       u = SugarCRM::User.new
+      assert u.email1?
       u.email1 = "abc@abc.com"
       u.first_name = "Test"
       u.last_name = "User"
@@ -82,6 +78,7 @@ class TestSugarCRM < ActiveSupport::TestCase
       m.title = "Test User"
       assert m.save!
       assert m.delete
+      assert m.destroyed?
     end
     
     should "support finding first instance (sorted by attribute)" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 11
-  version: 0.9.11
+  - 12
+  version: 0.9.12
 platform: ruby
 authors: 
 - Carl Hicks
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 -08:00
+date: 2011-03-02 00:00:00 -08:00
 default_executable: sugarcrm
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,65 +112,70 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .document
-- Gemfile
+- ./Gemfile
+- ./LICENSE
+- ./README.rdoc
+- ./Rakefile
+- ./VERSION
+- ./lib/rails/generators/sugarcrm/config/config_generator.rb
+- ./lib/rails/generators/sugarcrm/config/templates/initializer.rb
+- ./lib/rails/generators/sugarcrm/config/templates/sugarcrm.yml
+- ./lib/sugarcrm.rb
+- ./lib/sugarcrm/associations.rb
+- ./lib/sugarcrm/associations/association.rb
+- ./lib/sugarcrm/associations/association_cache.rb
+- ./lib/sugarcrm/associations/association_collection.rb
+- ./lib/sugarcrm/associations/association_methods.rb
+- ./lib/sugarcrm/associations/associations.rb
+- ./lib/sugarcrm/attributes.rb
+- ./lib/sugarcrm/attributes/attribute_methods.rb
+- ./lib/sugarcrm/attributes/attribute_serializers.rb
+- ./lib/sugarcrm/attributes/attribute_typecast.rb
+- ./lib/sugarcrm/attributes/attribute_validations.rb
+- ./lib/sugarcrm/base.rb
+- ./lib/sugarcrm/config/sugarcrm.yaml
+- ./lib/sugarcrm/connection.rb
+- ./lib/sugarcrm/connection/api/get_available_modules.rb
+- ./lib/sugarcrm/connection/api/get_document_revision.rb
+- ./lib/sugarcrm/connection/api/get_entries.rb
+- ./lib/sugarcrm/connection/api/get_entries_count.rb
+- ./lib/sugarcrm/connection/api/get_entry.rb
+- ./lib/sugarcrm/connection/api/get_entry_list.rb
+- ./lib/sugarcrm/connection/api/get_module_fields.rb
+- ./lib/sugarcrm/connection/api/get_note_attachment.rb
+- ./lib/sugarcrm/connection/api/get_relationships.rb
+- ./lib/sugarcrm/connection/api/get_report_entries.rb
+- ./lib/sugarcrm/connection/api/get_server_info.rb
+- ./lib/sugarcrm/connection/api/get_user_id.rb
+- ./lib/sugarcrm/connection/api/get_user_team_id.rb
+- ./lib/sugarcrm/connection/api/login.rb
+- ./lib/sugarcrm/connection/api/logout.rb
+- ./lib/sugarcrm/connection/api/seamless_login.rb
+- ./lib/sugarcrm/connection/api/search_by_module.rb
+- ./lib/sugarcrm/connection/api/set_campaign_merge.rb
+- ./lib/sugarcrm/connection/api/set_document_revision.rb
+- ./lib/sugarcrm/connection/api/set_entries.rb
+- ./lib/sugarcrm/connection/api/set_entry.rb
+- ./lib/sugarcrm/connection/api/set_note_attachment.rb
+- ./lib/sugarcrm/connection/api/set_relationship.rb
+- ./lib/sugarcrm/connection/api/set_relationships.rb
+- ./lib/sugarcrm/connection/connection.rb
+- ./lib/sugarcrm/connection/helper.rb
+- ./lib/sugarcrm/connection/request.rb
+- ./lib/sugarcrm/connection/response.rb
+- ./lib/sugarcrm/connection_pool.rb
+- ./lib/sugarcrm/exceptions.rb
+- ./lib/sugarcrm/extensions/README.txt
+- ./lib/sugarcrm/finders.rb
+- ./lib/sugarcrm/finders/dynamic_finder_match.rb
+- ./lib/sugarcrm/finders/finder_methods.rb
+- ./lib/sugarcrm/module.rb
+- ./lib/sugarcrm/module_methods.rb
+- ./lib/sugarcrm/session.rb
+- ./sugarcrm.gemspec
+- ./sugarcrm.tmproj
 - LICENSE
 - README.rdoc
-- Rakefile
-- VERSION
-- bin/sugarcrm
-- lib/sugarcrm.rb
-- lib/sugarcrm/associations.rb
-- lib/sugarcrm/associations/association.rb
-- lib/sugarcrm/associations/association_cache.rb
-- lib/sugarcrm/associations/association_collection.rb
-- lib/sugarcrm/associations/association_methods.rb
-- lib/sugarcrm/associations/associations.rb
-- lib/sugarcrm/attributes.rb
-- lib/sugarcrm/attributes/attribute_methods.rb
-- lib/sugarcrm/attributes/attribute_serializers.rb
-- lib/sugarcrm/attributes/attribute_typecast.rb
-- lib/sugarcrm/attributes/attribute_validations.rb
-- lib/sugarcrm/base.rb
-- lib/sugarcrm/config/sugarcrm.yaml
-- lib/sugarcrm/connection.rb
-- lib/sugarcrm/connection/api/get_available_modules.rb
-- lib/sugarcrm/connection/api/get_document_revision.rb
-- lib/sugarcrm/connection/api/get_entries.rb
-- lib/sugarcrm/connection/api/get_entries_count.rb
-- lib/sugarcrm/connection/api/get_entry.rb
-- lib/sugarcrm/connection/api/get_entry_list.rb
-- lib/sugarcrm/connection/api/get_module_fields.rb
-- lib/sugarcrm/connection/api/get_note_attachment.rb
-- lib/sugarcrm/connection/api/get_relationships.rb
-- lib/sugarcrm/connection/api/get_report_entries.rb
-- lib/sugarcrm/connection/api/get_server_info.rb
-- lib/sugarcrm/connection/api/get_user_id.rb
-- lib/sugarcrm/connection/api/get_user_team_id.rb
-- lib/sugarcrm/connection/api/login.rb
-- lib/sugarcrm/connection/api/logout.rb
-- lib/sugarcrm/connection/api/seamless_login.rb
-- lib/sugarcrm/connection/api/search_by_module.rb
-- lib/sugarcrm/connection/api/set_campaign_merge.rb
-- lib/sugarcrm/connection/api/set_document_revision.rb
-- lib/sugarcrm/connection/api/set_entries.rb
-- lib/sugarcrm/connection/api/set_entry.rb
-- lib/sugarcrm/connection/api/set_note_attachment.rb
-- lib/sugarcrm/connection/api/set_relationship.rb
-- lib/sugarcrm/connection/api/set_relationships.rb
-- lib/sugarcrm/connection/connection.rb
-- lib/sugarcrm/connection/helper.rb
-- lib/sugarcrm/connection/request.rb
-- lib/sugarcrm/connection/response.rb
-- lib/sugarcrm/exceptions.rb
-- lib/sugarcrm/extensions/README.txt
-- lib/sugarcrm/finders.rb
-- lib/sugarcrm/finders/dynamic_finder_match.rb
-- lib/sugarcrm/finders/finder_methods.rb
-- lib/sugarcrm/module.rb
-- lib/sugarcrm/module_methods.rb
-- lib/sugarcrm/session.rb
-- test/config_test.yaml
 - test/connection/test_get_available_modules.rb
 - test/connection/test_get_entries.rb
 - test/connection/test_get_entry.rb
@@ -182,6 +187,7 @@ files:
 - test/connection/test_get_user_team_id.rb
 - test/connection/test_login.rb
 - test/connection/test_logout.rb
+- test/connection/test_set_document_revision.rb
 - test/connection/test_set_note_attachment.rb
 - test/connection/test_set_relationship.rb
 - test/extensions_test/patch.rb
@@ -189,10 +195,12 @@ files:
 - test/test_association_collection.rb
 - test/test_associations.rb
 - test/test_connection.rb
+- test/test_connection_pool.rb
 - test/test_module.rb
 - test/test_response.rb
 - test/test_session.rb
 - test/test_sugarcrm.rb
+- bin/sugarcrm
 has_rdoc: true
 homepage: http://github.com/chicks/sugarcrm
 licenses: []
@@ -207,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2666117297979367978
+      hash: 912327613836966464
       segments: 
       - 0
       version: "0"
@@ -238,6 +246,7 @@ test_files:
 - test/connection/test_get_user_team_id.rb
 - test/connection/test_login.rb
 - test/connection/test_logout.rb
+- test/connection/test_set_document_revision.rb
 - test/connection/test_set_note_attachment.rb
 - test/connection/test_set_relationship.rb
 - test/extensions_test/patch.rb
@@ -245,6 +254,7 @@ test_files:
 - test/test_association_collection.rb
 - test/test_associations.rb
 - test/test_connection.rb
+- test/test_connection_pool.rb
 - test/test_module.rb
 - test/test_response.rb
 - test/test_session.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/test/config_test.yaml

@@ -1,15 +0,0 @@
-# below is an example configuration file
-#
-# to create you own configuration file, simply copy and adapt the text below, removing the '#' in front of the key-value pairs
-#
-# you'll find an example of a configuration file (used for tests) in test/config_test.yaml
-#
-# config:
-#   base_url: http://127.0.0.1/sugarcrm # where your SugarCRM instance is located
-#   username: admin
-#   password: letmein
-
-config:
-  base_url: http://127.0.0.1/sugarcrm # where your SugarCRM instance is located
-  username: admin
-  password: letmein