couchmodel 0.1.1 → 0.1.2

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Philipp Bruell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 +02:00
+date: 2010-06-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +25,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 3
         - 0
-        version: "0"
+        version: 1.3.0
   type: :development
   version_requirements: *id001
 description: CouchModel provides an interface to easly handle CouchDB documents. It also comes with a ActiveModel implementation to integrate into an Rails 3 application.
@@ -52,22 +54,24 @@ files:
 - lib/couch_model/collection.rb
 - lib/couch_model/server.rb
 - lib/couch_model/design.rb
-- lib/couch_model/transport.rb
 - lib/couch_model/base.rb
 - lib/couch_model/database.rb
 - lib/couch_model.rb
 - lib/core_extension/string.rb
 - lib/core_extension/array.rb
+- lib/transport/request/builder.rb
+- lib/transport/request/parameter/serializer.rb
+- lib/transport/json.rb
+- lib/transport/base.rb
 - lib/code_smells.reek
 - spec/spec_helper.rb
 - spec/lib/couch_model/view_spec.rb
 - spec/lib/couch_model/server_spec.rb
-- spec/lib/couch_model/core/association_spec.rb
-- spec/lib/couch_model/core/finder_spec.rb
-- spec/lib/couch_model/core/accessor_spec.rb
-- spec/lib/couch_model/core/setup_spec.rb
 - spec/lib/couch_model/design_spec.rb
-- spec/lib/couch_model/transport_spec.rb
+- spec/lib/couch_model/base/association_spec.rb
+- spec/lib/couch_model/base/finder_spec.rb
+- spec/lib/couch_model/base/accessor_spec.rb
+- spec/lib/couch_model/base/setup_spec.rb
 - spec/lib/couch_model/active_model_spec.rb
 - spec/lib/couch_model/collection_spec.rb
 - spec/lib/couch_model/design/association_test_model_one.design
@@ -80,6 +84,10 @@ files:
 - spec/lib/couch_model_spec.rb
 - spec/lib/core_extension/string_spec.rb
 - spec/lib/core_extension/array_spec.rb
+- spec/lib/transport/request/builder_spec.rb
+- spec/lib/transport/request/parameter/serializer_spec.rb
+- spec/lib/transport/json_spec.rb
+- spec/lib/transport/base_spec.rb
 - spec/fake_transport_helper.rb
 - spec/integration/views_spec.rb
 - spec/integration/associations_spec.rb
@@ -122,12 +130,11 @@ summary: CouchModel provides an interface to easly handle CouchDB documents.
 test_files: 
 - spec/lib/couch_model/view_spec.rb
 - spec/lib/couch_model/server_spec.rb
-- spec/lib/couch_model/core/association_spec.rb
-- spec/lib/couch_model/core/finder_spec.rb
-- spec/lib/couch_model/core/accessor_spec.rb
-- spec/lib/couch_model/core/setup_spec.rb
 - spec/lib/couch_model/design_spec.rb
-- spec/lib/couch_model/transport_spec.rb
+- spec/lib/couch_model/base/association_spec.rb
+- spec/lib/couch_model/base/finder_spec.rb
+- spec/lib/couch_model/base/accessor_spec.rb
+- spec/lib/couch_model/base/setup_spec.rb
 - spec/lib/couch_model/active_model_spec.rb
 - spec/lib/couch_model/collection_spec.rb
 - spec/lib/couch_model/configuration_spec.rb
@@ -137,6 +144,10 @@ test_files:
 - spec/lib/couch_model_spec.rb
 - spec/lib/core_extension/string_spec.rb
 - spec/lib/core_extension/array_spec.rb
+- spec/lib/transport/request/builder_spec.rb
+- spec/lib/transport/request/parameter/serializer_spec.rb
+- spec/lib/transport/json_spec.rb
+- spec/lib/transport/base_spec.rb
 - spec/integration/views_spec.rb
 - spec/integration/associations_spec.rb
 - spec/integration/saved_model_spec.rb

data/lib/couch_model/transport.rb

@@ -1,178 +0,0 @@
-require 'uri'
-require 'cgi'
-require 'net/http'
-require 'json'
-
-module CouchModel
-
-  # 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
-
-    def perform
-      initialize_request_class
-      initialize_request_path
-      initialize_request
-      initialize_request_body
-      perform_request
-    end
-
-    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_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 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 initialize_request_body
-      return unless [ :post, :put ].include?(@http_method.to_sym)
-      @request.body = @body ? @body : @serialized_parameters.sub(/^\?/, "")
-    end
-
-    def perform_request
-      @response = Net::HTTP.start(@uri.host, @uri.port) do |connection|
-        connection.request @request
-      end
-    end
-
-    def self.request(http_method, url, options = { })
-      transport = new http_method, url, options
-      transport.perform
-      transport.response
-    end
-
-  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
-
-    end
-
-    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 perform
-      initialize_headers
-      super
-      check_status_code
-      parse_response
-    end
-
-    private
-
-    def initialize_headers
-      @headers["Accept"] = "application/json"
-    end
-
-    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 quote_parameters
-      @parameters.each do |key, value|
-        @parameters[key] = value.to_json if value.respond_to?(:to_json)
-      end
-      super
-    end
-
-    def initialize_request_body
-      super
-      if @body
-        @request.body = @body.to_json
-        @request["Content-Type"] = "application/json"
-      end
-    end
-
-    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 parse_response
-      body = @response.body
-      @response = body.nil? ? nil : JSON.parse(body)
-    rescue JSON::ParserError
-      @response = body.to_s
-    end
-
-  end
-
-end

data/spec/lib/couch_model/transport_spec.rb

@@ -1,114 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "couch_model", "transport"))
-
-describe CouchModel::Transport do
-
-  use_real_transport!
-
-  describe "request" do
-
-    before :each do
-      @http_method = :get
-      @url = "http://localhost:5984/"
-      @options = { }
-
-      @request = Net::HTTP::Get.new "/", { }
-      @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 = { })
-      CouchModel::Transport.request @http_method, @url, @options.merge(options)
-    end
-
-    it "should initialize the correct request object" do
-      Net::HTTP::Get.should_receive(:new).with("/", { }).and_return(@request)
-      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
-
-    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
-
-end
-
-describe CouchModel::ExtendedTransport 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",
-        :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
-
-    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 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