wrest 0.1.2-java → 1.0.0.beta0-java

data/CHANGELOG

@@ -13,6 +13,12 @@ Features under a numbered section are complete and available in the Wrest gem.
  * 304/ETag response caching
  * Keep-alive support for libcurl
 
+== 0.9.0
+ * Dependencies updated to ActiveSupport 3.0.0.rc and RSpec 2.0.0.beta19
+
+== 0.1.2
+ * Locked gem dependencies to ActiveSupport 2.3.8 and rspec 1.3.0 to avoid breakages caused by inadvertently requiring the Rails 3.0 and Rspec 2.0 gems which have changed greatly
+
 == 0.1.1
  * Multipart post and put using Net::Http
 

data/README.rdoc

@@ -1,13 +1,13 @@
-= Wrest 0.1.2
+= Wrest 1.0.0.beta0
 
 (c) Copyright 2009-2010 {Sidu Ponnappa}[http://blog.sidu.in]. All Rights Reserved.
 
 Wrest is a ruby REST client library which
 * allows allows you to quickly build object oriented wrappers around any web service 
 * is spec driven, strongly favours immutable objects and avoids class methods and setters making it better suited for use as a library, especially in multi-threaded environments 
-* runs on Ruby 1.8, 1.9 and JRuby, with MacRuby and IronRuby support on the way
+* runs on Ruby 1.8 and JRuby with 1.9, Rubinius, MacRuby and IronRuby support on the way
 
-To receive notifications whenever new features are added to Wrest, pleasesubscribe to my {twitter feed}[http://twitter.com/ponnappa].
+To receive notifications whenever new features are added to Wrest, please subscribe to my {twitter feed}[http://twitter.com/ponnappa].
 
 (If you were wondering why the words 'demon', 'chi' and 'fu-puppies' show up in nearly every example and spec, it's because they're all references to {Roger Zelazny's}[http://en.wikipedia.org/wiki/Roger_Zelazny] last book, 'Lord Demon.')
 

data/Rakefile

@@ -10,14 +10,14 @@
 # Note that some optional libraries/gems that the build (not Wrest itself) uses may not be available on all implementations of Ruby.
 puts "Building on Ruby #{RUBY_VERSION}, #{RUBY_RELEASE_DATE}, #{RUBY_PLATFORM}"
 
-if Object.const_defined?('RAILS_ROOT') || Object.const_defined?('Rails') 
+if Object.const_defined?('RAILS_ROOT')
   require File.dirname(__FILE__) + '/../../../config/environment'
 else
   require 'rubygems'
-  gem 'rspec', '= 1.3.0'
+  gem 'rspec'
   require 'rake'
-  require 'spec'
-  require 'spec/rake/spectask'
+  require 'rspec'
+  require 'rspec/core/rake_task'
 
   begin
     require 'metric_fu'
@@ -28,19 +28,16 @@ end
 
 desc 'Default: run spec tests.'
 task :default => 'rspec:unit'
-task :spec => 'rspec:unit'
 
 namespace :rspec do
   desc "Run all unit specs"
-  Spec::Rake::SpecTask.new(:unit) do |task|
-    task.spec_files = FileList['spec/unit/wrest/**/*_spec.rb']
-    task.spec_opts = ['--options', 'spec/spec.opts']
+  RSpec::Core::RakeTask.new(:unit) do |task|
+    task.pattern = 'spec/unit/wrest/**/*_spec.rb'
   end
-  
+
   desc "Run all live functional specs - requires sample_rails_app running at 3000 in test environment"
-  Spec::Rake::SpecTask.new(:functional) do |task| 
-    task.spec_files = FileList['spec/functional/wrest/**/*_spec.rb']
-    task.spec_opts = ['--options', 'spec/spec.opts']
+  RSpec::Core::RakeTask.new(:functional) do |task| 
+    task.pattern = 'spec/functional/wrest/**/*_spec.rb'
   end
 end
 
@@ -63,9 +60,9 @@ begin
   require 'rcov'
   require 'rcov/rcovtask'
   desc "Run all specs in spec directory with RCov"
-  Spec::Rake::SpecTask.new(:rcov) do |t|
+  RSpec::Core::RakeTask.new(:rcov) do |t|
     t.spec_opts = ['--options', "spec/spec.opts"]
-    t.spec_files = FileList["spec/unit/wrest/**/*_spec.rb"]
+    t.pattern = "spec/unit/wrest/**/*_spec.rb"
     t.rcov = true
     t.rcov_opts = lambda do
       IO.readlines("spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
@@ -88,24 +85,24 @@ begin
     gemspec.homepage = "http://github.com/kaiwren/wrest"
     gemspec.has_rdoc = true
     gemspec.rubyforge_project = 'wrest'
-    gemspec.executables = ['wrest']
+    gemspec.executables = ['wrest', 'jwrest']
     gemspec.require_path = "lib"
     gemspec.files.exclude *['.gitignore', 'spec/functional']
     gemspec.test_files.exclude *['.gitignore', 'spec/functional', 'examples']
-    gemspec.add_dependency('activesupport', '= 2.3.8')
+    gemspec.add_dependency('activesupport', '>= 3.0.0.rc')
     case RUBY_PLATFORM
     when /java/
-      gemspec.add_dependency('json-jruby', '>= 1.1.3')
+      gemspec.add_dependency('json-jruby', '>= 1.4.2')
       gemspec.add_dependency('nokogiri', '>= 1.3.3')
       gemspec.platform = 'java'
     else
-      gemspec.add_dependency('json', '>= 1.1.3')
+      gemspec.add_dependency('json', '>= 1.4.2')
       gemspec.platform = Gem::Platform::RUBY
     end
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-  puts "If you're using JRuby and are having trouble installing jeweler, try installing the git (gem install git) and rubyforge (gem install rubyforge) gems by hand. Also remember to update gems itself (jruby -S gem update --system)." if RUBY_PLATFORM =~ /java/
+  puts "Jeweler not available. Install it with: gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "If you're using JRuby and are having trouble installing jeweler, try installing the git (gem install git) and rubyforge (gem install rubyforge) gems by hand. Also remember to update gems itself (jruby -S gem update --system)."
 end
 
 begin

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:patch: 2
-:minor: 1
-:major: 0
+:build: beta0
+:patch: 0
+:minor: 0
+:major: 1

data/lib/wrest.rb

@@ -7,7 +7,7 @@
 # See the License for the specific language governing permissions and limitations under the License.
 
 require 'rubygems'
-gem 'activesupport', '=2.3.8'
+gem 'activesupport', '>= 3.0.0.rc'
 
 require 'net/http'
 require 'net/https'
@@ -18,7 +18,11 @@ require 'base64'
 require 'logger'
 require 'benchmark'
 require 'active_support'
-
+require 'active_support/json'
+require 'active_support/core_ext/string'
+require 'active_support/core_ext/hash'
+require 'active_support/core_ext/module'
+require 'active_support/core_ext/object'
 
 module Wrest
   Root = File.dirname(__FILE__)
@@ -52,7 +56,9 @@ begin
   gem 'libxml-ruby', '>= 1.1.3'
   ActiveSupport::XmlMini.backend='LibXML'
 rescue Gem::LoadError
-  Wrest.logger.debug "Warning: LibXML >= 1.1.3 not found, attempting to use Nokogiri. To install LibXML run `(sudo) gem install libxml-ruby` (libxml-ruby is not available on JRuby)"
+  unless RUBY_PLATFORM =~ /java/
+    Wrest.logger.debug "Warning: LibXML >= 1.1.3 not found, attempting to use Nokogiri. To install LibXML run `(sudo) gem install libxml-ruby` (libxml-ruby is not available on JRuby)"
+  end
   begin
     gem 'nokogiri', '>= 1.3.3'
     ActiveSupport::XmlMini.backend='Nokogiri'
@@ -70,6 +76,10 @@ rescue Gem::LoadError
   end
 end
 
+RUBY_PLATFORM =~ /java/ ? gem('json-jruby', '>= 1.4.2') : gem('json', '>= 1.4.2')
+ActiveSupport::JSON.backend = "JSONGem"
+
+
 Dir["#{File.expand_path(File.dirname(__FILE__))}/wrest/core_ext/*.rb"].each { |file| require file }
 
 # Load Wrest Core

data/lib/wrest/components/container/typecaster.rb

@@ -26,45 +26,45 @@ module Wrest
         klass.class_eval{ include Typecaster::InstanceMethods }
         klass.alias_method_chain  :initialize,  :typecasting
       end
-      
+
       module Helpers
         def as_base64Binary
-          ActiveSupport::CoreExtensions::Hash::Conversions::XML_PARSING['base64Binary']
+          ActiveSupport::XmlMini::PARSING['base64Binary']
         end
 
         def as_boolean
-          ActiveSupport::CoreExtensions::Hash::Conversions::XML_PARSING['boolean']
+          ActiveSupport::XmlMini::PARSING['boolean']
         end
 
         def as_decimal
-          ActiveSupport::CoreExtensions::Hash::Conversions::XML_PARSING['decimal']
+          ActiveSupport::XmlMini::PARSING['decimal']
         end
 
         def as_date
-          ActiveSupport::CoreExtensions::Hash::Conversions::XML_PARSING['date']
+          ActiveSupport::XmlMini::PARSING['date']
         end
 
         def as_datetime
-          ActiveSupport::CoreExtensions::Hash::Conversions::XML_PARSING['datetime']
+          ActiveSupport::XmlMini::PARSING['datetime']
         end
 
         def as_float
-          ActiveSupport::CoreExtensions::Hash::Conversions::XML_PARSING['float']
+          ActiveSupport::XmlMini::PARSING['float']
         end
 
         def as_integer
-          ActiveSupport::CoreExtensions::Hash::Conversions::XML_PARSING['integer']
+          ActiveSupport::XmlMini::PARSING['integer']
         end
 
         def as_symbol
-          ActiveSupport::CoreExtensions::Hash::Conversions::XML_PARSING['symbol']
+          ActiveSupport::XmlMini::PARSING['symbol']
         end
 
         def as_yaml
-          ActiveSupport::CoreExtensions::Hash::Conversions::XML_PARSING['yaml']
+          ActiveSupport::XmlMini::PARSING['yaml']
         end
       end
-        
+
       module ClassMethods
         # Accepts a set of attribute-name/lambda pairs which are used
         # to typecast string values injected through the constructor.

data/lib/wrest/components/mutators/xml_mini_type_caster.rb

@@ -23,7 +23,7 @@ module Wrest
           if in_value['nil'] == 'true'
             out_value = nil
           elsif in_value.key?('type')
-            caster = ActiveSupport::CoreExtensions::Hash::Conversions::XML_PARSING[in_value['type']]
+            caster = ActiveSupport::XmlMini::PARSING[in_value['type']]
             out_value = caster ? caster.call(in_value['__content__']) : in_value
           elsif in_value.key?('__content__')
             out_value = in_value['__content__']

data/lib/wrest/components/mutators/xml_simple_type_caster.rb

@@ -24,7 +24,7 @@ module Wrest
           if in_value['nil'] == 'true'
             out_value = nil
           elsif in_value.key?('type')
-            out_value = ActiveSupport::CoreExtensions::Hash::Conversions::XML_PARSING[in_value['type']].call(in_value['content'])
+            out_value = ActiveSupport::XmlMini::PARSING[in_value['type']].call(in_value['content'])
           else
             out_value = in_value.mutate_using(self)
           end

data/lib/wrest/core_ext/hash/conversions.rb

@@ -34,9 +34,9 @@ module Wrest
         #                           :start  => '1'
         #                         ).deserialise.mutate_using(XmlSimpleTypeCaster.new)
         def mutate_using(mutator)
-          returning({})do |mutated_hash|
+          mutated_hash = {}
             self.each{|tuple| mutated_hash.store(*mutator.mutate(tuple))}
-          end
+          mutated_hash
         end
       end
     end

data/lib/wrest/native/get.rb

@@ -12,7 +12,6 @@ module Wrest::Native
     def initialize(wrest_uri, parameters = {}, headers = {}, options = {})
       follow_redirects = options[:follow_redirects]
       options[:follow_redirects] = (follow_redirects == nil ? true : follow_redirects)
-      options[:cache_store] ||= {}
       super(
             wrest_uri, 
             Net::HTTP::Get, 
@@ -22,30 +21,5 @@ module Wrest::Native
             options
           )
     end
-
-    def invoke_with_cache_check
-      cached_response = get_cached_response
-      if cached_response.nil? then
-        response = invoke_without_cache_check
-        cache_response(response)
-        response
-      else
-        cached_response
-      end
-    end
-
-    def get_cached_response
-      response = nil
-      if cache_store.has_key?(@uri)
-        response = cache_store.fetch(@uri)
-      end
-      response
-    end
-
-    def cache_response(response)
-      cache_store[@uri] = response
-    end
-
-    alias_method_chain :invoke, :cache_check
   end
 end

data/lib/wrest/native/request.rb

@@ -13,7 +13,7 @@ module Wrest::Native
   # or Wrest::Native::Get etc. instead.
   class Request
     attr_reader :http_request, :uri, :body, :headers, :username, :password, :follow_redirects,
-                :follow_redirects_limit, :follow_redirects_count, :timeout, :connection, :parameters, :cache_store
+                :follow_redirects_limit, :follow_redirects_count, :timeout, :connection, :parameters
     # Valid tuples for the options are:
     #   :username => String, defaults to nil
     #   :password => String, defaults to nil
@@ -31,7 +31,6 @@ module Wrest::Native
     #               in the event of a connection failing to open. Defaulted to 60 by Uri#create_connection.
     #   :connection => The HTTP Connection object to use. This is how a keep-alive connection can be
     #                  used for multiple requests.
-    #   :cache_store => The object which should be used as cache store for cacheable responses
     def initialize(wrest_uri, http_request_klass, parameters = {}, body = nil, headers = {}, options = {})
       @uri = wrest_uri
       @headers = headers.stringify_keys
@@ -46,7 +45,6 @@ module Wrest::Native
       @timeout = @options[:timeout]
       @connection = @options[:connection]
       @http_request = self.build_request(http_request_klass, @uri, @parameters, @headers)
-      @cache_store = options[:cache_store]
     end
 
     # Makes a request and returns a Wrest::Native::Response. 

data/lib/wrest/version.rb

@@ -10,11 +10,12 @@
 module Wrest
   module VERSION
     unless defined? MAJOR
-      MAJOR  = 0
-      MINOR  = 1
-      TINY   = 2
-
-      STRING = [MAJOR, MINOR, TINY].join('.')
+      MAJOR  = 1
+      MINOR  = 0
+      TINY   = 0
+      BUILD = 'beta0'
+      
+      STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
 
       SUMMARY = "wrest version #{STRING}"
     end

data/spec/unit/spec_helper.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../lib/wrest")
 require "#{Wrest::Root}/wrest/curl" unless RUBY_PLATFORM =~ /java/
-require 'spec'
+require 'rspec'
 
 ['/../custom_matchers/**/*.rb'].each{|directory|
   Dir["#{File.expand_path(File.dirname(__FILE__) + directory)}"].each { |file|
@@ -22,12 +22,12 @@ def puts(*args)
  # super *args
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include(CustomMatchers)
 end
 
 def build_ok_response(body = '')
-  returning mock(Net::HTTPOK) do |response|
+  mock(Net::HTTPOK).tap do |response|
     response.stub!(:code).and_return('200')
     response.stub!(:message).and_return('OK')
     response.stub!(:body).and_return(body)

data/spec/unit/wrest/native/session_spec.rb

@@ -35,7 +35,7 @@ module Wrest
       http.should_receive(:request).with(request_two, nil).and_return(ok_response)
 
       Native::Session.new(uri) do |session|
-        session.get('/glassware', :owner => 'Kai', :type => 'bottle')
+        session.get('/glassware', ActiveSupport::OrderedHash.new.merge!([[:owner, 'Kai'],[:type, 'bottle']]))
         session.get '/bottles.xml'
       end
     end
@@ -64,7 +64,7 @@ module Wrest
       http.should_receive(:request).with(request_two, nil).and_return(ok_response_with_connection_close)
 
       Native::Session.new(uri) do |session|
-        session.get('/glassware', :owner => 'Kai', :type => 'bottle')
+        session.get('/glassware', ActiveSupport::OrderedHash.new.merge!([[:owner, 'Kai'],[:type, 'bottle']]))
         session.instance_variable_get('@connection').should == http
         session.get '/bottles.xml'
         session.instance_variable_get('@connection').should be_nil

data/spec/unit/wrest/uri_spec.rb

@@ -129,10 +129,10 @@ module Wrest
     
     describe 'HTTP actions' do
       def setup_http
-        returning mock(Net::HTTP) do |http|
+        http = mock(Net::HTTP) 
           Net::HTTP.should_receive(:new).with('localhost', 3000).and_return(http)
           http.should_receive(:read_timeout=).with(60)
-        end
+        http
       end
       
       it "should know how to get" do
@@ -160,7 +160,7 @@ module Wrest
         
         http.should_receive(:request).with(request, nil).and_return(build_ok_response)
 
-        uri.get({:owner => 'Kai', :type => 'bottle'}, :page => '2', :per_page => '5')
+        uri.get(ActiveSupport::OrderedHash.new.merge!([[:owner, 'Kai'],[:type, 'bottle']]), :page => '2', :per_page => '5')
       end
 
       it "should know how to get with parameters but without any headers" do
@@ -174,7 +174,7 @@ module Wrest
         
         http.should_receive(:request).with(request, nil).and_return(build_ok_response)
 
-        uri.get(:owner => 'Kai', :type => 'bottle')
+        uri.get(ActiveSupport::OrderedHash.new.merge!([[:owner, 'Kai'],[:type, 'bottle']]))
       end
 
       it "should know how to post" do
@@ -203,10 +203,7 @@ module Wrest
                                                   ).and_return(request)
 
         http.should_receive(:request).with(request, "foo=bar&ooga=booga").and_return(build_ok_response)
-        params = ActiveSupport::OrderedHash.new
-        params[:ooga] = 'booga'
-        params[:foo] = 'bar'
-        uri.post_form(params, :page => '2', :per_page => '5')
+        uri.post_form(ActiveSupport::OrderedHash.new.merge!([[:foo, 'bar'],[:ooga, 'booga']]), :page => '2', :per_page => '5')
       end
 
       it "should know how to put" do
@@ -234,7 +231,7 @@ module Wrest
 
         http.should_receive(:request).with(request, nil).and_return(build_ok_response(nil))
 
-        uri.delete({:owner => 'Kai', :type => 'bottle'}, :page => '2', :per_page => '5')
+        uri.delete(ActiveSupport::OrderedHash.new.merge!([[:owner, 'Kai'],[:type, 'bottle']]), :page => '2', :per_page => '5')
       end
 
       it "should know how to ask for options on a URI" do
@@ -268,7 +265,7 @@ module Wrest
         http.should_receive(:request).with(request_get, nil).and_return(build_ok_response)
         http.should_receive(:request).with(request_post, '<ooga>Booga</ooga>').and_return(build_ok_response)
 
-        uri.get({:owner => 'Kai', :type => 'bottle'}, :page => '2', :per_page => '5')
+        uri.get(ActiveSupport::OrderedHash.new.merge!([[:owner, 'Kai'],[:type, 'bottle']]), :page => '2', :per_page => '5')
         uri.post '<ooga>Booga</ooga>', :page => '2', :per_page => '5'
       end
     end  

data/wrest.gemspec

@@ -5,16 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wrest}
-  s.version = "0.1.2"
+  s.version = "1.0.0.beta0"
   s.platform = %q{java}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sidu Ponnappa"]
   s.date = %q{2010-07-27}
-  s.default_executable = %q{wrest}
   s.description = %q{Wrest is a HTTP and REST client library which allows you to quickly build well encapsulated, object oriented wrappers around any web service.}
   s.email = %q{ckponnappa@gmail.com}
-  s.executables = ["wrest"]
+  s.executables = ["wrest", "jwrest"]
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -92,7 +91,7 @@ Gem::Specification.new do |s|
      "lib/wrest/version.rb",
      "spec/custom_matchers/custom_matchers.rb",
      "spec/rcov.opts",
-     "spec/spec.opts",
+     "spec/spec.opts.disable",
      "spec/unit/spec_helper.rb",
      "spec/unit/wrest/components/attributes_container/alias_accessors_spec.rb",
      "spec/unit/wrest/components/attributes_container/typecaster_spec.rb",
@@ -109,7 +108,6 @@ Gem::Specification.new do |s|
      "spec/unit/wrest/curl/request_spec.rb",
      "spec/unit/wrest/curl/response_spec.rb",
      "spec/unit/wrest/http/response_spec.rb",
-     "spec/unit/wrest/native/get_spec.rb",
      "spec/unit/wrest/native/redirection_spec.rb",
      "spec/unit/wrest/native/request_spec.rb",
      "spec/unit/wrest/native/response_spec.rb",
@@ -145,7 +143,6 @@ Gem::Specification.new do |s|
      "spec/unit/wrest/curl/request_spec.rb",
      "spec/unit/wrest/curl/response_spec.rb",
      "spec/unit/wrest/http/response_spec.rb",
-     "spec/unit/wrest/native/get_spec.rb",
      "spec/unit/wrest/native/redirection_spec.rb",
      "spec/unit/wrest/native/request_spec.rb",
      "spec/unit/wrest/native/response_spec.rb",
@@ -158,17 +155,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["= 2.3.8"])
-      s.add_runtime_dependency(%q<json-jruby>, [">= 1.1.3"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.rc"])
+      s.add_runtime_dependency(%q<json-jruby>, [">= 1.4.2"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.3.3"])
     else
-      s.add_dependency(%q<activesupport>, ["= 2.3.8"])
-      s.add_dependency(%q<json-jruby>, [">= 1.1.3"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0.rc"])
+      s.add_dependency(%q<json-jruby>, [">= 1.4.2"])
       s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
     end
   else
-    s.add_dependency(%q<activesupport>, ["= 2.3.8"])
-    s.add_dependency(%q<json-jruby>, [">= 1.1.3"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0.rc"])
+    s.add_dependency(%q<json-jruby>, [">= 1.4.2"])
     s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wrest
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
-    - 0
     - 1
-    - 2
-  version: 0.1.2
+    - 0
+    - 0
+    - beta0
+  version: 1.0.0.beta0
 platform: java
 authors: 
   - Sidu Ponnappa
@@ -15,7 +16,7 @@ bindir: bin
 cert_chain: []
 
 date: 2010-07-27 00:00:00 +05:30
-default_executable: wrest
+default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: activesupport
@@ -23,13 +24,14 @@ dependencies:
     requirement: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - "="
+        - - ">="
           - !ruby/object:Gem::Version 
             segments: 
-              - 2
               - 3
-              - 8
-            version: 2.3.8
+              - 0
+              - 0
+              - rc
+            version: 3.0.0.rc
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -42,9 +44,9 @@ dependencies:
           - !ruby/object:Gem::Version 
             segments: 
               - 1
-              - 1
-              - 3
-            version: 1.1.3
+              - 4
+              - 2
+            version: 1.4.2
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -66,6 +68,7 @@ description: Wrest is a HTTP and REST client library which allows you to quickly
 email: ckponnappa@gmail.com
 executables: 
   - wrest
+  - jwrest
 extensions: []
 
 extra_rdoc_files: 
@@ -144,7 +147,7 @@ files:
   - lib/wrest/version.rb
   - spec/custom_matchers/custom_matchers.rb
   - spec/rcov.opts
-  - spec/spec.opts
+  - spec/spec.opts.disable
   - spec/unit/spec_helper.rb
   - spec/unit/wrest/components/attributes_container/alias_accessors_spec.rb
   - spec/unit/wrest/components/attributes_container/typecaster_spec.rb
@@ -161,7 +164,6 @@ files:
   - spec/unit/wrest/curl/request_spec.rb
   - spec/unit/wrest/curl/response_spec.rb
   - spec/unit/wrest/http/response_spec.rb
-  - spec/unit/wrest/native/get_spec.rb
   - spec/unit/wrest/native/redirection_spec.rb
   - spec/unit/wrest/native/request_spec.rb
   - spec/unit/wrest/native/response_spec.rb
@@ -190,11 +192,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
         segments: 
-          - 0
-        version: "0"
+          - 1
+          - 3
+          - 1
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: wrest
@@ -222,7 +226,6 @@ test_files:
   - spec/unit/wrest/curl/request_spec.rb
   - spec/unit/wrest/curl/response_spec.rb
   - spec/unit/wrest/http/response_spec.rb
-  - spec/unit/wrest/native/get_spec.rb
   - spec/unit/wrest/native/redirection_spec.rb
   - spec/unit/wrest/native/request_spec.rb
   - spec/unit/wrest/native/response_spec.rb

data/spec/unit/wrest/native/get_spec.rb

@@ -1,64 +0,0 @@
-# Copyright 2009 Sidu Ponnappa
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe Wrest::Native::Get do
-  describe "caching" do
-  
-    before :each do
-      @request_uri = 'http://localhost/foo'.to_uri
-      @cache = Hash.new
-      @get = Wrest::Native::Get.new(@request_uri, {},{},{:cache_store => @cache})
-    end
-
-    describe "dependencies" do
-      before :each do
-        @get.stub!(:invoke_without_cache_check).and_return(build_ok_response)
-      end
-
-      it "should call get_cached_response before making actual request" do
-        @get.should_receive(:get_cached_response)
-        @get.invoke
-      end
-
-      it "should call cache_response after calling invoke method for fresh request" do
-        @get.should_receive(:get_cached_response).and_return(nil)
-        @get.should_receive(:cache_response)
-        @get.invoke
-      end
-
-      it "should check if response already exists cache before making a request" do
-        @cache.should_receive(:has_key?).with(@request_uri)
-        @get.invoke
-      end
-    end
-    it "should call invoke_without_cache_check if response does not exist in cache" do
-      @cache.should_receive(:has_key?).with(@request_uri).and_return(false)
-      @get.should_receive(:invoke_without_cache_check)
-      @get.invoke
-    end
-
-    it "should not call invoke_without_cache_check if response exists in cache" do
-      @cache.should_receive(:has_key?).with(@request_uri).and_return(true)
-      @cache.should_receive(:fetch).with(@request_uri).and_return(build_ok_response)
-      @get.should_not_receive(:invoke_without_cache_check)
-      @get.invoke
-    end
-
-    it "should store response in cache if it did not exist in cache" do
-      response = build_ok_response
-      @cache.should_receive(:has_key?).with(@request_uri).and_return(false)
-      @get.should_receive(:invoke_without_cache_check).and_return(response)
-      @cache.should_receive(:[]=).with(@request_uri,response)
-      @get.invoke
-    end
-
-  end
-end