mirror of
https://github.com/mistergibson/gxg-framework.git
synced 2026-08-15 03:46:00 -07:00
Dep bug fix for mimemagic
This commit is contained in:
parent
2bfa33874e
commit
bcea6a2a62
4 changed files with 63 additions and 16 deletions
|
|
@ -28,6 +28,7 @@ Gem::Specification.new do |s|
|
||||||
# s.add_runtime_dependency 'ezmq'
|
# s.add_runtime_dependency 'ezmq'
|
||||||
end
|
end
|
||||||
s.add_runtime_dependency 'nokogiri'
|
s.add_runtime_dependency 'nokogiri'
|
||||||
|
s.add_runtime_dependency 'shared-mime-info'
|
||||||
s.add_runtime_dependency 'mimemagic'
|
s.add_runtime_dependency 'mimemagic'
|
||||||
s.add_runtime_dependency 'rubysl-securerandom'
|
s.add_runtime_dependency 'rubysl-securerandom'
|
||||||
s.add_runtime_dependency 'net-ssh'
|
s.add_runtime_dependency 'net-ssh'
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@ requirements.push({:requirement => "chronic", :gem => "chronic"})
|
||||||
# requirements.push({:requirement => "ezmq", :gem => "ezmq"})
|
# requirements.push({:requirement => "ezmq", :gem => "ezmq"})
|
||||||
# requirements.push({:requirement => "nokogiri", :gem => "nokogiri"})
|
# requirements.push({:requirement => "nokogiri", :gem => "nokogiri"})
|
||||||
requirements.push({:requirement => "rufus-scheduler", :gem => "rufus-scheduler"})
|
requirements.push({:requirement => "rufus-scheduler", :gem => "rufus-scheduler"})
|
||||||
|
requirements.push({:requirement => "shared-mime-info", :gem => "shared-mime-info"})
|
||||||
requirements.push({:requirement => "mimemagic", :gem => "mimemagic"})
|
requirements.push({:requirement => "mimemagic", :gem => "mimemagic"})
|
||||||
#requirements.push({:requirement => "mimemagic/overlay", :gem => "mimemagic"})
|
#requirements.push({:requirement => "mimemagic/overlay", :gem => "mimemagic"})
|
||||||
requirements.push({:requirement => "bcrypt", :gem => "bcrypt"})
|
requirements.push({:requirement => "bcrypt", :gem => "bcrypt"})
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#
|
#
|
||||||
module GxG
|
module GxG
|
||||||
#
|
#
|
||||||
GXG_FEDERATION = {:title => "Untitled", :uuid => nil, :available => {}, :connections => {}}
|
GXG_FEDERATION = {:title => "Untitled", :uuid => nil, :access_url => nil, :available => {}, :connections => {}}
|
||||||
GXG_FEDERATION_SAFETY = Mutex.new
|
GXG_FEDERATION_SAFETY = Mutex.new
|
||||||
def self.federation_servers()
|
def self.federation_servers()
|
||||||
result = {}
|
result = {}
|
||||||
|
|
|
||||||
|
|
@ -3896,27 +3896,26 @@ module GxG
|
||||||
#
|
#
|
||||||
def initialize(the_url=nil, options={})
|
def initialize(the_url=nil, options={})
|
||||||
# URI Note: user:password@hostname/path/to/endpoint
|
# URI Note: user:password@hostname/path/to/endpoint
|
||||||
the_uri = ::URI::parse(the_url.to_s)
|
@uri = ::URI::parse(the_url.to_s)
|
||||||
|
if ::GxG::valid_uuid?(options[:use_uuid].to_s.to_sym)
|
||||||
|
@uuid = options[:use_uuid].to_s.to_sym
|
||||||
|
else
|
||||||
@uuid = ::GxG::uuid_generate.to_s.to_sym
|
@uuid = ::GxG::uuid_generate.to_s.to_sym
|
||||||
|
end
|
||||||
@scheme = "https"
|
@scheme = "https"
|
||||||
@hostname = the_uri.hostname
|
@hostname = @uri.hostname
|
||||||
@services = {}
|
@services = {}
|
||||||
self.refresh_services
|
self.refresh_services
|
||||||
@clients = {}
|
@clients = {}
|
||||||
|
@credential = :"00000000-0000-4000-0000-000000000000"
|
||||||
|
@bridge_challenge = ::GxG::uuid_generate.to_s.to_sym
|
||||||
|
@status = :unavailable
|
||||||
@services.each_pair do |service,endpoint|
|
@services.each_pair do |service,endpoint|
|
||||||
@clients[(service)] = ::GxG::Networking::GxGApi.new("gxg://#{@hostname}#{endpoint}")
|
@clients[(service)] = ::GxG::Networking::GxGApi.new("gxg://#{@hostname}#{endpoint}")
|
||||||
if service == :federation
|
@clients[(service)].login(@uri.username, @uri.password)
|
||||||
@clients[(service)].login(the_uri.username, the_uri.password)
|
#
|
||||||
if @clients[(service)].respond_to_event?(:connect)
|
|
||||||
header = @clients[(service)].get({:connect => @uuid})
|
|
||||||
if header.is_a?(::Hash)
|
|
||||||
@title = header[:title]
|
|
||||||
else
|
|
||||||
raise Exception.new("Could not connect")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
@status = :connected
|
||||||
self
|
self
|
||||||
end
|
end
|
||||||
#
|
#
|
||||||
|
|
@ -3928,6 +3927,52 @@ module GxG
|
||||||
@title
|
@title
|
||||||
end
|
end
|
||||||
#
|
#
|
||||||
|
def credential()
|
||||||
|
@credential
|
||||||
|
end
|
||||||
|
#
|
||||||
|
def status()
|
||||||
|
@status
|
||||||
|
end
|
||||||
|
# ### Bridging tools:
|
||||||
|
def connect_bridge(parmameters={})
|
||||||
|
localuuid = nil
|
||||||
|
localtitle = "Untitled"
|
||||||
|
localaccess = nil
|
||||||
|
::GxG::GXG_FEDERATION_SAFETY.synchronize do
|
||||||
|
localuuid = ::GxG::GXG_FEDERATION[:uuid]
|
||||||
|
localtitle = ::GxG::GXG_FEDERATION[:title]
|
||||||
|
localaccess = ::GxG::GXG_FEDERATION[:access_url]
|
||||||
|
end
|
||||||
|
# @bridge_challenge
|
||||||
|
# {:uuid => localuuid, :title => localtitle, :access_url => localaccess, :bridge_challenge => @bridge_challenge}
|
||||||
|
header = @clients[:federation].get({:connect => {:uuid => localuuid, :title => localtitle, :access_url => localaccess, :bridge_challenge => @bridge_challenge}})
|
||||||
|
# xxx
|
||||||
|
if service == :federation
|
||||||
|
# :access_url
|
||||||
|
if @clients[(service)].respond_to_event?(:connect)
|
||||||
|
# {:uuid => (uuid), :username => String, :password => String}
|
||||||
|
header = @clients[(service)].get({:connect => {:uuid => @uuid, :username => "", :password => ""}})
|
||||||
|
# {}
|
||||||
|
if header.is_a?(::Hash)
|
||||||
|
@title = header[:title]
|
||||||
|
else
|
||||||
|
raise Exception.new("Could not connect")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
#
|
||||||
|
end
|
||||||
|
#
|
||||||
|
def disconnect_bridge(parmameters={})
|
||||||
|
# @bridge_challenge
|
||||||
|
#
|
||||||
|
end
|
||||||
|
#
|
||||||
|
def complete_bridge(parmameters={})
|
||||||
|
#@bridge_challenge
|
||||||
|
end
|
||||||
|
#
|
||||||
def interface
|
def interface
|
||||||
result = {}
|
result = {}
|
||||||
#
|
#
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue