couchrest 1.2.1 → 2.0.0.beta1

data/spec/couchrest/server_spec.rb

@@ -2,34 +2,5 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 describe CouchRest::Server do
   
-  describe "available databases" do
-    before(:each) do
-      @couch = CouchRest::Server.new COUCHHOST
-    end
-
-    after(:each) do
-      @couch.available_databases.each do |ref, db|
-        db.delete!
-      end
-    end
-    
-    it "should let you add more databases" do
-      @couch.available_databases.should be_empty
-      @couch.define_available_database(:default, "cr-server-test-db")
-      @couch.available_databases.keys.should include(:default)
-    end
-    
-    it "should verify that a database is available" do
-      @couch.define_available_database(:default, "cr-server-test-db")
-      @couch.available_database?(:default).should be_true
-      @couch.available_database?("cr-server-test-db").should be_true
-      @couch.available_database?(:matt).should be_false
-    end
-    
-    it "should let you set a default database" do
-      @couch.default_database = 'cr-server-test-default-db'
-      @couch.available_database?(:default).should be_true
-    end
-  end
   
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require "bundler/setup"
 require "rubygems"
 require "rspec"
+require "webmock/rspec"
 
 require File.join(File.dirname(__FILE__), '..','lib','couchrest')
 # check the following file to see how to use the spec'd features.
@@ -13,17 +14,21 @@ unless defined?(FIXTURE_PATH)
   TESTDB    = 'couchrest-test'
   REPLICATIONDB = 'couchrest-test-replication'
   TEST_SERVER    = CouchRest.new COUCHHOST
-  TEST_SERVER.default_database = TESTDB
   DB = TEST_SERVER.database(TESTDB)
 end
 
+# Allows us to hack Specific request responses
+WebMock.disable_net_connect!(:allow_localhost => true)
+
 def reset_test_db!
   DB.recreate! rescue nil 
   DB
 end
 
 RSpec.configure do |config|
-  config.before(:all) { reset_test_db! }
+  config.before(:all) do
+    reset_test_db!
+  end
   
   config.after(:all) do
     cr = TEST_SERVER
@@ -34,13 +39,13 @@ RSpec.configure do |config|
   end
 end
 
+# Check if lucene server is running on port 5985 (not 5984)
 def couchdb_lucene_available?
-  lucene_path = "http://localhost:5985/"
-  url = URI.parse(lucene_path)
+  url = URI "http://localhost:5985/"
   req = Net::HTTP::Get.new(url.path)
-  res = Net::HTTP.new(url.host, url.port).start { |http| http.request(req) }
+  Net::HTTP.new(url.host, url.port).start { |http| http.request(req) }
   true
- rescue Exception => e
+ rescue Exception
   false
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchrest
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - J. Chris Anderson
@@ -12,22 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -49,9 +49,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,9 +56,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -82,14 +76,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +98,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CouchRest provides a simple interface on top of CouchDB's RESTful HTTP
   API, as well as including some utility scripts for managing views and attachments.
 email: jchris@apache.org
@@ -115,6 +123,7 @@ extra_rdoc_files:
 - THANKS.md
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -139,25 +148,28 @@ files:
 - lib/couchrest/attributes.rb
 - lib/couchrest/commands/generate.rb
 - lib/couchrest/commands/push.rb
+- lib/couchrest/connection.rb
 - lib/couchrest/database.rb
 - lib/couchrest/design.rb
 - lib/couchrest/document.rb
+- lib/couchrest/exceptions.rb
 - lib/couchrest/helper/attachments.rb
 - lib/couchrest/helper/pager.rb
-- lib/couchrest/helper/streamer.rb
+- lib/couchrest/helper/stream_row_parser.rb
 - lib/couchrest/helper/upgrade.rb
 - lib/couchrest/middlewares/logger.rb
-- lib/couchrest/monkeypatches.rb
 - lib/couchrest/rest_api.rb
 - lib/couchrest/server.rb
 - lib/couchrest/support/inheritable_attributes.rb
 - spec/.gitignore
+- spec/couchrest/connection_spec.rb
 - spec/couchrest/couchrest_spec.rb
 - spec/couchrest/database_spec.rb
 - spec/couchrest/design_spec.rb
 - spec/couchrest/document_spec.rb
+- spec/couchrest/exceptions_spec.rb
 - spec/couchrest/helpers/pager_spec.rb
-- spec/couchrest/helpers/streamer_spec.rb
+- spec/couchrest/helpers/stream_row_parser_spec.rb
 - spec/couchrest/rest_api_spec.rb
 - spec/couchrest/server_spec.rb
 - spec/fixtures/attachments/README
@@ -198,12 +210,14 @@ signing_key:
 specification_version: 4
 summary: Lean and RESTful interface to CouchDB.
 test_files:
+- spec/couchrest/connection_spec.rb
 - spec/couchrest/couchrest_spec.rb
 - spec/couchrest/database_spec.rb
 - spec/couchrest/design_spec.rb
 - spec/couchrest/document_spec.rb
+- spec/couchrest/exceptions_spec.rb
 - spec/couchrest/helpers/pager_spec.rb
-- spec/couchrest/helpers/streamer_spec.rb
+- spec/couchrest/helpers/stream_row_parser_spec.rb
 - spec/couchrest/rest_api_spec.rb
 - spec/couchrest/server_spec.rb
 - spec/fixtures/attachments/README

data/lib/couchrest/helper/streamer.rb

@@ -1,63 +0,0 @@
-module CouchRest
-  class Streamer
-
-    attr_accessor :default_curl_opts
-
-    def initialize
-      self.default_curl_opts = "--silent --no-buffer --tcp-nodelay -H \"Content-Type: application/json\""
-    end
-
-    def view(*args)
-      raise "CouchRest::Streamer#view is deprecated. Please use Database#view with block."
-    end
-
-    def get(url, &block)
-      open_pipe("curl #{default_curl_opts} \"#{url}\"", &block)
-    end
-
-    def post(url, params = {}, &block)
-      open_pipe("curl #{default_curl_opts} -d \"#{escape_quotes(MultiJson.encode(params))}\" \"#{url}\"", &block)
-    end
-
-    protected
-
-    def escape_quotes(data)
-      data.gsub(/"/, '\"')
-    end
-
-    def open_pipe(cmd, &block)
-      first = nil
-      prev = nil
-      IO.popen(cmd) do |f|
-        while line = f.gets
-          row = parse_line(line)
-          if row.nil?
-            first ||= line # save the header for later if we can't parse it.
-          else
-            block.call row
-          end
-          prev = line
-        end
-      end
-
-      raise RestClient::ServerBrokeConnection if $? && $?.exitstatus != 0
-
-      parse_first(first, prev)
-    end
-
-    def parse_line line
-      return nil unless line
-      if /(\{.*\}),?/.match(line.chomp)
-        MultiJson.decode($1)
-      end
-    end
-
-    def parse_first first, last
-      return nil unless first
-      header = MultiJson.decode(last ? first + last : first)
-      header.delete("rows")
-      header
-    end
-
-  end
-end

data/lib/couchrest/monkeypatches.rb

@@ -1,25 +0,0 @@
-# Monkey patch for faster net/http io
-if RUBY_VERSION.to_f < 1.9
-  require 'timeout'
-
-  class Net::BufferedIO #:nodoc:
-    alias :old_rbuf_fill :rbuf_fill
-    def rbuf_fill
-      if @io.respond_to?(:read_nonblock)
-        begin
-          @rbuf << @io.read_nonblock(65536)
-        rescue Errno::EWOULDBLOCK
-          if IO.select([@io], nil, nil, @read_timeout)
-            retry
-          else
-            raise Timeout::Error, "IO timeout"
-          end
-        end
-      else
-        timeout(@read_timeout) do
-          @rbuf << @io.sysread(65536)
-        end
-      end
-    end
-  end
-end

data/spec/couchrest/helpers/streamer_spec.rb

@@ -1,134 +0,0 @@
-require File.expand_path("../../../spec_helper", __FILE__)
-
-describe CouchRest::Streamer do
-  before(:all) do
-    @cr = CouchRest.new(COUCHHOST)
-    @db = @cr.database(TESTDB)
-    @db.delete! rescue nil
-    @db = @cr.create_db(TESTDB) rescue nil
-    @streamer = CouchRest::Streamer.new()
-    @docs = (1..1000).collect{|i| {:integer => i, :string => i.to_s}}
-    @db.bulk_save(@docs)
-    @db.save_doc({
-      "_id" => "_design/first",
-      :views => {
-        :test => {
-	  :map => "function(doc){for(var w in doc){ if(!w.match(/^_/))emit(w,doc[w])}}"
-        }
-      }
-    })
-  end
-
-  it "should raise error on #view as deprecated" do
-    lambda { @streamer.view }.should raise_error(/deprecated/)
-  end
-
-  it "should GET each row in a view" do
-    count = 0
-    header = @streamer.get("#{@db.root}/_all_docs") do |row|
-      count += 1
-    end
-    count.should == 1001
-    header.should == {"total_rows" => 1001, "offset" => 0}
-  end
-
-  it "should GET each row in a view with params" do
-    count = 0
-    header = @streamer.get("#{@db.root}/_all_docs?include_docs=true&limit=5") do |row|
-      count += 1
-    end
-    count.should == 5
-    header.should == {"total_rows" => 1001, "offset" => 0}
-  end
-
-  it "should GET no rows in a view with limit=0" do
-    count = 0
-    header = @streamer.get("#{@db.root}/_all_docs?include_docs=true&limit=0") do |row|
-      count += 1
-    end
-    count.should == 0
-    header.should == {"total_rows" => 1001, "offset" => 0}
-  end
-
-  it "should raise an exception if it receives malformed data" do
-    IO.stub(:popen) do |cmd, block|
-      class F
-        def initialize
-          @lines = [
-            '{"total_rows": 123, "offset": "0", "rows": [',
-            '{"foo": 1},',
-            '{"foo": 2},',
-          ]
-        end
-
-        def gets
-          @lines.shift
-        end
-      end
-
-      f = F.new
-      block.call f
-
-      IO.unstub(:popen)
-      IO.popen 'true' do; end
-    end
-
-    count = 0
-    expect do
-      @streamer.get("#{@db.root}/_all_docs?include_docs=true&limit=0") do |row|
-        count += 1
-      end
-    end.should raise_error(MultiJson::DecodeError)
-  end
-
-  it "should raise an exception if the couch connection fails" do
-    IO.stub(:popen) do |cmd, block|
-      class F
-        def initialize
-          @lines = [
-            '{"total_rows": 123, "offset": "0", "rows": [',
-            '{"foo": 1},',
-            '{"foo": 2},',
-          ]
-        end
-
-        def gets
-          @lines.shift
-        end
-      end
-
-      block.call F.new
-
-      IO.unstub(:popen)
-      IO.popen 'false' do; end
-    end
-
-    count = 0
-
-    expect do
-      @streamer.get("#{@db.root}/_all_docs?include_docs=true&limit=0") do |row|
-        count += 1
-      end
-    end.should raise_error(RestClient::ServerBrokeConnection)
-
-    count.should == 2
-  end
-
-  it "should POST for each row in a view" do
-    # First grab a pair of IDs
-    ids = []
-    @streamer.get("#{@db.root}/_design/first/_view/test?limit=2") do |row|
-      ids << row['id']
-    end
-    count = 0
-    @streamer.post("#{@db.root}/_all_docs?include_docs=true", :keys => ids) do |row|
-      count += 1
-    end
-    count.should == 2
-  end
-
-  it "should escape quotes" do
-    @streamer.send(:escape_quotes, "keys: [\"sams's test\"]").should eql("keys: [\\\"sams's test\\\"]")
-  end
-
-end