adn 0.3.3 → 0.3.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    adn (0.3.3)
+    adn (0.3.4)
 
 GEM
   remote: http://rubygems.org/

data/lib/adn/api/token.rb

@@ -5,7 +5,7 @@ module ADN
     module Token
       def self.current
         result = ADN::API.get(ADN::API_ENDPOINT_TOKEN)
-        result["data"] unless result.has_error?
+        result["data"]
       end
     end
   end

data/lib/adn/post.rb

@@ -8,7 +8,7 @@ module ADN
 
     def self.send_post(params)
       result = ADN::API::Post.create(params)
-      Post.new(result["data"]) unless result.has_error?
+      Post.new(result["data"])
     end
 
     def initialize(raw_post)
@@ -42,17 +42,17 @@ module ADN
 
     def reply_to_post
       result = ADN::API::Post.by_id(reply_to)
-      ADN.create_instance(result["data"], Post) unless result.has_error?
+      ADN.create_instance(result["data"], Post)
     end
 
     def replies(params = nil)
       result = ADN::API::Post.replies(id, params)
-      ADN.create_collection(result["data"], Post) unless result.has_error?
+      ADN.create_collection(result["data"], Post)
     end
 
     def delete
       result = ADN::API::Post.delete(id)
-      ADN.create_instance(result["data"], Post) unless result.has_error?
+      ADN.create_instance(result["data"], Post)
     end
 
     def set_values(values)

data/lib/adn/user.rb

@@ -9,12 +9,16 @@ module ADN
                   :locale, :name, :timezone, :type, :username,
                   :you_follow, :you_muted
 
+    def self.me
+      new ADN::API::Token.current['user']
+    end
+
     def initialize(user)
       if user.respond_to?(:each_pair)
         set_values(user)
-        self.user_id = id
+        self.user_id = id.to_s
       else
-        self.user_id = user
+        self.user_id = user.to_s
         user_details = details
         if details.has_key? "data"
           set_values(user_details["data"])
@@ -43,23 +47,23 @@ module ADN
     def follow(user)
       user_id = get_user(user)
       result = ADN.post("/stream/0/users/#{user_id}/follow")
-      ADN.create_instance(result["data"], User) unless result.has_error?
+      ADN.create_instance(result["data"], User)
     end
 
     def unfollow(user)
       user_id = get_user(user)
       result = ADN.delete("/stream/0/users/#{user_id}/follow")
-      ADN.create_instance(result["data"], User) unless result.has_error?
+      ADN.create_instance(result["data"], User)
     end
 
     def followers
       result = ADN::API::User.followers(user_id)
-      ADN.create_collection(result["data"], User) unless result.has_error?
+      ADN.create_collection(result["data"], User)
     end
 
     def following
       result = ADN::API::User.following(user_id)
-      ADN.create_collection(result["data"], User) unless result.has_error?
+      ADN.create_collection(result["data"], User)
     end
 
     # Mute
@@ -67,35 +71,35 @@ module ADN
     def mute(user)
       user_id = get_user(user)
       result = ADN.post("#{ADN::API_ENDPOINT_USERS}/#{user_id}/mute")
-      ADN.create_instance(result["data"], User) unless result.has_error?
+      ADN.create_instance(result["data"], User)
     end
 
     def unmute(user)
       user_id = get_user(user)
       result = ADN.delete("#{ADN::API_ENDPOINT_USERS}/#{user_id}/mute")
-      ADN.create_instance(result["data"], User) unless result.has_error?
+      ADN.create_instance(result["data"], User)
     end
 
     def mute_list
       result = ADN.get("#{ADN::API_ENDPOINT_USERS}/me/muted")
-      ADN.create_collection(result["data"], User) unless result.has_error?
+      ADN.create_collection(result["data"], User)
     end
 
     # Posts
 
     def posts(params = nil)
       result = ADN::API::Post.by_user(user_id, params)
-      ADN.create_collection(result["data"], Post) unless result.has_error?
+      ADN.create_collection(result["data"], Post)
     end
 
     def stream(params = nil)
       result = ADN::API::Post.stream(params)
-      ADN.create_collection(result["data"], Post) unless result.has_error?
+      ADN.create_collection(result["data"], Post)
     end
 
     def mentions(params = nil)
       result = ADN::API::Post.mentioning_user(user_id, params)
-      ADN.create_collection(result["data"], Post) unless result.has_error?
+      ADN.create_collection(result["data"], Post)
     end
 
     def set_values(values)

data/lib/adn/version.rb

@@ -3,7 +3,7 @@
 module ADN
   MAJOR = 0
   MINOR = 3
-  TINY  = 3
+  TINY  = 4
   VERSION = [MAJOR, MINOR, TINY].join('.')
 end
 

data/lib/adn.rb

@@ -40,10 +40,6 @@ module ADN
     @token
   end
 
-  def self.has_error?(hash)
-    hash.has_key?("error")
-  end
-
   def self.create_instance(data, type)
     type.new(data)
   end

data/spec/adn/user_spec.rb

@@ -9,6 +9,16 @@ describe ADN::User do
   let(:user) { subject.new(user_data) }
   let(:user_data) { fixture('user.json') }
 
+  describe "me" do
+    it "retrieves the user based on the current token" do
+      ADN::API::Token.stub(:current, { "user" => user_data }) do
+        u = subject.me
+        u.user_id.must_equal "4821"
+        u.username.must_equal "peterhellberg"
+      end
+    end
+  end
+
   describe "initialize" do
     it "populates the accessors based on the raw user data passed in" do
       u = subject.new(user_data)
@@ -18,7 +28,7 @@ describe ADN::User do
     # TODO: Remove this behavior, wrong level of abstraction
     it "populates the accessors based on the user id passed in" do
       ADN::API::User.stub(:retrieve, { "data" => user_data }) do
-        u = subject.new("4821")
+        u = subject.new(4821)
         u.name.must_equal "Peter Hellberg"
         u.user_id.must_equal "4821"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adn
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies: []
 description: A simple and easy to use library to interact with App.net's API
 email:
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 817879158107129194
+      hash: -2288184448617261034
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24