centrifuge 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09218a5c452092b2bd0c00132c2031d8fd21af6b
-  data.tar.gz: bb4e9c00f0859455b30bbb1dd21e163e6f8bdaed
+  metadata.gz: 5c72f7e53d98f1c39fa274dad8db771151df6275
+  data.tar.gz: c26967230df365720bcab949250650cd1f368df5
 SHA512:
-  metadata.gz: 0f3d5e00f2b98b8449adc2d0ba3cb68ee3fa75ea2f2756c1356f53d7101310cd4b53f9792301a308b130e5d8de8abb8ac8a4c4ded3c4c0aabf9dbd34e29c6056
-  data.tar.gz: f87ab041ef3e1d061a69d4e525481aa4203dce1f3957277daad053a1003b6dfdfa5d9aa6cfcab952029d0a4d5a84b21cb5001f566f25f3f50e9d738729d66c8e
+  metadata.gz: 753fe93461f18f82a268cb0e648e30bb0cce09f88aace6d5b15a044eef1e291d1b1105f57adaccc462d48e4647a6a932aa436717a450e2e8c14fb3e23c2dc8c6
+  data.tar.gz: 9af78670d1570d93fabc973ff7e46c3e254560e77864d253dc9bfb9a2128c0cf30d1cca2261aa0b46b4bcc95f2bba4da658bae438ea4825adad333e9e9c3e27f

data/README.md

@@ -20,18 +20,20 @@ Or install it yourself as:
 
     $ gem install centrifuge
 
+Compatible version for Centrifuge version 0.8.0 and above are 0.1.0+. Please use 0.0.x versions for older Centrifuge
+
 ## Usage
 
 `Centrifuge::Client` - is main usable class. Start with:
 
-	client = Centrifute::Client.new(scheme: :http, host: :localhost, port: 80, project_id: 'abc', secret: 'cde')
+	client = Centrifute::Client.new(scheme: :http, host: :localhost, port: 80, project_key: 'abc', secret: 'cde')
 
 If you are planning to use only one project, its convenient to set all data and use class methods:
 
 	Centrifuge.scheme = :http
 	Centrifuge.host = 'localhost'
 	Centrifuge.port = 8000
-	Centrifuge.project_id = 'abc'
+	Centrifuge.project_key = 'abc'
 	Centrifuge.secret = 'def'
 
 There are five methds available:

data/lib/centrifuge/client.rb

@@ -9,7 +9,7 @@ module Centrifuge
       host: 'localhost',
       port: 8000,
     }
-    attr_accessor :scheme, :host, :port, :project_id, :secret
+    attr_accessor :scheme, :host, :port, :project_key, :secret
     attr_writer :connect_timeout, :send_timeout, :receive_timeout,
     :keep_alive_timeout
 
@@ -17,8 +17,8 @@ module Centrifuge
 
     def initialize(options = {})
       options = DEFAULT_OPTIONS.merge(options)
-      @scheme, @host, @port, @project_id, @secret = options.values_at(
-       :scheme, :host, :port, :project_id, :secret
+      @scheme, @host, @port, @project_key, @secret = options.values_at(
+       :scheme, :host, :port, :project_key, :secret
       )
       set_default_timeouts
     end
@@ -35,7 +35,7 @@ module Centrifuge
         scheme: scheme.to_s,
         host: host,
         port: port,
-        path: "/api/#{project_id}#{path}"
+        path: "/api/#{project_key}#{path}"
       })
     end
 
@@ -59,13 +59,13 @@ module Centrifuge
       Centrifuge::Builder.new('history', { channel: channel }, self).process
     end
 
-    def token_for(user, timestamp, user_info = "{}")
+    def token_for(user, timestamp, user_info = "")
       sign("#{user}#{timestamp}#{user_info}")
     end
 
     def sign(body)
-      dig = OpenSSL::Digest.new('md5')
-      OpenSSL::HMAC.hexdigest(dig, secret, "#{project_id}#{body}")
+      dig = OpenSSL::Digest.new('sha256')
+      OpenSSL::HMAC.hexdigest(dig, secret, "#{project_key}#{body}")
     end
 
     def client

data/lib/centrifuge/request.rb

@@ -38,7 +38,7 @@ module Centrifuge
       when 401
         raise AuthenticationError, body
       when 404
-        raise Error, "404 Not found (#{@uri.path})"
+        raise Error, "404 Not found (#{@uri.path} #{@uri.to_json})"
       when 407
         raise Error, "Proxy Authentication Required"
       else

data/lib/centrifuge/version.rb

@@ -1,3 +1,3 @@
 module Centrifuge
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/lib/centrifuge.rb

@@ -16,8 +16,8 @@ module Centrifuge
   class << self
     extend Forwardable
 
-    def_delegators :default_client, :scheme, :host, :port, :project_id, :secret
-    def_delegators :default_client, :scheme=, :host=, :port=, :project_id=, :secret=
+    def_delegators :default_client, :scheme, :host, :port, :project_key, :secret
+    def_delegators :default_client, :scheme=, :host=, :port=, :project_key=, :secret=
 
     # def_delegators :default_client, :authentication_token, :url
     # def_delegators :default_client, :encrypted=, :url=

data/spec/client_spec.rb

@@ -1,46 +1,35 @@
 require 'spec_helper'
 
 describe Centrifuge::Client do
-  let(:options) { { scheme: :https, host: 'reddifuge.herokuapp.com', port: 443, project_id: '060748d06d4c411997e1b5255b2d969e', secret: '334e0fd69fc447a1b268d704f021f59c' } }
+  let(:options) { { scheme: :https, host: 'centrifugo.herokuapp.com', port: 443, project_key: 'development', secret: 'secret' } }
   let(:client) { Centrifuge::Client.new(options) }
   let(:data) { { action: :test } }
 
   it 'generates url' do
-    expect(client.url.to_s).to eq "https://reddifuge.herokuapp.com:443/api/#{client.project_id}"
+    expect(client.url.to_s).to eq "https://centrifugo.herokuapp.com:443/api/#{client.project_key}"
   end
 
   it 'publishes data' do
-    stub_request(:post, "https://reddifuge.herokuapp.com/api/060748d06d4c411997e1b5255b2d969e").
-    with(body: {"data"=>"{\"method\":\"publish\",\"params\":{\"channel\":\"testchannel\",\"data\":{\"action\":\"test\"}}}", "sign"=>"9191468cf61debb04768ff1f667a8df8"}).
-    to_return(status: 200, body: "[{\"body\":true,\"error\":null,\"method\":\"publish\",\"uid\":null}]", headers: {})
-    expect(client.publish("testchannel", data)).to eq [{"body" => true, "error" => nil, "method" => "publish", "uid" => nil}]
+    channel = SecureRandom.hex
+    expect(client.publish(channel, data)).to eq [{"body" => nil, "error" => nil, "method" => "publish"}]
   end
 
   it 'unsubscribes user' do
-    stub_request(:post, "https://reddifuge.herokuapp.com/api/060748d06d4c411997e1b5255b2d969e").
-    with(body: {"data"=>"{\"method\":\"unsubscribe\",\"params\":{\"channel\":\"testchannel\",\"user\":\"23\"}}", "sign"=>"613a46c24a54ad546b7bf084c249d8c2"}).
-    to_return(status: 200, body: "[{\"method\":\"unsubscribe\",\"error\":null,\"uid\":null,\"body\":true}]", headers: {})
-    expect(client.unsubscribe("testchannel", "23")).to eq [{"method"=>"unsubscribe", "error"=>nil, "uid"=>nil, "body"=>true}]
+    channel = SecureRandom.hex
+    expect(client.unsubscribe(channel, "23")).to eq [{"body"=>nil, "error"=>nil, "method"=>"unsubscribe"}]
   end
 
   it 'disconnects user' do
-    stub_request(:post, "https://reddifuge.herokuapp.com/api/060748d06d4c411997e1b5255b2d969e").
-    with(body: {"data"=>"{\"method\":\"disconnect\",\"params\":{\"user\":\"23\"}}", "sign"=>"1331a7cc6da5cb747cab3d4cfabc5644"}).
-    to_return(status: 200, body: "[{\"method\":\"disconnect\",\"error\":null,\"uid\":null,\"body\":true}]", headers: {})
-    expect(client.disconnect("23")).to eq [{"method"=>"disconnect", "error"=>nil, "uid"=>nil, "body"=>true}]
+    expect(client.disconnect("23")).to eq [{"body" => nil, "error" => nil, "method" => "disconnect"}]
   end
 
   it 'fetches presence info' do
-    stub_request(:post, "https://reddifuge.herokuapp.com/api/060748d06d4c411997e1b5255b2d969e").
-    with(body: {"data"=>"{\"method\":\"presence\",\"params\":{\"channel\":\"testchannel\"}}", "sign"=>"9e3db58b7cf9d9eccee4c85ee87e6532"}).
-    to_return(status: 200, body: "[{\"method\":\"presence\",\"error\":null,\"uid\":null,\"body\":{}}]", headers: {})
-    expect(client.presence("testchannel")).to eq [{"method"=>"presence", "error"=>nil, "uid"=>nil, "body"=>{}}]
+    channel = SecureRandom.hex
+    expect(client.presence(channel)).to eq [{"body" => {"channel" => channel, "data" => {}}, "error" => nil, "method" => "presence"}]
   end
 
   it 'fetches history' do
-    stub_request(:post, "https://reddifuge.herokuapp.com/api/060748d06d4c411997e1b5255b2d969e").
-    with(body: {"data"=>"{\"method\":\"history\",\"params\":{\"channel\":\"testchannel\"}}", "sign"=>"14413322f1fd26b4256db34941d6cdb7"}).
-    to_return(status: 200, body: "[{\"method\":\"history\",\"error\":null,\"uid\":null,\"body\":[]}]", headers: {})
-    expect(client.history("testchannel")).to eq [{"method"=>"history", "error"=>nil, "uid"=>nil, "body"=>[]}]
+    channel = SecureRandom.hex
+    expect(client.history(channel)).to eq [{"body" => {"channel" => channel, "data" => []}, "error" => nil, "method"=>"history"}]
   end
 end

data/spec/spec_helper.rb

@@ -16,7 +16,7 @@ require 'bundler/setup'
 Bundler.setup
 require 'centrifuge'
 require 'rspec'
-require 'webmock/rspec'
+# require 'webmock/rspec'
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
@@ -43,10 +43,10 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
-  config.before(:each) do
-    WebMock.reset!
-    WebMock.disable_net_connect!
-  end
+  # config.before(:each) do
+  #   WebMock.reset!
+  #   WebMock.disable_net_connect!
+  # end
 
   # The settings below are suggested to provide a good initial experience
   # with RSpec, but feel free to customize to your heart's content.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: centrifuge
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Oleg Bovykin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient