couchmodel 0.1.1 → 0.1.2

data/lib/transport/request/parameter/serializer.rb

@@ -0,0 +1,60 @@
+require 'cgi'
+
+module Transport
+
+  module Request
+
+    module Parameter
+
+      # Serializer for transport http parameters
+      class Serializer
+
+        def initialize(parameters = nil)
+          @parameters = parameters || { }
+        end
+
+        def query
+          return @serialized_parameters if @serialized_parameters
+
+          serialize_parameters
+          @serialized_parameters
+        end
+
+        private
+
+        def serialize_parameters
+          quote_parameters
+          @serialized_parameters = if @parameters.nil? || @parameters.empty?
+            nil
+          else
+            @quoted_parameters.collect do |key, value|
+              self.class.pair key, value
+            end.join("&")
+          end
+        end
+
+        def quote_parameters
+          @quoted_parameters = { }
+          @parameters.each do |key, value|
+            encoded_key = CGI.escape(key.to_s)
+            @quoted_parameters[encoded_key] = self.class.escape value
+          end
+        end
+
+        def self.pair(key, value)
+          value.is_a?(Array) ?
+            value.map{ |element| "#{key}=#{element}" }.join("&") :
+            "#{key}=#{value}"
+        end
+
+        def self.escape(value)
+          value.is_a?(Array) ? value.map{ |element| CGI.escape element } : CGI.escape(value)
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/fake_transport_helper.rb

@@ -1,3 +1,4 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "transport", "json"))
 require 'yaml'
 
 module FakeTransport
@@ -11,7 +12,11 @@ module FakeTransport
   end
 
   def self.transport_class
-    CouchModel::ExtendedTransport
+    Transport::JSON
+  end
+
+  def self.unexpected_status_code_error_class
+    Transport::UnexpectedStatusCodeError
   end
 
   def self.fake!
@@ -30,7 +35,7 @@ module FakeTransport
           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]
+      raise unexpected_status_code_error_class.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

data/spec/lib/couch_model/active_model_spec.rb

@@ -254,7 +254,12 @@ describe ActiveTestModel do
     end
     
     it "should return all attributes as xml" do
-      @model.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<active-test-model>\n  <-id>test_model_1</-id>\n  <email>test</email>\n  <model-class>ActiveTestModel</model-class>\n  <name>test</name>\n</active-test-model>\n"
+      xml = @model.to_xml
+      xml.should =~ /^<\?xml version=.+1\.0.+ encoding=.+UTF-8.+\?>/
+      xml.should =~ /<model-class>ActiveTestModel<\/model-class>/
+      xml.should =~ /<-id>test_model_1<\/-id>/
+      xml.should =~ /<name>test<\/name>/
+      xml.should =~ /<email>test<\/email>/
     end
 
   end

data/spec/lib/couch_model/{core → base}/accessor_spec.rb

@@ -5,6 +5,9 @@ class AccessorTestModel < CouchModel::Base
 
   setup_database :url => "http://localhost:5984/test"
 
+  key_reader   :test_one,   :default => "test default"
+  key_writer   :test_two,   :default => "test default"
+  key_accessor :test_three, :default => "test default"
 end
 
 describe AccessorTestModel do
@@ -16,16 +19,21 @@ describe AccessorTestModel do
   describe "key_reader" do
 
     before :each do
-      AccessorTestModel.key_reader :test, :default => "test default"
       @model = AccessorTestModel.new
     end
 
     it "should define a reader method" do
-      @model.should respond_to(:test)
+      @model.should respond_to(:test_one)
     end
 
     it "should set a default value" do
-      @model.test.should == "test default"
+      @model.test_one.should == "test default"
+    end
+
+    it "should raise an exception if the reader method is already defined" do
+      lambda do
+        AccessorTestModel.key_reader :test_one
+      end.should raise_error(ArgumentError)
     end
 
   end
@@ -33,16 +41,21 @@ describe AccessorTestModel do
   describe "key_writer" do
 
     before :each do
-      AccessorTestModel.key_writer :test, :default => "test default"
       @model = AccessorTestModel.new
     end
 
     it "should define a writer method" do
-      @model.should respond_to(:test=)
+      @model.should respond_to(:test_two=)
     end
 
     it "should set a default value" do
-      @model.test.should == "test default"
+      AccessorTestModel.defaults["test_two"].should == "test default"
+    end
+
+    it "should raise an exception if the writer method is already defined" do
+      lambda do
+        AccessorTestModel.key_writer :test_two
+      end.should raise_error(ArgumentError)
     end
 
   end
@@ -50,16 +63,15 @@ describe AccessorTestModel do
   describe "key_accessor" do
 
     before :each do
-      AccessorTestModel.key_accessor(:test, :default => "test default")
       @model = AccessorTestModel.new
     end
 
     it "should define a reader method" do
-      @model.should respond_to(:test)
+      @model.should respond_to(:test_three)
     end
 
     it "should define a writer method" do
-      @model.should respond_to(:test=)
+      @model.should respond_to(:test_three=)
     end
 
   end

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::ExtendedTransport.stub!(:request).and_raise(CouchModel::ExtendedTransport::UnexpectedStatusCodeError.new(404))
+        Transport::JSON.stub!(:request).and_raise(Transport::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::ExtendedTransport.stub!(:request).and_raise(CouchModel::ExtendedTransport::UnexpectedStatusCodeError.new(404))
+        Transport::JSON.stub!(:request).and_raise(Transport::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::ExtendedTransport.stub!(:request).and_raise(CouchModel::ExtendedTransport::UnexpectedStatusCodeError.new(404))
+        Transport::JSON.stub!(:request).and_raise(Transport::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::ExtendedTransport.stub!(:request).and_raise(CouchModel::ExtendedTransport::UnexpectedStatusCodeError.new(500))
+      Transport::JSON.stub!(:request).and_raise(Transport::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::ExtendedTransport.should_receive(:request).with(anything, anything,
+        Transport::JSON.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::ExtendedTransport.should_not_receive(:request)
+        Transport::JSON.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::ExtendedTransport.stub!(:request).and_return(@response)
+      Transport::JSON.stub!(:request).and_return(@response)
     end
 
     it "should create the database" do
-      CouchModel::ExtendedTransport.should_receive(:request).with(:put, /test$/, anything).and_return(@response)
+      Transport::JSON.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::ExtendedTransport.stub!(:request).and_return(@response)
+      Transport::JSON.stub!(:request).and_return(@response)
     end
 
     it "should delete the database" do
-      CouchModel::ExtendedTransport.should_receive(:request).with(:delete, /test$/, anything).and_return(@response)
+      Transport::JSON.should_receive(:request).with(:delete, /test$/, anything).and_return(@response)
       @database.delete!
     end
 

data/spec/lib/transport/base_spec.rb

@@ -0,0 +1,49 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "transport", "base"))
+
+describe Transport::Base do
+
+  use_real_transport!
+
+  describe "request" do
+
+    before :each do
+      @http_method = :get
+      @url = "http://localhost:5984/"
+      @options = { }
+
+      @request_builder = Transport::Request::Builder.new @http_method, @url, @options
+
+      @response = Object.new
+      @response.stub!(:code).and_return("200")
+      @response.stub!(:body).and_return("test")
+      Net::HTTP.stub!(:start).and_return(@response)
+    end
+
+    def do_request(options = { })
+      Transport::Base.request @http_method, @url, @options.merge(options)
+    end
+
+    it "should initialize the correct request builder" do
+      Transport::Request::Builder.should_receive(:new).with(@http_method, @url, @options).and_return(@request_builder)
+      do_request
+    end
+
+    it "should perform the request" do
+      Net::HTTP.should_receive(:start).and_return(@response)
+      do_request
+    end
+
+    it "should return the response" do
+      do_request.body.should == "test"
+    end
+
+    it "should raise UnexpectedStatusCodeError if responded status code is wrong" do
+      lambda do
+        do_request :expected_status_code => 201
+      end.should raise_error(Transport::UnexpectedStatusCodeError)
+    end
+
+  end
+
+end

data/spec/lib/transport/json_spec.rb

@@ -0,0 +1,56 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "transport", "json"))
+
+describe Transport::JSON do
+
+  use_real_transport!
+
+  describe "request" do
+
+    before :each do
+      @http_method = :get
+      @url = "http://localhost:5984/"
+      @options = {
+        :auth_type => :basic,
+        :username  => "test",
+        :password  => "test",
+        :body      => "test"
+      }
+
+      @request_builder = Transport::Request::Builder.new @http_method, @url, @options
+
+      @response = Object.new
+      @response.stub!(:code).and_return("200")
+      @response.stub!(:body).and_return("{\"test\":\"test\"}")
+      Net::HTTP.stub!(:start).and_return(@response)
+    end
+
+    def do_request(options = { })
+      Transport::JSON.request @http_method, @url, @options.merge(options)
+    end
+
+    it "should initialize the correct request object" do
+      Transport::Request::Builder.should_receive(:new).with(
+        @http_method, @url, hash_including(:headers => { "Accept" => "application/json", "Content-Type" => "application/json" })
+      ).and_return(@request_builder)
+      do_request
+    end
+
+    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
+
+  end
+
+end

data/spec/lib/transport/request/builder_spec.rb

@@ -0,0 +1,51 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "spec_helper"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "lib", "transport", "request", "builder"))
+
+describe Transport::Request::Builder do
+
+  before :each do
+    @builder = Transport::Request::Builder.new :get,
+                                               "http://localhost:5984/test",
+                                               :headers    => { "Test-Header" => "test" },
+                                               :parameters => { "test_parameter" => "test" }
+  end
+
+  describe "uri" do
+
+    before :each do
+      @uri = @builder.uri
+    end
+
+    it "should build an uri with the correct host, port and path" do
+      @uri.host.should == "localhost"
+      @uri.port.should == 5984
+      @uri.path.should == "/test"
+    end
+
+  end
+
+  describe "request" do
+
+    before :each do
+      @request = @builder.request
+    end
+
+    it "should have the correct class" do
+      @request.should be_instance_of(Net::HTTP::Get)
+    end
+
+    it "should have the correct headers" do
+      @request["Test-Header"].should == "test"
+    end
+
+    it "should point to the correct path" do
+      @request.path.should == "/test?test_parameter=test"
+    end
+
+    it "should have the correct body" do
+      @request.body.should be_nil
+    end
+
+  end
+
+end

data/spec/lib/transport/request/parameter/serializer_spec.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "spec_helper"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "..", "lib", "transport", "request", "parameter", "serializer"))
+
+describe Transport::Request::Parameter::Serializer do
+
+  it "should return nil on an empty parameter hash" do
+    serializer = Transport::Request::Parameter::Serializer.new
+    serializer.query.should be_nil
+  end
+
+  it "should return a correctly encoded query string" do
+    serializer = Transport::Request::Parameter::Serializer.new :foo => "bar", :test => [ "value1", "value2" ]
+    serializer.query.should == "foo=bar&test=value1&test=value2"
+  end
+
+end