ig3client 0.4.0 → 0.4.5

data/lib/ig3client.rb

@@ -1,181 +1 @@
-require 'etc'
-require 'net/http'
-require 'yaml'
-require 'timeout'
-require 'rubygems'
-require 'facets'
-require 'lib/util.rb'
-require 'lib/errors.rb'
-
-# External Options:
-#
-# ENV doesnt accept true (needs String)
-# ENV["IG3TOOL_CACHE"] = "yes"/"no"
-#
-
-
-class YAML::Object
-	def real_id
-		ivars["attributes"]["id"]
-	end
-
-	def [](k)
-		k = k.to_s
-		if ivars["attributes"].include? k
-			return ivars["attributes"][k]
-		elsif ivars.include? k
-			return ivars[k]
-		else
-			keys = ivars['attributes'].keys.join(', ')
-			warn "No such attribute: #{k.to_s} (#{keys})"
-			return nil
-		end
-	end
-
-	def method_missing(sym,*args)
-		self[sym]
-	end
-end
-
-module Ig3tool
-
-	class Client
-
-		attr_accessor :token, :username
-
-		def initialize(host="infogroep.be", port="2007", timeout=0)
-			@host    = host
-			@port    = port
-			@timeout = timeout # 0 = no timeout.
-
-			begin
-				@token = File.read(File.expand_path("~/.ig3token")).strip
-			rescue Exception => e
-				@token = nil
-			end
-
-			begin
-				@username = File.read(File.expand_path("~/.ig3user")).strip
-			rescue Exception => e
-				@username = Etc.getpwuid(Process::Sys.geteuid).name
-			end
-		end
-
-		def valid_token?
-			# XXX send no-op to server
-			false if @token.nil?
-      begin
-        self.validate
-      rescue
-        return false
-      end
-		end
-
-		def request!(h)
-			wannabe!(h)
-		end
-
-		def wannabe!(h)
-			username = h["username"]
-			passwd   = h["password"]
-			# request token
-			# if ok => store in file
-			# else => throw exception
-			@token = method_missing("wannabe!", {"username" => username,"password" =>  passwd})
-
-			File.open(File.expand_path("~/.ig3token"), "wb") do |f|
-				f.write @token
-			end
-
-			File.open(File.expand_path("~/.ig3user"), "wb") do |f|
-				f.write @username
-			end
-		#rescue Token => t
-		#	raise PermissionDenied
-		end
-
-
-		def method_missing(msg, *args, &block)
-			msg = msg.to_s
-
-			if match = /^async_(.*)/.match(msg)
-				raise "Async method called, no block given!" unless block_given?
-				Thread.new do
-					ans = self.send(match[1], *args)
-					block.call(ans)
-				end
-			else
-				uri = "/"+msg.gsub('_','/').sub(/!$/,'')
-				if msg.ends_with? '!'
-					args = [Hash[*args]] if args.length % 2 == 0
-					uri += "//" + @token if @token
-					req = Net::HTTP::Post.new(uri)
-					req["Content-Type"] = "text/yaml"
-					req.body = args.first.to_yaml
-				else
-					args = args[0].to_a.flatten if args[0].is_a? Hash
-					args.unshift(@token) if @token
-					extra = args.join('/')
-					extra = '//'+extra unless extra.empty?
-					req = Net::HTTP::Get.new(uri+extra)
-				end
-
-
-				req["Accept"] = "text/yaml"
-
-
-				n = Net::HTTP.new(@host,@port)
-				Timeout::timeout(@timeout) do
-					n.request(req) do |res|
-						rez = YAML::load(res.read_body)
-						_reraise(rez["type"].to_sym, rez["message"]) if res.code.to_i > 200
-						if block_given?
-							yield rez
-						else
-							return rez
-						end
-					end
-				end
-			end
-		end
-
-		if ENV["IG3TOOL_CACHE"] == "yes"
-			@@CACHE = {}
-			EXPIRY  = 900 # 15 minuten
-			BIG_QUERIES = [ :person_debuggers,   :person_honorarymembers,
-			                :person_members,     :person_nonmembers,
-			                :person_everybody,
-			                :product_categories, :product_all ]
-
-			BIG_QUERIES.each do |sym|
-				body = Proc.new do |*params|
-					if params.length > 0
-						method_missing(sym, *params)
-					else
-						entry = @@CACHE[sym]
-						time = Time.now
-						if entry.nil? or time > entry[0] 
-							result = method_missing(sym)
-							@@CACHE[sym] = [time + EXPIRY, result]
-							result
-						else
-							entry[1]
-						end
-					end
-				end
-
-				define_method sym, body
-			end
-		end
-
-		private
-
-		def _reraise(sym, msg)
-			raise constant(sym), msg
-		rescue NameError
-			raise "#{sym}: #{msg}"
-		end
-	
-	end
-
-end
+require 'ig3client/marshal_client.rb'

data/lib/ig3client/generic_client.rb

@@ -0,0 +1,110 @@
+require 'etc'
+require 'net/http'
+require 'timeout'
+require 'rubygems'
+require 'facets'
+require 'lib/util.rb'
+require 'lib/errors.rb'
+
+module Ig3tool
+
+	class GenericClient
+
+		attr_accessor :token, :username
+
+		def initialize(host="infogroep.be", port="2007", timeout=0)
+			@host    = host
+			@port    = port
+			@timeout = timeout # 0 = no timeout.
+
+			begin
+				@token = File.read(File.expand_path("~/.ig3token")).strip
+			rescue Exception => e
+				@token = nil
+			end
+
+			begin
+				@username = File.read(File.expand_path("~/.ig3user")).strip
+			rescue Exception => e
+				@username = Etc.getpwuid(Process::Sys.geteuid).name
+			end
+		end
+
+		def valid_token?
+			# XXX send no-op to server
+			false if @token.nil?
+			begin
+				self.validate
+			rescue
+				return false
+			end
+		end
+
+		def request!(h)
+			wannabe!(h)
+		end
+
+		def wannabe!(h)
+			username = h["username"]
+			passwd   = h["password"]
+			# request token
+			# if ok => store in file
+			# else => throw exception
+			@token = method_missing("wannabe!", {"username" => username,"password" =>  passwd})
+
+			File.open(File.expand_path("~/.ig3token"), "wb") do |f|
+				f.write @token
+			end
+
+			File.open(File.expand_path("~/.ig3user"), "wb") do |f|
+				f.write @username
+			end
+			#rescue Token => t
+			#	raise PermissionDenied
+		end
+
+
+		def method_missing(msg, *args, &block)
+			raise Exception, "this is an abstract class"
+		end
+
+		if ENV["IG3TOOL_CACHE"] == "yes"
+			@@CACHE = {}
+			EXPIRY  = 900 # 15 minuten
+			BIG_QUERIES = [ :person_debuggers,   :person_honorarymembers,
+				:person_members,     :person_nonmembers,
+				:person_everybody,
+				:product_categories, :product_all ]
+
+			BIG_QUERIES.each do |sym|
+				body = Proc.new do |*params|
+					if params.length > 0
+						method_missing(sym, *params)
+					else
+						entry = @@CACHE[sym]
+						time = Time.now
+						if entry.nil? or time > entry[0] 
+							result = method_missing(sym)
+							@@CACHE[sym] = [time + EXPIRY, result]
+							result
+						else
+							entry[1]
+						end
+					end
+				end
+
+				define_method sym, body
+			end
+		end
+
+		private
+
+		def _reraise(sym, msg)
+			raise constant(sym), msg
+		rescue NameError
+			raise "#{sym}: #{msg}"
+		end
+
+	end
+
+end

data/lib/ig3client/marshal_client.rb

@@ -0,0 +1,91 @@
+require 'ig3client/generic_client.rb'
+
+# External Options:
+#
+# ENV doesnt accept true (needs String)
+# ENV["IG3TOOL_CACHE"] = "yes"/"no"
+#
+
+
+
+# Capture serialised IG3Marshal Object
+class IG3Marshal
+
+	def initialize(attributes)
+		@attributes = attributes
+	end
+
+	def real_id
+		@attributes["id"]
+	end
+
+	def [](k)
+		k = k.to_s
+		if @attributes.include? k
+			return @attributes[k]
+		else
+			keys = @attributes.keys.join(', ')
+			warn "No such attribute: #{k.to_s} (#{keys})"
+			return nil
+		end
+	end
+	def method_missing(sym,*args)
+		self[sym]
+	end
+end
+
+
+module Ig3tool
+
+	class Client < GenericClient
+
+
+		def method_missing(msg, *args, &block)
+			msg = msg.to_s
+
+			if match = /^async_(.*)/.match(msg)
+				raise "Async method called, no block given!" unless block_given?
+				Thread.new do
+					ans = self.send(match[1], *args)
+					block.call(ans)
+				end
+			else
+				uri = "/"+msg.gsub('_','/').sub(/!$/,'')
+
+
+				if msg.ends_with? '!'
+					args = [Hash[*args]] if args.length % 2 == 0
+					uri += "//" + @token if @token
+					req = Net::HTTP::Post.new(uri)
+					req["Content-Type"] = "text/marshal"
+					req.body = Marshal.dump(args.first)
+				else
+					args = args[0].to_a.flatten if args[0].is_a? Hash
+					args.unshift(@token) if @token
+					extra = args.join('/')
+					extra = '//'+extra unless extra.empty?
+					req = Net::HTTP::Get.new(uri+extra)
+				end
+				req["Accept"] = "text/marshal"
+
+
+				n = Net::HTTP.new(@host,@port)
+				Timeout::timeout(@timeout) do
+					n.request(req) do |res|
+						a = res.read_body
+						rez = Marshal.load(a)
+						raise rez["type"].to_sym, rez["message"].to_s if (res.code.to_i > 200)
+						if block_given?
+							yield rez
+						else
+							return rez
+						end
+					end
+				end
+			end
+		end
+
+	
+	end
+
+end

data/lib/ig3client/yaml_client.rb

@@ -0,0 +1,82 @@
+require 'yaml'
+require 'ig3client/generic_client.rb'
+
+
+# Capture serialised YAML Object
+class YAML::Object
+	def real_id
+		ivars["attributes"]["id"]
+	end
+
+	def [](k)
+		k = k.to_s
+		if ivars["attributes"].include? k
+			return ivars["attributes"][k]
+		elsif ivars.include? k
+			return ivars[k]
+		else
+			keys = ivars['attributes'].keys.join(', ')
+			warn "No such attribute: #{k.to_s} (#{keys})"
+			return nil
+		end
+	end
+	
+	def method_missing(sym,*args)
+		self[sym]
+	end
+
+end
+
+
+module Ig3tool
+
+	class YAMLClient < GenericClient
+
+		def method_missing(msg, *args, &block)
+			msg = msg.to_s
+
+			if match = /^async_(.*)/.match(msg)
+				raise "Async method called, no block given!" unless block_given?
+				Thread.new do
+					ans = self.send(match[1], *args)
+					block.call(ans)
+				end
+			else
+				uri = "/"+msg.gsub('_','/').sub(/!$/,'')
+
+
+				if msg.ends_with? '!'
+					args = [Hash[*args]] if args.length % 2 == 0
+					uri += "//" + @token if @token
+					req = Net::HTTP::Post.new(uri)
+					req["Content-Type"] = "text/yaml"
+					req.body = args.first.to_yaml
+				else
+					args = args[0].to_a.flatten if args[0].is_a? Hash
+					args.unshift(@token) if @token
+					extra = args.join('/')
+					extra = '//'+extra unless extra.empty?
+					req = Net::HTTP::Get.new(uri+extra)
+				end
+				req["Accept"] = "text/yaml"
+
+
+				n = Net::HTTP.new(@host,@port)
+				Timeout::timeout(@timeout) do
+					n.request(req) do |res|
+						rez = YAML::load(res.read_body)
+						_reraise(rez["type"].to_sym, rez["message"]) if res.code.to_i > 200
+						if block_given?
+							yield rez
+						else
+							return rez
+						end
+					end
+				end
+			end
+		end
+
+	
+	end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ig3client
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.5
 platform: ruby
 authors: 
 - Kevin Pinte
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-25 00:00:00 +02:00
+date: 2008-04-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,10 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/lib
 - lib/ig3client.rb
+- lib/ig3client/generic_client.rb
+- lib/ig3client/marshal_client.rb
+- lib/ig3client/yaml_client.rb
 - lib/lib/errors.rb
 - lib/lib/util.rb
 has_rdoc: false
@@ -42,7 +44,7 @@ rdoc_options: []
 require_paths: 
 - lib
 - lib
-- lib/ui
+- lib/ig3client
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="