tida_sina_weibo 0.0.6 → 0.0.7

data/lib/generators/tida_sina_weibo/install_generator.rb

@@ -3,9 +3,6 @@ module TidaSinaWeibo
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path("../../templates", __FILE__)
 
-      desc "Creates a Devise initializer and copy locale files to your application."
-      class_option :orm
-
       def copy_settings
         copy_file "../../../config/tida_sina_weibo.yml", "config/tida_sina_weibo.yml"
       end

data/lib/tida_sina_weibo/api_settings.rb

@@ -0,0 +1,9 @@
+require 'settingslogic'
+require 'rails'
+
+module TidaSinaWeibo
+  class ApiSettings < ::Settingslogic
+    source "#{Rails.root}/config/tida_sina_weibo.yml"
+    namespace Rails.env
+  end
+end

data/lib/tida_sina_weibo/api_wrapper.rb

@@ -1,29 +1,8 @@
 require "rest-client"
+require 'tida_sina_weibo/api_settings'
 
 module TidaSinaWeibo
 
-  API = {}
-  API[:status]                        = {}
-  API[:status][:update]               = 'https://api.weibo.com/2/statuses/update.json'
-  API[:status][:upload]               = 'https://upload.api.weibo.com/2/statuses/upload.json'
-  API[:status][:user_timeline]        = 'https://api.weibo.com/2/statuses/user_timeline.json'
-  API[:status][:user_timeline_ids]    = 'https://api.weibo.com/2/statuses/user_timeline/ids.json'
-  API[:status][:show]                 = 'https://api.weibo.com/2/statuses/show.json'
-  API[:status][:repost_timeline]      = 'https://api.weibo.com/2/statuses/repost_timeline.json'
-  API[:status][:repost_timeline_ids]  = 'https://api.weibo.com/2/statuses/repost_timeline/ids.json'
-  API[:status][:queryid]              = 'https://api.weibo.com/2/statuses/queryid.json'
-  API[:status][:querymid]             = 'https://api.weibo.com/2/statuses/querymid.json'
-  API[:comments]                      = {}
-  API[:comments][:show]               = 'https://api.weibo.com/2/comments/show.json'
-  API[:user]                          = {}
-  API[:user][:show]                   = 'https://api.weibo.com/2/users/show.json'
-  API[:user][:domain_show]            = 'https://api.weibo.com/2/users/domain_show.json'
-  API[:tags]                          = 'https://api.weibo.com/2/tags.json'
-  API[:friendships]                   = {}
-  API[:friendships][:followers]       = 'https://api.weibo.com/2/friendships/followers.json'
-  API[:friendships][:followers_ids]   = 'https://api.weibo.com/2/friendships/followers/ids.json'
-  API[:friendships][:show]            = 'https://api.weibo.com/2/friendships/show.json'
-
   class ApiWrapper
 
     attr_reader :access_token
@@ -31,66 +10,67 @@ module TidaSinaWeibo
     attr_reader :token_provider
     attr_reader :rest_client
     
-    def initialize(rest_client, tp)
-      @rest_client = rest_client
+    def initialize(tp, rc = nil)
+      rc = RestClientWrapper.new if rc.nil?
+      @rest_client = rc
       @token_provider = tp
       @access_token = tp.token
     end
     
     def status_update(content)
-      post_request(API[:status][:update], :status => content)
+      post_request(ApiSettings.weibo.api.status.update, :status => content)
     end
     
     def status_upload(content, image_path)
-      post_request(API[:status][:upload], :status => content, :pic => File.new(image_path, 'rb'))
+      post_request(ApiSettings.weibo.api.status.upload, :status => content, :pic => File.new(image_path, 'rb'))
     end
     
     def status_user_timeline(uid, page = 1, count = 100)
-      get_request(API[:status][:user_timeline], :params => {:uid => uid, :page => page, :count => count})
+      get_request(ApiSettings.weibo.api.status.user_timeline, :params => {:uid => uid, :page => page, :count => count})
     end
     
     def status_repost_timeline(post_id, page = 1)
-      get_request(API[:status][:repost_timeline], :params => {:id => post_id, :page => page, :count => 50})
+      get_request(ApiSettings.weibo.api.status.repost_timeline, :params => {:id => post_id, :page => page, :count => 50})
     end
 
     def comments_show(post_id, page = 1)
-      get_request(API[:comments][:show], :params => {:id => post_id, :page => page, :count => 50})
+      get_request(ApiSettings.weibo.api.comments.show, :params => {:id => post_id, :page => page, :count => 50})
     end
     
     def status_show(wb_post_id)
-      get_request(API[:status][:show], :params => {:id => wb_post_id})
+      get_request(ApiSettings.weibo.api.status.show, :params => {:id => wb_post_id})
     end
     
     def user_show(uid, is_number_id = true)
       if is_number_id
-        get_request(API[:user][:show], {:params => {:uid => uid}})
+        get_request(ApiSettings.weibo.api.user.show, {:params => {:uid => uid}})
       else
-        get_request(API[:user][:show], {:params => {:screen_name => uid}})
+        get_request(ApiSettings.weibo.api.user.show, {:params => {:screen_name => uid}})
       end
     end
 
     def user_domain_show(domain)
-      get_request(API[:user][:domain_show], :params => {:domain => domain})
+      get_request(ApiSettings.weibo.api.user.domain_show, :params => {:domain => domain})
     end
 
     def friendships_followers(uid, cursor)
-      get_request(API[:friendships][:followers], :params => {:uid => uid, :cursor => cursor})
+      get_request(ApiSettings.weibo.api.friendships.followers, :params => {:uid => uid, :cursor => cursor})
     end
 
     def friendships_followers_ids(uid, cursor)
-      get_request(API[:friendships][:followers_ids], :params => {:uid => uid, :cursor => cursor})
+      get_request(ApiSettings.weibo.api.friendships.followers_ids, :params => {:uid => uid, :cursor => cursor})
     end
     
     def tags(uid)
-      get_request(API[:tags], :params => {:uid => uid})
+      get_request(ApiSettings.weibo.api.tags, :params => {:uid => uid})
     end
     
     def queryid(mid)
-      get_request(API[:status][:queryid], {:params => {:mid => mid, :type => 1, :isBase62 => 1}})
+      get_request(ApiSettings.weibo.api.status.queryid, {:params => {:mid => mid, :type => 1, :isBase62 => 1}})
     end
 
     def querymid(id, batch = false)
-      get_request(API[:status][:querymid], {:params => {:id => id, :type => 1, :is_batch => batch ? 1 : 0}})
+      get_request(ApiSettings.weibo.api.status.querymid, {:params => {:id => id, :type => 1, :is_batch => batch ? 1 : 0}})
     end
 
     def querymids(ids)

data/lib/tida_sina_weibo/version.rb

@@ -1,3 +1,3 @@
 module TidaSinaWeibo
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/api_wrapper_spec.rb

@@ -2,7 +2,7 @@ require 'tida_sina_weibo'
 
 describe TidaSinaWeibo::ApiWrapper do
   it 'get setting property' do
-    TidaSinaWeibo::API[:status][:update].should eql('https://api.weibo.com/2/statuses/update.json')
+    # ApiSettings.should eql('https://api.weibo.com/2/statuses/update.json')
   end
 
   it 'get request success' do
@@ -12,7 +12,7 @@ describe TidaSinaWeibo::ApiWrapper do
     token_provider = double('token_provider')
     token_provider.stub(:token) { 'token'}
 
-    target = TidaSinaWeibo::ApiWrapper.new request_wrapper, token_provider
+    target = TidaSinaWeibo::ApiWrapper.new token_provider, request_wrapper
     result = target.status_show '1'
     result.should eql({'result' =>'ok'})
   end
@@ -30,7 +30,7 @@ describe TidaSinaWeibo::ApiWrapper do
     token_provider.stub(:change)
     token_provider.stub(:token) { nil }
 
-    target = TidaSinaWeibo::ApiWrapper.new request_wrapper, token_provider
+    target = TidaSinaWeibo::ApiWrapper.new token_provider, request_wrapper
     begin
       result = target.status_show '1'
       raise 'Expect exception raise'
@@ -51,7 +51,7 @@ describe TidaSinaWeibo::ApiWrapper do
     token_provider.stub(:change)
     token_provider.stub(:token) { nil }
 
-    target = TidaSinaWeibo::ApiWrapper.new request_wrapper, token_provider
+    target = TidaSinaWeibo::ApiWrapper.new token_provider, request_wrapper
     begin
       result = target.status_show '1'
       raise 'Expect exception raise'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tida_sina_weibo
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -78,6 +78,7 @@ files:
 - lib/generators/tida_sina_weibo/.DS_Store
 - lib/generators/tida_sina_weibo/install_generator.rb
 - lib/tida_sina_weibo.rb
+- lib/tida_sina_weibo/api_settings.rb
 - lib/tida_sina_weibo/api_wrapper.rb
 - lib/tida_sina_weibo/exceptions.rb
 - lib/tida_sina_weibo/rest_client_wrapper.rb