CSApi 0.0.2 → 0.0.3

data/examples/{example/example.rb → example.rb}

@@ -4,7 +4,7 @@
 require_relative '../lib/csapi'
 
 begin
-  api = CS.new('username','password')
+  api = CS::Api.new('username','password')
 rescue CS::AuthError
   puts "Incorrect username or password"
   exit
@@ -15,6 +15,7 @@ end
 # ===
 profile = api.profile('205974')
 
+exit;
 # ===
 # Get a user's photos, by default ours
 # ===
@@ -39,7 +40,6 @@ requests = api.requests(limit)
 # ===
 # Create a new Couch Request
 # ===
-=begin
 details = {
   subject: 'This is my request subject',
   number: 1, #How many people travel with you
@@ -52,7 +52,6 @@ details = {
   message: 'This is my request message' #I've yet to figure out how to do the multi-part requests
 }
 couch_request = CS::Request.new(details)
-=end
 
 #api.requests(1).each do |key, value|
 #  pp value

data/lib/csapi.rb

@@ -10,124 +10,130 @@ Copyright (c) 2012 Partido Surrealista Mexicano
 require 'httparty'
 require 'json'
 require 'nokogiri'
-
-class CS
-  include HTTParty
-  base_uri 'https://api.couchsurfing.org'
-  headers "Content-Type" => 'application/json'
-  follow_redirects false
-  @uid = '0'
-
-  def initialize(username, password)
-    @username = username
-    r = self.class.post('/sessions', body:{username: username, password: password}.to_json)
-    raise CS::AuthError.new("Could not login") if r.code != 200
-    @cookies = []
-    r.headers['Set-Cookie'].split(/, (?!\d)/).each do |cookie|
-      key, value = cookie.split(';')[0].split('=')
-      @cookies = "#{key}=#{value}"
+module CS
+    
+  class Api
+    include HTTParty
+    base_uri 'https://api.couchsurfing.org'
+    headers "Content-Type" => 'application/json'
+    follow_redirects false
+    @uid = '0'
+
+    def initialize(username, password)
+      @username = username
+      r = self.class.post('/sessions', body:{username: username, password: password}.to_json)
+      
+      raise CS::AuthError.new("Could not login") if r.code != 200
+      
+      @cookies = []
+      r.headers['Set-Cookie'].split(/, (?!\d)/).each do |cookie|
+        key, value = cookie.split(';')[0].split('=')
+        @cookies = "#{key}=#{value}"
+      end
+      
+      data = JSON.parse r.body
+      @uid = data['url'].gsub(/[^\d]/, '')
+      @profile = data.keep_if {|k,v| ['realname', 'username', 'profile_image', 'gender', 'address'].include?(k)}
+      @profile['uid'] = @uid
+      self.class.headers 'Cookie' => @cookies
+      @@instance = self
     end
-    data = JSON.parse r.body
-    @uid = data['url'].gsub(/[^\d]/, '')
-    @profile = data.keep_if {|k,v| ['realname', 'username', 'profile_image', 'gender', 'address'].include?(k)}
-    @profile['uid'] = @uid
-    self.class.headers 'Cookie' => @cookies
-    @@instance = self
-  end
 
-  def CS::instance
-    @@instance
-  end
+    def CS::instance
+      @@instance
+    end
 
-  def requests(limit=10)
-    url = "/users/#{@uid}/couchrequests"
-    q = {
-        limit: limit
-    }
-    r = self.class.get(url, query:q)
-    requests = {}
-    response = JSON.parse r.body
-    response['object'].each do |req|
-      key = req.gsub(/[^\d]/, '')
-      requests[key] = self.request(key)
+    def requests(limit=10)
+      url = "/users/#{@uid}/couchrequests"
+      q = {
+          limit: limit
+      }
+      r = self.class.get(url, query:q)
+      requests = {}
+      response = JSON.parse r.body
+      response['object'].each do |req|
+        key = req.gsub(/[^\d]/, '')
+        requests[key] = self.request(key)
+      end
+      requests
     end
-    requests
-  end
 
 
-  def request(id)
-    url = "/couchrequests/#{id}"
-    r = self.class.get(url)
-    JSON.parse r.body
-  end
+    def request(id)
+      url = "/couchrequests/#{id}"
+      r = self.class.get(url)
+      JSON.parse r.body
+    end
 
-  def userdata
-    @profile
-  end
+    def userdata
+      @profile
+    end
 
-  def profile(user=@uid)
-    url = "/users/#{user}/profile"
-    r = self.class.get(url)
-    JSON.parse r.body
-  end
+    def profile(user=@uid)
+      url = "/users/#{user}/profile"
+      r = self.class.get(url)
+      JSON.parse r.body
+    end
 
-  def photos(user=@uid)
-    url = "/users/#{user}/photos"
-    r = self.class.get(url)
-    JSON.parse r.body
-  end
+    def photos(user=@uid)
+      url = "/users/#{user}/photos"
+      r = self.class.get(url)
+      JSON.parse r.body
+    end
 
-  def friends(user=@uid)
-    url = "/users/#{user}/friends"
-    r = self.class.get(url)
-    JSON.parse r.body
-  end
+    def friends(user=@uid)
+      url = "/users/#{user}/friends"
+      r = self.class.get(url)
+      JSON.parse r.body
+    end
 
-  def references(user=@uid)
-    url = "/users/#{user}/references"
-    r = self.class.get(url)
-    JSON.parse r.body
-  end
+    def references(user=@uid)
+      url = "/users/#{user}/references"
+      r = self.class.get(url)
+      JSON.parse r.body
+    end
 
-  def search(options)
+    def search(options)
     
-    defaults = {
-      location: nil,
-      gender: nil,
-      :'has-photo' => nil,
-      :'member-type' => 'host' ,
-      vouched: nil,
-      verified: nil,
-      network: nil,
-      :'min-age' => nil,
-      :'max-age' => nil,
-      :platform => 'android'
-    }
+      defaults = {
+        location: nil,
+        gender: nil,
+        :'has-photo' => nil,
+        :'member-type' => 'host' ,
+        vouched: nil,
+        verified: nil,
+        network: nil,
+        :'min-age' => nil,
+        :'max-age' => nil,
+        :platform => 'android'
+      }
     
-    options = defaults.merge(options)
-    html = self.class.get('/msearch', :query => options)
-    doc = Nokogiri::HTML(html);
-    users = {}
-    statuses = {
-      'M' => 'maybe',
-      'T' => 'travelling',
-      'Y' => 'available',
-      'N' => 'unavailable'
-    }
-    doc.xpath('//article').each do |article|
-      id = article.at_css('a').attr('href').split('/').last
-      user = {
-        name: article.children.at_css("h2").content,
-        location: article.children.at_css("div.location").content,
-        status: statuses[article['class'].match(/couch-([A-Z])/)[1]],
-        pic: article.at_css('img').attr('src')
+      options = defaults.merge(options)
+      html = self.class.get('/msearch', :query => options)
+      doc = Nokogiri::HTML(html);
+      users = {}
+      statuses = {
+        'M' => 'maybe',
+        'T' => 'travelling',
+        'Y' => 'available',
+        'N' => 'unavailable'
       }
-      users[id] = user
-    end
+      doc.xpath('//article').each do |article|
+        id = article.at_css('a').attr('href').split('/').last
+        user = {
+          name: article.children.at_css("h2").content,
+          location: article.children.at_css("div.location").content,
+          status: statuses[article['class'].match(/couch-([A-Z])/)[1]],
+          pic: article.at_css('img').attr('src')
+        }
+        users[id] = user
+      end
     
-    users;
+      users;
+    end
   end
-
+  
+  
   class AuthError < StandardError
   end
 
@@ -170,4 +176,5 @@ class CS
 
     end
   end
+  
 end

data/lib/csapi/version.rb

@@ -1,3 +1,3 @@
 module CS
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/readme.md

@@ -14,7 +14,7 @@ See [example.rb](https://github.com/unRob/CouchSurfing-API/blob/master/examples/
 
 As a gem:
 
-	gem install csapi
+	gem install CSApi
 	
 Or by hand:
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CSApi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2165348420 !ruby/object:Gem::Requirement
+  requirement: &2161153440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165348420
+  version_requirements: *2161153440
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2165347880 !ruby/object:Gem::Requirement
+  requirement: &2161152880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165347880
+  version_requirements: *2161152880
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2165347320 !ruby/object:Gem::Requirement
+  requirement: &2161152300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165347320
+  version_requirements: *2161152300
 description: Simple wrapper of couchsurfing.org API for accessing profile, friends,
   searching, etc.
 email:
@@ -52,13 +52,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .box
 - .gitignore
 - Gemfile
 - LICENSE.txt
 - Rakefile
 - csapi.gemspec
-- examples/example/example.rb
+- examples/example.rb
 - lib/csapi.rb
 - lib/csapi/version.rb
 - readme.md

data/.box

@@ -1,4 +0,0 @@
-php_version: '5.3.6'
-php_extensions: [apc, http, session]
-php_short_open_tag: On
-