danthes 1.0.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27e0f4f55cd741d5f62a313e52db507f1bbf433b
-  data.tar.gz: 372ff2271b39062cfb5a317f18c6e6fdae987b4f
+  metadata.gz: 7a3a2cbe4487d7c4d1882e8995e82c19ebb865e6
+  data.tar.gz: c4b1f8007b96a6adaeae32e45087da56daf2d16c
 SHA512:
-  metadata.gz: f5a8fb58b6b150c9f203cdb3893e23d3acb07d4b47ae9fb5ba4e474eb850ee8281263573099272dfa75df03ea81b3aecaf1633911b7bc9ea3a5c73d0f99fecba
-  data.tar.gz: 6daad290b612e2d8b96e340db92583b4d6698ce08be4a11c2c1347073f7a7fe143bfc9ea79b6ffd13abc764a3c583a3a85eec8272f9908228371e09df07758d1
+  metadata.gz: c474986bf3cf591a61d31b37b3a33894b9bb932b8d68222f14b850927b571901d20e31debb0eab027d613e78e3fe219d09b17b4382f5ef54db1a82d2aa84afa6
+  data.tar.gz: 294bd2039b3e69ded40fc94f739bec3a4d31fcf8274ff6e550a523818d3d437c6465e934bc9bb8c51cedc15ea0392a17c355175cd65b1532cc7fe7ae1e4fea0e

data/.gitignore

@@ -6,3 +6,4 @@ Gemfile.lock
 app/assets/javascripts/compiled
 spec/coffeescripts/compiled
 coverage
+.idea

data/.rubocop.yml

@@ -0,0 +1,11 @@
+AllCops:
+  Include:
+    - '**/Rakefile'
+  Exclude:
+    - 'spec/**/*'
+Style/LineLength:
+  Max: 99
+Style/FileName:
+  Enabled: false
+Documentation:
+  Enabled: false

data/.travis.yml

@@ -1,7 +1,8 @@
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.2
+  - 2.2.0
+  - rbx-2
 bundler_args: --without development
 before_script:
   - "export DISPLAY=:99.0"

data/Gemfile

@@ -1,12 +1,12 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 gemspec
 
 gem 'rake'
 gem 'faye-redis'
 gem 'guard'
 gem 'guard-coffeescript'
-gem 'jasmine'
-gem 'rspec'
-gem 'rspec-mocks'
+gem 'jasmine', '>= 2.0.0'
+gem 'rspec', '>= 3.0.0'
+gem 'rspec-mocks', '>= 3.0.0'
 gem 'webmock'
 gem 'coveralls', require: false

data/Guardfile

@@ -1,7 +1,7 @@
-guard 'coffeescript', :output => 'app/assets/javascripts/compiled' do
+guard 'coffeescript', output: 'app/assets/javascripts/compiled' do
   watch /^app\/assets\/javascripts\/(.*)\.coffee/
 end
 
-guard 'coffeescript', :output => 'spec/coffeescripts/compiled' do
+guard 'coffeescript', output: 'spec/coffeescripts/compiled' do
   watch /^spec\/coffeescripts\/(.*)\.coffee/
-end
+end

data/Rakefile

@@ -7,24 +7,24 @@ require 'coffee-script'
 require 'bundler/gem_tasks'
 load 'jasmine/tasks/jasmine.rake'
 
-desc "Run RSpec"
+desc 'Run RSpec'
 RSpec::Core::RakeTask.new do |t|
   t.verbose = false
 end
 
-task :default => [:spec, :compile_js, "jasmine:ci"]
+task default: [:spec, 'compile_js', 'jasmine:ci']
 
 def compile_coffee_script(file, path)
   source = File.read File.expand_path("#{path}/#{file}.coffee", __FILE__)
   compiled_path = File.expand_path("#{path}/compiled/", __FILE__)
-  if !(File.exists?(compiled_path) && File.directory?(compiled_path))
+  unless File.exist?(compiled_path) && File.directory?(compiled_path)
     Dir.mkdir compiled_path
   end
   destination = File.open File.join(compiled_path, file), 'w+'
   destination.write CoffeeScript.compile(source)
 end
 
-desc "Compile coffeescript"
+desc 'Compile coffeescript'
 task :compile_js do
   compile_coffee_script('danthes.js', '../app/assets/javascripts')
   compile_coffee_script('danthesSpec.js', '../spec/coffeescripts')

data/danthes.gemspec

@@ -1,18 +1,18 @@
 # -*- encoding: utf-8 -*-
-$:.unshift File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'danthes/version'
 Gem::Specification.new do |s|
-  s.name        = "danthes"
+  s.name        = 'danthes'
   s.version     = Danthes::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.author      = ["Alexander Simonov"]
-  s.email       = ["alex@simonov.me"]
-  s.homepage    = "http://github.com/phenomena/danthes"
-  s.summary     = "Private pub/sub messaging through Faye."
-  s.description = "Private pub/sub messaging in Rails through Faye. More Faye features supported. Based on PrivatePub."
-  s.files         = `git ls-files`.split($\)
+  s.author      = ['Alexander Simonov']
+  s.email       = ['alex@simonov.me']
+  s.homepage    = 'http://github.com/dotpromo/danthes'
+  s.summary     = 'Private pub/sub messaging through Faye.'
+  s.description = 'Private pub/sub messaging in Rails through Faye. More Faye features supported. Based on PrivatePub.'
+  s.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
   s.add_dependency 'faye',      '>= 1.0.1'
   s.add_dependency 'yajl-ruby', '~> 1.2.0'
 end

data/defaults.reek

@@ -0,0 +1,11 @@
+---
+NestedIterators:
+  max_allowed_nesting: 2
+UtilityFunction:
+  enabled: false
+IrresponsibleModule:
+  enabled: false
+DuplicateMethodCall:
+  max_calls: 5
+FeatureEnvy:
+  enabled: false

data/lib/danthes.rb

@@ -2,9 +2,9 @@ require 'digest/sha1'
 require 'net/http'
 require 'net/https'
 require 'yajl/json_gem'
+require 'erb'
 
 require 'danthes/faye_extension'
-require 'danthes/engine' if defined? Rails
 
 module Danthes
   class Error < StandardError; end
@@ -12,43 +12,45 @@ module Danthes
   class << self
     attr_reader :config
     attr_accessor :env
-    
+
     # List of accepted options in config file
     ACCEPTED_KEYS = %w(adapter server secret_token mount signature_expiration timeout)
-    
+
     # List of accepted options in redis config file
     REDIS_ACCEPTED_KEYS = %w(host port password database namespace socket)
 
     # Default options
-    DEFAULT_OPTIONS = {:mount => "/faye", :timeout => 60, :extensions => [FayeExtension.new]}
-    
+    DEFAULT_OPTIONS = { mount: '/faye', timeout: 60, extensions: [FayeExtension.new] }
+
     # Resets the configuration to the default
     # Set environment
     def startup
       @config = DEFAULT_OPTIONS.dup
-      @env = if defined? Rails
-               Rails.env
+      @env = if defined? ::Rails
+               ::Rails.env
              else
-               ENV["RAILS_ENV"] || "development"
+               ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
              end
     end
-    
+
     # Loads the configuration from a given YAML file
     def load_config(filename)
-      yaml = ::YAML.load(ERB.new(File.read(filename)).result)[env]
-      raise ArgumentError, "The #{environment} environment does not exist in #{filename}" if yaml.nil?
-      (yaml.keys - ACCEPTED_KEYS).each {|k| yaml.delete(k)}
-      yaml.each {|k, v| config[k.to_sym] = v}
+      yaml = ::YAML.load(::ERB.new(::File.read(filename)).result)[env]
+      fail ArgumentError, "The #{env} environment does not exist in #{filename}" if yaml.nil?
+      yaml.each do |key, val|
+        config[key.to_sym] = val if ACCEPTED_KEYS.include?(key)
+      end
     end
 
     # Loads the options from a given YAML file
     def load_redis_config(filename)
       require 'faye/redis'
-      yaml = YAML.load_file(filename)[env]
+      yaml = ::YAML.load(::ERB.new(::File.read(filename)).result)[env]
       # default redis options
-      options = {:type => Faye::Redis, :host => 'localhost', :port => 6379}
-      (yaml.keys - REDIS_ACCEPTED_KEYS).each {|k| yaml.delete(k)}
-      yaml.each {|k, v| options[k.to_sym] = v}
+      options = { type: Faye::Redis, host: 'localhost', port: 6379 }
+      yaml.each do |key, val|
+        options[key.to_sym] = val if REDIS_ACCEPTED_KEYS.include?(key)
+      end
       config[:engine] = options
     end
 
@@ -60,50 +62,58 @@ module Danthes
 
     # Sends the given message hash to the Faye server using Net::HTTP.
     def publish_message(message)
-      raise Error, "No server specified, ensure danthes.yml was loaded properly." unless config[:server]
+      fail Error, 'No server specified, ensure danthes.yml was loaded properly.' unless config[:server]
       url = URI.parse(server_url)
 
-      form = Net::HTTP::Post.new(url.path.empty? ? '/' : url.path)
-      form.set_form_data(:message => message.to_json)
+      form = ::Net::HTTP::Post.new(url.path.empty? ? '/' : url.path)
+      form.set_form_data(message: message.to_json)
 
-      http = Net::HTTP.new(url.host, url.port)
-      http.use_ssl = url.scheme == "https"
-      http.start {|h| h.request(form)}
+      http = ::Net::HTTP.new(url.host, url.port)
+      http.use_ssl = url.scheme == 'https'
+      http.start { |h| h.request(form) }
     end
 
     # Returns a message hash for sending to Faye
     def message(channel, data)
-      message = {:channel => channel, :data => {:channel => channel}, :ext => {:danthes_token => config[:secret_token]}}
-      if data.kind_of? String
+      message = { channel: channel,
+                  data: { channel: channel },
+                  ext: { danthes_token: config[:secret_token] }
+                }
+      if data.is_a? String
         message[:data][:eval] = data
       else
         message[:data][:data] = data
       end
       message
     end
-    
+
     def server_url
-      [config[:server], config[:mount].gsub(/^\//,'')].join('/')
+      [config[:server], config[:mount].gsub(/^\//, '')].join('/')
     end
-    
+
     # Returns a subscription hash to pass to the PrivatePub.sign call in JavaScript.
     # Any options passed are merged to the hash.
     def subscription(options = {})
-      sub = {:server => server_url, :timestamp => (Time.now.to_f * 1000).round}.merge(options)
-      sub[:signature] = Digest::SHA1.hexdigest([config[:secret_token], sub[:channel], sub[:timestamp]].join)
+      sub = { server: server_url, timestamp: (Time.now.to_f * 1000).round }.merge(options)
+      sub[:signature] = ::Digest::SHA1.hexdigest([config[:secret_token],
+                                                sub[:channel],
+                                                sub[:timestamp]].join)
       sub
     end
 
     # Determine if the signature has expired given a timestamp.
     def signature_expired?(timestamp)
-      timestamp < ((Time.now.to_f - config[:signature_expiration])*1000).round if config[:signature_expiration]
+      return false unless config[:signature_expiration]
+      timestamp < ((Time.now.to_f - config[:signature_expiration]) * 1000).round
     end
 
     # Returns the Faye Rack application.
     def faye_app
-      Faye::RackAdapter.new(config)
+      ::Faye::RackAdapter.new(config)
     end
   end
 
   startup
 end
+
+require 'danthes/engine' if defined? ::Rails

data/lib/danthes/engine.rb

@@ -1,15 +1,15 @@
-require "danthes/view_helpers"
+require 'danthes/view_helpers'
 
 module Danthes
   class Engine < Rails::Engine
     # Loads the danthes.yml file if it exists.
-    initializer "danthes.config" do
-      path = Rails.root.join("config/danthes.yml")
-      Danthes.load_config(path) if path.exist?
+    initializer 'danthes.config' do |app|
+      path = app.root.join('config/danthes.yml')
+      ::Danthes.load_config(path) if path.exist?
     end
 
     # Adds the ViewHelpers into ActionView::Base
-    initializer "danthes.view_helpers" do
+    initializer 'danthes.view_helpers' do
       ActionView::Base.send :include, ViewHelpers
     end
   end

data/lib/danthes/faye_extension.rb

@@ -5,35 +5,35 @@ module Danthes
     # Callback to handle incoming Faye messages. This authenticates both
     # subscribe and publish calls.
     def incoming(message, callback)
-      if message["channel"] == "/meta/subscribe"
+      if message['channel'] == '/meta/subscribe'
         authenticate_subscribe(message)
-      elsif message["channel"] !~ %r{^/meta/}
+      elsif message['channel'] !~ %r{^/meta/}
         authenticate_publish(message)
       end
       callback.call(message)
     end
 
-  private
+    private
 
     # Ensure the subscription signature is correct and that it has not expired.
     def authenticate_subscribe(message)
-      subscription = Danthes.subscription(:channel => message["subscription"], 
-                                          :timestamp => message["ext"]["danthes_timestamp"])
-      if message["ext"]["danthes_signature"] != subscription[:signature]
-        message["error"] = "Incorrect signature."
-      elsif Danthes.signature_expired? message["ext"]["danthes_timestamp"].to_i
-        message["error"] = "Signature has expired."
+      subscription = Danthes.subscription(channel: message['subscription'],
+                                          timestamp: message['ext']['danthes_timestamp'])
+      if message['ext']['danthes_signature'] != subscription[:signature]
+        message['error'] = 'Incorrect signature.'
+      elsif Danthes.signature_expired? message['ext']['danthes_timestamp'].to_i
+        message['error'] = 'Signature has expired.'
       end
     end
 
     # Ensures the secret token is correct before publishing.
     def authenticate_publish(message)
       if Danthes.config[:secret_token].nil?
-        raise Error, "No secret_token config set, ensure danthes.yml is loaded properly."
-      elsif message["ext"]["danthes_token"] != Danthes.config[:secret_token]
-        message["error"] = "Incorrect token."
+        fail Error, 'No secret_token config set, ensure danthes.yml is loaded properly.'
+      elsif message['ext']['danthes_token'] != Danthes.config[:secret_token]
+        message['error'] = 'Incorrect token.'
       else
-        message["ext"]["danthes_token"] = nil
+        message['ext']['danthes_token'] = nil
       end
     end
   end

data/lib/danthes/version.rb

@@ -1,3 +1,3 @@
 module Danthes
-  VERSION = '1.0.5'
+  VERSION = '2.0.0'
 end

data/lib/danthes/view_helpers.rb

@@ -13,8 +13,8 @@ module Danthes
     # some JavaScript calling Danthes.sign with the subscription
     # options.
     def subscribe_to(channel)
-      subscription = Danthes.subscription(:channel => channel)
-      content_tag "script", :type => "text/javascript" do
+      subscription = Danthes.subscription(channel: channel)
+      content_tag 'script', type: 'text/javascript' do
         raw("if (typeof Danthes != 'undefined') { Danthes.sign(#{subscription.to_json}) }")
       end
     end

data/lib/generators/danthes/install_generator.rb

@@ -1,15 +1,12 @@
-require 'generators/danthes'
+require 'generators/danthes_generator'
 
 module Danthes
   module Generators
     class InstallGenerator < Base
       desc 'Create sample config file and add rackup file'
       def copy_files
-        template "danthes.yml", "config/danthes.yml"
-        if ::Rails.version < "3.1"
-          copy_file "../../../../app/assets/javascripts/danthes.js.coffee", "public/javascripts/danthes.js.coffee"
-        end
-        copy_file "danthes.ru", "danthes.ru"
+        template 'danthes.yml', 'config/danthes.yml'
+        copy_file 'danthes.ru', 'danthes.ru'
       end
     end
   end

data/lib/generators/danthes/redis_install_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/danthes'
+require 'generators/danthes_generator'
 
 module Danthes
   module Generators
@@ -6,9 +6,9 @@ module Danthes
       desc 'Create sample redis config file and add faye-redis gem to Gemfile'
 
       def copy_files
-        template "danthes_redis.yml", "config/danthes_redis.yml"
+        template 'danthes_redis.yml', 'config/danthes_redis.yml'
       end
-      
+
       def add_redis_gem
         add_gem 'faye-redis'
       end

data/lib/generators/{danthes.rb → danthes_generator.rb}

@@ -4,22 +4,21 @@ module Danthes
   module Generators
     class Base < Rails::Generators::Base
       def self.source_root
-        File.dirname(__FILE__) + "/templates"
+        File.dirname(__FILE__) + '/templates'
       end
-      
+
       def self.banner
         "rails generate danthes:#{generator_name}"
       end
-      
-    private
-      
+
+      private
+
       def add_gem(name, options = {})
         gemfile_path = File.join(destination_root, 'Gemfile')
         gemfile_content = File.read(gemfile_path)
         File.open(gemfile_path, 'a') { |f| f.write("\n") } unless gemfile_content =~ /\n\Z/
         gem name, options unless gemfile_content.include? name
       end
-
     end
   end
 end

data/lib/generators/templates/danthes.ru

@@ -3,14 +3,13 @@ require "bundler/setup"
 require "yaml"
 require "faye"
 require "danthes"
-require "thin"
 
-Danthes.load_config(File.expand_path("../config/danthes.yml", __FILE__))
+::Danthes.load_config(File.expand_path("../config/danthes.yml", __FILE__))
 Faye::WebSocket.load_adapter(Danthes.config[:adapter])
 
 path = File.expand_path("../config/danthes_redis.yml", __FILE__)
 if File.exist?(path)
-  Danthes.load_redis_config(path)
+  ::Danthes.load_redis_config(path)
 end
 
-run Danthes.faye_app
+run ::Danthes.faye_app

data/spec/danthes/faye_extension_spec.rb

@@ -1,67 +1,67 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Danthes::FayeExtension do
   before(:each) do
     Danthes.startup
     @faye = Danthes::FayeExtension.new
-    @message = {"channel" => "/meta/subscribe", "ext" => {}}
+    @message = { 'channel' => '/meta/subscribe', 'ext' => {} }
   end
 
-  it "adds an error on an incoming subscription with a bad signature" do
-    @message["subscription"] = "hello"
-    @message["ext"]["danthes_signature"] = "bad"
-    @message["ext"]["danthes_timestamp"] = "123"
-    message = @faye.incoming(@message, lambda { |m| m })
-    message["error"].should eq("Incorrect signature.")
+  it 'adds an error on an incoming subscription with a bad signature' do
+    @message['subscription'] = 'hello'
+    @message['ext']['danthes_signature'] = 'bad'
+    @message['ext']['danthes_timestamp'] = '123'
+    message = @faye.incoming(@message, ->(m) { m })
+    expect(message['error']).to eq('Incorrect signature.')
   end
 
-  it "has no error when the signature matches the subscription" do
-    sub = Danthes.subscription(:channel => "hello")
-    @message["subscription"] = sub[:channel]
-    @message["ext"]["danthes_signature"] = sub[:signature]
-    @message["ext"]["danthes_timestamp"] = sub[:timestamp]
-    message = @faye.incoming(@message, lambda { |m| m })
-    message["error"].should be_nil
+  it 'has no error when the signature matches the subscription' do
+    sub = Danthes.subscription(channel: 'hello')
+    @message['subscription'] = sub[:channel]
+    @message['ext']['danthes_signature'] = sub[:signature]
+    @message['ext']['danthes_timestamp'] = sub[:timestamp]
+    message = @faye.incoming(@message, ->(m) { m })
+    expect(message['error']).to be_nil
   end
 
-  it "has an error when signature just expired" do
+  it 'has an error when signature just expired' do
     Danthes.config[:signature_expiration] = 1
-    sub = Danthes.subscription(:timestamp => 123, :channel => "hello")
-    @message["subscription"] = sub[:channel]
-    @message["ext"]["danthes_signature"] = sub[:signature]
-    @message["ext"]["danthes_timestamp"] = sub[:timestamp]
-    message = @faye.incoming(@message, lambda { |m| m })
-    message["error"].should eq("Signature has expired.")
+    sub = Danthes.subscription(timestamp: 123, channel: 'hello')
+    @message['subscription'] = sub[:channel]
+    @message['ext']['danthes_signature'] = sub[:signature]
+    @message['ext']['danthes_timestamp'] = sub[:timestamp]
+    message = @faye.incoming(@message, ->(m) { m })
+    expect(message['error']).to eq('Signature has expired.')
   end
 
-  it "has an error when trying to publish to a custom channel with a bad token" do
-    Danthes.config[:secret_token] = "good"
-    @message["channel"] = "/custom/channel"
-    @message["ext"]["danthes_token"] = "bad"
-    message = @faye.incoming(@message, lambda { |m| m })
-    message["error"].should eq("Incorrect token.")
+  it 'has an error when trying to publish to a custom channel with a bad token' do
+    Danthes.config[:secret_token] = 'good'
+    @message['channel'] = '/custom/channel'
+    @message['ext']['danthes_token'] = 'bad'
+    message = @faye.incoming(@message, ->(m) { m })
+    expect(message['error']).to eq('Incorrect token.')
   end
 
-  it "raises an exception when attempting to call a custom channel without a secret_token set" do
-    @message["channel"] = "/custom/channel"
-    @message["ext"]["danthes_token"] = "bad"
-    lambda {
-      message = @faye.incoming(@message, lambda { |m| m })
-    }.should raise_error("No secret_token config set, ensure danthes.yml is loaded properly.")
+  it 'raises an exception when attempting to call a custom channel without a secret_token set' do
+    @message['channel'] = '/custom/channel'
+    @message['ext']['danthes_token'] = 'bad'
+    expect do
+      message = @faye.incoming(@message, ->(m) { m })
+    end.to raise_error('No secret_token config set, ensure danthes.yml is loaded properly.')
   end
 
-  it "has no error on other meta calls" do
-    @message["channel"] = "/meta/connect"
-    message = @faye.incoming(@message, lambda { |m| m })
-    message["error"].should be_nil
+  it 'has no error on other meta calls' do
+    @message['channel'] = '/meta/connect'
+    message = @faye.incoming(@message, ->(m) { m })
+    expect(message['error']).to be_nil
   end
 
   it "should not let message carry the private pub token after server's validation" do
-    Danthes.config[:secret_token] = "good"
-    @message["channel"] = "/custom/channel"
-    @message["ext"]["danthes_token"] = Danthes.config[:secret_token]
-    message = @faye.incoming(@message, lambda { |m| m })
-    message['ext']["danthes_token"].should be_nil
+    Danthes.config[:secret_token] = 'good'
+    @message['channel'] = '/custom/channel'
+    @message['ext']['danthes_token'] = Danthes.config[:secret_token]
+    message = @faye.incoming(@message, ->(m) { m })
+    expect(message['ext']['danthes_token']).to be_nil
   end
 
 end

data/spec/danthes_spec.rb

@@ -1,190 +1,190 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Danthes do
   before(:each) do
     Danthes.startup
   end
-  
+
   let(:config) { Danthes.config }
 
-  it "defaults server to nil" do
-    config[:server].should be_nil
+  it 'defaults server to nil' do
+    expect(config[:server]).to be_nil
   end
 
-  it "defaults signature_expiration to nil" do
-    config[:signature_expiration].should be_nil
+  it 'defaults signature_expiration to nil' do
+    expect(config[:signature_expiration]).to be_nil
   end
 
-  it "defaults subscription timestamp to current time in milliseconds" do
+  it 'defaults subscription timestamp to current time in milliseconds' do
     time = Time.now
-    Time.stub(:now).and_return(time)
-    Danthes.subscription[:timestamp].should eq((time.to_f * 1000).round)
+    allow(Time).to receive(:now).and_return(time)
+    expect(Danthes.subscription[:timestamp]).to eq((time.to_f * 1000).round)
   end
 
-  it "loads a simple configuration file via load_config" do
+  it 'loads a simple configuration file via load_config' do
     Danthes.env = 'production'
-    Danthes.load_config("spec/fixtures/danthes.yml")
-    config[:server].should eq("http://example.com/faye")
-    config[:secret_token].should eq("PRODUCTION_SECRET_TOKEN")
-    config[:signature_expiration].should eq(600)
-    config[:adapter].should eq('thin')
+    Danthes.load_config('spec/fixtures/danthes.yml')
+    expect(config[:server]).to eq('http://example.com/faye')
+    expect(config[:secret_token]).to eq('PRODUCTION_SECRET_TOKEN')
+    expect(config[:signature_expiration]).to eq(600)
+    expect(config[:adapter]).to eq('thin')
   end
 
-  it "loads configuration file with erb via load_config" do
-    ENV['DANTHES_SERVER'] = "http://example.com"
+  it 'loads configuration file with erb via load_config' do
+    ENV['DANTHES_SERVER'] = 'http://example.com'
     Danthes.env = 'production'
-    Danthes.load_config("spec/fixtures/danthes_with_erb.yml")
-    config[:server].should eq("http://example.com")
+    Danthes.load_config('spec/fixtures/danthes_with_erb.yml')
+    expect(config[:server]).to eq('http://example.com')
   end
 
-  context "when redis config exists" do
+  context 'when redis config exists' do
     before do
       Danthes.env = 'test'
-      Danthes.load_redis_config("spec/fixtures/danthes_redis.yml")
+      Danthes.load_redis_config('spec/fixtures/danthes_redis.yml')
     end
 
-    it "passes redis config to faye engine options" do
-      config[:engine][:type].should eq Faye::Redis
-      config[:engine][:host].should eq 'redis_host'
-      config[:engine][:port].should eq 'redis_port'
-      config[:engine][:password].should eq 'redis_password'
-      config[:engine][:database].should eq 'redis_database'
-      config[:engine][:namespace].should eq '/namespace'
+    it 'passes redis config to faye engine options' do
+      expect(config[:engine][:type]).to eq Faye::Redis
+      expect(config[:engine][:host]).to eq 'redis_host'
+      expect(config[:engine][:port]).to eq 'redis_port'
+      expect(config[:engine][:password]).to eq 'redis_password'
+      expect(config[:engine][:database]).to eq 'redis_database'
+      expect(config[:engine][:namespace]).to eq '/namespace'
     end
 
-    it "should pass redis config and default options to faye" do
-      Faye::RackAdapter.should_receive(:new) do |options|
-        options[:engine].should eq Danthes.config[:engine]
-        options[:mount].should eq '/faye'
+    it 'should pass redis config and default options to faye' do
+      expect(Faye::RackAdapter).to receive(:new) do |options|
+        expect(options[:engine]).to eq Danthes.config[:engine]
+        expect(options[:mount]).to eq '/faye'
       end
       Danthes.faye_app
     end
   end
 
-  context "when redis config does not exist" do
-    it "should not have :engine inside of config hash" do
-      config.should_not include :engine
+  context 'when redis config does not exist' do
+    it 'should not have :engine inside of config hash' do
+      expect(config).not_to include :engine
     end
 
-    it "should have mount point" do
-      config[:mount].should eq '/faye'
+    it 'should have mount point' do
+      expect(config[:mount]).to eq '/faye'
     end
   end
 
-  it "raises an exception if an invalid environment is passed to load_config" do
-    lambda {
-      Danthes.load_config("spec/fixtures/danthes.yml", 'foo')
-    }.should raise_error ArgumentError
+  it 'raises an exception if an invalid environment is passed to load_config' do
+    expect do
+      Danthes.load_config('spec/fixtures/danthes.yml', 'foo')
+    end.to raise_error ArgumentError
   end
 
-  it "includes channel, server, and custom time in subscription" do
-    Danthes.config[:server] = "server"
+  it 'includes channel, server, and custom time in subscription' do
+    Danthes.config[:server] = 'server'
     Danthes.config[:mount] = '/faye'
-    subscription = Danthes.subscription(:timestamp => 123, :channel => "hello")
-    subscription[:timestamp].should eq(123)
-    subscription[:channel].should eq("hello")
-    subscription[:server].should eq("server/faye")
-  end
-  
-  it "returns full server url from server and mount configs" do
-    Danthes.config[:server] = "server.com"
+    subscription = Danthes.subscription(timestamp: 123, channel: 'hello')
+    expect(subscription[:timestamp]).to eq(123)
+    expect(subscription[:channel]).to eq('hello')
+    expect(subscription[:server]).to eq('server/faye')
+  end
+
+  it 'returns full server url from server and mount configs' do
+    Danthes.config[:server] = 'server.com'
     Danthes.config[:mount] = '/faye'
-    Danthes.server_url.should == 'server.com/faye'
+    expect(Danthes.server_url).to eq('server.com/faye')
   end
 
-  it "does a sha1 digest of channel, timestamp, and secret token" do
-    Danthes.config[:secret_token] = "token"
-    subscription = Danthes.subscription(:timestamp => 123, :channel => "channel")
-    subscription[:signature].should eq(Digest::SHA1.hexdigest("tokenchannel123"))
+  it 'does a sha1 digest of channel, timestamp, and secret token' do
+    Danthes.config[:secret_token] = 'token'
+    subscription = Danthes.subscription(timestamp: 123, channel: 'channel')
+    expect(subscription[:signature]).to eq(Digest::SHA1.hexdigest('tokenchannel123'))
   end
 
-  it "formats a message hash given a channel and a string for eval" do
-    Danthes.config[:secret_token] = "token"
-    Danthes.message("chan", "foo").should eq(
-      :ext => {:danthes_token => "token"},
-      :channel => "chan",
-      :data => {
-        :channel => "chan",
-        :eval => "foo"
+  it 'formats a message hash given a channel and a string for eval' do
+    Danthes.config[:secret_token] = 'token'
+    expect(Danthes.message('chan', 'foo')).to eq(
+      ext: { danthes_token: 'token' },
+      channel: 'chan',
+      data: {
+        channel: 'chan',
+        eval: 'foo'
       }
     )
   end
 
-  it "formats a message hash given a channel and a hash" do
-    Danthes.config[:secret_token] = "token"
-    Danthes.message("chan", :foo => "bar").should eq(
-      :ext => {:danthes_token => "token"},
-      :channel => "chan",
-      :data => {
-        :channel => "chan",
-        :data => {:foo => "bar"}
+  it 'formats a message hash given a channel and a hash' do
+    Danthes.config[:secret_token] = 'token'
+    expect(Danthes.message('chan', foo: 'bar')).to eq(
+      ext: { danthes_token: 'token' },
+      channel: 'chan',
+      data: {
+        channel: 'chan',
+        data: { foo: 'bar' }
       }
     )
   end
 
-  it "publish message as json to server using Net::HTTP" do
-    Danthes.config[:server] = "http://localhost"
+  it 'publish message as json to server using Net::HTTP' do
+    Danthes.config[:server] = 'http://localhost'
     Danthes.config[:mount] = '/faye/path'
     message = 'foo'
-    faye = stub_request(:post, "http://localhost/faye/path").
-             with(:body => {"message"=>"\"foo\""},
-                  :headers => {'Accept'=>'*/*', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Ruby'}).
-             to_return(:status => 200, :body => "", :headers => {})
+    faye = stub_request(:post, 'http://localhost/faye/path').
+             with(body: { 'message' => "\"foo\"" },
+                  headers: { 'Accept' => '*/*', 'Content-Type' => 'application/x-www-form-urlencoded', 'User-Agent' => 'Ruby' }).
+             to_return(status: 200, body: '', headers: {})
     Danthes.publish_message(message)
-    faye.should have_been_made.once
+    expect(faye).to have_been_made.once
   end
 
-  it "it should use HTTPS if the server URL says so" do
-    Danthes.config[:server] = "https://localhost"
+  it 'it should use HTTPS if the server URL says so' do
+    Danthes.config[:server] = 'https://localhost'
     Danthes.config[:mount] = '/faye/path'
     http = double(:http).as_null_object
 
-    Net::HTTP.should_receive(:new).and_return(http)
-    http.should_receive(:use_ssl=).with(true)
+    expect(Net::HTTP).to receive(:new).and_return(http)
+    expect(http).to receive(:use_ssl=).with(true)
 
     Danthes.publish_message('foo')
   end
 
-  it "it should not use HTTPS if the server URL says not to" do
-    Danthes.config[:server] = "http://localhost"
+  it 'it should not use HTTPS if the server URL says not to' do
+    Danthes.config[:server] = 'http://localhost'
     http = double(:http).as_null_object
 
-    Net::HTTP.should_receive(:new).and_return(http)
-    http.should_receive(:use_ssl=).with(false)
+    expect(Net::HTTP).to receive(:new).and_return(http)
+    expect(http).to receive(:use_ssl=).with(false)
 
     Danthes.publish_message('foo')
   end
 
-  it "raises an exception if no server is specified when calling publish_message" do
-    lambda {
-      Danthes.publish_message("foo")
-    }.should raise_error(Danthes::Error)
+  it 'raises an exception if no server is specified when calling publish_message' do
+    expect do
+      Danthes.publish_message('foo')
+    end.to raise_error(Danthes::Error)
   end
 
-  it "publish_to passes message to publish_message call" do
-    Danthes.should_receive(:message).with("chan", "foo").and_return("message")
-    Danthes.should_receive(:publish_message).with("message").and_return(:result)
-    Danthes.publish_to("chan", "foo").should eq(:result)
+  it 'publish_to passes message to publish_message call' do
+    expect(Danthes).to receive(:message).with('chan', 'foo').and_return('message')
+    expect(Danthes).to receive(:publish_message).with('message').and_return(:result)
+    expect(Danthes.publish_to('chan', 'foo')).to eq(:result)
   end
 
-  it "has a Faye rack app instance" do
-    Danthes.faye_app.should be_kind_of(Faye::RackAdapter)
+  it 'has a Faye rack app instance' do
+    expect(Danthes.faye_app).to be_kind_of(Faye::RackAdapter)
   end
 
-  it "says signature has expired when time passed in is greater than expiration" do
-    Danthes.config[:signature_expiration] = 30*60
-    time = Danthes.subscription[:timestamp] - 31*60*1000
-    Danthes.signature_expired?(time).should be_true
+  it 'says signature has expired when time passed in is greater than expiration' do
+    Danthes.config[:signature_expiration] = 30 * 60
+    time = Danthes.subscription[:timestamp] - 31 * 60 * 1000
+    expect(Danthes.signature_expired?(time)).to be_truthy
   end
 
-  it "says signature has not expired when time passed in is less than expiration" do
-    Danthes.config[:signature_expiration] = 30*60
-    time = Danthes.subscription[:timestamp] - 29*60*1000
-    Danthes.signature_expired?(time).should be_false
+  it 'says signature has not expired when time passed in is less than expiration' do
+    Danthes.config[:signature_expiration] = 30 * 60
+    time = Danthes.subscription[:timestamp] - 29 * 60 * 1000
+    expect(Danthes.signature_expired?(time)).to be_falsy
   end
 
-  it "says signature has not expired when expiration is nil" do
+  it 'says signature has not expired when expiration is nil' do
     Danthes.config[:signature_expiration] = nil
-    Danthes.signature_expired?(0).should be_false
+    expect(Danthes.signature_expired?(0)).to be_falsy
   end
 end

data/spec/javascripts/support/jasmine_helper.rb

@@ -1,12 +1,11 @@
-#Use this file to set/override Jasmine configuration options
-#You can remove it if you don't need it.
-#This file is loaded *after* jasmine.yml is interpreted.
+# Use this file to set/override Jasmine configuration options
+# You can remove it if you don't need it.
+# This file is loaded *after* jasmine.yml is interpreted.
 #
-#Example: using a different boot file.
+# Example: using a different boot file.
 Jasmine.configure do |config|
   config.ci_port = 8888
-#   config.boot_dir = '/absolute/path/to/boot_dir'
-#   config.boot_files = lambda { ['/absolute/path/to/boot_dir/file.js'] }
+  #   config.boot_dir = '/absolute/path/to/boot_dir'
+  #   config.boot_files = lambda { ['/absolute/path/to/boot_dir/file.js'] }
 end
 #
-

data/spec/spec_helper.rb

@@ -6,5 +6,5 @@ Bundler.require(:default)
 require 'coveralls'
 Coveralls.wear!
 require 'webmock/rspec'
-RSpec.configure do |config|
+RSpec.configure do |_config|
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: danthes
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 2.0.0
 platform: ruby
 authors:
 - Alexander Simonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
 description: Private pub/sub messaging in Rails through Faye. More Faye features supported.
@@ -46,11 +46,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -59,14 +58,15 @@ files:
 - Rakefile
 - app/assets/javascripts/danthes.js.coffee
 - danthes.gemspec
+- defaults.reek
 - lib/danthes.rb
 - lib/danthes/engine.rb
 - lib/danthes/faye_extension.rb
 - lib/danthes/version.rb
 - lib/danthes/view_helpers.rb
-- lib/generators/danthes.rb
 - lib/generators/danthes/install_generator.rb
 - lib/generators/danthes/redis_install_generator.rb
+- lib/generators/danthes_generator.rb
 - lib/generators/templates/danthes.ru
 - lib/generators/templates/danthes.yml
 - lib/generators/templates/danthes_redis.yml
@@ -79,7 +79,7 @@ files:
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_helper.rb
 - spec/spec_helper.rb
-homepage: http://github.com/phenomena/danthes
+homepage: http://github.com/dotpromo/danthes
 licenses: []
 metadata: {}
 post_install_message: 
@@ -88,17 +88,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Private pub/sub messaging through Faye.

data/.ruby-gemset

@@ -1 +0,0 @@
-danthes

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.0.0