redflex-hydrogen-ruby 0.9.0 → 0.9.1

data/README.md

@@ -7,7 +7,7 @@ there will be a simultaneous update of this library.
 
 ## Requirements ##############################################################
 
-* HTTParty
+* Crack
 * Mash
 
 
@@ -49,10 +49,7 @@ The first step is to create a `Hydrogen::Base` object to represent your
 client.
 
 	require 'hydrogen'
-	client = Hydrogen::Base.new('redflex')
-	
-In the above example, the Hydrogen account is `redflex` (this is the same as
-*account*.hydrogenapp.com, **not** your user name).
+	client = Hydrogen::Base.new('account_name', 'username', 'password')
 
 
 ### Getting a list of topics #################################################

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+:patch: 1
 :major: 0
 :minor: 9
-:patch: 0

data/lib/hydrogen/base.rb

@@ -19,12 +19,14 @@ module Hydrogen
 		# Options: 
 		def topic(id)
 			response = perform_get("/topics/#{id}.json")
+			response['topic']
 		end
 		
 		
 		# Options:
 		def create_topic(query={})
 			response = perform_post("/topics/create.json", query)
+			response['topic']
 		end
 		
 		
@@ -44,12 +46,14 @@ module Hydrogen
 		# Options: 
 		def comment(topic_id, comment_id)
 			response = perform_get("/topics/#{topic_id}/comments/#{comment_id}.json")
+			response['comment']
 		end
 		
 		
 		# Options: comment*, reply_to
 		def create_comment(topic_id, query={})
 			response = perform_post("/topics/#{topic_id}/comments/create.json", query)
+			response['comment']
 		end
 		
 		

data/lib/hydrogen/request.rb

@@ -2,9 +2,6 @@ module Hydrogen
 	class Request
 		
 		
-		include HTTParty
-		
-		
 		def initialize(options={})
 			@options = {:mash => true}.merge(options)
 			@auth = {:username => @options[:username], :password => @options[:password]} if @options[:username]
@@ -12,14 +9,25 @@ module Hydrogen
 		
 		
 		def perform_get(path, query={})
-			response = self.class.get("#{@options[:base_uri]}#{path}", { :query => query, :basic_auth => @auth })
-			perform(response)
+			url = URI.parse("#{@options[:base_uri]}#{path}")
+			req = Net::HTTP::Get.new(url.path)
+			req.basic_auth @auth[:username], @auth[:password]
+			res = Net::HTTP.start(url.host, url.port) do |http|
+				response = http.request(req)
+				perform(response)
+			end
 		end
 		
 		
 		def perform_post(path, query={})
-			response = self.class.post("#{@options[:base_uri]}#{path}", { :query => query, :basic_auth => @auth })
-			perform(response)
+			url = URI.parse("#{@options[:base_uri]}#{path}")
+			req = Net::HTTP::Post.new(url.path)
+			req.basic_auth @auth[:username], @auth[:password]
+			req.set_form_data(query)
+			res = Net::HTTP.start(url.host, url.port) do |http|
+				response = http.request(req)
+				perform(response)
+			end
 		end
 		
 		

data/lib/hydrogen.rb

@@ -1,5 +1,7 @@
+require 'net/http'
+require 'uri'
 require 'rubygems'
-require 'httparty'
+require 'crack'
 require 'mash'
 
 

data/test/fixtures/comment.json

@@ -0,0 +1 @@
+{"comment":{"comment_id":1,"parent":0,"text":"first comment","created":"Thu, 27 Aug 2009 21:28:55 +0000","creator":"Matt Kirman"}}

data/test/fixtures/comments.json

@@ -0,0 +1 @@
+{"comments":[{"comment_id":1,"parent":0,"text":"first comment","created":"Thu, 27 Aug 2009 21:28:55 +0000","creator":"Matt Kirman"}, {"comment_id":2,"parent":1,"text":"reply to first comment","created":"Thu, 27 Aug 2009 23:28:55 +0000","creator":"Matt Kirman"}]}

data/test/fixtures/create_comment.json

@@ -0,0 +1 @@
+{"comment":{"comment_id":3,"parent":0,"text":"This is a test comment","created":"Sun, 27 Sep 2009 15:09:55 +0000","creator":"Matt Kirman"}}

data/test/fixtures/create_topic.json

@@ -0,0 +1 @@
+{"topic":{"topic_id":1,"title":"This is a test question","text":"","type":"question","product":"Hydrogen","tags":["test","question"],"status":4,"private":false,"created":"Tue, 25 Aug 2009 15:07:43 +0000","creator":"Matt Kirman","comments":1,"updated":"Thu, 27 Aug 2009 21:28:55 +0000"}}

data/test/fixtures/delete_topic.json

@@ -0,0 +1 @@
+true

data/test/fixtures/topic.json

@@ -0,0 +1 @@
+{"topic":{"topic_id":1,"title":"This is a test question","text":"","type":"question","product":"Hydrogen","tags":["test","question"],"status":4,"private":false,"created":"Tue, 25 Aug 2009 15:07:43 +0000","creator":"Matt Kirman","comments":1,"updated":"Thu, 27 Aug 2009 21:28:55 +0000"}}

data/test/fixtures/topics.json

@@ -0,0 +1 @@
+{"topics":[{"topic_id":1,"title":"This is a test question","text":"","type":"question","product":"Hydrogen","tags":["test","question"],"status":4,"private":false,"created":"Tue, 25 Aug 2009 15:07:43 +0000","creator":"Matt Kirman","comments":1,"updated":"Thu, 27 Aug 2009 21:28:55 +0000"},{"topic_id":2,"title":"And another test topic","text":"","type":"praise","product":null,"tags":[""],"status":4,"private":false,"created":"Tue, 25 Aug 2009 15:03:50 +0000","creator":"Matt Kirman","comments":0}]}

data/test/hydrogen/base_test.rb

@@ -0,0 +1,81 @@
+require 'test_helper'
+
+class BaseTest < Test::Unit::TestCase
+	context "#base" do
+		setup do
+			@hydrogen = Hydrogen::Base.new('redflex', 'username', 'password')
+		end
+		
+		
+		context "initialize" do
+			should "require a client" do
+				@hydrogen.should respond_to('topics')
+				@hydrogen.should respond_to('comments')
+			end
+		end
+		
+		
+		context "hitting the api" do
+			should "be able to get topics" do
+				stub_get('/topics.json', 'topics.json')
+				topics = @hydrogen.topics
+				topics.size.should == 2
+				first = topics.first
+				first.topic_id.should == 1
+				first.creator.should == 'Matt Kirman'
+				first.tags.is_a?(Array).should == true
+				first.tags[0].should == 'test'
+				first.private.should be(false)
+			end
+			
+			should "be able to get a single topic" do
+				stub_get('/topics/1.json', 'topic.json')
+				topic = @hydrogen.topic(1)
+				topic.creator.should == 'Matt Kirman'
+				topic.tags.is_a?(Array).should be(true)
+				topic.tags[0].should == 'test'
+				topic.private.should be(false)
+			end
+			
+			should "be able to create a topic" do
+				stub_post('/topics/create.json', 'create_topic.json')
+				topic = @hydrogen.create_topic({ :title => 'Test topic', :type => 'question' })
+				topic.creator.should == 'Matt Kirman'
+				topic.tags.is_a?(Array).should be(true)
+				topic.tags[0].should == 'test'
+				topic.private.should be(false)
+			end
+			
+			should "be able to delete a topic" do
+				stub_get('/topics/1/delete.json', 'delete_topic.json')
+				response = @hydrogen.delete_topic(1)
+				response.should be(true)
+			end
+			
+			should "be able to get topic comments" do
+				stub_get('/topics/1/comments.json', 'comments.json')
+				comments = @hydrogen.comments(1)
+				comments.size.should == 2
+				first = comments.first
+				first.comment_id.should == 1
+				first.creator.should == 'Matt Kirman'
+			end
+			
+			should "be able to get a single topic comment" do
+				stub_get('/topics/1/comments/1.json', 'comment.json')
+				comment = @hydrogen.comment(1,1)
+				comment.comment_id.should == 1
+				comment.creator.should == 'Matt Kirman'
+			end
+			
+			should "be able to create a new topic comment" do
+				stub_post('/topics/1/comments/create.json', 'create_comment.json')
+				comment = @hydrogen.create_comment(1, { :comment => 'This is a test comment' })
+				comment.comment_id.should == 3
+				comment.creator.should == 'Matt Kirman'
+				comment.text.should == 'This is a test comment'
+			end
+		end
+		
+	end
+end

data/test/test_helper.rb

@@ -0,0 +1,48 @@
+require 'test/unit'
+require 'pathname'
+require 'rubygems'
+
+gem 'thoughtbot-shoulda', '>= 2.10.1'
+gem 'jnunemaker-matchy', '>= 0.4.0'
+gem 'mocha', '>= 0.9.4'
+gem 'fakeweb', '>= 1.2.5'
+
+require 'shoulda'
+require 'matchy'
+require 'mocha'
+require 'fakeweb'
+
+FakeWeb.allow_net_connect = false
+
+dir = (Pathname(__FILE__).dirname + '../lib').expand_path
+require dir + 'hydrogen'
+
+
+class Test::Unit::TestCase
+end
+
+
+def fixture_file(filename)
+	return '' if filename == ''
+	
+	file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/' + filename)
+	File.read(file_path)
+end
+
+
+def hydrogen_url(url)
+	url =~ /^http/ ? url : "http://username:password@redflex.hydrogenapp.com:80#{url}"
+end
+
+
+def stub_get(url, filename, status=nil)
+	options = {:body => fixture_file(filename)}
+	options.merge!({:status => status}) unless status.nil?
+	
+	FakeWeb.register_uri(:get, hydrogen_url(url), options)
+end
+
+
+def stub_post(url, filename)
+	FakeWeb.register_uri(:post, hydrogen_url(url), :body => fixture_file(filename))
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: redflex-hydrogen-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Matt Kirman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 -07:00
+date: 2009-09-27 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,14 +22,23 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- History.txt
 - README.md
 - VERSION.yml
 - lib/hydrogen.rb
 - lib/hydrogen/base.rb
 - lib/hydrogen/request.rb
+- test/fixtures/comment.json
+- test/fixtures/comments.json
+- test/fixtures/create_comment.json
+- test/fixtures/create_topic.json
+- test/fixtures/delete_topic.json
+- test/fixtures/topic.json
+- test/fixtures/topics.json
+- test/hydrogen/base_test.rb
+- test/test_helper.rb
 has_rdoc: false
-homepage: http://redflex.co.uk/products/hydrogen
+homepage: http://github.com/redflex/hydrogen-ruby
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -50,9 +59,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hydrogen
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A Ruby implementation of the Hydrogen API.
-test_files: []
-
+test_files: 
+- test/hydrogen/base_test.rb
+- test/test_helper.rb