contextio 1.2.1 → 1.2.2

data/CHANGES.md

@@ -1,5 +1,16 @@
 # Changes
 
+## 1.2.2
+
+* Fix `PUT` and `POST` parameter submission. - Ben Hamill
+* Added missing `server` argument to `SourceCollection.create`. - Dominik Gehl
+* Moved erroneous `File.sync_data` and `File.sync!` over to `Source` where it
+  belonged in the first place. - Bram Plessers
+
+## 1.2.1
+
+* Fixed syntax error typo in previous release. - Geoff Longman
+
 ## 1.2.0
 
 * Add `#empty?` and `#size` to resource collections so you can treat them even

data/lib/contextio/api.rb

@@ -89,9 +89,8 @@ class ContextIO
     #
     # @raise [API::Error] if the response code isn't in the 200 or 300 range.
     def request(method, resource_path, params = {})
-      response = token.send(method, path(resource_path, params), 'Accept' => 'application/json', 'User-Agent' => user_agent_string)
+      response = oauth_request(method, resource_path, params)
       body = response.body
-
       results = JSON.parse(body) unless response.body.empty?
 
       if response.code =~ /[45]\d\d/
@@ -108,7 +107,7 @@ class ContextIO
     end
 
     def raw_request(method, resource_path, params={})
-      response = token.send(method, path(resource_path, params), 'User-Agent' => user_agent_string)
+      response = oauth_request(method, resource_path, params, 'User-Agent' => user_agent_string)
 
       if response.code =~ /[45]\d\d/
         raise API::Error, response.message
@@ -119,6 +118,25 @@ class ContextIO
 
     private
 
+    # Makes a request signed for OAuth, encoding parameters correctly, etc.
+    #
+    # @param [String, Symbol] method The HTTP verb for the request (lower case).
+    # @param [String] resource_path The path to the resource in question.
+    # @param [{String, Symbol => String, Symbol, Array<String, Symbol>}] params
+    #   A Hash of the query parameters for the action represented by this
+    #   request.
+    #
+    # @return [Net::HTTP*] The response object from the request.
+    def oauth_request(method, resource_path, params, headers=nil)
+      headers ||= { 'Accept' => 'application/json', 'User-Agent' => user_agent_string }
+
+      if %w(put post).include? method.to_s.downcase
+        token.request(method, path(resource_path), params, headers)
+      else # GET, DELETE, HEAD, etc.
+        token.request(method, path(resource_path, params), headers)
+      end
+    end
+
     # So that we can accept full URLs, this strips the domain and version number
     # out and returns just the resource path.
     #

data/lib/contextio/file.rb

@@ -75,18 +75,5 @@ class ContextIO
       return @revisions
     end
 
-    def sync_data
-      return @sync_data if @sync_data
-
-      sync_hashes = api.request(:get, "#{resource_url}/sync")
-
-      @sync_data = ContextIO::SourceSyncData.new(sync_hashes)
-
-      return @sync_data
-    end
-
-    def sync!
-      api.request(:post, "#{resource_url}/sync")['success']
-    end
   end
 end

data/lib/contextio/source.rb

@@ -51,5 +51,19 @@ class ContextIO
     def delete
       api.request(:delete, resource_url)['success']
     end
+
+    def sync_data
+      return @sync_data if @sync_data
+
+      sync_hashes = api.request(:get, "#{resource_url}/sync")
+
+      @sync_data = ContextIO::SourceSyncData.new(sync_hashes)
+
+      return @sync_data
+    end
+
+    def sync!
+      api.request(:post, "#{resource_url}/sync")['success']
+    end
   end
 end

data/lib/contextio/source_collection.rb

@@ -25,6 +25,7 @@ class ContextIO
     def create(email, server, username, use_ssl, port, type, options={})
       api_args = options.merge(
         'email' => email,
+        'server' => server,
         'username' => username,
         'use_ssl' => use_ssl ? '1' : '0',
         'port' => port.to_s,

data/lib/contextio/version.rb

@@ -1,6 +1,6 @@
 class ContextIO
   # @private
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 
   # The gem version.
   #

data/spec/contextio/source_spec.rb

@@ -49,4 +49,21 @@ describe ContextIO::Source do
       subject.update(sync_period: '4h')
     end
   end
+
+  describe ".sync!" do
+    before do
+      api.stub(:request).and_return({'success' => true})
+    end
+
+    subject { ContextIO::Source.new(api, resource_url: 'resource_url', sync_period: '1h') }
+
+    it "syncs to the api" do
+      api.should_receive(:request).with(
+        :post,
+        'resource_url/sync'
+      )
+
+      subject.sync!
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contextio
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth