twicas_stream 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec2e828a4cfe3400f1695a66f7c1242450d23a909de2533d8fde24959532ee04
-  data.tar.gz: c8a32e0c9345277ce27591f9ea72db9d4fddc38e02ad7da9f045c6231d724cdf
+  metadata.gz: f264f6618752379927f999963a8e6e685faadd33697794b0fcffea3b720148b8
+  data.tar.gz: 7f979f21409dbdeb049b397682ae5237f9d2a535e529bb30cb087321b1e74fe1
 SHA512:
-  metadata.gz: 5eafb58aeee996d5b74c5ca904f70d13e1d34773ac1c0b31a385cf8ebec849c0d75295c5985238924f6f0e871deb0fcd021863686896d540d108237fb3d5be80
-  data.tar.gz: e9005499b49eb8a77a5d2a0eb02fa65772dc81237bc109472b35dc30a3f9d8d637d56aa5902090bade9135aacf78b2e4bb5639ae702010194b0c26f4ff2febd7
+  metadata.gz: 77241d501ba6b4e45987a496972d4f62bb338fafcfabaac1d906fb051f37f580826f3cee2c5240835e95872249509dc2d97f7dd85379a571232d64f8e31853c4
+  data.tar.gz: 4c1905d59d5355701fcd570403b0c4d1855b9e68a6e48e4a415bd948d57ddfa8c462b9b6715264175c2a42c169929a0c1d230b81a81dd3cc67779c1d0cf54149

data/.gitignore

@@ -1,5 +1,5 @@
 # It must be ignored
-config/access_token.txt
-pkg
+/config/access_token.txt
+/pkg
 .rspec_status
 Gemfile.lock

data/CHANGELOG.md

@@ -1,10 +1,19 @@
+## v1.3.0
+[full changelog](http://github.com/ysato5654/twicas_stream/compare/v1.2.2...v1.3.0)
+
+* support some requests
+	* Movie
+		- Get Movies by User
+		- Get Current Live
+* improve reliability
+
 ## v1.2.2
-[full changelog](http://github.com/ysato5654/twicas_stream/compare/v1.2.2...v1.2.1)
+[full changelog](http://github.com/ysato5654/twicas_stream/compare/v1.2.1...v1.2.2)
 
 * improve reliability
 
 ## v1.2.1
-[full changelog](http://github.com/ysato5654/twicas_stream/compare/v1.2.1...v1.2.0)
+[full changelog](http://github.com/ysato5654/twicas_stream/compare/v1.2.0...v1.2.1)
 
 * improve reliability
 
@@ -25,8 +34,8 @@
 ## v1.1.1
 [full changelog](http://github.com/ysato5654/twicas_stream/compare/v1.1.0...v1.1.1)
 
-* Add changelog
-* Add github badge
+* add changelog
+* add github badge
 	- RubyGems.org
 	- Travis CI
 	- Coveralls
@@ -34,7 +43,7 @@
 ## v1.1.0
 [full changelog](http://github.com/ysato5654/twicas_stream/compare/v1.0.0...v1.1.0)
 
-* Support some requests
+* support some requests
 	* Live Thumbnail
 		- Get Live Thumbnail Image
 	* Supporter

data/lib/twicas_stream/comment.rb

@@ -40,6 +40,8 @@ module TwicasStream
 
 			DEFAULT_OFFSET = 0
 
+			LOWER_OFFSET = 0
+
 			DEFAULT_LIMIT = 10
 
 			LOWER_LIMIT = 1
@@ -54,13 +56,17 @@ module TwicasStream
 				@response = Hash.new
 				param = Hash.new
 
+				if offset < LOWER_OFFSET
+					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. offset range should be over #{LOWER_OFFSET}."
+				end
+
 				unless limit >= LOWER_LIMIT and limit <= UPPER_LIMIT
-					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. limitation range is #{LOWER_LIMIT} ~ #{UPPER_LIMIT}."
+					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. limit range is #{LOWER_LIMIT} ~ #{UPPER_LIMIT}."
 				end
 
 				if slice_id.kind_of?(Integer)
 					if slice_id < LOWER_SLICE_ID
-						STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. slice id (comment id) should be over than #{LOWER_SLICE_ID}."
+						STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. slice id (comment id) should be over #{LOWER_SLICE_ID}."
 					end
 				else
 					unless slice_id == DEFAULT_SLICE_ID

data/lib/twicas_stream/movie.rb

@@ -61,9 +61,78 @@ module TwicasStream
 		end
 
 		class GetMoviesbyUser
+			attr_reader :response
+
+			PREFIX_URL = 'users'
+
+			SUFFIX_URL = 'movies'
+
+			DEFAULT_OFFSET = 0
+
+			LOWER_OFFSET = 0
+
+			UPPER_OFFSET = 1000
+
+			DEFAULT_LIMIT = 20
+
+			LOWER_LIMIT = 1
+
+			UPPER_LIMIT = 50
+
+			DEFAULT_SLICE_ID = 'none'
+
+			LOWER_SLICE_ID = 1
+
+			def initialize user_id, offset = DEFAULT_OFFSET, limit = DEFAULT_LIMIT, slice_id = DEFAULT_SLICE_ID
+				@response = Hash.new
+				param = Hash.new
+
+				unless offset >= LOWER_OFFSET and offset <= UPPER_OFFSET
+					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. offset range is #{LOWER_OFFSET} ~ #{UPPER_OFFSET}."
+				end
+
+				unless limit >= LOWER_LIMIT and limit <= UPPER_LIMIT
+					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. limit range is #{LOWER_LIMIT} ~ #{UPPER_LIMIT}."
+				end
+
+				if slice_id.kind_of?(Integer)
+					if slice_id < LOWER_SLICE_ID
+						STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. slice id (comment id) should be over #{LOWER_SLICE_ID}."
+					end
+				else
+					unless slice_id == DEFAULT_SLICE_ID
+						STDERR.puts "#{__FILE__}:#{__LINE__}:Error: invalid parameter. default is '#{DEFAULT_SLICE_ID}'."
+					end
+				end
+
+				param['offset'] = offset
+				param['limit'] = limit
+				param['slice_id'] = slice_id unless slice_id == DEFAULT_SLICE_ID
+
+				url = [BASE_URL, PREFIX_URL, user_id, SUFFIX_URL].join('/') + TwicasStream.make_query_string(param)
+				#url = BASE_URL + '/' + PREFIX_URL + '/' + user_id + '/' + SUFFIX_URL + TwicasStream.make_query_string(param)
+				# => 'https://apiv2.twitcasting.tv/users/:user_id/movies?offset=0&limit=20'
+
+				@response = TwicasStream.parse(TwicasStream.get(url))
+			end
 		end
 
 		class GetCurrentLive
+			attr_reader :response
+
+			PREFIX_URL = 'users'
+
+			SUFFIX_URL = 'current_live'
+
+			def initialize user_id
+				@response = Hash.new
+
+				#url = [BASE_URL, PREFIX_URL, user_id, SUFFIX_URL].join('/')
+				url = BASE_URL + '/' + PREFIX_URL + '/' + user_id + '/' + SUFFIX_URL
+				# => 'https://apiv2.twitcasting.tv/users/:user_id/current_live'
+
+				@response = TwicasStream.parse(TwicasStream.get(url))
+			end
 		end
 	end
 end

data/lib/twicas_stream/search.rb

@@ -62,7 +62,7 @@ module TwicasStream
 				end
 
 				unless limit >= LOWER_LIMIT and limit <= UPPER_LIMIT
-					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. limitation range is #{LOWER_LIMIT} ~ #{UPPER_LIMIT}."
+					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. limit range is #{LOWER_LIMIT} ~ #{UPPER_LIMIT}."
 				end
 
 				unless LANG_LIMITATION.include?(lang)
@@ -144,7 +144,7 @@ module TwicasStream
 				param = Hash.new
 
 				unless limit >= LOWER_LIMIT and limit <= UPPER_LIMIT
-					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. limitation range is #{LOWER_LIMIT} ~ #{UPPER_LIMIT}"
+					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. limit range is #{LOWER_LIMIT} ~ #{UPPER_LIMIT}"
 				end
 
 				unless TYPE_LIMITATION.include?(type)

data/lib/twicas_stream/supporter.rb

@@ -54,11 +54,11 @@ module TwicasStream
 				param = Hash.new
 
 				if offset < LOWER_OFFSET
-					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. offset should be over than #{LOWER_OFFSET}."
+					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. offset should be over #{LOWER_OFFSET}."
 				end
 
 				unless limit >= LOWER_LIMIT and limit <= UPPER_LIMIT
-					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. limitation range is #{LOWER_LIMIT} ~ #{UPPER_LIMIT}."
+					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. limit range is #{LOWER_LIMIT} ~ #{UPPER_LIMIT}."
 				end
 
 				param['offset'] = offset
@@ -95,11 +95,11 @@ module TwicasStream
 				param = Hash.new
 
 				if offset < LOWER_OFFSET
-					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. offset should be over than #{LOWER_OFFSET}."
+					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. offset should be over #{LOWER_OFFSET}."
 				end
 
 				unless limit >= LOWER_LIMIT and limit <= UPPER_LIMIT
-					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. limitation range is #{LOWER_LIMIT} ~ #{UPPER_LIMIT}."
+					STDERR.puts "#{__FILE__}:#{__LINE__}:Warning: out of limitation. limit range is #{LOWER_LIMIT} ~ #{UPPER_LIMIT}."
 				end
 
 				unless SORT_LIMITATION.include?(sort)

data/lib/twicas_stream/version.rb

@@ -2,5 +2,5 @@
 # coding: utf-8
 
 module TwicasStream
-	VERSION = '1.2.2'
+	VERSION = '1.3.0'
 end

data/lib/twicas_stream.rb

@@ -33,32 +33,38 @@ module TwicasStream
 			header = header(result)
 
 			body.each{ |key, value|
-				# here is the plural form of TwicasStream
-				if (key != key.singularize) and is_TwicasApiObject?(key)
-					if key == 'movies'
-						array = Array.new
-						value.each{ |e|
-							tmp = Hash.new
-
-							e.each{ |child_key, child_value|
-								tmp[child_key.to_sym] = parse_deep(child_key, child_value)
-							}
-
-							array.push tmp
+				# special if statement for the key into following method
+				# * 'movies' key of 'SearchLiveMovies' method
+				# * 'movies' key of 'GetMoviesbyUser' method
+				if key == 'movies'
+					# 'SearchLiveMovies'
+					if is_TwicasApiObject?(value.first.keys.first)
+						response[key.to_sym] = value.map{ |i|
+							child_response = Hash.new
+
+							i.each{ |child_key, child_value| child_response[child_key.to_sym] = parse_deep(child_key, child_value) }
+
+							child_response
 						}
-
-						response[key.to_sym] = array
-
+					# 'GetMoviesbyUser'
 					else
 						response[key.to_sym] = value.map{ |i| parse_deep(key, i) }
-
 					end
-				# following keys is actually TwicasApiObject as 'SupporterUser', but is_TwicasApiObject?(key) = false
-				# so, we prepare special support as below
+
+				# special if statement for 'SupporterUser' as TwicasApiObject into 'SupportingList' and 'SupporterList' method, because these keys are is_TwicasApiObject?(key) = false
+				# * 'supporting' key of 'SupportingList' method
+				# * 'supporters' key of 'SupporterList' method
 				elsif key == 'supporting' or key == 'supporters'
 					response[key.to_sym] = value.map{ |i| parse_deep('SupporterUser', i) }
 
-				# here is a singular form of TwicasApiObject, also others are here
+				# plural form
+				# * 'users' key of 'SearchUsers' method
+				# * 'categories' key of 'GetCategories' method
+				# * 'comments' key of 'GetComments' method
+				elsif (key != key.singularize) and is_TwicasApiObject?(key)
+					response[key.to_sym] = value.map{ |i| parse_deep(key, i) }
+
+				# singular form, and others
 				else
 					response[key.to_sym] = parse_deep(key, value)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twicas_stream
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Yuya Sato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-15 00:00:00.000000000 Z
+date: 2018-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport