railsbros-thrift4rails 0.2.0 → 0.3.1

data/History.txt

@@ -4,5 +4,7 @@
   * Initial release
   * created ThriftClient
   * created first rake-tasks to generate thrift definitions
-* Version 0.2.0
+* 2 Version 0.2.0
   * ThriftClient catches the Thrift::ProtocolException now
+* Version 0.2.2
+  * ClientStubForTesting added, It catches all methods and returns true

data/Manifest.txt

@@ -4,6 +4,8 @@ PostInstall.txt
 README.rdoc
 Rakefile
 lib/thrift4rails.rb
+lib/thrift4rails/client_stub_for_testing.rb
+lib/thrift4rails/release_active_record_connection.rb
 lib/thrift4rails/tasks.rb
 lib/thrift4rails/tasks/generate.rake
 lib/thrift4rails/tasks/service.rake
@@ -14,6 +16,7 @@ script/destroy
 script/generate
 tasks/Rakefile
 tasks/thrift.rb
+test/release_active_record_connection_test.rb
 test/test_helper.rb
 test/test_thrift4rails.rb
 thrift4rails.gemspec

data/README.rdoc

@@ -4,7 +4,8 @@
 
 == DESCRIPTION:
 
-FIX (describe your package)
+module Thrift4Rails::ReleaseActiveRecordConnection ist in der Version 0.3.0 dazugekommen
+Wenn das Modul inkludiert wird, wird nach jedem Methodenaufruf zusaetzlich ActiveRecord::Base.clear_active_connections! aufgerufen.
 
 == FEATURES/PROBLEMS:
 

data/Rakefile

@@ -11,9 +11,11 @@ $hoe = Hoe.new('thrift4rails', Thrift4Rails::VERSION) do |p|
   p.rubyforge_name       = p.name # TODO this is default value
   p.extra_deps         = [
     ['activesupport','>= 2.3.2'],
+    ['activerecord', '>= 2.3.2']
   ]
   p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
+    ['newgem', ">= #{::Newgem::VERSION}"],
+    ['mocha']
   ]
   
   p.clean_globs |= %w[**/.DS_Store tmp *.log]

data/lib/thrift4rails.rb

@@ -2,8 +2,11 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'activesupport'
+require "activerecord"
 require 'thrift4rails/thrift_client'
+require 'thrift4rails/client_stub_for_testing'
+require 'thrift4rails/release_active_record_connection'
 
 module Thrift4Rails
-  VERSION = '0.2.0'
+  VERSION = '0.3.1'
 end

data/lib/thrift4rails/client_stub_for_testing.rb

@@ -0,0 +1,7 @@
+module Thrift4Rails
+  class ClientStubForTesting
+    def method_missing(meth, *args, &blk)
+      return true
+    end
+  end
+end

data/lib/thrift4rails/release_active_record_connection.rb

@@ -0,0 +1,40 @@
+module Thrift4Rails
+  module ReleaseActiveRecordConnection
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def singleton_method_added(method_name) 
+        @@class_singleton_methods  ||= []
+        if !(method_name.to_s =~ /_execution_callback/) && !@@class_singleton_methods.include?(method_name)
+          @@class_singleton_methods << method_name
+          @@current_method_name = method_name
+          class << self
+            method_name = @@current_method_name
+            define_method "#{method_name}_with_execution_callback" do |*args|
+              return_value = self.send("#{method_name}_without_execution_callback", *args)
+              ActiveRecord::Base.clear_active_connections!
+              return return_value
+            end
+            alias_method_chain method_name, :execution_callback
+          end
+        end
+      end
+      
+      def method_added(method_name)
+        @@class_instance_methods ||= []
+        if !(method_name.to_s =~ /_execution_callback/) && !@@class_instance_methods.include?(method_name)
+          @@class_instance_methods << method_name
+          define_method "#{method_name}_with_execution_callback" do |*args|
+            return_value = self.send("#{method_name}_without_execution_callback", *args)
+            ActiveRecord::Base.clear_active_connections!
+            return return_value
+          end
+          alias_method_chain method_name, :execution_callback
+        end
+      end
+    end
+
+  end
+end

data/lib/thrift4rails/tasks/service.rake

@@ -2,7 +2,11 @@ namespace :service do
   
   desc "Start server of service on port #{Service.port}"
   task :start do
-    system "script/server -p #{Service.port}"
+    add_rails_env = ""
+    if ENV["RAILS_ENV"]
+      add_rails_env = " -e #{ENV["RAILS_ENV"]}"
+    end  
+    system "script/server -p #{Service.port}#{add_rails_env}"
   end
   
 end

data/lib/thrift4rails/thrift_client.rb

@@ -72,7 +72,7 @@ module Thrift4Rails
           client_exception = ClientException.new("No connection to Provider: #{@url}. (Original Error: #{e.message})")
           client_exception.set_backtrace(e.backtrace)
           raise client_exception
-        rescue Errno::ETIMEDOUT => e
+        rescue Errno::ETIMEDOUT, Timeout::Error => e
           client_exception = ClientException.new("Connection to Provider '#{@url}' timed out. (Original Error: #{e.message})")
           client_exception.set_backtrace(e.backtrace)
           raise client_exception

data/test/release_active_record_connection_test.rb

@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/../lib/thrift4rails/release_active_record_connection'
+
+
+# class definition
+class TestClass
+  include Thrift4Rails::ReleaseActiveRecordConnection
+
+  def self.class_test1
+    Array.new
+  end
+
+  def self.class_test2(arg)
+    Array.new
+    arg
+  end
+
+  def instance_test1
+    Array.new
+  end
+
+  def instance_test2(arg)
+    Array.new
+    arg
+  end
+
+end
+# end class definition
+
+class TestThrift4Rails < Test::Unit::TestCase
+  
+  def test_should_code_after_class_method_calls_without_params
+    Array.expects(:new).times(2)
+    ActiveRecord::Base.expects(:clear_active_connections!)
+    assert_equal Array.new ,TestClass.class_test1
+  end
+  
+  def test_should_code_after_class_method_calls_with_params
+    Array.expects(:new)
+    ActiveRecord::Base.expects(:clear_active_connections!)
+    assert_equal "success",TestClass.class_test2("success")
+  end
+  
+  def test_should_code_after_instance_method_calls_without_params
+    test_class = TestClass.new
+    Array.expects(:new).times(2)
+    ActiveRecord::Base.expects(:clear_active_connections!)
+    assert_equal Array.new ,test_class.instance_test1
+  end
+  
+  def test_should_code_after_instance_method_calls_with_params
+    test_class = TestClass.new
+    Array.expects(:new)
+    ActiveRecord::Base.expects(:clear_active_connections!)
+    assert_equal "success" ,test_class.instance_test2("success")
+  end
+
+end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
 require 'stringio'
 require 'test/unit'
+require 'mocha'
 require File.dirname(__FILE__) + '/../lib/thrift4rails'

data/test/test_thrift4rails.rb

@@ -1,11 +1,11 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestThrift4Rails < Test::Unit::TestCase
-
-  def setup
-  end
-  
-  def test_truth
-    assert true
-  end
-end
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestThrift4Rails < Test::Unit::TestCase
+
+  def setup
+  end
+  
+  def test_truth
+    assert true
+  end
+end

data/thrift4rails.gemspec

@@ -2,41 +2,47 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thrift4rails}
-  s.version = "0.2.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pkw.de Development Team"]
-  s.date = %q{2009-07-30}
-  s.description = %q{FIX (describe your package)}
+  s.date = %q{2009-09-03}
+  s.description = %q{module Thrift4Rails::ReleaseActiveRecordConnection ist in der Version 0.3.0 dazugekommen
+Wenn das Modul inkludiert wird, wird nach jedem Methodenaufruf zusaetzlich ActiveRecord::Base.clear_active_connections! aufgerufen.}
   s.email = ["dev@pkw.de"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc"]
-  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "lib/thrift4rails.rb", "lib/thrift4rails/tasks.rb", "lib/thrift4rails/tasks/generate.rake", "lib/thrift4rails/tasks/service.rake", "lib/thrift4rails/tasks/tunnel.rake", "lib/thrift4rails/thrift_client.rb", "script/console", "script/destroy", "script/generate", "tasks/Rakefile", "tasks/thrift.rb", "test/test_helper.rb", "test/test_thrift4rails.rb", "thrift4rails.gemspec"]
-  s.has_rdoc = true
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "lib/thrift4rails.rb", "lib/thrift4rails/client_stub_for_testing.rb", "lib/thrift4rails/release_active_record_connection.rb", "lib/thrift4rails/tasks.rb", "lib/thrift4rails/tasks/generate.rake", "lib/thrift4rails/tasks/service.rake", "lib/thrift4rails/tasks/tunnel.rake", "lib/thrift4rails/thrift_client.rb", "script/console", "script/destroy", "script/generate", "tasks/Rakefile", "tasks/thrift.rb", "test/release_active_record_connection_test.rb", "test/test_helper.rb", "test/test_thrift4rails.rb", "thrift4rails.gemspec"]
   s.homepage = %q{http://github.com/#{github_username}/#{project_name}}
   s.post_install_message = %q{PostInstall.txt}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{thrift4rails}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{FIX (describe your package)}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{module Thrift4Rails::ReleaseActiveRecordConnection ist in der Version 0.3.0 dazugekommen Wenn das Modul inkludiert wird, wird nach jedem Methodenaufruf zusaetzlich ActiveRecord::Base.clear_active_connections! aufgerufen.}
   s.test_files = ["test/test_helper.rb", "test/test_thrift4rails.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.2"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.2"])
       s.add_development_dependency(%q<newgem>, [">= 1.4.1"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.2"])
+      s.add_dependency(%q<activerecord>, [">= 2.3.2"])
       s.add_dependency(%q<newgem>, [">= 1.4.1"])
+      s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.2"])
+    s.add_dependency(%q<activerecord>, [">= 2.3.2"])
     s.add_dependency(%q<newgem>, [">= 1.4.1"])
+    s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: railsbros-thrift4rails
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - pkw.de Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-30 00:00:00 -07:00
+date: 2009-09-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.3.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
   type: :development
@@ -32,6 +42,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.4.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -42,7 +62,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.8.0
     version: 
-description: FIX (describe your package)
+description: module Thrift4Rails::ReleaseActiveRecordConnection ist in der Version 0.3.0 dazugekommen Wenn das Modul inkludiert wird, wird nach jedem Methodenaufruf zusaetzlich ActiveRecord::Base.clear_active_connections! aufgerufen.
 email: 
 - dev@pkw.de
 executables: []
@@ -61,6 +81,8 @@ files:
 - README.rdoc
 - Rakefile
 - lib/thrift4rails.rb
+- lib/thrift4rails/client_stub_for_testing.rb
+- lib/thrift4rails/release_active_record_connection.rb
 - lib/thrift4rails/tasks.rb
 - lib/thrift4rails/tasks/generate.rake
 - lib/thrift4rails/tasks/service.rake
@@ -71,12 +93,12 @@ files:
 - script/generate
 - tasks/Rakefile
 - tasks/thrift.rb
+- test/release_active_record_connection_test.rb
 - test/test_helper.rb
 - test/test_thrift4rails.rb
 - thrift4rails.gemspec
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/#{github_username}/#{project_name}
-licenses: 
 post_install_message: PostInstall.txt
 rdoc_options: 
 - --main
@@ -98,10 +120,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: thrift4rails
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
-summary: FIX (describe your package)
+specification_version: 3
+summary: module Thrift4Rails::ReleaseActiveRecordConnection ist in der Version 0.3.0 dazugekommen Wenn das Modul inkludiert wird, wird nach jedem Methodenaufruf zusaetzlich ActiveRecord::Base.clear_active_connections! aufgerufen.
 test_files: 
 - test/test_helper.rb
 - test/test_thrift4rails.rb