mambanation 0.1.5 → 0.1.6

data/Rakefile

@@ -1,13 +1,12 @@
 require "rake"
 require "jeweler"
-require "yaml"
 
 Jeweler::Tasks.new do |gem|
   gem.name          = "mambanation"
   gem.summary       = %Q{wrapper for mambanation-api}
   gem.email         = ["jeremy.vandewyngaert@mimesis-republic.com", "sbellity@gmail.com"]
   gem.homepage      = "https://github.com/mimesis/mambanation-wrapper"
-  gem.authors       = ["Jeremy Van de Wyngaert"]
+  gem.authors       = ["Jeremy Van de Wyngaert", "Stéphane Bellity"]
   gem.files         = FileList["[A-Z]*", "{lib,test}/**/*"]
 
   gem.add_dependency("hashie", "~> 0.2.0")

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 1
-:patch: 5
+:patch: 6
 :build: 
 :major: 0

data/lib/mambanation/base.rb

@@ -37,7 +37,7 @@ module MambaNation
     alias_method :user_by_id, :user
     
     def user_set_websession(id, credentials)
-      perform_post("/users/#{id.to_i}/update_websession", :body => { :user_credentials => credentials })
+      perform_post("/users/#{id.to_i}/update_websession", :query => { :user_credentials => credentials })
     end
     
     #
@@ -135,12 +135,12 @@ module MambaNation
       perform_post("/posts/create", :body => { :post => post })
     end
     
-    def post(id)
+    def posts(id)
       perform_get("/posts/#{id.to_i}.json")
     end
     
     def publish_post(id, stream_id)
-      perform_post("/posts/#{id.to_i}/publish", :body =>{ :post => { :stream_id => stream_id } })
+      perform_post("/posts/#{id.to_i}/publish.json", :body => { :post => { :stream_id => stream_id } })
     end
     
     #
@@ -193,7 +193,7 @@ module MambaNation
     
     def request_options(opts={})
       opts[:headers] ||= {}
-      opts[:headers].merge! "FB-Cookies" => fbs_cookies
+      opts[:headers].merge! "FB-Cookies" => fbs_cookies if fbs_cookies
       opts
     end
     

data/lib/mambanation/httpauth.rb

@@ -7,18 +7,19 @@ module MambaNation
     attr_reader :username, :password, :options
 
     def initialize(username, password, options={})
+      
       @username, @password = username, password
       @options = { :ssl => false, :timeout => 100 }.merge(options)
       options[:api_endpoint] ||= "api.mambanation.com"
 
       if options[:api_version] == false
-        version_path = "v2"
+        version_path = "2"
       else
         options[:api_version] ||= API_VERSION
-        version_path = "v#{options[:api_version]}"
+        version_path = "#{options[:api_version]}"
       end
 
-      self.class.base_uri "http#{'s' if options[:ssl]}://#{options[:api_endpoint]}/#{version_path}"
+      self.class.base_uri "http#{'s' if options[:ssl]}://#{options[:api_endpoint]}/v#{version_path}"
       self.class.default_timeout options[:timeout] if options[:timeout]
     end
 

data/lib/mambanation.rb

@@ -1,33 +1,32 @@
 require "forwardable"
 require "hashie"
 require "httparty"
-require "json"
 require "yajl"
 
 module MambaNation
   include HTTParty
   API_VERSION = "2".freeze
   format :json
-
+  
   class MambaNationError < StandardError
     attr_reader :data
-
+    
     def initialize(data)
       @data = data
       super
     end
   end
-
+  
   class RateLimitExceeded < MambaNationError; end
   class Unauthorized      < MambaNationError; end
   class General           < MambaNationError; end
-
+  
   class Unavailable       < StandardError; end
   class InformMambaNation < StandardError; end
   class NotFound          < StandardError; end
   
   def self.api_endpoint
-    @api_endpoint ||= "api.mambanation.com/v#{API_VERSION}"
+    @api_endpoint ||= "api.mambanation.com"
   end
   
   def self.api_endpoint=(value)
@@ -35,12 +34,12 @@ module MambaNation
   end
   
   private
-
+  
   def self.perform_get(uri, options = {})
     base_uri(self.api_endpoint)
     make_friendly(get(uri, options))
   end
-
+  
   def self.make_friendly(response)
     raise_errors(response)
     data = parse(response)
@@ -51,7 +50,7 @@ module MambaNation
       mash(data)
     end
   end
-
+  
   def self.raise_errors(response)
     case response.code.to_i
       when 400
@@ -119,5 +118,4 @@ directory = File.expand_path(File.dirname(__FILE__))
 
 require File.join(directory, "mambanation", "base")
 require File.join(directory, "mambanation", "httpauth")
-#require File.join(directory, "mambanation", "oauth")
 require File.join(directory, "mambanation", "request")

metadata

@@ -5,16 +5,17 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Jeremy Van de Wyngaert
+- "St\xC3\xA9phane Bellity"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 +02:00
+date: 2010-08-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -148,7 +149,6 @@ files:
 - lib/mambanation.rb
 - lib/mambanation/base.rb
 - lib/mambanation/httpauth.rb
-- lib/mambanation/oauth.rb
 - lib/mambanation/request.rb
 - test/fixtures/actions.json
 - test/fixtures/badges.json

data/lib/mambanation/oauth.rb

@@ -1,64 +0,0 @@
-module MambaNation
-  class OAuth
-    extend Forwardable
-
-    def_delegators :access_token, :get, :post, :put, :delete
-
-    attr_reader :ctoken, :csecret, :consumer_options, :api_endpoint, :signing_endpoint
-
-    # Options
-    #   :sign_in => true to just sign in with twitter instead of doing oauth authorization
-    #               (http://apiwiki.twitter.com/Sign-in-with-Twitter)
-    def initialize(ctoken, csecret, options={})
-      @ctoken, @csecret, @consumer_options = ctoken, csecret, {}
-      @api_endpoint = options[:api_endpoint] || 'http://api.twitter.com'
-      @signing_endpoint = options[:signing_endpoint] || 'http://api.twitter.com'
-      if options[:sign_in]
-        @consumer_options[:authorize_path] =  '/oauth/authenticate'
-      end
-    end
-
-    def consumer
-      @consumer ||= ::OAuth::Consumer.new(@ctoken, @csecret, {:site => api_endpoint}.merge(consumer_options))
-    end
-
-    def signing_consumer
-      @signing_consumer ||= ::OAuth::Consumer.new(@ctoken, @csecret, {:site => signing_endpoint, :request_endpoint => api_endpoint }.merge(consumer_options))
-    end
-
-    def set_callback_url(url)
-      clear_request_token
-      request_token(:oauth_callback => url)
-    end
-
-    # Note: If using oauth with a web app, be sure to provide :oauth_callback.
-    # Options:
-    #   :oauth_callback => String, url that twitter should redirect to
-    def request_token(options={})
-      @request_token ||= signing_consumer.get_request_token(options)
-    end
-
-    # For web apps use params[:oauth_verifier], for desktop apps,
-    # use the verifier is the pin that twitter gives users.
-    def authorize_from_request(rtoken, rsecret, verifier_or_pin)
-      request_token = ::OAuth::RequestToken.new(signing_consumer, rtoken, rsecret)
-      access_token = request_token.get_access_token(:oauth_verifier => verifier_or_pin)
-      @atoken, @asecret = access_token.token, access_token.secret
-    end
-
-    def access_token
-      @access_token ||= ::OAuth::AccessToken.new(signing_consumer, @atoken, @asecret)
-    end
-
-    def authorize_from_access(atoken, asecret)
-      @atoken, @asecret = atoken, asecret
-    end
-
-    private
-
-    def clear_request_token
-      @request_token = nil
-    end
-
-  end
-end