auto_tagging 1.0.1 → 1.1.1

data/README.rdoc

@@ -35,9 +35,9 @@ Specify one or many services you want to use, for example:
 or
   AutoTagging.services = [{:open_calais => "open_calais_api_key}]
 or
-  AutoTagging.services = ["yahoo"]
+  AutoTagging.services = [:yahoo]
 or
-  AutoTagging.services = ["delicious"]
+  AutoTagging.services = [{:delicious => {"delicious_username" => "delicious_password"}}]
 or
   AutoTagging.services = [{:open_calais => "open_calais_api_key}, {:alchemy => "alchemy_api_key"}, "yahoo"]
 

data/lib/auto_tagging/config.rb

@@ -27,13 +27,24 @@ module AutoTagging
     def add_service(service)
       klass = const(service)
       klass.api_key = api_key(service) if klass.respond_to?("api_key=")
+      klass.credentials = credentials(service) if klass.respond_to?("credentials=")
       ( self.mains ||= [] ) << klass.new
     end
 
+    #{:alchemy => "api-key"}
     def api_key(service)
       service.values[0].to_s if service.instance_of? Hash
     end
 
+    #{:delicious => {"username" => "password"}}
+    def credentials(service)      
+      if service.instance_of?(Hash) && service.values[0].instance_of?(Hash)
+        service.values[0]
+      else
+        raise AutoTagging::Errors::InvalidCredentialsError
+      end
+    end
+
     def service_name(service)
       ( service.instance_of?(Hash) ? service.keys[0] : service ).to_s
     end

data/lib/auto_tagging/delicious.rb

@@ -3,13 +3,19 @@ require 'auto_tagging/search_param'
 require 'rexml/document'
 
 module AutoTagging
-	class Delicious
-		USERNAME = 'auto_tagging_gem'
-		PASSWORD = 'notsecure'
-		
+	class Delicious		
 		API_HOST = 'api.del.icio.us'
 		API_PAGE = '/v1/posts/suggest'
 
+		class << self
+			attr_accessor :username, :password
+
+			def credentials=(credentials)
+				self.username = credentials.keys[0]
+				self.password = credentials.values[0]
+			end
+		end		
+
 		def get_tags(opts)			
 			AutoTagging::SearchParam.url_search?(opts) ? api_request(url(opts)) : []
 		end
@@ -21,7 +27,7 @@ module AutoTagging
 
 		  prepared_http.start do |http|
 		    req = Net::HTTP::Get.new(api_request_url(url), user_agent)
-		    req.basic_auth(USERNAME, PASSWORD)
+		    req.basic_auth(self.class.username, self.class.password)
 		    parse_response(http.request(req))
 		  end
 		rescue SocketError => e
@@ -43,10 +49,16 @@ module AutoTagging
 			{"User-Agent" => "auto_tagging ruby gem"}	
 		end
 
-		def parse_response(response)						
-		  REXML::Document.new(response.body).root.elements.map { |e| e.attributes['tag'] }
-		rescue
-		  []
+		def parse_response(response)		
+			if response.code == "401"							
+				raise AutoTagging::Errors::InvalidCredentialsError
+			else
+				begin
+					REXML::Document.new(response.body).root.elements.map { |e| e.attributes['tag'] }
+				rescue
+					[]	
+				end	
+			end
 		end
 
 		def wait_for_next_valid_request
@@ -57,22 +69,4 @@ module AutoTagging
 			"#{URI.encode(AutoTagging::SearchParam.to_valid_url(opts[:url]))}"			
 		end
 	end
-end
-
-#ssl certificate ( Chung chi ssl ) was created uniquely for each website
-#steps
-#browser request server for ssl certificate
-#server send back its ssl certificate
-#browser then verify for the validity of certificate by sending this certificate to GLobalSign or Verisign
-#browser then send back digital number to encode and decode
-
-
-#another steps
-#browser make request to a secure url (https)
-#web server sends its public key with its certificate
-#browser then check for its validity (issued by a trusted party, still valid, related to site contacted)
-#browser then use public key to encrypt a random symmetric encryption key and sends it to the server
-#The web server decrypts the symmetric encryption key using its private key and uses the symmetric key to decrypt the URL and http data.
-
-#public key => send out to everybody , let them encrypt some data with this public key and send back the encrypted data
-#private key => use to decrypt the encrypted data which is encrypted by the sent out public key
+end

data/lib/auto_tagging/error.rb

@@ -23,5 +23,11 @@ module AutoTagging
         super(msg)
       end
     end
+
+    class InvalidCredentialsError < StandardError
+      def initialize(msg = "Delicious service is configured without credentials")
+        super(msg)
+      end
+    end
   end
 end

data/lib/auto_tagging/version.rb

@@ -1,3 +1,3 @@
 module AutoTagging
-  VERSION = "1.0.1"
+  VERSION = "1.1.1"
 end

data/spec/lib/auto_tagging/delicious_spec.rb

@@ -2,30 +2,44 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe "AutoTagging::Delicious" do
 	let(:main) { AutoTagging::Delicious.new }
+	
+	context "invalid credentials" do
+		let(:url) { "www.facebook.com" }
 
-	context "valid options" do
-		context "with valid url" do
-			let(:url) { "www.facebook.com" }
+		it "should raise AutoTagging::Errors::InvalidCredentialsError" do
+			expect{main.get_tags(url: url)}.to raise_error AutoTagging::Errors::InvalidCredentialsError
+		end
+	end
+
+	context "valid credentials" do
+		let(:valid_credentials) { {"auto_tagging_gem" => "notsecure"} }
 
-			it "should return an array" do
-				main.get_tags(url: url).should_not be_empty
+		before(:each) { AutoTagging::Delicious.credentials = valid_credentials }
+
+		context "valid options" do
+			context "with valid url" do
+				let(:url) { "www.facebook.com" }
+
+				it "should return an array" do
+					main.get_tags(url: url).should_not be_empty
+				end
 			end
-		end
 
-		context "with invalid url" do
-			let(:url) { "www.amustbeinvalidwebsitebb.com"}
+			context "with invalid url" do
+				let(:url) { "www.amustbeinvalidwebsitebb.com"}
 
-			it "should return an empty array" do
-				main.get_tags(url: url).should be_empty
+				it "should return an empty array" do
+					main.get_tags(url: url).should be_empty
+				end
 			end
 		end
-	end
 
-	context "invalid options" do
-		let(:opt) { "an invalid opt" }
+		context "invalid options" do
+			let(:opt) { "an invalid opt" }
 
-		it "should return an empty array" do
-			main.get_tags(opt).should be_empty	
+			it "should return an empty array" do
+				main.get_tags(opt).should be_empty	
+			end
 		end
-	end
+	end	
 end

data/spec/lib/auto_tagging_spec.rb

@@ -48,6 +48,61 @@ describe "AutoTagging" do
         AutoTagging.send(:add_service,service)
       end.to change(AutoTagging.mains,:size).by(1)
     end
+
+    it "should not invoke api_key" do
+      AutoTagging.should_not_receive(:api_key).with(service)
+      AutoTagging.send(:add_service,service)
+    end
+
+    it "should not invoke credentials" do
+      AutoTagging.should_not_receive(:credentials).with(service)
+      AutoTagging.send(:add_service,service)
+    end
+
+    context "class respond_to api_key=" do
+      before(:each) { klass.stub("api_key=") }
+
+      it "should invoke api_key" do
+        AutoTagging.should_receive(:api_key).once.with(service)
+        AutoTagging.send(:add_service,service)
+      end
+    end
+
+    context "class respond_to credentials=" do
+      before(:each) { klass.stub("credentials=") }
+
+      it "should invoke credentials" do
+        AutoTagging.should_receive(:credentials).once.with(service)
+        AutoTagging.send(:add_service,service)
+      end
+    end    
+  end
+
+  describe "#credentials" do
+    context "service is not hash" do
+      let(:service) { "invalid_service" }
+      it "should raise AutoTagging::Errors::InvalidCredentialsError" do
+        expect{ AutoTagging.send(:credentials, service) }.to raise_error(AutoTagging::Errors::InvalidCredentialsError)
+      end
+    end
+
+    context "service is a hash" do
+      let(:service) { { :delicious => value } }
+
+      context "service value is not a hash" do
+        let(:value) { "invalid_value" }
+        it "should raise AutoTagging::Errors::InvalidCredentialsError" do
+          expect{ AutoTagging.send(:credentials, service) }.to raise_error(AutoTagging::Errors::InvalidCredentialsError)
+        end
+      end
+
+      context "service value is a hash" do
+        let(:value) { {"username" => "password"} }
+        it "should return value" do
+          AutoTagging.send(:credentials, service).should == value
+        end
+      end      
+    end
   end
 
   describe "#get_tags" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auto_tagging
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors: