qingting_api 0.1.5 → 0.3.0

data/qingting_api.gemspec

@@ -1,16 +1,16 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'qingting_api/version'
+require 'qingting/version'
 
 Gem::Specification.new do |s|
   s.name          = "qingting_api"
-  s.version       = QingtingApi::VERSION
+  s.version       = Qingting::VERSION
   s.authors       = ["cheenwe"]
-  s.email         = ["cheenwe@gmail.com"]
+  s.email         = ["cxhyun@126.com"]
 
-  s.summary       = "Qingting Fm ruby api"
-  s.description   = "Qingting Fm ruby api"
+  s.summary       = "QingtingFM ruby api"
+  s.description   = "蜻蜓 FM Ruby API"
   s.homepage      = "https://github.com/cheenwe/qingting_api"
   s.license       = "MIT"
 
@@ -20,11 +20,11 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
 
-  s.add_dependency 'activerecord', ['>= 3.0', '< 5.0']
-  s.add_dependency 'activesupport', ['>= 3.0', '< 5.0']
+  # s.add_dependency 'activerecord', ['>= 3.0']
+  # s.add_dependency 'activesupport', ['>= 3.0']
 
   s.add_development_dependency 'bundler', ['>= 1.0.0']
   s.add_development_dependency 'rake', ['>= 0']
-  s.add_development_dependency 'rails', ['>= 3.1.0']
-  s.add_development_dependency "rspec"
+  # s.add_development_dependency 'rails', ['>= 3.1.0']
+  # s.add_development_dependency "rspec"
 end

metadata

@@ -1,55 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: qingting_api
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.3.0
 platform: ruby
 authors:
 - cheenwe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2017-01-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -78,56 +38,36 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Qingting Fm ruby api
+description: 蜻蜓 FM Ruby API
 email:
-- cheenwe@gmail.com
-executables: []
+- cxhyun@126.com
+executables:
+- console
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
 - lib/generators/qingting_api/config_generator.rb
 - lib/generators/qingting_api/templates/qingting_api_config.rb
+- lib/qingting/api/account.rb
+- lib/qingting/api/base.rb
+- lib/qingting/api/billboard.rb
+- lib/qingting/api/category.rb
+- lib/qingting/api/live.rb
+- lib/qingting/api/ondemand.rb
+- lib/qingting/api/podcaster.rb
+- lib/qingting/api/recent.rb
+- lib/qingting/config.rb
+- lib/qingting/utils/http.rb
+- lib/qingting/utils/request.rb
+- lib/qingting/version.rb
 - lib/qingting_api.rb
-- lib/qingting_api/account.rb
-- lib/qingting_api/config.rb
-- lib/qingting_api/qing_ting.rb
-- lib/qingting_api/request.rb
-- lib/qingting_api/version.rb
 - qingting_api.gemspec
 homepage: https://github.com/cheenwe/qingting_api
 licenses:
@@ -149,9 +89,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Qingting Fm ruby api
+summary: QingtingFM ruby api
 test_files: []
-has_rdoc: 

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.0.0
-
-script:
-  - bundle exec rspec spec

data/lib/qingting_api/account.rb

@@ -1,38 +0,0 @@
-# encoding: utf-8
-require 'net/http'
-require 'active_support/json'
-
-module QingtingApi
-  # Module that handle user information
-  #
-  module Account
-    module_function
-
-    # 获取账户 token
-    #
-    def access_token
-      post 'access', grant_type: "client_credentials", client_id: QingtingApi.config.client_id, client_secret:QingtingApi.config.client_secret
-    end
-
-
-    def post(api, options = {})
-      uri = URI.join(QingtingApi.config.base_url, api)
-      res = Net::HTTP.post_form(uri, options)
-      result res.body
-    end
-
-
-    def result(body)
-      begin
-       resule =  ActiveSupport::JSON.decode body
-       resule['access_token']
-      rescue => e
-        {
-          code: 502,
-          msg: '内容解析错误',
-          detail: e.to_s
-        }
-      end
-    end
-  end
-end

data/lib/qingting_api/config.rb

@@ -1,44 +0,0 @@
-# encoding: utf-8
-require 'active_support/configurable'
-require 'active_support/core_ext'
-
-module QingtingApi
-
-  # curl  -X POST "http://api.open.qingting.fm/access?&grant_type=client_credentials" -d "client_id=ZTk4MzAwMzAtYWFiOC0xMWU0LTkyM2YtMDAxNjNlMDAyMGFk&client_secret=OTdiNmI0MWEtYzhiZC0zYWE1LWExZmEtMDU0OWZhNTljZmRk"
-
-  # client_id和client_secret，用以后续获取access_token
-  def self.configure(&block)
-    yield @config ||= QingtingApi::Configuration.new
-  end
-
-  # Global settings for QingtingApi
-  def self.config
-    @config
-  end
-
-  # Configuration class
-  #
-  class Configuration #:nodoc:
-    include ActiveSupport::Configurable
-    # client_id和client_secret，用以后续获取access_token
-    config_accessor :base_url                     # api url
-    config_accessor :client_id                     # 授权 API client_id
-    config_accessor :client_secret                     # 授权 API client_secret
-    config_accessor :api_version                 # API 的版本,目前有v6
-    config_accessor :page_num                    # 获取信息时, 指定默认的页数
-    config_accessor :page_size                   # 获取信息时, 一页包含信息数量
-    config_accessor :company                     # 默认公司名称
-    config_accessor :expires_in                  # 过期时间。当access_token过期时，API会返回token_expired错误。这时需要重新申请access token
-  end
-
-  configure do |config|
-    config.base_url                     = "http://api.open.qingting.fm"
-    config.client_id                     = "ZTk4MzAwMzAtYWFiOC0xMWU0LTkyM2YtMDAxNjNlMDAyMGFk"
-    config.client_secret                     = "OTdiNmI0MWEtYzhiZC0zYWE1LWExZmEtMDU0OWZhNTljZmRk"
-    config.api_version                 = :v6
-    config.page_num                    = 1
-    config.page_size                   = 30
-    config.company                     = 'Cheenwe'
-    config.expires_in                  = 7200.second
-  end
-end

data/lib/qingting_api/qing_ting.rb

@@ -1,70 +0,0 @@
-module QingtingApi
-	# Message service: methods that are used to manage messages
-	module QingTing
-
-		def self.included(base)
-			base.send :extend, ClassMethods
-		end
-
-		# Class methods
-		module ClassMethods
-
-			def find_by_cid(cmode, cid)
-				Request.get "#{cmode}", cid: cid
-			end
-
-			def method_missing(name, *args)
-				if name != /^get_(.*)/
-					Request.get  "/#{QingtingApi.config.api_version}/media/#{name}?access_token=#{token}"
-				else
-					{
-						code: 404,
-						msg: 'NOT FIND'
-					}
-				end
-			end
-
-			def get(name)
-				Request.get  "/#{QingtingApi.config.api_version}/media/#{name}?access_token=#{token}"
-			end
-
-			def get_id(name, id)
-				Request.get  "/#{QingtingApi.config.api_version}/media/#{name}/#{id}?access_token=#{token}"
-			end
-
-			def catrgory_channel(category_id, curpage, page_size={})
-				if page_size.present?
-				Request.get  "/#{QingtingApi.config.api_version}/media/categories/#{category_id}/channels/order/0/curpage/#{curpage}/pagesize/#{page_size}?access_token=#{token}"
-				else
-				Request.get  "/#{QingtingApi.config.api_version}/media/categories/#{category_id}/channels/order/0/curpage/#{curpage}/pagesize/#{QingtingApi.config.page_size}?access_token=#{token}"
-				end
-			end
-
-			def ondemand_channel(category_id, curpage, page_size={})
-				if page_size.present?
-					Request.get  "/#{QingtingApi.config.api_version}/media/channelondemands/#{category_id}/programs/curpage/#{curpage}/pagesize/#{page_size}?access_token=#{token}"
-				else
-					Request.get  "/#{QingtingApi.config.api_version}/media/channelondemands/#{category_id}/programs/curpage/#{curpage}/pagesize/#{QingtingApi.config.page_size}?access_token=#{token}"
-				end
-			end
-
-			def live_channel(channel_id, day)
-				Request.get  "/#{QingtingApi.config.api_version}/media/channellives/#{channel_id}/programs/day/#{day}?access_token=#{token}"
-			end
-
-			def search(keyword, type={})
-				if type.present?
-					Request.get  "/search/#{CGI.escape(keyword)}/type/#{type}?access_token=#{token}"
-				else
-					Request.get  "/search/#{CGI.escape(keyword)}/type/all?access_token=#{token}"
-				end
-			end
-
-			def token
-				QingtingApi::Account.access_token
-			end
-
-		end
-
-	end
-end

data/lib/qingting_api/request.rb

@@ -1,52 +0,0 @@
-# encoding: utf-8
-require 'net/http'
-require 'active_support/json'
-
-module QingtingApi
-  # Module that manage requests
-  module Request
-    # Method that use `Net::HTTP.post_form` to perform `POST` action
-    #
-    def post(api, options = {})
-      uri = URI.join(base_url, api)
-      res = Net::HTTP.post_form(uri, options)
-      result res.body
-    end
-
-    # Method that use `Net::HTTP.get` to perform `GET` action
-    #
-    def get(api, options = {})
-      url = URI.join(base_url, api)
-      result Net::HTTP.get(url)
-
-      # uri = URI('http://example.com/index.html')
-      # params = { :limit => 10, :page => 3 }
-      # uri.query = URI.encode_www_form(params)
-
-      # res = Net::HTTP.get_response(uri)
-    end
-
-    private
-
-    # Method that parse JSON to Hash
-    #
-    def result(body)
-      begin
-        ActiveSupport::JSON.decode body
-      rescue => e
-        {
-          code: 502,
-          msg: '内容解析错误',
-          detail: e.to_s
-        }
-      end
-    end
-
-    # Base uri for Qingting API
-    def base_url
-      "#{QingtingApi.config.base_url}"
-    end
-
-    module_function :post, :get, :result, :base_url
-  end
-end

data/lib/qingting_api/version.rb

@@ -1,3 +0,0 @@
-module QingtingApi
-  VERSION = "0.1.5"
-end