Rubbit 0.2.3 → 0.2.5

data/lib/Rubbit.rb

@@ -138,6 +138,14 @@ class Rubbit
 		return @object_builder.build_user(@me.name)
 	end
 
+	def create_live(title,description='',nsfw=false)
+		return @rubbit_poster.create_live(title,description,nsfw)
+	end
+	
+	def create_subreddit(name,other_params)
+		return @rubbit_poster.create_subreddit(name,other_params)
+	end
+
 	def update(curpass=nil,email=nil,newpass=nil,verify=nil,verpass=nil)
 		if(@me==nil)
 			print('Not logged in. Cannot update password or email')

data/lib/Rubbit/Rubbit_Construction_Layer.rb

@@ -85,6 +85,18 @@ class Rubbit_Poster
 		Reddit_Net_Wrapper.instance(net_name)
 		@logged_in_user = nil
 	end
+	
+	def set_subreddit_sticky(post_id,state)
+		params = {}
+		params['api_type']='json'
+		params['id']=post_id
+		params['state']=state
+		params['uh']=get_modhash
+		
+		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/set_subreddit_sticky/',params)
+		
+		return JSON.parse(response.body)
+	end
 
 	def self.instance(name=nil)
 		if(@@instance==nil)
@@ -123,7 +135,7 @@ class Rubbit_Poster
 
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/clear_sessions/',params)
 
-		return response.body
+		return JSON.parse(response.body)
 	end
 
 	def delete_user(user,passwd,message)
@@ -135,7 +147,7 @@ class Rubbit_Poster
 		params['uh']=get_modhash
 
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/delete_user/',params)
-		return response.body
+		return JSON.parse(response.body)
 	end
 
 	def update(email,newpass,curpass,verify,verpass)
@@ -149,7 +161,7 @@ class Rubbit_Poster
 		params['uh']=get_modhash
 
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/update/',params)
-		return response.body
+		return JSON.parse(response.body)
 	end
 
 	def submit(sr,title,url=nil,text=nil,kind='self',resubmit=nil,save=false,sendreplies=true)
@@ -174,14 +186,14 @@ class Rubbit_Poster
 
 	def comment(parent,text)
 		params = {}
-		params['text']=text
+		params['api_type']='json'
 		params['thing_id']=parent
+		params['text']=text
 		params['uh']=get_modhash
-		params['renderstylel']='html'
 
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/comment',params)
 
-		return response.body
+		return JSON.parse(response.body)
 	end
 
 	def hide(id)
@@ -191,7 +203,7 @@ class Rubbit_Poster
 		
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/hide',params)
 
-		return response.body
+		return JSON.parse(response.body)
 	end
 
 	def delete(id)
@@ -201,7 +213,7 @@ class Rubbit_Poster
 		
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/del',params)
 
-		return response.body
+		return JSON.parse(response.body)
 	end
 
 	def edit(id,text)
@@ -213,7 +225,7 @@ class Rubbit_Poster
 		
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/editusertext',params)
 
-		return response.body
+		return JSON.parse(response.body)
 	end
 
 	def mark_nsfw(id)
@@ -223,7 +235,33 @@ class Rubbit_Poster
 		
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/marknsfw',params)
 
-		return response.body
+		return JSON.parse(response.body)
+	end
+
+	def create_live(title,description='',nsfw=false)
+		params = {}
+
+		params['api_type']='json'
+		params['title']=title
+		params['description']=description
+		params['nsfw']=nsfw
+		params['uh']=get_modhash
+
+		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/live/create',params)
+
+		return Live_Thread.new(JSON.parse(response.body)['json']['data']['id'])
+	end
+
+	def update_live(id,body)
+		params = {}
+
+		params['api_type']='json'
+		params['body']=body
+		params['uh']=get_modhash
+
+		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/live/'+id+'/update',params)
+
+		return JSON.parse(response.body)
 	end
 
 	def friend(type,user,container,info=nil,duration=nil)
@@ -231,7 +269,7 @@ class Rubbit_Poster
 		params['api_type']='json'
 		params['type']=type
 		params['name']=user
-		params['modhash']=get_modhash
+		params['uh']=get_modhash
 		case type
 		when 'friend'
 			params['note']=info
@@ -244,6 +282,7 @@ class Rubbit_Poster
 			params['permissions']=info
 		when 'contributor'
 			params['container']=container
+			params['r']=info
 		when 'banned'
 			params['container']=container
 			params['note']=info
@@ -255,10 +294,10 @@ class Rubbit_Poster
 		when 'wikicontributor'
 			params['container']=container
 		end
-
+		
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/friend',params)
 
-		return response.body
+		return JSON.parse(response.body)
 	end
 
 	def unfriend(type,user,container)
@@ -266,15 +305,34 @@ class Rubbit_Poster
 		params['api_type']='json'
 		params['type']=type
 		params['name']=user
-		params['modhash']=get_modhash
+		params['uh']=get_modhash
 		params['container']=container
 
 		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/unfriend',params)
 
 		return response.body
 	end
+	
+	def create_subreddit(name,other_params)
+		params = {}
+		params['link_type']='any'
+		params['wikimode']='disabled'
+		params['type'] = 'public'
+		params['name'] = name
+		other_params.keys.each do |k|
+			params[k] = other_params[k]
+		end
+		params['uh']=get_modhash
+		
+		response = Reddit_Net_Wrapper.instance.make_request('post','http://www.reddit.com/api/site_admin',params)
+		
+		return response.body
+	end
 
 	def get_modhash
+		if(@logged_in_user==nil)
+			raise LoginException, 'Not logged in.'
+		end
 		response = Reddit_Net_Wrapper.instance.make_request('get','http://www.reddit.com/user/'+@logged_in_user+'/about.json',{})
 		data = JSON.parse(response.body)
 		return data['data']['modhash']

data/lib/Rubbit/Rubbit_Objects.rb

@@ -175,7 +175,16 @@ class Subreddit
 	def get_moderators
 		return ContentGenerator.new('http://www.reddit.com/r/'+@display_name.to_s+'/about/moderators.json',nil)
 	end
+	
+	def get_modmail(limit=100)
+		return ContentGenerator.new("http://www.reddit.com/r/#{@display_name.to_s}/about/message/inbox/.json",limit)
+	end
 
+	def is_contributor?(name)
+		contrib_check = ContentGenerator.new("http://www.reddit.com/r/#{@display_name.to_s}/about/contributors/.json?user=#{name}")
+		user = contrib_check.next
+		return user != nil
+	end
 	
 	# ==== Description
 	#
@@ -198,7 +207,7 @@ class Subreddit
 	# * +name+ - name of user to add as a contributor
 	#
 	def add_contributor(name)
-		return Rubbit_Poster.instance.friend('contributor',name,@display_name)
+		return Rubbit_Poster.instance.friend('contributor',name,@name,@display_name)
 	end
 
 	# ==== Description
@@ -403,7 +412,6 @@ class ContentGenerator
 					end
 				else
 					listing = Rubbit_Object_Builder.instance.build_listing(@source+@limit_param+100.to_s+"&after="+@after+"&count="+@count.to_s)
-					puts(@source+@limit_param+100.to_s+"&after="+@after+"&count="+@count.to_s)
 					@after = listing.after
 					@data += listing.children
 					@count += listing.children.length
@@ -432,14 +440,13 @@ class ContentGenerator
 		if(@index>=@data.length)
 			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)
+					listing = Rubbit_Object_Builder.instance.build_listing(@source+@limit_param+[@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)
-				puts(@source+"?limit="+100.to_s+"&after="+@after+"&count="+@count.to_s)
+				listing = Rubbit_Object_Builder.instance.build_listing(@source+@limit_param+100.to_s+"&after="+@after+"&count="+@count.to_s)
 				@after = listing.after
 				@data += listing.children
 				@count += listing.children.length
@@ -582,14 +589,18 @@ class Post
 	def reply(text)
 		return Rubbit_Poster.instance.comment(@name,text)
 	end
+	
+	def set_as_sticky(state)
+		return Rubbit_Poster.instance.set_subreddit_sticky(@name,state)
+	end
 
 	# ==== Description
 	#
 	# Retrieves the comments of a post in a list tree.
 	#
-	def replies
+	def replies(limit=100)
 		if(@comments==nil)
-			@comments = Rubbit_Object_Builder.instance.get_comments('http://www.reddit.com'+@permalink).children
+			@comments = Rubbit_Object_Builder.instance.get_comments("http://www.reddit.com#{permalink}.json",limit)
 		end
 		return @comments
 	end
@@ -655,7 +666,50 @@ class Message
 	# * +text+ - The new message body.
 	#
 	def reply(text)
-		Rubbit_Poster.instance.comment(text,@name)
+		return Rubbit_Poster.instance.comment(@name,text)
+	end
+end
+
+# == Rubbit Object
+#
+# Object that represents a Live Thread
+#
+class Live_Thread
+	@id = nil
+	def initialize(id)
+		@id = id
+	end
+
+	def get_updates
+		return ContentGenerator.new('http://www.reddit.com/live/'+@id+'.json',limit)
+	end
+
+	def make_update(body)
+		return Rubbit_Poster.instance.update_live(@id,body)
+	end
+end
+
+# == Rubbit Object
+#
+# Object that represents an Update in a Live Thread
+#
+class Live_Update
+	def initialize(json)
+		if(json['kind']=='LiveUpdate')
+			data = json['data']
+			data.each_key do |k|
+				self.class.module_eval {attr_accessor(k)}
+				self.send("#{k}=",data[k])
+			end
+		end
+	end
+
+	def strike
+
+	end
+
+	def delete
+
 	end
 end
 
@@ -686,6 +740,8 @@ class Listing
 					children_objects += [Subreddit.new(c)]
 				elsif(c['kind'] == 'Listing')
 					children_objects += [Listing.new(c)]
+				elsif(c['kind'] == 'LiveUpdate')
+					children_objects += [Live_Update.new(c)]
 				end
 			end
 			@children = children_objects

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: Rubbit
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
+  prerelease: 
 platform: ruby
 authors:
 - /u/The1RGood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies: []
 description: A simple Ruby-based Reddit API Wrapper
 email: randy@kindofabigdeal.org
@@ -18,31 +19,32 @@ extra_rdoc_files: []
 files:
 - lib/Rubbit.rb
 - lib/Rubbit/Reddit_Net_Wrapper.rb
+- lib/Rubbit/Rubbit_Objects.rb
 - lib/Rubbit/Rubbit_Construction_Layer.rb
 - lib/Rubbit/Rubbit_Exceptions.rb
-- lib/Rubbit/Rubbit_Objects.rb
 homepage: http://rubygems.org/gems/rubbit
 licenses:
 - GPL v3
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby API Wrapper for Reddit
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjljN2VjOTY3MGYwMjg4YzY5YWU3MTExNTc4MDE5NzEyYTI1OGY5OQ==
-  data.tar.gz: !binary |-
-    ZWQ3MTc4YTY5MjQyYzcxMDk3YjViZjE1NTA3NDU3NDk0NDg0MDkwMQ==
-SHA512:
-  metadata.gz: !binary |-
-    N2JmNmRkMmJjOGIxZDc0MDY2NmU2OWVhZTE1YjlhZTEwYzA2NTE1ZTY5ZDVm
-    OGViM2ZkMjdiMzk5ZDk2M2I0MWVlNzc3ZWVhMzNhZWY3ZjI4M2VmMDgwOTVl
-    NTA1OTE5NmIzY2VlYTliMzI0ZjkxY2M5MWJlNzZkMzhjZjExYjk=
-  data.tar.gz: !binary |-
-    NmM3ZGIyYWZlZGYwYjBkZWY4YmFmYmNmMWFjYWQ5ZDkzNDI4ZjcxM2VhY2Fl
-    MWE1MDYwMTBmMjJjYzk5MWJjMzRkYzNjNzcwYzExZDc4YmUwMjgzYTM3Mjg4
-    ZDk1MTI4MGFhMzBlMzJlOGU5NGIzMDk3NGFkNzZhMTFmNWE0NTk=