pubnub-ruby 3.3.0.7 → 3.4

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'pubnub'
+require 'pry'
+require 'rr'
+require 'stringio'
+require 'webmock/rspec'
+
+WebMock.disable_net_connect!
+
+$log = Logger.new('pubnub.log', 0, 100 * 1024 * 1024)
+
+RSpec.configure do |config|
+  config.color_enabled = true
+  config.tty = true
+end

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: pubnub-ruby
 version: !ruby/object:Gem::Version
-  version: 3.3.0.7
-  prerelease: 
+  version: '3.4'
 platform: ruby
 authors:
 - PubNub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: em-http-request
+  name: persistent_httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: uuid
+  name: em-http-request
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: uuid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby anywhere in the world in 250ms with PubNub!
@@ -113,32 +100,158 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .yardoc/checksums
+- .yardoc/object_types
+- .yardoc/objects/root.dat
+- .yardoc/proxy_types
+- LICENSE
+- README.md
+- Rakefile
+- VERSION
+- examples/demo_console.rb
+- examples/error_server.rb
+- examples/pubnub_livestream/.gitignore
+- examples/pubnub_livestream/Gemfile
+- examples/pubnub_livestream/Gemfile.lock
+- examples/pubnub_livestream/README.rdoc
+- examples/pubnub_livestream/Rakefile
+- examples/pubnub_livestream/app/assets/images/.keep
+- examples/pubnub_livestream/app/assets/javascripts/application.js
+- examples/pubnub_livestream/app/assets/javascripts/streamer.js.coffee
+- examples/pubnub_livestream/app/assets/stylesheets/application.css.sass
+- examples/pubnub_livestream/app/assets/stylesheets/streamer.css.scss
+- examples/pubnub_livestream/app/controllers/application_controller.rb
+- examples/pubnub_livestream/app/controllers/concerns/.keep
+- examples/pubnub_livestream/app/controllers/streamer_controller.rb
+- examples/pubnub_livestream/app/helpers/application_helper.rb
+- examples/pubnub_livestream/app/helpers/streamer_helper.rb
+- examples/pubnub_livestream/app/mailers/.keep
+- examples/pubnub_livestream/app/models/.keep
+- examples/pubnub_livestream/app/models/concerns/.keep
+- examples/pubnub_livestream/app/models/message.rb
+- examples/pubnub_livestream/app/views/layouts/application.html.erb
+- examples/pubnub_livestream/app/views/streamer/index.haml
+- examples/pubnub_livestream/bin/bundle
+- examples/pubnub_livestream/bin/rails
+- examples/pubnub_livestream/bin/rake
+- examples/pubnub_livestream/config.ru
+- examples/pubnub_livestream/config/application.rb
+- examples/pubnub_livestream/config/boot.rb
+- examples/pubnub_livestream/config/database.yml
+- examples/pubnub_livestream/config/environment.rb
+- examples/pubnub_livestream/config/environments/development.rb
+- examples/pubnub_livestream/config/environments/production.rb
+- examples/pubnub_livestream/config/environments/test.rb
+- examples/pubnub_livestream/config/initializers/backtrace_silencers.rb
+- examples/pubnub_livestream/config/initializers/filter_parameter_logging.rb
+- examples/pubnub_livestream/config/initializers/inflections.rb
+- examples/pubnub_livestream/config/initializers/mime_types.rb
+- examples/pubnub_livestream/config/initializers/pubnub.rb
+- examples/pubnub_livestream/config/initializers/secret_token.rb
+- examples/pubnub_livestream/config/initializers/session_store.rb
+- examples/pubnub_livestream/config/initializers/wrap_parameters.rb
+- examples/pubnub_livestream/config/locales/en.yml
+- examples/pubnub_livestream/config/routes.rb
+- examples/pubnub_livestream/db/migrate/20130826110322_create_messages.rb
+- examples/pubnub_livestream/db/schema.rb
+- examples/pubnub_livestream/db/seeds.rb
+- examples/pubnub_livestream/lib/assets/.keep
+- examples/pubnub_livestream/lib/tasks/.keep
+- examples/pubnub_livestream/log/.keep
+- examples/pubnub_livestream/public/404.html
+- examples/pubnub_livestream/public/422.html
+- examples/pubnub_livestream/public/500.html
+- examples/pubnub_livestream/public/assets/application-22a604196dfb65fd0d602eb1eb65f9b7.js
+- examples/pubnub_livestream/public/assets/application-22a604196dfb65fd0d602eb1eb65f9b7.js.gz
+- examples/pubnub_livestream/public/assets/application-3fac0c014bbdf9ee7b3986ff615d5da0.css
+- examples/pubnub_livestream/public/assets/application-3fac0c014bbdf9ee7b3986ff615d5da0.css.gz
+- examples/pubnub_livestream/public/assets/application-f06834e402639ad43230e3859b9bdd78.css
+- examples/pubnub_livestream/public/assets/application-f06834e402639ad43230e3859b9bdd78.css.gz
+- examples/pubnub_livestream/public/assets/application-f91b87f490140d86003c46b4d06b6c70.js
+- examples/pubnub_livestream/public/assets/application-f91b87f490140d86003c46b4d06b6c70.js.gz
+- examples/pubnub_livestream/public/assets/manifest-c129e1f5ec52d8b661ebfa902554a2e2.json
+- examples/pubnub_livestream/public/assets/twitter/glyphicons-halflings-regular-0bc0341283e3bb8ec518375794cc7c28.eot
+- examples/pubnub_livestream/public/assets/twitter/glyphicons-halflings-regular-24dfb40c91db789b8b8faba6886ac1ef.svg
+- examples/pubnub_livestream/public/assets/twitter/glyphicons-halflings-regular-4b2130768da98222338d1519f9179528.ttf
+- examples/pubnub_livestream/public/assets/twitter/glyphicons-halflings-regular-7a07f26f72466361ac9671de2d33fd1c.woff
+- examples/pubnub_livestream/public/assets/twitter/glyphicons-halflings-regular-9f75212cf9fca594cee7e0e3587db9d1.svg
+- examples/pubnub_livestream/public/assets/twitter/glyphicons-halflings-regular-ab2f6984951c07fd89e6afdefabd93c7.eot
+- examples/pubnub_livestream/public/assets/twitter/glyphicons-halflings-regular-c21928f7d46b397b0af6b9ee4a7bd0dd.ttf
+- examples/pubnub_livestream/public/assets/twitter/glyphicons-halflings-regular-fa1d7f79d80d03f8a598822bd9df79bf.woff
+- examples/pubnub_livestream/public/favicon.ico
+- examples/pubnub_livestream/public/robots.txt
+- examples/pubnub_livestream/test/controllers/.keep
+- examples/pubnub_livestream/test/controllers/streamer_controller_test.rb
+- examples/pubnub_livestream/test/fixtures/.keep
+- examples/pubnub_livestream/test/fixtures/messages.yml
+- examples/pubnub_livestream/test/helpers/.keep
+- examples/pubnub_livestream/test/helpers/streamer_helper_test.rb
+- examples/pubnub_livestream/test/integration/.keep
+- examples/pubnub_livestream/test/mailers/.keep
+- examples/pubnub_livestream/test/models/.keep
+- examples/pubnub_livestream/test/models/message_test.rb
+- examples/pubnub_livestream/test/test_helper.rb
+- examples/pubnub_livestream/vendor/assets/javascripts/.keep
+- examples/pubnub_livestream/vendor/assets/stylesheets/.keep
+- examples/serial_publish.rb
+- examples/sinatra/.sass-cache/65d837cc121fc62381bb76d93e5bd081356aa3f9/application.sassc
+- examples/sinatra/.sass-cache/d1525a8542f6e7fb2ecd3275251283768779b344/main.rbc
+- examples/sinatra/.sass-cache/d35765d68c1df11fa3368aa802b3d38109cba214/application.sassc
+- examples/sinatra/main.rb
+- examples/sinatra/public/bootstrap-responsive.min.css
+- examples/sinatra/public/bootstrap.css
+- examples/sinatra/public/bootstrap.min.css
+- examples/sinatra/public/jquery-1.10.2.min.js
+- examples/sinatra/views/application.sass
+- examples/sinatra/views/index.slim
+- examples/sinatra/views/layout.slim
+- examples/sinatra/views/streamer.coffee
+- examples/sub_and_unsub_1.rb
+- examples/translator.rb
 - lib/pubnub.rb
-- lib/pubnub_crypto.rb
-- lib/pubnub_request.rb
-homepage: http://github.com/pubnub/pubnub-api
+- lib/pubnub/client.rb
+- lib/pubnub/configuration.rb
+- lib/pubnub/crypto.rb
+- lib/pubnub/error.rb
+- lib/pubnub/request.rb
+- lib/pubnub/response.rb
+- lib/pubnub/subscription.rb
+- lib/tasks/examples.rake
+- lib/version.rb
+- pubnub.gemspec
+- spec/lib/client_spec.rb
+- spec/lib/crypto_spec.rb
+- spec/lib/history_integration_spec.rb
+- spec/lib/presence_integration_spec.rb
+- spec/lib/publish_integration_spec.rb
+- spec/lib/pubnub_spec.rb
+- spec/lib/request_spec.rb
+- spec/lib/subscribe_integration_spec.rb
+- spec/lib/time_integration_spec.rb
+- spec/spec_helper.rb
+homepage: http://github.com/pubnub/ruby
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: PubNub Official Ruby gem
 test_files: []

data/lib/pubnub_crypto.rb

@@ -1,53 +0,0 @@
-class PubnubCrypto
-  require 'yajl'
-
-  def initialize(cipher_key)
-    @alg = "AES-256-CBC"
-    sha256_key = Digest::SHA256.hexdigest(cipher_key)
-    @key = sha256_key.slice(0,32)
-
-    #puts("\nraw sha cipher_key is: #{cipher_key}")
-    #puts("raw sha cipher_key is: #{sha256_key}")
-    #puts("padded cipher_key is: #{@key}\n")
-
-    @iv = '0123456789012345'
-  end
-
-
-  def encrypt(message)
-
-    aes = OpenSSL::Cipher::Cipher.new(@alg)
-    aes.encrypt
-    aes.key = @key
-    aes.iv = @iv
-
-    json_message = Yajl.dump(message)
-    cipher = aes.update(json_message)
-    cipher << aes.final
-
-    Base64.strict_encode64(cipher)
-
-  end
-
-
-  def decrypt(cipher_text)
-    decode_cipher = OpenSSL::Cipher::Cipher.new(@alg)
-    decode_cipher.decrypt
-    decode_cipher.key = @key
-    decode_cipher.iv = @iv
-
-    plain_text = ""
-
-    begin
-    undecoded_text = Base64.decode64(cipher_text)
-    plain_text = decode_cipher.update(undecoded_text)
-    plain_text << decode_cipher.final
-    rescue => e
-
-      return "DECRYPTION_ERROR"
-
-    end
-
-    return Yajl.load(plain_text)
-  end
-end

data/lib/pubnub_request.rb

@@ -1,310 +0,0 @@
-class PubnubRequest
-  attr_accessor :cipher_key, :host, :query, :response, :timetoken, :url, :operation, :callback, :publish_key, :subscribe_key, :secret_key, :channel, :jsonp, :message, :ssl, :port
-  attr_accessor :history_limit, :history_count, :history_start, :history_end, :history_reverse, :session_uuid, :last_timetoken, :origin, :error
-
-  class RequestError < RuntimeError;
-  end
-
-  def initialize(args = {})
-    args = HashWithIndifferentAccess.new(args)
-
-    @operation = args[:operation].to_s
-    @callback = args[:callback]
-    @cipher_key = args[:cipher_key]
-    @session_uuid = args[:session_uuid]
-    @publish_key = args[:publish_key]
-    @subscribe_key = args[:subscribe_key]
-    @channel = args[:channel]
-    @jsonp = args[:jsonp].present? ? "1" : "0"
-    @message = args[:message]
-    @secret_key = args[:secret_key] || "0"
-    @timetoken = args[:timetoken] || "0"
-    @ssl = args[:ssl]
-
-    @port = args[:port]
-    @url = args[:url]
-    @host = args[:host]
-    @query = args[:query]
-  end
-
-  def op_exception
-    if @operation.present?
-      ("Pubnub::" + @operation.to_s.capitalize + "Error").constantize
-    else
-      PubnubRequest::RequestError
-    end
-  end
-
-  def ==(another)
-    self.operation == another.operation && self.callback == another.callback &&
-        self.channel == another.channel && self.message == another.message
-  end
-
-  def set_error(options)
-    options = HashWithIndifferentAccess.new(options)
-
-    if options[:error].present?
-      self.error = true
-    end
-    self
-  end
-
-  def set_origin(options)
-    options = HashWithIndifferentAccess.new(options)
-
-    if options[:origin].present?
-      self.origin = options[:origin].to_s
-      self
-    end
-  end
-
-  def set_channel(options)
-    options = HashWithIndifferentAccess.new(options)
-
-    if options[:channel].blank?
-      raise(op_exception, "channel is a required parameter.")
-    else
-      self.channel = options[:channel].to_s
-      self
-    end
-  end
-
-  def set_callback(options)
-    options = HashWithIndifferentAccess.new(options)
-
-    if options[:callback].blank?
-      raise(op_exception, "callback is a required parameter.")
-    elsif !options[:callback].try(:respond_to?, "call")
-      raise(op_exception, "callback is invalid.")
-    else
-      self.callback = options[:callback]
-      self
-    end
-  end
-
-
-  def set_cipher_key(options, self_cipher_key)
-    options = HashWithIndifferentAccess.new(options)
-
-    if self_cipher_key.present? && options['cipher_key'].present?
-      raise(op_exception, "existing cipher_key #{self_cipher_key} cannot be overridden at publish-time.")
-
-    elsif (self_cipher_key.present? && options[:cipher_key].blank?) || (self_cipher_key.blank? && options[:cipher_key].present?)
-
-      this_cipher_key = self_cipher_key || options[:cipher_key]
-      raise(Pubnub::PublishError, "secret key must be a string.") if this_cipher_key.class != String
-      self.cipher_key = this_cipher_key
-    end
-  end
-
-  def set_secret_key(options, self_secret_key)
-    options = HashWithIndifferentAccess.new(options)
-
-    if self_secret_key.present? && options['secret_key'].present?
-      raise(Pubnub::PublishError, "existing secret_key #{self_secret_key} cannot be overridden at publish-time.")
-
-    elsif (self_secret_key.present? && options[:secret_key].blank?) || (self_secret_key.blank? && options[:secret_key].present?)
-
-      my_secret_key = self_secret_key || options[:secret_key]
-      raise(Pubnub::PublishError, "secret key must be a string.") if my_secret_key.class != String
-
-      signature = "{ @publish_key, @subscribe_key, @secret_key, channel, message}"
-      digest = OpenSSL::Digest.new("sha256")
-      key = [my_secret_key]
-      hmac = OpenSSL::HMAC.hexdigest(digest, key.pack("H*"), signature)
-      self.secret_key = hmac
-    else
-      self.secret_key = "0"
-    end
-  end
-
-  def set_message(options, self_cipher_key)
-    options = HashWithIndifferentAccess.new(options)
-
-    if options[:message].blank? && options[:message] != ""
-      raise(op_exception, "message is a required parameter.")
-    else
-      my_cipher_key = options[:cipher_key] || self_cipher_key
-
-      if my_cipher_key.present?
-        self.message = Yajl.dump(aes_encrypt(my_cipher_key, options, self))
-      else
-        self.message = Yajl.dump(options[:message])
-      end
-    end
-  end
-
-  def set_publish_key(options, self_publish_key)
-    options = HashWithIndifferentAccess.new(options)
-
-    if options[:publish_key].blank? && self_publish_key.blank?
-      raise(Pubnub::PublishError, "publish_key is a required parameter.")
-    elsif self_publish_key.present? && options['publish_key'].present?
-      raise(Pubnub::PublishError, "existing publish_key #{self_publish_key} cannot be overridden at publish-time.")
-    else
-      self.publish_key = (self_publish_key || options[:publish_key]).to_s
-    end
-  end
-
-  def set_subscribe_key(options, self_subscribe_key)
-    options = HashWithIndifferentAccess.new(options)
-
-    if options[:subscribe_key].blank? && self_subscribe_key.blank?
-      raise(op_exception, "subscribe_key is a required parameter.")
-    elsif self_subscribe_key.present? && options['subscribe_key'].present?
-      raise(op_exception, "existing subscribe_key #{self_subscribe_key} cannot be overridden at subscribe-time.")
-    else
-      self.subscribe_key = (self_subscribe_key || options[:subscribe_key]).to_s
-    end
-  end
-
-  def package_response!(response_data)
-    self.response = response_data.respond_to?(:content) ? Yajl.load(response_data.content) : Yajl.load(response_data)
-    self.last_timetoken = self.timetoken
-    self.timetoken = self.response[1] unless self.operation == "time"
-
-    if self.cipher_key.present? && %w(subscribe history detailed_history).include?(self.operation)
-
-      myarr = Array.new
-      pc = PubnubCrypto.new(@cipher_key)
-
-      case @operation
-        when "publish"
-          iterate = self.response.first
-        when "subscribe"
-          iterate = self.response.first
-        when "history"
-          iterate = self.response
-        when "detailed_history"
-          iterate = self.response.first
-
-        else
-          raise(RequestError, "Don't know how to iterate on this operation.")
-      end
-
-      iterate.each do |message|
-        message = pc.decrypt(message)
-        myarr.push(message)
-      end
-
-      if %w(publish subscribe).include?(@operation)
-        self.response[0] = myarr
-      elsif @operation == "detailed_history"
-        json_response_data = Yajl.load(response_data)
-        self.response = [myarr, json_response_data[1], json_response_data[2]]
-      else
-        self.response = myarr
-      end
-
-    end
-  end
-
-  def format_url!(override_timetoken = nil)
-
-    raise(Pubnub::PublishError, "Missing .operation in PubnubRequest object") if self.operation.blank?
-
-    if @ssl.present?
-      origin = 'https://' + (self.origin.present? ? self.origin : Pubnub::ORIGIN_HOST)
-      @port = 443
-    else
-      origin = 'http://' + (self.origin.present? ? self.origin : Pubnub::ORIGIN_HOST)
-      @port = 80
-    end
-
-    if override_timetoken.present?
-      self.timetoken = override_timetoken.to_s
-    end
-
-    case self.operation.to_s
-      when "publish"
-        url_array = [self.operation.to_s, self.publish_key.to_s, self.subscribe_key.to_s,
-                     self.secret_key.to_s, self.channel.to_s, "0", self.message]
-
-      when "subscribe"
-        url_array = [self.operation.to_s, self.subscribe_key.to_s, self.channel.to_s, "0", @timetoken]
-
-      when "presence"
-        url_array = ["subscribe", self.subscribe_key.to_s, ((self.channel.to_s) + "-pnpres"), "0", @timetoken]
-
-      when "time"
-        url_array = [self.operation.to_s, "0"]
-
-      when "history"
-        url_array = [self.operation.to_s, self.subscribe_key.to_s, self.channel.to_s, "0", self.history_limit.to_s]
-
-      when "detailed_history"
-        url_array = ["v2", "history", "sub-key", self.subscribe_key.to_s, "channel", self.channel.to_s]
-
-      when "here_now"
-        url_array = ["v2", "presence", "sub-key", self.subscribe_key.to_s, "channel", self.channel.to_s]
-
-      else
-
-        raise(PubnubRequest::RequestError, "I can't create that URL for you due to unknown operation type.")
-    end
-
-    self.url = origin + encode_URL(url_array)
-
-    uri = URI.parse(self.url)
-
-    self.host = uri.host
-    url_params = ""
-
-    if %w(subscribe presence).include?(@operation)
-      uri.query = uri.query.blank? ? "uuid=#{@session_uuid}" : (uri.query + "uuid=#{@session_uuid}")
-
-    elsif @operation == "detailed_history"
-      url_sep = "?"
-
-      if @history_count || @history_start || @history_end || @history_reverse
-
-        if @history_count
-          url_params += url_sep + "count=" + @history_count.to_s
-          url_sep = "&"
-        end
-
-        if @history_start
-          url_params += url_sep + "start=" + @history_start.to_s
-          url_sep = "&"
-        end
-
-        if @history_end
-          url_params += url_sep + "end=" + @history_end.to_s
-          url_sep = "&"
-        end
-
-        if @history_reverse
-          url_params += url_sep + "reverse=true"
-          url_sep = "&"
-        end
-      end
-    end
-
-    self.query = uri.path + (uri.query.present? ? ("?" + uri.query) : "") + url_params
-    self.url += url_params
-    self
-
-  end
-
-  def aes_encrypt(cipher_key, options, publish_request)
-    options = HashWithIndifferentAccess.new(options)
-
-    pc = PubnubCrypto.new(cipher_key)
-    publish_request.message = pc.encrypt(options[:message])
-
-  end
-
-  def encode_URL(request)
-    ## Construct Request URL
-    url = '/' + request.map { |bit| bit.split('').map { |ch|
-      ' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.index(ch) ?
-          '%' + ch.unpack('H2')[0].to_s.upcase : URI.encode(ch)
-    }.join('') }.join('/')
-    return url
-  end
-
-  def first_request?
-    @last_timetoken == "0"
-  end
-
-end