dolly 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 018a9bd659e968422dd5b822ebfc43dd72838307
-  data.tar.gz: 645e49f46d0e2246e12501e69c39a154d73e8885
+  metadata.gz: 4aebf024e5e48154c3725af48715816d015b6444
+  data.tar.gz: e1a4d17548ecdd9e9d4cceb9c482ba77de1ba983
 SHA512:
-  metadata.gz: 8996310eaabdf5dfbbb50e8eebc8b4a98a3fcea0cbf723da3919e948341ed555163a4def8c0f8b599580890fcda11f02ed30f559fc572bfed3a663b25ade8c52
-  data.tar.gz: bda2f0a5b092e2975b2ec0d3be5ed23a19b2bb1115c52cf0bc443743a1574ee18611e09c1eb48d017a319aacf5eadf86eb970a9e5fcfc21d7f8c3a6288c83c06
+  metadata.gz: 2262642fce24061d8141d160be3aec870a8cf101931bb0bf6371b3e08d5e590ddb80121d0cac6246f1530ac5a175557d9c343e36066ad1bb7eca6cc086b425ea
+  data.tar.gz: 98160dca126b53ca2c3840719463747d29067985777445149744fb003720842428a1026f66e1ccab3dd80cc5c03b4687e1ba1c53524d70009f1caaf7a00af6aa

data/lib/dolly/request.rb

@@ -25,19 +25,19 @@ module Dolly
 
     def get resource, data = nil
       q = {query: values_to_json(data)} if data
-      request :get, resource, q
+      request :get, full_path(resource), q
     end
 
     def put resource, data
-      request :put, resource, {body: data}
+      request :put, full_path(resource), {body: data}
     end
 
     def post resource, data
-      request :post, resource, {body: data}
+      request :post, full_path(resource), {body: data}
     end
 
     def delete resource
-      request :delete, resource, {}
+      request :delete, full_path(resource), {}
     end
 
     def protocol
@@ -50,7 +50,22 @@ module Dolly
 
     def all_docs data = {}
       data =  values_to_json data.merge( include_docs: true )
-      request :get, '_all_docs', {query: data}
+      request :get, full_path('_all_docs'), {query: data}
+    end
+
+    def request method, resource, data = nil
+      data ||= {}
+      data.merge!(basic_auth: auth_info) if auth_info.present?
+      headers = { 'Content-Type' => 'application/json' }
+      headers.merge! data[:headers] if data[:headers]
+      response = self.class.send method, resource, data.merge(headers: headers)
+      if response.code == 404
+        raise Dolly::ResourceNotFound
+      elsif (500..600).include? response.code
+        raise Dolly::ServerError
+      else
+        response
+      end
     end
 
     private
@@ -73,20 +88,6 @@ module Dolly
     def full_path resource
       "/#{database_name}/#{resource}"
     end
-
-    def request method, resource, data = nil
-      data ||= {}
-      data.merge!(basic_auth: auth_info) if auth_info.present?
-      headers = { 'Content-Type' => 'application/json' }
-      response = self.class.send method, full_path(resource), data.merge(headers: headers)
-      if response.code == 404
-        raise Dolly::ResourceNotFound
-      elsif (500..600).include? response.code
-        raise Dolly::ServerError
-      else
-        response
-      end
-    end
   end
 
 end

data/lib/dolly/version.rb

@@ -1,3 +1,3 @@
 module Dolly
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dolly
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - javierg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties