lib/twitterland.rb in twitterland-0.4.5 vs lib/twitterland.rb in twitterland-0.4.6

@@ -1,14 +1,12 @@
 require 'forwardable'
 require 'rubygems'
-
-gem 'mash', '0.0.3'
-require 'mash'
-
-gem 'httparty', '>= 0.4.5'
+require 'hashie'
 require 'httparty'
 
+Hash.send :include, Hashie::HashExtensions
+
 module Twitterland
   class TwitterError < StandardError
     attr_reader :data
     
     def initialize(data)
@@ -32,19 +30,20 @@
   
     # Takes any URL posted to Twitter and resolves it to its original URL as well as details about that webpage, such as the title.
     # 
     #   Twitterland::TweetMeme.url_info('http://squeejee.com')
     def self.url_info(url)
-      Mash.new get("/url_info.json", :query => {:url => url})
+      Hashie::Mash.new get("/url_info.json", :query => {:url => url})
     end
     
   end
   
 end
 
 directory = File.expand_path(File.dirname(__FILE__))
 
+require File.join(directory, 'twitterland', 'cadmus')
 require File.join(directory, 'twitterland', 'zutual')
 require File.join(directory, 'twitterland', 'autoff')
 require File.join(directory, 'twitterland', 'foller_me')
 require File.join(directory, 'twitterland', 'follow_cost')
 require File.join(directory, 'twitterland', 'twitter_counter')
@@ -54,6 +53,7 @@
 require File.join(directory, 'twitterland', 'tweet_blocker')
 require File.join(directory, 'twitterland', 'back_tweets')
 require File.join(directory, 'twitterland', 'thumbfight')
 require File.join(directory, 'twitterland', 'tweet_meme', 'stories')
 require File.join(directory, 'twitterland', 'tweet_meme', 'comments')
-require File.join(directory, 'twitterland', 'tweet_meme', 'analytics')
+require File.join(directory, 'twitterland', 'tweet_meme', 'analytics')
+require File.join(directory, 'twitterland', 'one40_proof')
\ No newline at end of file