Rubbit 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGFmMGJmOTMxYjQzNjhmNmE2ZGZlOGU0NDQyMTRkZWRjMmY3Njg4MQ==
+    NzY2MmNhYTY2ZmExYjJmZWE4N2U3OTBjYzA0YjUxMzVlMjc3NmE4Yw==
   data.tar.gz: !binary |-
-    MTIzYmQ5NTZkNjBmZTMxNGE2NDAyZDkxNmNkMmY2NzY4NDFlYzg4NQ==
+    ZmQyMzA3OThhZmY2MmUyYTBkNjc1NDFmYTgyZjA3OTgxMjY2OTQyYg==
 SHA512:
   metadata.gz: !binary |-
-    NGY2MTM4OTJhMDI1ZjcwMjFjZDEzZjAxYTJjNWU3NDRiNjY5ODAxMWZjMDAx
-    ZTMyY2M1NzgzYzdhMzU0ZWViOGFkMDViZjZiY2I3MzZlNDgyMjc0NGYzODY3
-    MDU1MDhkMTllNGQ1MzAzYmM1NWRlZDQ1OTE5ZDM5ZjczNWI2MDI=
+    NTMwMzgzMzUyZTI3MzUwYzI4ZTM5YmMxMWJiMDBjYzU0YmI4NmViYzBjMjJi
+    ZjA2YzNkMTNkZDA0NTdkZDViNTBkZWU1MjE5Y2QzOTBhZjBiNTExMTI5MTJi
+    NTI4NGYxMmUxYWE2YzUzMzg1NWEyMGMwMzkyN2U1ZWU2NWQ0NWI=
   data.tar.gz: !binary |-
-    YzM1ZDRjZTdlZGFkMzZjZWM0MTllNDkwZjA5ZTMxY2Y2NzJkYzliNWNiMzRk
-    MDQ0YzA1M2YzMDNiYTY0ZjgyOGJmZjY0ZTg3MGNlNzNkMDJmNTA1ZmZiZjUw
-    NWEzZDBkMGIyOGIzMTBiYjEwMGM3MDAyYjdkM2NlYjY5ZWZkZWQ=
+    YTg2YTY5ZmQxZjA5Mjk1NWQyZTE4ZmM3ZDMxOTNjNjY5NGY0ZDE1NDU1MWU0
+    ZDNmYzc0YTE2Y2NjMDYwOWY2YzZiZWZmNTgzMTU4OGI3YzNlNmIyZTA0MGYw
+    OWM1ZGQzNGU0MjEzZWY2NTg3ZDQzNGY3ZGYyZjc3MDdkM2Q4NjM=

data/lib/Rubbit/Rubbit_Construction_Layer.rb

@@ -41,6 +41,7 @@ class Rubbit_Object_Builder
 		if(response.code=='200')
 			return Listing.new(JSON.parse(response.body,:max_nesting => 100))
 		end
+		return nil
 	end
 
 	def build_submission(link)

data/lib/Rubbit/Rubbit_Objects.rb

@@ -46,6 +46,14 @@ class Subreddit
 	def submit_link(title,url,save=false,sendreplies=true)
 		return submit(title,url,nil,'link',false,save,sendreplies)
 	end
+
+	def get_contributors(limit=100)
+		return ContentGenerator.new('http://www.reddit.com/r/'+@display_name.to_s+'/about/contributors.json',limit)
+	end
+
+	def get_banned(limit=100)
+		return ContentGenerator.new('http://www.reddit.com/r/'+@display_name.to_s+'/about/banned.json',limit)
+	end
 end
 
 class Redditor
@@ -56,6 +64,12 @@ class Redditor
 				self.class.module_eval {attr_accessor(k)}
 				self.send("#{k}=",data[k])
 			end
+		elsif(json['id'][0..2]=='t2_')
+			data = json
+			data.each_key do |k|
+				self.class.module_eval {attr_accessor(k)}
+				self.send("#{k}=",data[k])
+			end
 		end
 	end
 
@@ -70,6 +84,14 @@ class Redditor
 	def get_submitted(limit=100)
 		return ContentGenerator.new('http://www.reddit.com/user/'+@name.to_s+'/submitted.json',limit)
 	end
+
+	def rebuild
+		rebuilt_user = Rubbit_Object_Builder.instance.build_user(@name)
+		rebuilt_user.instance_variables.each do |attr_name|
+			self.class.module_eval{attr_accessor(attr_name[1..-1])}
+			self.send("#{attr_name[1..-1]}=",rebuilt_user.instance_variable_get(attr_name))
+		end
+	end
 end
 
 class ContentGenerator
@@ -91,29 +113,17 @@ class ContentGenerator
 
 	def each
 		index = 0
-		if(@limit!=nil)
-			listing = Rubbit_Object_Builder.instance.build_listing(@source+'?limit='+[@limit-@count,100].min.to_s+"&after="+@after+"&count="+@count.to_s)
-			if(listing.children[listing.children.length-1]!=nil)
-				@after = listing.children[listing.children.length-1].name
-			else
-				@after = nil
-			end
-			if(@after == nil)
-				@data+=[]
-			else
-				@data += listing.children
-				@count += listing.children.length
-			end
-		else
-			listing = Rubbit_Object_Builder.instance.build_listing(@source+'?limit='+100.to_s+"&after="+@after+"&count="+@count.to_s)
-			if(listing.children[listing.children.length-1]!=nil)
-				@after = listing.children[listing.children.length-1].name
-			else
-				@after = nil
-			end
-			if(@after == nil)
-				@data+=[]
+		if(@data.length==0)
+			if(@limit!=nil)
+				if(@limit-@count>0)
+					listing = Rubbit_Object_Builder.instance.build_listing(@source+'?limit='+[@limit-@count,100].min.to_s+"&after="+@after+"&count="+@count.to_s)
+					@after = listing.after
+					@data += listing.children
+					@count += listing.children.length
+				end
 			else
+				listing = Rubbit_Object_Builder.instance.build_listing(@source+'?limit='+100.to_s+"&after="+@after+"&count="+@count.to_s)
+				@after = listing.after
 				@data += listing.children
 				@count+= listing.children.length
 			end
@@ -124,39 +134,21 @@ class ContentGenerator
 			index+=1
 			if(index==@data.length)
 				if(@after==nil)
-					@after=''
+					break
 				end
 				if(@limit!=nil)
 					if(@limit-@count>0)
 						listing = Rubbit_Object_Builder.instance.build_listing(@source+'?limit='+[@limit-@count,100].min.to_s+"&after="+@after+"&count="+@count.to_s)
-						if(listing.children[listing.children.length-1]!=nil)
-							@after = listing.children[listing.children.length-1].name
-						else
-							@after = nil
-						end
-						if(@after == nil)
-							@data+=[]
-						else
-							@data += listing.children
-							@count += listing.children.length
-						end
-					else
-						@data += []
+						@after = listing.after
+						@data += listing.children
+						@count += listing.children.length
 					end
 				else
 					listing = Rubbit_Object_Builder.instance.build_listing(@source+"?limit="+100.to_s+"&after="+@after+"&count="+@count.to_s)
 					puts(@source+"?limit="+100.to_s+"&after="+@after+"&count="+@count.to_s)
-					if(listing.children[listing.children.length-1]!=nil)
-						@after = listing.children[listing.children.length-1].name
-					else
-						@after = nil
-					end
-					if(@after == nil)
-						@data+=[]
-					else
-						@data += listing.children
-						@count += listing.children.length
-					end
+					@after = listing.after
+					@data += listing.children
+					@count += listing.children.length
 				end
 			end
 		end
@@ -166,10 +158,6 @@ class ContentGenerator
 		return @data[i]
 	end
 
-	def length
-		return @data.length
-	end
-
 	def next
 		listing = Rubbit_Object_Builder.instance.build_listing(@source+'?limit='+1.to_s+"&after="+@after+"&count="+@count.to_s)
 		if(listing.children[listing.children.length-1]!=nil)
@@ -196,6 +184,18 @@ class Comment
 				self.class.module_eval {attr_accessor(k)}
 				self.send("#{k}=",data[k])
 			end
+			children = []
+			if(@replies!= nil and @replies['data']!=nil and @replies['data']['children']!=nil)
+				@replies['data']['children'].each do |c|
+					if(c!=nil)
+						children += [Comment.new(c)]
+					end
+				end
+				@replies = children
+			end
+			if(@replies=="")
+				replies = nil
+			end
 		end
 	end
 
@@ -232,7 +232,7 @@ class Post
 		return Rubbit_Poster.instance.comment(@name,text)
 	end
 
-	def comments
+	def replies
 		if(@comments==nil)
 			@comments = Rubbit_Object_Builder.instance.get_comments('http://www.reddit.com'+@permalink).children
 		end
@@ -282,18 +282,20 @@ class Listing
 			end
 			children_objects = []
 			@children.each do |c|
-				case c['kind']
-				when 't1'
+				if(c['id']==nil)
+					c['id']='   '
+				end
+				if(c['kind'] == 't1' or c['id'][0..2]=='t1_')
 					children_objects += [Comment.new(c)]
-				when 't2'
+				elsif(c['kind'] == 't2' or c['id'][0..2]=='t2_')
 					children_objects += [Redditor.new(c)]
-				when 't3'
+				elsif(c['kind'] == 't3' or c['id'][0..2]=='t3_')
 					children_objects += [Post.new(c)]
-				when 't4'
+				elsif(c['kind'] == 't4' or c['id'][0..2]=='t4_')
 					children_objects += [Message.new(c)]
-				when 't5'
+				elsif(c['kind'] == 't5' or c['id'][0..2]=='t5_')
 					children_objects += [Subreddit.new(c)]
-				when 'Listing'
+				elsif(c['kind'] == 'Listing')
 					children_objects += [Listing.new(c)]
 				end
 			end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Rubbit
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - /u/The1RGood