tida_sina_weibo 0.0.9 → 0.0.11

data/Gemfile

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in tida_sina_weibo.gemspec
-gemspec
-
-gem "rails", "~> 3.2.8"
+gemspec

data/lib/tida_sina_weibo/api_wrapper.rb

@@ -2,73 +2,72 @@ require "rest-client"
 require 'tida_sina_weibo/api_settings'
 
 module TidaSinaWeibo
-
   class ApiWrapper
-
     attr_reader :access_token
-    attr_reader :request_data
     attr_reader :rest_client
+    attr_reader :api_settings
     
-    def initialize(token, rc = nil)
+    def initialize(api, token, rc = nil)
       rc = RestClientWrapper.new if rc.nil?
       @rest_client = rc
       @access_token = token
+      @api_settings = api
     end
     
     def status_update(content)
-      post_request(ApiSettings.api.status.update, :status => content)
+      post_request(api_settings.status.update, :status => content)
     end
     
     def status_upload(content, image_path)
-      post_request(ApiSettings.api.status.upload, :status => content, :pic => File.new(image_path, 'rb'))
+      post_request(api_settings.status.upload, :status => content, :pic => File.new(image_path, 'rb'))
     end
     
     def status_user_timeline(uid, page = 1, count = 100)
-      get_request(ApiSettings.api.status.user_timeline, :params => {:uid => uid, :page => page, :count => count})
+      get_request(api_settings.status.user_timeline, :params => {:uid => uid, :page => page, :count => count})
     end
     
     def status_repost_timeline(post_id, page = 1)
-      get_request(ApiSettings.api.status.repost_timeline, :params => {:id => post_id, :page => page, :count => 50})
+      get_request(api_settings.status.repost_timeline, :params => {:id => post_id, :page => page, :count => 50})
     end
 
     def comments_show(post_id, page = 1)
-      get_request(ApiSettings.api.comments.show, :params => {:id => post_id, :page => page, :count => 50})
+      get_request(api_settings.comments.show, :params => {:id => post_id, :page => page, :count => 50})
     end
     
     def status_show(wb_post_id)
-      get_request(ApiSettings.api.status.show, :params => {:id => wb_post_id})
+      get_request(api_settings.status.show, :params => {:id => wb_post_id})
     end
     
     def user_show(uid, is_number_id = true)
       if is_number_id
-        get_request(ApiSettings.api.user.show, {:params => {:uid => uid}})
+        get_request(api_settings.user.show, {:params => {:uid => uid}})
       else
-        get_request(ApiSettings.api.user.show, {:params => {:screen_name => uid}})
+        get_request(api_settings.user.show, {:params => {:screen_name => uid}})
       end
     end
 
     def user_domain_show(domain)
-      get_request(ApiSettings.api.user.domain_show, :params => {:domain => domain})
+      get_request(api_settings.user.domain_show, :params => {:domain => domain})
     end
 
     def friendships_followers(uid, cursor)
-      get_request(ApiSettings.api.friendships.followers, :params => {:uid => uid, :cursor => cursor})
+      get_request(api_settings.friendships.followers, :params => {:uid => uid, :cursor => cursor})
     end
 
     def friendships_followers_ids(uid, cursor)
-      get_request(ApiSettings.api.friendships.followers_ids, :params => {:uid => uid, :cursor => cursor})
+      get_request(api_settings.friendships.followers_ids, :params => {:uid => uid, :cursor => cursor})
     end
     
     def tags(uid)
-      get_request(ApiSettings.api.tags, :params => {:uid => uid})
+      get_request(api_settings.tags, :params => {:uid => uid})
     end
     
     def queryid(mid)
-      get_request(ApiSettings.api.status.queryid, {:params => {:mid => mid, :type => 1, :isBase62 => 1}})
+      get_request(api_settings.status.queryid, {:params => {:mid => mid, :type => 1, :isBase62 => 1}})
     end
 
     def querymid(id, batch = false)
-      get_request(ApiSettings.api.status.querymid, {:params => {:id => id, :type => 1, :is_batch => batch ? 1 : 0}})
+      get_request(api_settings.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.9"
+  VERSION = "0.0.11"
 end

data/tida_sina_weibo.gemspec

@@ -18,7 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "rspec", "~> 2.6"
-
-  gem.add_dependency "settingslogic"
   gem.add_dependency "rest-client"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tida_sina_weibo
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: settingslogic
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +62,6 @@ 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/auto_token_switch_api_wrapper.rb
 - lib/tida_sina_weibo/exceptions.rb

data/lib/tida_sina_weibo/api_settings.rb

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