couchmodel 0.1.0.beta4 → 0.1.0

data/README.rdoc

@@ -66,20 +66,20 @@ a design document will be created (but not saved to the file). The design ducume
 
 A design document should look like this
 
-  :id:        "test_design"
-  :language:  "javascript"
-  :views:
-    :view_name_1:
-      :map:
+  id:        "test_design"
+  language:  "javascript"
+  views:
+    view_name_1:
+      map:
         function(document) {
           ...
         };
-      :reduce:
+      reduce:
         function(key, values, rereduce) {
           ...
         };
-    :view_name_2:
-      :keys: [ "key_one", "key_two" ]
+    view_name_2:
+      keys: [ "key_one", "key_two" ]
     ...
 
 It will create the methods <tt>Model.view_name_1</tt> and <tt>Model.view_name_2</tt>, which returns the result of the

data/Rakefile

@@ -1,10 +1,44 @@
 require 'rubygems'
 gem 'rspec'
 require 'spec'
+require 'rake/rdoctask'
+require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 
 task :default => :spec
 
+specification = Gem::Specification.new do |specification|
+  specification.name              = "couchmodel"
+  specification.version           = "0.1.0"
+  specification.date              = "2010-03-31"
+
+  specification.authors           = [ "Philipp Bruell" ]
+  specification.email             = "b.phifty@gmail.com"
+  specification.homepage          = "http://github.com/phifty/couchmodel"
+  specification.rubyforge_project = "couchmodel"
+
+  specification.summary           = "CouchModel provides an interface to easly handle CouchDB documents."
+  specification.description       = "CouchModel provides an interface to easly handle CouchDB documents. It also comes with a ActiveModel implementation to integrate into an Rails 3 application."
+
+  specification.has_rdoc          = true
+  specification.files             = [ "README.rdoc", "LICENSE", "Rakefile" ] + Dir["lib/**/*"] + Dir["spec/**/*"]
+  specification.extra_rdoc_files  = [ "README.rdoc" ]
+  specification.require_path      = "lib"
+
+  specification.test_files        = Dir["spec/**/*_spec.rb"]
+end
+
+Rake::GemPackageTask.new(specification) do |package|
+  package.gem_spec = specification
+end
+
+desc "Generate the rdoc"
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_files.add [ "README.rdoc", "lib/**/*.rb" ]
+  rdoc.main   = "README.rdoc"
+  rdoc.title  = "CouchModel interface to handle CouchDB documents."
+end
+
 desc "Run all specs in spec directory"
 Spec::Rake::SpecTask.new do |task|
   task.spec_files = FileList["spec/lib/**/*_spec.rb"]

data/lib/code_smells.reek

@@ -0,0 +1,3 @@
+---
+LongMethod:
+  max_statements: 9

data/lib/couch_model/base.rb

@@ -63,9 +63,9 @@ module CouchModel
     end
 
     def load
-      load_response Transport.request(:get, url, :expected_status_code => 200)
+      load_response ExtendedTransport.request(:get, url, :expected_status_code => 200)
       true
-    rescue Transport::UnexpectedStatusCodeError => error
+    rescue ExtendedTransport::UnexpectedStatusCodeError => error
       upgrade_unexpected_status_error error
     end
 
@@ -77,10 +77,10 @@ module CouchModel
 
     def destroy
       return false if new?
-      Transport.request :delete, self.url, :headers => { "If-Match" => self.rev }, :expected_status_code => 200
+      ExtendedTransport.request :delete, self.url, :headers => { "If-Match" => self.rev }, :expected_status_code => 200
       clear_rev
       true
-    rescue Transport::UnexpectedStatusCodeError => error
+    rescue ExtendedTransport::UnexpectedStatusCodeError => error
       upgrade_unexpected_status_error error
     end
 
@@ -105,19 +105,19 @@ module CouchModel
     end
 
     def create
-      response = Transport.request :post, self.database.url, :body => self.attributes, :expected_status_code => 201
+      response = ExtendedTransport.request :post, self.database.url, :body => self.attributes, :expected_status_code => 201
       self.id  = response["id"]
       self.rev = response["rev"]
       true
-    rescue Transport::UnexpectedStatusCodeError
+    rescue ExtendedTransport::UnexpectedStatusCodeError
       false
     end
 
     def update
-      response = Transport.request :put, self.url, :body => self.attributes, :expected_status_code => 201
+      response = ExtendedTransport.request :put, self.url, :body => self.attributes, :expected_status_code => 201
       self.rev = response["rev"]
       true
-    rescue Transport::UnexpectedStatusCodeError
+    rescue ExtendedTransport::UnexpectedStatusCodeError
       false
     end
 

data/lib/couch_model/collection.rb

@@ -64,7 +64,7 @@ module CouchModel
     end
 
     def fetch_response
-      @response = Transport.request(
+      @response = ExtendedTransport.request(
         :get, url,
         :parameters            => request_parameters,
         :expected_status_code  => 200
@@ -72,7 +72,7 @@ module CouchModel
     end
 
     def fetch_meta_response
-      @response = Transport.request(
+      @response = ExtendedTransport.request(
         :get, url,
         :parameters            => request_parameters.merge(:limit => 0),
         :expected_status_code  => 200

data/lib/couch_model/database.rb

@@ -25,7 +25,7 @@ module CouchModel
     end
 
     def create!
-      Transport.request :put, url, :expected_status_code => 201
+      ExtendedTransport.request :put, url, :expected_status_code => 201
     end
 
     def create_if_missing!
@@ -33,7 +33,7 @@ module CouchModel
     end
 
     def delete!
-      Transport.request :delete, url, :expected_status_code => 200
+      ExtendedTransport.request :delete, url, :expected_status_code => 200
     end
 
     def delete_if_exists!
@@ -41,7 +41,7 @@ module CouchModel
     end
 
     def informations
-      Transport.request :get, url, :expected_status_code => 200
+      ExtendedTransport.request :get, url, :expected_status_code => 200
     end
 
     def exists?

data/lib/couch_model/design.rb

@@ -33,7 +33,9 @@ module CouchModel
     end
 
     def load_file
-      self.id, self.language, self.views = YAML::load_file(self.filename).values_at(:id, :language, :views)
+      hash = YAML::load_file self.filename
+      symbolize_hash_keys hash
+      self.id, self.language, self.views = hash.values_at(:id, :language, :views)
       true
     rescue Errno::ENOENT
       false
@@ -65,7 +67,7 @@ module CouchModel
     end
 
     def exists?
-      Transport.request :get, self.url, :expected_status_code => 200
+      ExtendedTransport.request :get, self.url, :expected_status_code => 200
       true
     rescue Transport::UnexpectedStatusCodeError
       false
@@ -73,9 +75,9 @@ module CouchModel
 
     def push
       url = self.url
-      evaluate Transport.request(:get, url)
+      evaluate ExtendedTransport.request(:get, url)
 
-      Transport.request :put, url, :body => self.to_hash, :expected_status_code => 201
+      ExtendedTransport.request :put, url, :body => self.to_hash, :expected_status_code => 201
       true
     end
 
@@ -87,6 +89,14 @@ module CouchModel
 
     attr_writer :rev
 
+    def symbolize_hash_keys(hash)
+      hash.keys.each do |key|
+        value = hash.delete key
+        symbolize_hash_keys value if value.is_a?(Hash)
+        hash[(key.to_sym rescue key) || key] = value
+      end
+    end
+
     def evaluate(response)
       self.rev = response["_rev"] if response.has_key?("_rev")
     end

data/lib/couch_model/server.rb

@@ -19,19 +19,19 @@ module CouchModel
     end
 
     def informations
-      Transport.request :get, url + "/", :expected_status_code => 200
+      ExtendedTransport.request :get, url + "/", :expected_status_code => 200
     end
 
     def statistics
-      Transport.request :get, url + "/_stats", :expected_status_code => 200
+      ExtendedTransport.request :get, url + "/_stats", :expected_status_code => 200
     end
 
     def database_names
-      Transport.request :get, url + "/_all_dbs", :expected_status_code => 200
+      ExtendedTransport.request :get, url + "/_all_dbs", :expected_status_code => 200
     end
 
     def uuids(count = 1)
-      response = Transport.request :get, url + "/_uuids", :expected_status_code => 200, :parameters => { :count => count }
+      response = ExtendedTransport.request :get, url + "/_uuids", :expected_status_code => 200, :parameters => { :count => count }
       response["uuids"]
     end
 

data/lib/couch_model/transport.rb

@@ -1,89 +1,178 @@
 require 'uri'
+require 'cgi'
 require 'net/http'
 require 'json'
 
 module CouchModel
 
-  module Transport
+  # Common transport layer for http transfers.
+  class Transport
+
+    attr_reader :http_method
+    attr_reader :url
+    attr_reader :options
+    attr_reader :headers
+    attr_reader :parameters
+    attr_reader :body
+    attr_reader :response
+
+    def initialize(http_method, url, options = { })
+      @http_method  = http_method
+      @uri          = URI.parse url
+      @headers      = options[:headers]     || { }
+      @parameters   = options[:parameters]  || { }
+      @body         = options[:body]
+    end
 
-    # The UnexpectedStatusCodeError is raised if the :expected_status_code option is given to
-    # the :request method and the responded status code is different from the expected one.
-    class UnexpectedStatusCodeError < StandardError
+    def perform
+      initialize_request_class
+      initialize_request_path
+      initialize_request
+      initialize_request_body
+      perform_request
+    end
 
-      attr_reader :status_code
+    private
+
+    def initialize_request_class
+      request_class_name = @http_method.to_s.capitalize
+      raise NotImplementedError, "the request method #{http_method} is not implemented" unless Net::HTTP.const_defined?(request_class_name)
+      @request_class = Net::HTTP.const_get request_class_name
+    end
 
-      def initialize(status_code)
-        @status_code = status_code
+    def initialize_request_path
+      serialize_parameters
+      @request_path = @uri.path + @serialized_parameters
+    end
+
+    def serialize_parameters
+      quote_parameters
+      @serialized_parameters = if @parameters.nil? || @parameters.empty?
+        ""
+      else
+        "?" + @quoted_parameters.collect do |key, value|
+          value.is_a?(Array) ?
+            value.map{ |element| "#{key}=#{element}" }.join("&") :
+            "#{key}=#{value}"
+        end.join("&")
       end
+    end
 
-      def to_s
-        "#{super} received status code #{self.status_code}"
+    def quote_parameters
+      @quoted_parameters = { }
+      @parameters.each do |key, value|
+        encoded_key = CGI.escape(key.to_s)
+        @quoted_parameters[encoded_key] = value.is_a?(Array) ? value.map{ |element| CGI.escape element } : CGI.escape(value)
       end
+    end
 
+    def initialize_request
+      @request = @request_class.new @request_path, @headers
     end
 
-    def self.request(http_method, url, options = { })
-      expected_status_code = options[:expected_status_code]
+    def initialize_request_body
+      return unless [ :post, :put ].include?(@http_method.to_sym)
+      @request.body = @body ? @body : @serialized_parameters.sub(/^\?/, "")
+    end
 
-      uri = URI.parse url
-      response = perform request_object(http_method, uri, options), uri
+    def perform_request
+      @response = Net::HTTP.start(@uri.host, @uri.port) do |connection|
+        connection.request @request
+      end
+    end
 
-      check_status_code response, expected_status_code if expected_status_code
-      parse response
+    def self.request(http_method, url, options = { })
+      transport = new http_method, url, options
+      transport.perform
+      transport.response
     end
 
-    def self.request_object(http_method, uri, options)
-      raise NotImplementedError, "the request method #{http_method} is not implemented" unless
-        self.respond_to?(:"#{http_method}_request_object")
+  end
+
+  # Extended transport layer for http transfers. Basic authorization and JSON transfers are supported.
+  class ExtendedTransport < Transport
+
+    # The UnexpectedStatusCodeError is raised if the :expected_status_code option is given to
+    # the :request method and the responded status code is different from the expected one.
+    class UnexpectedStatusCodeError < StandardError
+
+      attr_reader :status_code
+      attr_reader :message
+
+      def initialize(status_code, message = nil)
+        @status_code, @message = status_code, message
+      end
+
+      def to_s
+        "#{super} received status code #{self.status_code}" + (@message ? " [#{@message}]" : "")
+      end
 
-      request_object = send :"#{http_method}_request_object", uri.path, (options[:parameters] || { }), (options[:headers] || { })
-      request_object.body = options[:body].to_json if options.has_key?(:body)
-      request_object
     end
 
-    def self.get_request_object(path, parameters, headers)
-      Net::HTTP::Get.new path + serialize_parameters(parameters),
-                         headers
+    attr_reader :expected_status_code
+    attr_reader :auth_type
+    attr_reader :username
+    attr_reader :password
+
+    def initialize(http_method, url, options = { })
+      super http_method, url, options
+      @expected_status_code = options[:expected_status_code]
+      @auth_type            = options[:auth_type]
+      @username             = options[:username]
+      @password             = options[:password]
     end
 
-    def self.post_request_object(path, parameters, headers)
-      Net::HTTP::Post.new path + serialize_parameters(parameters),
-                          { "Content-Type" => "application/json" }.merge(headers)
+    def perform
+      initialize_headers
+      super
+      check_status_code
+      parse_response
     end
 
-    def self.put_request_object(path, parameters, headers)
-      Net::HTTP::Put.new path + serialize_parameters(parameters),
-                         { "Content-Type" => "application/json" }.merge(headers)
+    private
+
+    def initialize_headers
+      @headers["Accept"] = "application/json"
     end
 
-    def self.delete_request_object(path, parameters, headers)
-      Net::HTTP::Delete.new path + serialize_parameters(parameters),
-                            headers
+    def initialize_request
+      super
+      if @auth_type == :basic
+        @request.basic_auth @username, @password
+      elsif @auth_type
+        raise NotImplementedError, "the given auth_type [#{@auth_type}] is not implemented"
+      end
     end
 
-    def self.serialize_parameters(parameters)
-      return "" if parameters.empty?
-      "?" + parameters.collect do |key, value|
-        value = value.respond_to?(:to_json) ? value.to_json : value.to_s
-        "#{key}=#{URI.escape(value)}"
-      end.reverse.join("&")
+    def quote_parameters
+      @parameters.each do |key, value|
+        @parameters[key] = value.to_json if value.respond_to?(:to_json)
+      end
+      super
     end
 
-    def self.perform(request, uri)
-      Net::HTTP.start(uri.host, uri.port) do |connection|
-        connection.request request
+    def initialize_request_body
+      super
+      if @body
+        @request.body = @body.to_json
+        @request["Content-Type"] = "application/json"
       end
     end
 
-    def self.check_status_code(response, expected_status_code)
-      response_code = response.code
-      raise UnexpectedStatusCodeError, response_code.to_i if expected_status_code.to_s != response_code
+    def check_status_code
+      return unless @expected_status_code
+      response_code = @response.code
+      response_body = @response.body
+      raise UnexpectedStatusCodeError.new(response_code.to_i, response_body) if @expected_status_code.to_s != response_code
     end
 
-    def self.parse(response)
-      JSON.parse response.body
+    def parse_response
+      body = @response.body
+      @response = body.nil? ? nil : JSON.parse(body)
+    rescue JSON::ParserError
+      @response = body.to_s
     end
 
   end
 
-end
+end

data/spec/fake_transport_helper.rb

@@ -1,29 +1,38 @@
 require 'yaml'
 
-module CouchModel
+module FakeTransport
 
-  module Transport
+  def self.enable!
+    @enabled = true
+  end
+
+  def self.disable!
+    @enabled = false
+  end
 
-    def self.fake!
-      @@fake ||= YAML::load_file File.join(File.dirname(__FILE__), "fake_transport.yml")
-      self.stub!(:request).and_return do |http_method, url, options|
-        options ||= { }
-        parameters            = options[:parameters]
-        headers               = options[:headers]
-        expected_status_code  = options[:expected_status_code]
+  def self.transport_class
+    CouchModel::ExtendedTransport
+  end
+
+  def self.fake!
+    return unless @enabled
+    @@fake ||= YAML::load_file File.join(File.dirname(__FILE__), "fake_transport.yml")
+    transport_class.stub!(:request).and_return do |http_method, url, options|
+      options ||= { }
+      parameters            = options[:parameters]
+      headers               = options[:headers]
+      expected_status_code  = options[:expected_status_code]
 
-        request = @@fake.detect do |hash|
-          hash[:http_method].to_s == http_method.to_s &&
-            hash[:url].to_s == url.to_s &&
-            hash[:parameters] == parameters &&
-            hash[:headers] == headers
-        end
-        raise StandardError, "no fake request found for [#{http_method} #{url} #{parameters.inspect} #{headers.inspect}]" unless request
-        raise UnexpectedStatusCodeError, request[:response][:code].to_i if expected_status_code && expected_status_code.to_s != request[:response][:code]
-        request[:response][:body].dup
+      request = @@fake.detect do |hash|
+        hash[:http_method].to_s == http_method.to_s &&
+          hash[:url].to_s == url.to_s &&
+          hash[:parameters] == parameters &&
+          hash[:headers] == headers
       end
+      raise StandardError, "no fake request found for [#{http_method} #{url} #{parameters.inspect} #{headers.inspect}]" unless request
+      raise transport_class::UnexpectedStatusCodeError.new(request[:response][:code].to_i, request[:response][:body]) if expected_status_code && expected_status_code.to_s != request[:response][:code]
+      request[:response][:body].dup
     end
-
   end
 
 end

data/spec/integration/basic_spec.rb

@@ -121,7 +121,12 @@ describe "integration" do
     describe "all" do
 
       it "should include the saved user" do
-        User.all.should include(@user_one)
+        begin
+          User.all.should include(@user_one)
+        rescue Object => error
+          puts error.backtrace
+          raise error
+        end
         User.all.should include(@user_two)
       end
 

data/spec/integration/design/membership.design

@@ -1,5 +1,5 @@
-:id:        "membership"
-:language:  "javascript"
-:views:
-  :by_user_id_and_created_at:
-    :keys:  [ "user_id", "created_at" ]
+id:        "membership"
+language:  "javascript"
+views:
+  by_user_id_and_created_at:
+    keys:  [ "user_id", "created_at" ]

data/spec/integration/design/user.design

@@ -1,14 +1,14 @@
-:id:        "user"
-:language:  "javascript"
-:views:
-  :user_count:
-    :map:
+id:        "user"
+language:  "javascript"
+views:
+  user_count:
+    map:
       function(document) {
         if (document['model_class'] == 'User') {
           emit('user_count', 1);
         }
       }
-    :reduce:
+    reduce:
       function(keys, values, rereduce) {
         return sum(values);
       }

data/spec/lib/couch_model/base_spec.rb

@@ -93,7 +93,7 @@ describe BaseTestModel do
       end
 
       it "should return false on wrong status code" do
-        CouchModel::Transport.stub!(:request).and_raise(CouchModel::Transport::UnexpectedStatusCodeError.new(404))
+        CouchModel::ExtendedTransport.stub!(:request).and_raise(CouchModel::ExtendedTransport::UnexpectedStatusCodeError.new(404))
         do_save.should be_false
       end
 
@@ -110,7 +110,7 @@ describe BaseTestModel do
       end
 
       it "should return false on wrong status code" do
-        CouchModel::Transport.stub!(:request).and_raise(CouchModel::Transport::UnexpectedStatusCodeError.new(404))
+        CouchModel::ExtendedTransport.stub!(:request).and_raise(CouchModel::ExtendedTransport::UnexpectedStatusCodeError.new(404))
         do_save.should be_false
       end
 
@@ -143,7 +143,7 @@ describe BaseTestModel do
       end
 
       it "should raise NotFoundError on wrong status code" do
-        CouchModel::Transport.stub!(:request).and_raise(CouchModel::Transport::UnexpectedStatusCodeError.new(404))
+        CouchModel::ExtendedTransport.stub!(:request).and_raise(CouchModel::ExtendedTransport::UnexpectedStatusCodeError.new(404))
         lambda do
           do_destroy
         end.should raise_error(CouchModel::Base::NotFoundError)
@@ -175,7 +175,7 @@ describe BaseTestModel do
     end
 
     it "should return nil on error" do
-      CouchModel::Transport.stub!(:request).and_raise(CouchModel::Transport::UnexpectedStatusCodeError.new(500))
+      CouchModel::ExtendedTransport.stub!(:request).and_raise(CouchModel::ExtendedTransport::UnexpectedStatusCodeError.new(500))
       model = BaseTestModel.create :id => "test_model_1"
       model.should be_nil
     end

data/spec/lib/couch_model/collection_spec.rb

@@ -41,7 +41,7 @@ describe CouchModel::Collection do
     describe "without a previously performed fetch" do
 
       it "should perform a meta fetch (with a limit of zero)" do
-        CouchModel::Transport.should_receive(:request).with(anything, anything,
+        CouchModel::ExtendedTransport.should_receive(:request).with(anything, anything,
           hash_including(:parameters => { :include_docs => true, :limit => 0 }))
         @collection.total_count
       end
@@ -59,7 +59,7 @@ describe CouchModel::Collection do
       end
 
       it "should not perform another fetch" do
-        CouchModel::Transport.should_not_receive(:request)
+        CouchModel::ExtendedTransport.should_not_receive(:request)
         @collection.total_count
       end
 

data/spec/lib/couch_model/database_spec.rb

@@ -49,11 +49,11 @@ describe CouchModel::Database do
 
     before :each do
       @response = { :code => "201" }
-      CouchModel::Transport.stub!(:request).and_return(@response)
+      CouchModel::ExtendedTransport.stub!(:request).and_return(@response)
     end
 
     it "should create the database" do
-      CouchModel::Transport.should_receive(:request).with(:put, /test$/, anything).and_return(@response)
+      CouchModel::ExtendedTransport.should_receive(:request).with(:put, /test$/, anything).and_return(@response)
       @database.create!
     end
 
@@ -83,11 +83,11 @@ describe CouchModel::Database do
 
     before :each do
       @response = { :code => "200" }
-      CouchModel::Transport.stub!(:request).and_return(@response)
+      CouchModel::ExtendedTransport.stub!(:request).and_return(@response)
     end
 
     it "should delete the database" do
-      CouchModel::Transport.should_receive(:request).with(:delete, /test$/, anything).and_return(@response)
+      CouchModel::ExtendedTransport.should_receive(:request).with(:delete, /test$/, anything).and_return(@response)
       @database.delete!
     end
 

data/spec/lib/couch_model/design/association_test_model_one.design

@@ -1,5 +1,5 @@
-:id:        "test_design"
-:language:  "javascript"
-:views:
-  "by_related_id_and_name":
-    :keys:  [ "related_id", "name" ]
+id:        "test_design"
+language:  "javascript"
+views:
+  by_related_id_and_name:
+    keys:  [ "related_id", "name" ]

data/spec/lib/couch_model/design/base_test_model.design

@@ -1,10 +1,10 @@
-:id:        "test_design"
-:language:  "javascript"
-:views:
-  "test_view":
-    :map:
+id:        "test_design"
+language:  "javascript"
+views:
+  test_view:
+    map:
       function(document) {
       };
-    :reduce:
+    reduce:
       function(key, values, rereduce) {
       };

data/spec/lib/couch_model/design/setup_test_model.design

@@ -1,10 +1,10 @@
-:id:        "test_design"
-:language:  "javascript"
-:views:
-  "test_view":
-    :map:
+id:        "test_design"
+language:  "javascript"
+views:
+  test_view:
+    map:
       function(document) {
       };
-    :reduce:
+    reduce:
       function(key, values, rereduce) {
       };

data/spec/lib/couch_model/transport_spec.rb

@@ -3,19 +3,19 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "li
 
 describe CouchModel::Transport do
 
-  describe "request" do
+  use_real_transport!
 
-    use_real_transport!
+  describe "request" do
 
     before :each do
       @http_method = :get
       @url = "http://localhost:5984/"
       @options = { }
 
-      @request = Net::HTTP::Get.new "/"
+      @request = Net::HTTP::Get.new "/", { }
       @response = Object.new
       @response.stub!(:code).and_return("200")
-      @response.stub!(:body).and_return("{\"couchdb\":\"Welcome\",\"version\":\"0.10.0\"}")
+      @response.stub!(:body).and_return("test")
       Net::HTTP.stub!(:start).and_return(@response)
     end
 
@@ -33,29 +33,82 @@ describe CouchModel::Transport do
       do_request
     end
 
-    it "should raise UnexpectedStatusCodeError if an unexpected status id returned" do
-      lambda do
-        do_request :expected_status_code => 201
-      end.should raise_error(CouchModel::Transport::UnexpectedStatusCodeError)
+    it "should return the response" do
+      do_request.body.should == "test"
+    end
+
+    context "with parameters" do
+
+      before :each do
+        @options.merge! :parameters => { :foo => "bar", :test => [ "value1", "value2" ] }
+      end
+
+      it "should initialize the correct request object" do
+        Net::HTTP::Get.should_receive(:new).with(
+          "/?foo=bar&test=value1&test=value2", { }
+        ).and_return(@request)
+        do_request
+      end
+
     end
 
   end
 
-  describe "serialize_parameters" do
+end
+
+describe CouchModel::ExtendedTransport do
+
+  use_real_transport!
+
+  describe "request" do
 
     before :each do
-      @parameters = { :test => [ :test, 1, 2, 3 ], :another_test => :test }
+      @http_method = :get
+      @url = "http://localhost:5984/"
+      @options = {
+        :auth_type            => :basic,
+        :username             => "test",
+        :password             => "test",
+        :expected_status_code => 200
+      }
+
+      @request = Net::HTTP::Get.new "/", { }
+      @response = Object.new
+      @response.stub!(:code).and_return("200")
+      @response.stub!(:body).and_return("{\"test\":\"test\"}")
+      Net::HTTP.stub!(:start).and_return(@response)
     end
 
-    it "should return an empty string on empty parameter hash" do
-      CouchModel::Transport.send(:serialize_parameters, { }).should == ""
+    def do_request(options = { })
+      CouchModel::ExtendedTransport.request @http_method, @url, @options.merge(options)
+    end
+
+    it "should initialize the correct request object" do
+      Net::HTTP::Get.should_receive(:new).with("/", { "Accept" => "application/json" }).and_return(@request)
+      do_request
     end
-    
-    it "should serialize the given parameters" do
-      CouchModel::Transport.send(:serialize_parameters, @parameters).should ==
-        "?another_test=%22test%22&test=[%22test%22,1,2,3]"
+
+    it "should perform the request" do
+      Net::HTTP.should_receive(:start).and_return(@response)
+      do_request
+    end
+
+    it "should return the parsed response" do
+      do_request.should == { "test" => "test" }
+    end
+
+    it "should raise NotImplementedError if the given auth_type is wrong" do
+      lambda do
+        do_request :auth_type => :invalid
+      end.should raise_error(NotImplementedError)
+    end
+
+    it "should raise UnexpectedStatusCodeError if responded status code is wrong" do
+      lambda do
+        do_request :expected_status_code => 201
+      end.should raise_error(CouchModel::ExtendedTransport::UnexpectedStatusCodeError)
     end
 
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -2,13 +2,12 @@ require 'rubygems'
 gem 'rspec', '1.3.0'
 require 'spec'
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "couch_model", "configuration"))
 require File.join(File.dirname(__FILE__), "fake_transport_helper")
 
-CouchModel::Configuration.fake_transport = true
+FakeTransport.enable!
 Spec::Runner.configure do |configuration|
   configuration.before :each do
-    CouchModel::Transport.fake! if CouchModel::Configuration.fake_transport
+    FakeTransport.fake!
   end
 end
 
@@ -16,11 +15,11 @@ def use_real_transport!
   class_eval do
 
     before :all do
-      CouchModel::Configuration.fake_transport = false
+      FakeTransport.disable!
     end
 
     after :all do
-      CouchModel::Configuration.fake_transport = true
+      FakeTransport.enable!
     end
 
   end

metadata

@@ -1,21 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: couchmodel
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 1
   - 0
-  - beta4
-  version: 0.1.0.beta4
+  version: 0.1.0
 platform: ruby
 authors: 
-- "Philipp Br\xC3\xBCll"
+- Philipp Bruell
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 +01:00
+date: 2010-03-31 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -48,6 +47,7 @@ files:
 - lib/couch_model.rb
 - lib/core_extension/string.rb
 - lib/core_extension/array.rb
+- lib/code_smells.reek
 - spec/spec_helper.rb
 - spec/lib/couch_model/view_spec.rb
 - spec/lib/couch_model/server_spec.rb
@@ -79,10 +79,8 @@ homepage: http://github.com/phifty/couchmodel
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --main
-- README.rdoc
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -90,22 +88,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 9
-      - 1
-      version: 1.9.1
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: couchmodel
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3