mambanation 0.1.2 → 0.1.4

data/VERSION.yml

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

data/lib/mambanation.rb

@@ -1,5 +1,4 @@
 require "forwardable"
-#require "oauth"
 require "hashie"
 require "httparty"
 require "json"
@@ -7,7 +6,6 @@ require "json"
 module MambaNation
   include HTTParty
   API_VERSION = "2".freeze
-  base_uri "api.mambanation.com/v#{API_VERSION}"
   format :json
 
   class MambaNationError < StandardError
@@ -27,9 +25,18 @@ module MambaNation
   class InformMambaNation < StandardError; end
   class NotFound          < StandardError; end
   
+  def self.api_endpoint
+    @api_endpoint ||= "api.mambanation.com/v#{API_VERSION}"
+  end
+  
+  def self.api_endpoint=(value)
+    @api_endpoint = value
+  end
+  
   private
 
   def self.perform_get(uri, options = {})
+    base_uri(self.api_endpoint)
     make_friendly(get(uri, options))
   end
 
@@ -65,10 +72,7 @@ module MambaNation
   end
 
   def self.parse(response)
-    return '' if response.body == ''
-    JSON.parse(response.body)
-  rescue
-    response.body # Text body response
+    Yajl::Parser.parse(response.body)
   end
 
   def self.mash(obj)
@@ -94,6 +98,7 @@ end
 
 module Hashie
   class Mash
+
     # Converts all of the keys to strings, optionally formatting key name
     def rubyify_keys!
       keys.each{|k|
@@ -105,6 +110,7 @@ module Hashie
       }
       self
     end
+
   end
 end
 
@@ -112,5 +118,5 @@ 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", "oauth")
 require File.join(directory, "mambanation", "request")

data/lib/mambanation/base.rb

@@ -140,8 +140,8 @@ module MambaNation
     end
     
     def publish_post(id, stream_id)
-      perform_post("/posts/#{id.to_i}/publish",:body =>{ :post => { :stream_id => stream_id } })
-    en
+      perform_post("/posts/#{id.to_i}/publish", :body =>{ :post => { :stream_id => stream_id } })
+    end
     
     #
     # Roles
@@ -151,7 +151,7 @@ module MambaNation
     end
     
     protected
-    
+
     def self.mime_type(file)
       case
         when file =~ /\.jpg/ then 'image/jpg'
@@ -160,11 +160,11 @@ module MambaNation
         else 'application/octet-stream'
       end
     end
-    
+
     def mime_type(f) self.class.mime_type(f) end
-    
+
     CRLF = "\r\n"
-    
+
     def self.build_multipart_bodies(parts)
       boundary = Time.now.to_i.to_s(16)
       body = ""
@@ -191,7 +191,7 @@ module MambaNation
     
     private
     
-    def request_options opts={}
+    def request_options(opts={})
       opts[:headers] ||= {}
       opts[:headers].merge! "FB-Cookies" => fbs_cookies
       opts

data/lib/mambanation/request.rb

@@ -29,17 +29,16 @@ module MambaNation
     def uri
       @uri ||= begin
         uri = URI.parse(path)
-        
+
         if options[:query] && options[:query] != {}
           uri.query = to_query(options[:query])
         end
-        
+
         uri.to_s
       end
     end
 
     def perform
-      puts "\nuri: #{uri}\noptions[:body]: #{options[:body]}\noptions[:headers]: #{options[:headers]}"
       MambaNation.make_friendly(send("perform_#{method}"))
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jeremy Van de Wyngaert