one_sky 0.0.1 → 0.0.2

data/lib/one_sky/project.rb

@@ -11,12 +11,22 @@ module OneSky
 
     # Returns details about the project.
     def details
-      get("/details")["project"]
+      get("/project/details")["project"]
+    end
+
+    # Returns available types to be specified when creating a new the project.
+    def types
+      get("/project/types")["types"]
     end
 
     # Returns an array of available languages.
     def languages
-      get("/languages")["languages"]
+      get("/project/languages")["languages"]
+    end
+
+    # Returns info about your account. 
+    def info
+      get("/info")["application"]
     end
 
     # Returns the SSO URL for the given unique_id
@@ -89,22 +99,27 @@ module OneSky
     def hash_to_params(hash)
       hash.inject({}) { |o, (k,v)| o[k.to_s.gsub("_", "-").to_sym] = v; o }
     end
-  
+
+    def authorization_params
+      timestamp = Time.now.to_i.to_s
+      {:project => @name, :"api-key" => @api_key, :timestamp => timestamp, :"dev-hash" => Digest::MD5.hexdigest(timestamp + @api_secret)}
+    end
+ 
     def get(path, params = {}, options = {:content_type => "text/plain; charset=UTF-8"})
-      params = {:"api-key" => @api_key, :"api-secret" => @api_secret, :"project" => @name}.merge(params)
+      params = authorization_params.merge(params)
       parse_response(RestClient.get([API_ROOT_URL, path].join, {:params => params}.merge(options)))
     end
 
     def post(path, params = {}, options = {:content_type => "text/plain; charset=UTF-8"})
-      params = {:"api-key" => @api_key, :"api-secret" => @api_secret, :"project" => @name}.merge(params)
+      params = authorization_params.merge(params)
       parse_response(RestClient.post([API_ROOT_URL, path].join, params.merge(options)))
     end
 
     def parse_response(response)
-      raise ApiHttpResponseError, "HTTP response status code: #{response.code.inspect}." unless response.code.eql?(200)
       # Do not post-process response if it isn't JSON. (ie. Binary file returned from /output_mo.)
       return response.body unless response.headers[:content_type] =~ /json/
       response_hash = JSON.parse(response)
+
       raise ApiError, response.body if response_hash.has_key?("response") and response_hash["response"] != "ok"
       response_hash
     end

data/lib/one_sky/version.rb

@@ -1,3 +1,3 @@
 module OneSky
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/one_sky.rb

@@ -1,10 +1,11 @@
 require 'json'
 require 'rest_client'
+require 'digest/md5'
 
 module OneSky
   API_ROOT_URL = "https://api.oneskyapp.com/1"
 
   autoload :Project, 'one_sky/project'
 
-  %w[ApiHttpResponseError ApiError].each { |e| const_set(e, Class.new(StandardError)) }
+  %w[ApiError].each { |e| const_set(e, Class.new(StandardError)) }
 end

data/spec/project_spec.rb

@@ -17,7 +17,7 @@ describe "Project" do
 
   it "raises an error when incorrect API credentials are passed." do
     @project.api_secret = "wrong secret"
-    lambda { @project.details }.should raise_error OneSky::ApiError
+    lambda { @project.details }.should raise_error RestClient::Exception
   end
 
   describe "#details" do
@@ -26,9 +26,27 @@ describe "Project" do
     end
   end
 
+  describe "#types" do
+    it "returns an array." do
+      types = @project.types
+      types.should be_an(Array)
+      types.size.should > 0
+    end
+  end
+
   describe "#languages" do
     it "returns an array." do
-      @project.languages.should be_an(Array)
+      langs = @project.languages
+      langs.should be_an(Array)
+      langs.size.should > 0
+    end
+  end
+
+  describe "#info" do
+    it "returns a hash." do
+      info = @project.info
+      info.should be_an(Hash)
+      info.has_key?("name").should be_true
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Junjun Olympia
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 +08:00
+date: 2011-02-10 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency