winnie 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    winnie (0.0.4)
+    winnie (0.0.5)
       json
       rest-client
 
@@ -14,16 +14,14 @@ GEM
     mime-types (1.16)
     rest-client (1.6.1)
       mime-types (>= 1.16)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
 
 PLATFORMS
   ruby
@@ -32,5 +30,5 @@ DEPENDENCIES
   fakefs
   json
   rest-client
-  rspec (~> 2.0.0)
+  rspec (~> 2.1.0)
   winnie!

data/lib/winnie/client.rb

@@ -29,14 +29,14 @@ module Winnie
     end
 
     def request(path, method, params = {})
-      headers = {:accept => 'application/json'}.merge(Client.winnie_headers)
+      headers = {:accept => :json, :content_type => :json}.merge(Client.winnie_headers)
       params.merge!(:api_key => @api_key)
 
       RestClient::Request.execute(
         :method   => method,
         :url      => "#{winnie_url}#{path}",
         :headers  => headers,
-        :payload  => params
+        :payload  => params.to_json
       ) { |response, request| process_response(response) }
     end
 

data/lib/winnie/version.rb

@@ -1,3 +1,3 @@
 module Winnie
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/client_spec.rb

@@ -17,9 +17,7 @@ describe Winnie::Client do
 
     it "should include provided parameters in the request" do
       RestClient::Request.should_receive(:execute).with(
-        request_parameters('/api/account', :post,
-          :payload => {:api_key => 'secret_one', :name => 'test'}
-        )
+        request_parameters('/api/account', :post, {:api_key => 'secret_one', :name => 'test'})
       )
       @client.request('/api/account', :post, :name => 'test')
     end
@@ -27,18 +25,7 @@ describe Winnie::Client do
     it "should include api_key in the request parameters" do
       @client = Winnie::Client.new('AABBCC')
       RestClient::Request.should_receive(:execute).with(
-        request_parameters('/api/account', :get,
-          :payload => {:api_key => 'AABBCC'}
-        )
-      )
-      @client.request('/api/account', :get)
-    end
-
-    it "should accept json responses only" do
-      RestClient::Request.should_receive(:execute).with(
-        request_parameters('/api/account', :get,
-          :headers => {:accept => 'application/json'}
-        )
+        request_parameters('/api/account', :get, {:api_key => 'AABBCC'})
       )
       @client.request('/api/account', :get)
     end
@@ -52,12 +39,12 @@ describe Winnie::Client do
       @client.request('/api/account', :get)
     end
 
-    def request_parameters(path, method, params = {})
-      {:payload => {:api_key => 'secret_one'},
+    def request_parameters(path, method, payload = {})
+      {:payload => ({:api_key => 'secret_one'}.merge(payload)).to_json,
        :method  => method,
-       :headers => {:accept => 'application/json'},
+       :headers => {:accept => :json, :content_type => :json},
        :url     => "https://admin.winniecloud.com#{path}"
-       }.merge(params)
+       }
     end
   end
 

data/winnie.gemspec

@@ -21,19 +21,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency "json"
   s.add_dependency "rest-client"
-  s.add_development_dependency "rspec", "~> 2.0.0"
+  s.add_development_dependency "rspec", "~> 2.1.0"
   s.add_development_dependency "fakefs"
-
-  # TODO: remove after few releases
-  s.post_install_message = %q{
-========================================================================
-
-If upgrading from 0.0.1 version of winnie do the following:
-> winnie auth
-Enter your API key
-confirm changes
-
-This is important to protect your Winnie Cloud credentials.
-========================================================================
-}
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: winnie
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - winnie
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 +02:00
+date: 2010-11-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,12 +54,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 2
+        - 1
         - 0
-        - 0
-        version: 2.0.0
+        version: 2.1.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -114,18 +114,7 @@ has_rdoc: true
 homepage: http://winniecloud.com
 licenses: []
 
-post_install_message: |
-  
-  ========================================================================
-  
-  If upgrading from 0.0.1 version of winnie do the following:
-  > winnie auth
-  Enter your API key
-  confirm changes
-  
-  This is important to protect your Winnie Cloud credentials.
-  ========================================================================
-
+post_install_message: 
 rdoc_options: []
 
 require_paths: 
@@ -155,11 +144,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Winnie command line tool
-test_files: 
-- spec/client_spec.rb
-- spec/command_spec.rb
-- spec/commands/app_spec.rb
-- spec/commands/auth_spec.rb
-- spec/commands/base_spec.rb
-- spec/spec_helper.rb
-- spec/winnie_spec.rb
+test_files: []
+