Rubbit 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzY2MmNhYTY2ZmExYjJmZWE4N2U3OTBjYzA0YjUxMzVlMjc3NmE4Yw==
+    Y2I2NDlhOTg0OWU1MDljYTQ4NjliZTk0YWI3NzBjOWU5ZmE3ODYxYQ==
   data.tar.gz: !binary |-
-    ZmQyMzA3OThhZmY2MmUyYTBkNjc1NDFmYTgyZjA3OTgxMjY2OTQyYg==
+    NjU4YmFmZTA4MmU2ODcxMWJmZGMzNWNlOGIyMjBhYTdkOTNkODRlZA==
 SHA512:
   metadata.gz: !binary |-
-    NTMwMzgzMzUyZTI3MzUwYzI4ZTM5YmMxMWJiMDBjYzU0YmI4NmViYzBjMjJi
-    ZjA2YzNkMTNkZDA0NTdkZDViNTBkZWU1MjE5Y2QzOTBhZjBiNTExMTI5MTJi
-    NTI4NGYxMmUxYWE2YzUzMzg1NWEyMGMwMzkyN2U1ZWU2NWQ0NWI=
+    Nzk2Mjk2Mzc5Y2EyNmUxNjkzM2Q4N2JmMDgyNDI1NjM0OGM2NDAwYTZjOWUy
+    MDIwMzliYmZkYjliZDkyM2NiNTM5OGQzODczMDAxYzM4ZGQyZWQxNmZlZWRi
+    YmQzY2ExZTU1NWQ4NWFmZGMzOTNlY2YyMTkxMjc3M2JjM2UwMGU=
   data.tar.gz: !binary |-
-    YTg2YTY5ZmQxZjA5Mjk1NWQyZTE4ZmM3ZDMxOTNjNjY5NGY0ZDE1NDU1MWU0
-    ZDNmYzc0YTE2Y2NjMDYwOWY2YzZiZWZmNTgzMTU4OGI3YzNlNmIyZTA0MGYw
-    OWM1ZGQzNGU0MjEzZWY2NTg3ZDQzNGY3ZGYyZjc3MDdkM2Q4NjM=
+    ZWRmYTdmZTJlZDU4NWRiMDMzMDllN2FmYzg1YTM5YmEzMDk4YTFlZTVhZTcx
+    MzRmYzE4ZTNjNmI0ODdiMDc2NDc1OTg1NGM4YjJhZTU3MWQ3ZjQyNTA1YWMz
+    MWY3ZGNhOWY3MTYwYThlNDJkNzMyYzMwZWZlMzI3NjhiNmYwZGM=

data/lib/Rubbit/Reddit_Net_Wrapper.rb

@@ -57,7 +57,7 @@ class Reddit_Net_Wrapper
 			@reset = (Time.now - @first_request).to_i
 		end
 
-		puts url
+		#puts url
 
 		case request_type.downcase
 		when 'post'

data/lib/Rubbit/Rubbit_Construction_Layer.rb

@@ -1,5 +1,6 @@
 require 'Rubbit/Rubbit_Objects'
 require 'Rubbit/Reddit_Net_Wrapper'
+require 'Rubbit/Rubbit_Exceptions'
 require 'json'
 
 class Rubbit_Object_Builder
@@ -26,6 +27,10 @@ class Rubbit_Object_Builder
 		puts response.code
 		if(response.code=='200')
 			return Subreddit.new(JSON.parse(response.body))
+		elsif(response.code=='403')
+			raise PrivateDataException, "/r/" + display_name + " is a private subreddit."
+		elsif(response.code=='404')
+			raise InvalidSubredditException, "/r/" + display_name + " does not exist."
 		end
 	end
 
@@ -33,6 +38,8 @@ class Rubbit_Object_Builder
 		response = Reddit_Net_Wrapper.instance.make_request('get','http://www.reddit.com/user/'+user.to_s+'/about.json',{})
 		if(response.code=='200')
 			return Redditor.new(JSON.parse(response.body))
+		else
+			raise InvalidUserException, "User unable to be retrieved"
 		end
 	end
 
@@ -55,7 +62,7 @@ class Rubbit_Object_Builder
 			elsif(json['kind']=='t4')
 				return Message.new(json)
 			else
-				return nil
+				raise InvalidSubmissionException, "Could not get submission"
 			end
 		end
 	end
@@ -65,8 +72,11 @@ class Rubbit_Object_Builder
 		if(response.code=='200')
 			json = JSON.parse(response.body,:max_nesting=>100)
 			return Listing.new(json[1])
+		elsif(response.code=='403')
+			raise PrivateDataException
+		else
+			raise InvalidSubmissionException, "Could not get comment"
 		end
-		return
 	end
 
 	private_class_method :new
@@ -102,11 +112,12 @@ class Rubbit_Poster
 		login_status = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/login/',params).code
 
 		if(login_status=='200')
-			user = Rubbit_Object_Builder.instance.build_user('the1rgood')
+			user = Rubbit_Object_Builder.instance.build_user(user)
 			@logged_in_user = user.name
 			return user
+		else
+			raise InvalidUserException, "Could not validate login credentials"
 		end
-		return nil
 	end
 
 	def clear_sessions(curpass)
@@ -117,10 +128,7 @@ class Rubbit_Poster
 
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/clear_sessions/',params)
 
-		if(response.code=='200')
-			return true
-		end
-		return false
+		return response.body
 	end
 
 	def delete_user(user,passwd,message,confirm)
@@ -132,10 +140,7 @@ class Rubbit_Poster
 		params['uh']=get_modhash
 
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/delete_user/',params)
-		if(response.code=='200')
-			return true
-		end
-		return false
+		return response.body
 	end
 
 	def update(email,newpass,curpass,verify,verpass)
@@ -149,10 +154,7 @@ class Rubbit_Poster
 		params['uh']=get_modhash
 
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/update/',params)
-		if(response.code=='200')
-			return true
-		end
-		return false
+		return response.body
 	end
 
 	def submit(sr,title,url=nil,text=nil,kind='self',resubmit=nil,save=false,sendreplies=true)
@@ -184,10 +186,7 @@ class Rubbit_Poster
 
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/comment',params)
 
-		if(response.code=='200')
-			return true
-		end
-		return false
+		return response.body
 	end
 
 	def hide(id)
@@ -197,10 +196,7 @@ class Rubbit_Poster
 		
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/hide',params)
 
-		if(response.code=='200')
-			return true
-		end
-		return false
+		return response.body
 	end
 
 	def delete(id)
@@ -210,10 +206,7 @@ class Rubbit_Poster
 		
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/del',params)
 
-		if(response.code=='200')
-			return true
-		end
-		return false
+		return response.body
 	end
 
 	def edit(id,text)
@@ -225,10 +218,7 @@ class Rubbit_Poster
 		
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/editusertext',params)
 
-		if(response.code=='200')
-			return true
-		end
-		return false
+		return response.body
 	end
 
 	def mark_nsfw(id)
@@ -238,10 +228,7 @@ class Rubbit_Poster
 		
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/marknsfw',params)
 
-		if(response.code=='200')
-			return true
-		end
-		return false
+		return response.body
 	end
 
 	def get_modhash

data/lib/Rubbit/Rubbit_Exceptions.rb

@@ -0,0 +1,14 @@
+class InvalidUserException < Exception
+end
+
+class InvalidSubmissionException < Exception
+end
+
+class LoginException < Exception
+end
+
+class PrivateDataException < Exception
+end
+
+class InvalidSubredditException < Exception
+end

data/lib/Rubbit/Rubbit_Objects.rb

@@ -108,7 +108,6 @@ class ContentGenerator
 		@count = 0
 		@data = []
 		@after = after
-		@modhash = nil
 	end
 
 	def each
@@ -174,6 +173,10 @@ class ContentGenerator
 			return listing.children[0]
 		end
 	end
+
+	def length
+		return @data.length
+	end
 end
 
 class Comment

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Rubbit
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - /u/The1RGood
@@ -19,6 +19,7 @@ files:
 - lib/Rubbit.rb
 - lib/Rubbit/Reddit_Net_Wrapper.rb
 - lib/Rubbit/Rubbit_Construction_Layer.rb
+- lib/Rubbit/Rubbit_Exceptions.rb
 - lib/Rubbit/Rubbit_Objects.rb
 homepage: http://rubygems.org/gems/rubbit
 licenses: