adnruby 0.1 → 0.2

data/lib/adnruby.rb

@@ -1,8 +1,34 @@
+#
+# ADNRuby - A simple and easy to use App.net Ruby library
+# 
+# Copyright (c) 2012 Kishyr Ramdial
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'net/https'
 require 'uri'
 require 'json'
 
 API = "alpha-api.app.net"
+ADNHTTP = Net::HTTP.new(API, 443)
+ADNHTTP.use_ssl = true
 
 module ADN
   def self.token=(token)
@@ -14,50 +40,124 @@ module ADN
   end
 
   class User
-    def self.retrieve(user_id)
-      ADN.get("/stream/0/users/#{user_id}")
+    attr_accessor :user_id
+    attr_accessor :avatar_image, :counts, :cover_image, :created_at, :description, :follows_you, :id, :is_follower, :is_following, :is_muted, :locale, :name, :timezone, :type, :username, :you_follow, :you_muted
+
+    def initialize(user_id)
+      @user_id = user_id
+      details = self.details
+      if details.has_key? "data"
+        details["data"].each do |k, v|
+          self.instance_variable_set "@#{k}", v
+        end
+      end
     end
 
-    def self.follow(user_id)
-      ADN.post("/stream/0/users/#{user_id}/follow")
+    def details
+      if self.id
+        h = {}
+        self.instance_variables.each { |iv| h[iv.to_s.gsub(/[^a-zA-Z0-9_]/, '')] = self.instance_variable_get(iv) }
+        h
+      else
+        ADN::Users.retrieve(@user_id)
+      end
     end
 
-    def self.unfollow(user_id)
-      ADN.delete("/stream/0/users/#{user_id}/follow")
+
+    # Followers/Users
+
+    def follow(user)
+      user_id = user.is_a?(ADN::User) ? user.id : user
+      result = ADN.post("/stream/0/users/#{user_id}/follow")
+      result["data"] unless result.has_error?
     end
 
-    def self.following(user_id)
-      ADN.get("/stream/0/users/#{user_id}/following")
+    def unfollow(user)
+      user_id = user.is_a?(ADN::User) ? user.id : user
+      result = ADN.delete("/stream/0/users/#{user_id}/follow")
+      result["data"] unless result.has_error?
     end
 
-    def self.followers(user_id)
-      ADN.get("/stream/0/users/#{user_id}/followers")
+    def followers
+      result = ADN::Users.followers(@user_id)
+      result["data"] unless result.has_error?
+    end
+
+    def following
+      result = ADN::Users.following(@user_id)
+      result["data"] unless result.has_error?
+    end
+
+    
+    # Mute
+
+    def mute(user)
+      user_id = user.is_a?(ADN::User) ? user.id : user
+      result = ADN.post("/stream/0/users/#{user_id}/mute")
+      result["data"] unless result.has_error?
+    end
+
+    def unmute(user)
+      user_id = user.is_a?(ADN::User) ? user.id : user
+      result = ADN.delete("/stream/0/users/#{user_id}/mute")
+      result["data"] unless result.has_error?
+    end
+
+    def mute_list
+      result = ADN.get("/stream/0/users/me/muted")
+      result["data"] unless result.has_error?
     end
 
-    def self.mute(user_id)
-      ADN.post("/stream/0/users/#{user_id}/mute")
+    
+    # Posts
+
+    def posts(params = nil)
+      result = ADN::Post.by_user(@user_id, params)
+      result["data"] unless result.has_error?
+    end
+
+    def stream(params = nil)
+      result = ADN::Post.stream(params)
+      result["data"] unless result.has_error?
     end
 
-    def self.unmute(user_id)
-      ADN.delete("/stream/0/users/#{user_id}/mute")
+    def mentions(params = nil)
+      result = ADN::Post.mentioning_user(@user_id, params)
+      result["data"] unless result.has_error?
+    end
+
+    # Errors
+
+    def has_error?
+      self.id.nil?
     end
 
-    def self.mute_list
-      ADN.get("/stream/0/users/me/muted")
+  end
+
+
+  # Modules
+
+  module Users
+
+    def self.retrieve(user_id)
+      ADN.get("/stream/0/users/#{user_id}")
     end
 
-    # def self.posts(user_id)
-    #   ADN::Post.by_user(user_id)
-    # end
+    def self.by_id(user_id)
+      self.retrieve(user_id)
+    end
 
-    # def self.mentions(user_id)
-    #   ADN::Post.mentioning_user(user_id)
-    # end
+    def self.following(user_id)
+      ADN.get("/stream/0/users/#{user_id}/following")
+    end
 
+    def self.followers(user_id)
+      ADN.get("/stream/0/users/#{user_id}/followers")
+    end
 
   end
 
-  class Post
+  module Post
     def self.new(params)
       ADN.post("/stream/0/posts", params)
     end
@@ -100,67 +200,66 @@ module ADN
 
   end
 
-  class Stream
+  module Stream
     # Not Yet Implemented
     # https://github.com/appdotnet/api-spec/blob/master/resources/streams.md
   end
 
-  class Subscription
+  module Subscription
     # Not Yet Implemented
     # https://github.com/appdotnet/api-spec/blob/master/resources/subscriptions.md
   end
 
-  class Filter
+  module Filter
     # Not Yet Implemented
     # https://github.com/appdotnet/api-spec/blob/master/resources/filters.md
   end
 
-  class Token
+  module Token
     def self.current
-      ADN.get("/stream/0/token")
+      result = ADN.get("/stream/0/token")
+      result["data"] unless result.has_error?
     end
   end
 
-  def self.get(url, params = nil)
-    http = Net::HTTP.new(API, 443)
-    http.use_ssl = true
 
+
+  private 
+
+  def self.get(url, params = nil)
     get_url = params.nil? ? url : "#{url}?#{URI.encode_www_form(params)}"
     request = Net::HTTP::Get.new(get_url)
     request.add_field("Authorization", "Bearer #{ADN.token}")
-    response = http.request(request)
+    response = ADNHTTP.request(request)
     return JSON.parse(response.body)
   end
 
   def self.post(url, params = nil)
-    http = Net::HTTP.new(API, 443)
-    http.use_ssl = true
-
     request = Net::HTTP::Post.new(url)
     request.set_form_data(params) if params
     request.add_field("Authorization", "Bearer #{ADN.token}")
-    response = http.request(request)
+    response = ADNHTTP.request(request)
     return JSON.parse(response.body)
   end
 
   def self.put(url, params = nil)
-    http = Net::HTTP.new(API, 443)
-    http.use_ssl = true
-
     request = Net::HTTP::Put.new(url)
     request.set_form_data(params) if params
     request.add_field("Authorization", "Bearer #{ADN.token}")
-    response = http.request(request)
+    response = ADNHTTP.request(request)
     return JSON.parse(response.body)
   end
 
   def self.delete(url, params = nil)
-    http = Net::HTTP.new(API, 443)
-    http.use_ssl = true
-
     request = Net::HTTP::Delete.new(url)
     request.add_field("Authorization", "Bearer #{ADN.token}")
-    response = http.request(request)
+    response = ADNHTTP.request(request)
     return JSON.parse(response.body)
   end
 end
+
+class Hash
+  def has_error?
+    self.has_key? "error"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adnruby
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-25 00:00:00.000000000 Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies: []
 description: A simple and easy to use library to interact with App.net's API
 email: kishyr@gmail.com