activeresource-persistent 0.1.0 → 0.2.0

data/.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+Gemfile_*.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile_2.3.10

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'activeresource', '2.3.10'
+gem 'net-http-persistent', '2.6'
+
+group :test do
+  gem 'rspec', '2.8.0'
+  gem 'sinatra', '1.3.2'
+  gem 'multi_json', '1.3.2'
+  gem 'posix-spawn', '0.3.6'
+end
+
+group :bundle do
+  gem 'passenger', '3.0.12'
+end

data/Gemfile_3.0.10

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'activeresource', '3.0.10'
+gem 'net-http-persistent', '2.6'
+
+group :test do
+  gem 'rspec', '2.8.0'
+  gem 'sinatra', '1.3.2'
+  gem 'multi_json', '1.3.2'
+  gem 'posix-spawn', '0.3.6'
+end
+
+group :bundle do
+  gem 'passenger', '3.0.12'
+end

data/Gemfile_3.1.4

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'activeresource', '3.1.4'
+gem 'net-http-persistent', '2.6'
+
+group :test do
+  gem 'rspec', '2.8.0'
+  gem 'sinatra', '1.3.2'
+  gem 'multi_json', '1.3.2'
+  gem 'posix-spawn', '0.3.6'
+end
+
+group :bundle do
+  gem 'passenger', '3.0.12'
+end

data/{Gemfile → Gemfile_3.2.3}

@@ -8,6 +8,7 @@ gem 'net-http-persistent', '2.6'
 group :test do
   gem 'rspec', '2.8.0'
   gem 'sinatra', '1.3.2'
+  gem 'multi_json', '1.3.2'
   gem 'posix-spawn', '0.3.6'
 end
 

data/Gemfile_3.2.9

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'activeresource', '3.2.9'
+gem 'net-http-persistent', '2.8'
+
+group :test do
+  gem 'rspec', '2.12.0'
+  gem 'sinatra', '1.3.2'
+  gem 'multi_json', '1.3.2'
+  gem 'posix-spawn', '0.3.6'
+end
+
+group :bundle do
+  gem 'passenger', '3.0.18'
+end

data/README.md

@@ -2,6 +2,14 @@
 
 HTTP persistent connection support for ActiveResource.
 
+Tested with ActiveResource:
+
+* v2.3.10
+* v3.0.10
+* v3.1.4
+* v3.2.3
+* v3.2.9
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -22,6 +30,44 @@ Works out of box after adding:
 
     require 'active_resource/persistent'
 
+## SSL Support
+
+Supported ActiveResource ssl options:
+
+* ca_file
+* cert
+* cert_store
+* key
+* verify_mode
+* verify_callback
+
+Unsupported ActiveResource ssl options:
+
+* ca_path
+* ssl_timeout
+* verify_depth
+
+## Testing
+
+Currently we use passenger server because it provides REMOTE_PORT enviroment variable.
+Thus we can ensure that connections are persistent.
+
+Before start suite ensure that passenger gem are installed correctly.
+
+    $ BUNDLE_GEMFILE=Gemfile_3.2.9 bundle
+    $ BUNDLE_GEMFILE=Gemfile_3.2.9 bundle exec passenger start
+
+Run tests with:
+
+    $ BUNDLE_GEMFILE=Gemfile_3.2.9 bundle
+    $ BUNDLE_GEMFILE=Gemfile_3.2.9 bundle exec rspec -fs -c spec
+
+    $ rake test:gemfile_2.3.10  # Testing with Gemfile_2.3.10
+    $ rake test:gemfile_3.0.10  # Testing with Gemfile_3.0.10
+    $ rake test:gemfile_3.1.4   # Testing with Gemfile_3.1.4
+    $ rake test:gemfile_3.2.3   # Testing with Gemfile_3.2.3
+    $ rake test:gemfile_3.2.9   # Testing with Gemfile_3.2.9
+
 ## References
 
 * [activeresource](https://github.com/rails/activeresource)

data/Rakefile

@@ -1,2 +1,27 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+gemfiles = Dir['Gemfile_*'].reject { |filename| filename =~ /\.lock$/ }
+
+namespace :test do
+  gemfile_tasks = []
+
+  gemfiles.each do |gemfile|
+    gemfile_task_name = gemfile.downcase.gsub('.', '_').to_sym
+    gemfile_tasks << gemfile_task_name
+    desc "Testing with #{gemfile}"
+    task gemfile_task_name do
+      puts "Testing with #{gemfile}"
+
+      ENV['BUNDLE_GEMFILE'] = gemfile
+
+      system "bundle install --quiet"
+      system "bundle exec rspec -c spec"
+    end
+  end
+
+  desc "Testing using all gemfiles"
+  task :all => gemfile_tasks
+end
+
+task :default => 'test:all'

data/activeresource-persistent.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "activeresource-persistent"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.0"
+  gem.version       = "0.2.0"
 
   gem.add_runtime_dependency 'net-http-persistent', '>=2.5'
   gem.add_runtime_dependency 'activeresource', '>=2.3.0'

data/lib/active_resource/persistent/http.rb

@@ -36,6 +36,17 @@ module ActiveResource
         req = Net::HTTP::Head.new(path, headers)
         request(@site, req)
       end
+
+      ##
+      # SSL support
+      #
+
+      def use_ssl=(value)
+        expected_scheme = value ? 'https' : 'http'
+        site.scheme == expected_scheme or
+          raise ArgumentError, "Site scheme should be #{expected_scheme.inspect}"
+      end
+
     end
   end
 end

data/spec/active_resource/connection_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ActiveResource::Connection do
   let(:site) { TestServer.uri }
 
-  let(:instance) { described_class.new(site) }
+  let(:instance) { described_class.new(site, ActiveResource::Formats[:json]) }
   
   describe "#http" do
     subject { instance.send(:http) }
@@ -30,7 +30,7 @@ describe ActiveResource::Connection do
     let(:body) { 'HELLO WORLD' }
     let(:headers) { { 'X_Header' => 'x_value' } }
     let(:http_mock) { mock('HTTP MOCK') }
-    let(:response_mock) { mock('RESPONSE MOCK', :code => '200') }
+    let(:response_mock) { mock('RESPONSE MOCK', :code => '200', :body => '') }
 
     describe "#head" do
       it "should use ActiveResource::Persistent::HTTP#head" do

data/spec/active_resource/integration_spec.rb

@@ -38,8 +38,14 @@ describe %q(
   end
 
   it "Updating different resources from the same site" do
-    user = TestUser.find("101").update_attribute(:username, "jack")
-    post = TestPost.find("202").update_attribute(:title, "hi")
+    user = TestUser.find("101")
+    post = TestPost.find("202")
+
+    user.username = "jack"
+    post.title = "hi"
+
+    user.save
+    post.save
    
     TestHelper.logged_requests.size.should == 4
     TestHelper.persistent_requests_logged?.should be_true

data/spec/active_resource/persistent/http_spec.rb

@@ -66,7 +66,7 @@ describe ActiveResource::Persistent::HTTP do
       @response.should be_instance_of(Net::HTTPOK)
 
       body = YAML.load(@response.body)
-     
+
       body['REQUEST_METHOD'].should == request_method
       body['REQUEST_URI'].should == path
       body['HTTP_X_AUTHORIZATION'].should == 'qwerty'
@@ -74,4 +74,66 @@ describe ActiveResource::Persistent::HTTP do
     end
 
   end
+
+
+
+  context "ActiveResource ssl options support" do
+    let(:site) { URI.parse("https://127.0.0.1:2000") }
+    let(:instance) { described_class.new(site, nil) }
+
+    it "should support use_ssl for https scheme" do
+      instance = described_class.new(URI.parse("https://127.0.0.1:2000"), nil)
+      expect { instance.use_ssl = true }.to_not raise_error {ArgumentError}
+    end
+
+    it "should NOT support use_ssl for http scheme" do
+      instance = described_class.new(URI.parse("http://127.0.0.1:2000"), nil)
+      expect { instance.use_ssl = true }.to raise_error {ArgumentError}
+    end
+
+    it "should support verify_mode option" do
+      instance.verify_mode.should_not == OpenSSL::SSL::VERIFY_NONE
+      instance.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      instance.verify_mode.should == OpenSSL::SSL::VERIFY_NONE
+    end
+
+    it "should support verify_callback option" do
+      instance.verify_callback = "call_me_back"
+      instance.verify_callback.should == "call_me_back"
+    end
+
+
+    it "should support ca_file option" do
+      instance.ca_file = "/tmp/ca.crt"
+      instance.ca_file.should == "/tmp/ca.crt"
+    end
+
+    it "should support cert option" do
+      instance.cert = "/tmp/some.crt"
+      instance.cert.should == "/tmp/some.crt"
+    end
+
+    it "should support key option" do
+      instance.key = "/tmp/some.key"
+      instance.key.should == "/tmp/some.key"
+    end
+
+    it "should support cert_store option" do
+      instance.cert_store = "/tmp/some_cert_store"
+      instance.cert_store.should == "/tmp/some_cert_store"
+    end
+
+    it "should NOT support verify_depth option" do
+      expect { instance.verify_depth = 5 }.to raise_error { NoMethodError}
+    end
+
+    it "should NOT support ca_path option" do
+      expect { instance.ca_path = "/tmp/ca_path" }.to raise_error { NoMethodError }
+    end
+
+    it "should NOT support ssl_timeout option" do
+      expect { instance.ssl_timeout = 10 }.to raise_error { NoMethodError }
+    end
+  end
+
 end

data/spec/support/test_resources.rb

@@ -2,8 +2,10 @@ require 'active_resource'
 
 class TestUser < ActiveResource::Base
   self.element_name = 'user'
+  self.format = :json
 end
 
 class TestPost < ActiveResource::Base
   self.element_name = 'post'
+  self.format = :json
 end

data/spec/support/test_server.rb

@@ -22,7 +22,7 @@ module TestServer
 
   def start
     @pid = POSIX::Spawn.spawn("passenger start --port #{port}", :out => 'test_server.output')
-    sleep(1)
+    sleep(5)
   end
 
   def stop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeresource-persistent
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &16473480 !ruby/object:Gem::Requirement
+  requirement: &9169140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.5'
   type: :runtime
   prerelease: false
-  version_requirements: *16473480
+  version_requirements: *9169140
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &16472560 !ruby/object:Gem::Requirement
+  requirement: &9184980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *16472560
+  version_requirements: *9184980
 description: HTTP persistent connection support for ActiveResource
 email:
 - andriy.yanko@gmail.com
@@ -41,7 +41,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- Gemfile
+- Gemfile_2.3.10
+- Gemfile_3.0.10
+- Gemfile_3.1.4
+- Gemfile_3.2.3
+- Gemfile_3.2.9
 - LICENSE
 - README.md
 - Rakefile
@@ -80,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: HTTP persistent connection support for ActiveResource
@@ -94,4 +98,3 @@ test_files:
 - spec/support/test_ipc.rb
 - spec/support/test_resources.rb
 - spec/support/test_server.rb
-has_rdoc: