twenty3andme 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/twenty3andme/callback_listener.rb

@@ -11,7 +11,7 @@ module Twenty3AndMe
           handler.handle(client.token, client.refresh_token)
           
           status 302
-          header 'Location', ENV['AFTER_REDIRECT_URI']
+          header 'Location', ENV['AFTER_REDIRECT_URI'] + "?token=#{client.token}"
         end
       end
 

data/lib/twenty3andme/client.rb

@@ -1,4 +1,7 @@
 module Twenty3AndMe
+  class TokenRequestError < StandardError ; end
+  class APIRequestError < StandardError ; end
+  
   class Client
     include HTTParty
     base_uri 'api.23andme.com'
@@ -10,13 +13,16 @@ module Twenty3AndMe
     def get(path)
       options = { :headers => {"Authorization" => "Bearer #{@token}"} }
       fullpath = URI.escape(VERSION + path)
-      self.class.get(fullpath, options).parsed_response
+      resp = self.class.get(fullpath, options).parsed_response
+      raise APIRequestError, resp['error_description'] if resp['error']
+      resp
     end
     
     def request_token(client_id, client_secret, code, redirect_uri, scope)
       scope_uri = Array(scope).join(" ")
       req_body = {:client_id => client_id, :client_secret => client_secret, :grant_type => 'authorization_code', :code => code, :redirect_uri => redirect_uri, :scope => scope_uri}
       resp = self.class.post("https://api.23andme.com:443/token", :body => req_body)
+      raise TokenRequestError, resp['error_description'] if resp['error']
       
       @token = resp['access_token']
       @refresh_token = resp['refresh_token']

data/spec/callback_listener_spec.rb

@@ -6,13 +6,15 @@ describe Twenty3AndMe::CallbackListener do
   def app
     Twenty3AndMe::CallbackListener
   end
+  
+  before do
+  end
+
 
-  describe Twenty3AndMe::CallbackListener do
-    describe "GET /?code=adc996063679f1a400aa0e13c54094dc" do
-      it "returns the provided code from 23andme" do
-        get "/?code=adc996063679f1a400aa0e13c54094dc"
-        last_response.status.should == 200
-      end
+  describe "GET /?code=adc996063679f1a400aa0e13c54094dc" do
+    it "returns the provided code from 23andme" do
+      get "/?code=adc996063679f1a400aa0e13c54094dc"
+      last_response.status.should == 200
     end
   end
 end

data/spec/twenty3andme_spec.rb

@@ -3,11 +3,38 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Twenty3andme" do
   
   context "API Client" do
-    before do
+    
+    before :all do
+      code = "fillmein"
+      @client = Twenty3AndMe::Client.new
+      @client.request_token(ENV['CLIENT_ID'], ENV['CLIENT_SECRET'], code, ENV['REDIRECT_URI'], ENV['SCOPE'].split(','))
+    end
+    
+    it "has a token recieved by 23andme" do
+      @client.token.should_not be_nil
+    end
+    
+    it "makes the /user request " do
+      @client.user
+    end
+    
+    it "makes the /names request " do
+      @client.names
     end
     
-    pending "test the client " do
+    it "makes the /haplogroups request " do
+      @client.haplogroups
     end
+    
+    it "makes the /relatives request " do
+      @client.relatives
+    end
+    
+    it "requests a genotype" do
+      @client.genotype('rs3094315')
+    end
+    
+    
   end
   
 end

data/twenty3andme.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "twenty3andme"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian Morgan"]
-  s.date = "2013-01-06"
+  s.date = "2013-01-09"
   s.description = "Ruby API client and Rails engine for creating applications that integrate with data from the personal genetic testing service 23AndMe"
   s.email = "ian@ruby-code.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twenty3andme
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-06 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -182,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3107833515902135248
+      hash: 2400844370785792384
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: