danthes 1.0.4 → 1.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 27e0f4f55cd741d5f62a313e52db507f1bbf433b
+  data.tar.gz: 372ff2271b39062cfb5a317f18c6e6fdae987b4f
+SHA512:
+  metadata.gz: f5a8fb58b6b150c9f203cdb3893e23d3acb07d4b47ae9fb5ba4e474eb850ee8281263573099272dfa75df03ea81b3aecaf1633911b7bc9ea3a5c73d0f99fecba
+  data.tar.gz: 6daad290b612e2d8b96e340db92583b4d6698ce08be4a11c2c1347073f7a7fe143bfc9ea79b6ffd13abc764a3c583a3a85eec8272f9908228371e09df07758d1

data/.gitignore

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

data/.ruby-gemset

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

data/.ruby-version

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

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.1
 bundler_args: --without development
 before_script:
   - "export DISPLAY=:99.0"

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # d'Anthès
 
+## 1.0.5 (May 19 2014)
+
+* Added ERB support in configuration files
+
 ## 1.0.4 (February 25 2013)
 
 * Added possibility to activate Faye's subscription later on subscribe call

data/Gemfile

@@ -5,7 +5,8 @@ gem 'rake'
 gem 'faye-redis'
 gem 'guard'
 gem 'guard-coffeescript'
-gem 'jasmine', '1.3.0'
+gem 'jasmine'
 gem 'rspec'
 gem 'rspec-mocks'
 gem 'webmock'
+gem 'coveralls', require: false

data/README.md

@@ -1,12 +1,12 @@
-# d'Anthès [![Build Status](https://secure.travis-ci.org/phenomena/danthes.png?branch=master)](http://travis-ci.org/phenomena/danthes)
+# d'Anthès [![Build Status](https://secure.travis-ci.org/dotpromo/danthes.png?branch=master)](http://travis-ci.org/dotpromo/danthes)[![Code Climate](https://codeclimate.com/github/dotpromo/danthes.png)](https://codeclimate.com/github/dotpromo/danthes)[![Coverage Status](https://coveralls.io/repos/dotpromo/danthes/badge.png?branch=master)](https://coveralls.io/r/dotpromo/danthes)
 
 d'Anthès is a Ruby gem for use with Rails to publish and subscribe to messages through [Faye](http://faye.jcoglan.com/). It allows you to easily provide real-time updates through an open socket without tying up a Rails process. All channels are private so users can only listen to events you subscribe them to. Based on PrivatePub gem.
 
 ## Docs
 
-[Ruby](http://rubydoc.info/github/phenomena/danthes/frames)
+[Ruby](http://rubydoc.info/github/dotpromo/danthes/frames)
 
-[CoffeeScript](https://github.com/phenomena/danthes/wiki/CoffeeScript-documentation)
+[CoffeeScript](https://github.com/dotpromo/danthes/wiki/CoffeeScript-documentation)
 
 ## Setup
 
@@ -146,7 +146,7 @@ The `publish_to` method will send a post request to the Faye server (using `Net:
 
 ## Development & Feedback
 
-Questions or comments? Please use the [issue tracker](https://github.com/phenomena/danthes/issues). Tests can be run with `bundle` and `rake` commands.
+Questions or comments? Please use the [issue tracker](https://github.com/dotpromo/danthes/issues). Tests can be run with `bundle` and `rake` commands.
 
 ## TODO
 

data/Rakefile

@@ -4,6 +4,7 @@ require 'rspec/core/rake_task'
 require 'yaml'
 require 'jasmine'
 require 'coffee-script'
+require 'bundler/gem_tasks'
 load 'jasmine/tasks/jasmine.rake'
 
 desc "Run RSpec"
@@ -11,7 +12,7 @@ RSpec::Core::RakeTask.new do |t|
   t.verbose = false
 end
 
-task :default => [:compile_js, :spec, "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__)
@@ -26,5 +27,5 @@ end
 desc "Compile coffeescript"
 task :compile_js do
   compile_coffee_script('danthes.js', '../app/assets/javascripts')
-  compile_coffee_script('danthes_spec.js', '../spec/coffeescripts')
+  compile_coffee_script('danthesSpec.js', '../spec/coffeescripts')
 end

data/danthes.gemspec

@@ -13,5 +13,6 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($\)
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
-  s.add_dependency 'faye', '>= 0.8.0'
+  s.add_dependency 'faye',      '>= 1.0.1'
+  s.add_dependency 'yajl-ruby', '~> 1.2.0'
 end

data/lib/danthes.rb

@@ -35,7 +35,7 @@ module Danthes
     
     # Loads the configuration from a given YAML file
     def load_config(filename)
-      yaml = ::YAML.load_file(filename)[env]
+      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}

data/lib/danthes/version.rb

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

data/spec/coffeescripts/{danthes_spec.js.coffee → danthesSpec.js.coffee}

@@ -4,8 +4,8 @@ describe "Danthes", ->
 
   signToChannel = (channel, addOptions = {}) ->
     sub = {callback: jasmine.createSpy(), errback: jasmine.createSpy()}
-    faye = {subscribe: jasmine.createSpy().andReturn(sub)}
-    spyOn(pub, 'faye').andCallFake (callback) ->
+    faye = {subscribe: jasmine.createSpy().and.returnValue(sub)}
+    spyOn(pub, 'faye').and.callFake (callback) ->
       callback(faye)
     options = {server: "server", channel: "#{channel}", timestamp: 1234567890, signature: '1234567890'}
     options['connect'] = addOptions['connect'] if addOptions['connect']?
@@ -158,7 +158,7 @@ describe "Danthes", ->
 
   it "adds subscription faye object into channel object", ->
     sub = {callback: jasmine.createSpy(), errback: jasmine.createSpy()}
-    pub.fayeClient = {subscribe: jasmine.createSpy().andReturn(sub)}
+    pub.fayeClient = {subscribe: jasmine.createSpy().and.returnValue(sub)}
     options = {server: "server", channel: 'somechannel'}
     pub.sign(options)
     pub.subscribe("somechannel", jasmine.createSpy())
@@ -171,7 +171,7 @@ describe "Danthes", ->
       callback: (f) ->
         f()
       errback: jasmine.createSpy()
-    pub.fayeClient = {subscribe: jasmine.createSpy().andReturn(sub)}
+    pub.fayeClient = {subscribe: jasmine.createSpy().and.returnValue(sub)}
     options = {server: "server", channel: 'somechannel'}
     pub.sign(options)
     connectSpy = jasmine.createSpy()
@@ -183,7 +183,7 @@ describe "Danthes", ->
       callback: jasmine.createSpy()
       errback: (f) ->
         f('error')
-    pub.fayeClient = {subscribe: jasmine.createSpy().andReturn(sub)}
+    pub.fayeClient = {subscribe: jasmine.createSpy().and.returnValue(sub)}
     erroSpy = jasmine.createSpy()
     options = {server: "server", channel: 'somechannel'}
     pub.sign(options)
@@ -192,7 +192,7 @@ describe "Danthes", ->
 
   it "removes subscription to the channel", ->
     sub = {callback: jasmine.createSpy(), errback: jasmine.createSpy(), cancel: jasmine.createSpy()}
-    pub.fayeClient = {subscribe: jasmine.createSpy().andReturn(sub)}
+    pub.fayeClient = {subscribe: jasmine.createSpy().and.returnValue(sub)}
     options = {server: "server", channel: 'somechannel'}
     pub.sign(options)
     pub.subscribe('somechannel', jasmine.createSpy())
@@ -202,7 +202,7 @@ describe "Danthes", ->
 
   it "removes all subscription to the channels", ->
     sub = {callback: jasmine.createSpy(), errback: jasmine.createSpy(), cancel: jasmine.createSpy()}
-    pub.fayeClient = {subscribe: jasmine.createSpy().andReturn(sub)}
+    pub.fayeClient = {subscribe: jasmine.createSpy().and.returnValue(sub)}
     options = {server: "server", channel: 'somechannel'}
     pub.sign(options)
     pub.subscribe "somechannel", jasmine.createSpy()

data/spec/danthes_spec.rb

@@ -17,7 +17,7 @@ describe Danthes do
 
   it "defaults subscription timestamp to current time in milliseconds" do
     time = Time.now
-    Time.stub!(:now).and_return(time)
+    Time.stub(:now).and_return(time)
     Danthes.subscription[:timestamp].should eq((time.to_f * 1000).round)
   end
 
@@ -30,6 +30,13 @@ describe Danthes do
     config[:adapter].should eq('thin')
   end
 
+  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")
+  end
+
   context "when redis config exists" do
     before do
       Danthes.env = 'test'
@@ -130,7 +137,7 @@ describe Danthes do
   it "it should use HTTPS if the server URL says so" do
     Danthes.config[:server] = "https://localhost"
     Danthes.config[:mount] = '/faye/path'
-    http = mock(:http).as_null_object
+    http = double(:http).as_null_object
 
     Net::HTTP.should_receive(:new).and_return(http)
     http.should_receive(:use_ssl=).with(true)
@@ -140,7 +147,7 @@ describe Danthes do
 
   it "it should not use HTTPS if the server URL says not to" do
     Danthes.config[:server] = "http://localhost"
-    http = mock(:http).as_null_object
+    http = double(:http).as_null_object
 
     Net::HTTP.should_receive(:new).and_return(http)
     http.should_receive(:use_ssl=).with(false)

data/spec/fixtures/danthes_with_erb.yml

@@ -0,0 +1,10 @@
+development:
+  adapter: thin
+  server: http://dev.local:9292/faye
+  secret_token: DEVELOPMENT_SECRET_TOKEN
+  signature_expiration: 600
+production:
+  adapter: thin
+  server: <%= ENV['DANTHES_SERVER'] %>
+  secret_token: PRODUCTION_SECRET_TOKEN
+  signature_expiration: 600

data/spec/javascripts/support/jasmine.yml

@@ -3,4 +3,7 @@ src_dir: app/assets/javascripts/compiled
 src_files:
   - danthes.js
 
-spec_dir: spec/coffeescripts/compiled
+spec_dir: spec/coffeescripts/compiled
+
+spec_files:
+  - danthesSpec.js

data/spec/javascripts/support/jasmine_helper.rb

@@ -0,0 +1,12 @@
+#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.
+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'] }
+end
+#
+

data/spec/spec_helper.rb

@@ -3,6 +3,8 @@ require 'bundler/setup'
 require 'faye'
 require 'faye/redis'
 Bundler.require(:default)
+require 'coveralls'
+Coveralls.wear!
 require 'webmock/rspec'
 RSpec.configure do |config|
 end

metadata

@@ -1,32 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: danthes
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 1.0.5
 platform: ruby
 authors:
 - Alexander Simonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        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.
   Based on PrivatePub.
 email:
@@ -37,7 +48,8 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -58,46 +70,45 @@ files:
 - lib/generators/templates/danthes.ru
 - lib/generators/templates/danthes.yml
 - lib/generators/templates/danthes_redis.yml
-- spec/coffeescripts/danthes_spec.js.coffee
+- spec/coffeescripts/danthesSpec.js.coffee
 - spec/danthes/faye_extension_spec.rb
 - spec/danthes_spec.rb
 - spec/fixtures/danthes.yml
 - spec/fixtures/danthes_redis.yml
+- spec/fixtures/danthes_with_erb.yml
 - spec/javascripts/support/jasmine.yml
-- spec/javascripts/support/jasmine_config.rb
-- spec/javascripts/support/jasmine_runner.rb
+- spec/javascripts/support/jasmine_helper.rb
 - spec/spec_helper.rb
 homepage: http://github.com/phenomena/danthes
 licenses: []
+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.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Private pub/sub messaging through Faye.
 test_files:
-- spec/coffeescripts/danthes_spec.js.coffee
+- spec/coffeescripts/danthesSpec.js.coffee
 - spec/danthes/faye_extension_spec.rb
 - spec/danthes_spec.rb
 - spec/fixtures/danthes.yml
 - spec/fixtures/danthes_redis.yml
+- spec/fixtures/danthes_with_erb.yml
 - spec/javascripts/support/jasmine.yml
-- spec/javascripts/support/jasmine_config.rb
-- spec/javascripts/support/jasmine_runner.rb
+- spec/javascripts/support/jasmine_helper.rb
 - spec/spec_helper.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@danthes --create

data/spec/javascripts/support/jasmine_config.rb

@@ -1,24 +0,0 @@
-module Jasmine
-  require 'yaml'
-  class Config
-
-    # Add your overrides or custom config code here
-
-  end
-end
-
-
-# Note - this is necessary for rspec2, which has removed the backtrace
-module Jasmine
-  class SpecBuilder
-    def declare_spec(parent, spec)
-      me = self
-      example_name = spec["name"]
-      @spec_ids << spec["id"]
-      backtrace = @example_locations[parent.description + " " + example_name]
-      parent.it example_name, {} do
-        me.report_spec(spec["id"])
-      end
-    end
-  end
-end

data/spec/javascripts/support/jasmine_runner.rb

@@ -1,33 +0,0 @@
-$:.unshift(ENV['JASMINE_GEM_PATH']) if ENV['JASMINE_GEM_PATH'] # for gem testing purposes
-
-require 'rubygems'
-require 'yaml'
-require 'jasmine'
-jasmine_config_overrides = File.expand_path(File.join(File.dirname(__FILE__), 'jasmine_config.rb'))
-require jasmine_config_overrides if File.exist?(jasmine_config_overrides)
-if Jasmine::Dependencies.rspec2?
-  require 'rspec'
-else
-  require 'spec'
-end
-
-jasmine_config = Jasmine::Config.new
-spec_builder = Jasmine::SpecBuilder.new(jasmine_config)
-
-should_stop = false
-
-if Jasmine::Dependencies.rspec2?
-  RSpec.configuration.after(:suite) do
-    spec_builder.stop if should_stop
-  end
-else
-  Spec::Runner.configure do |config|
-    config.after(:suite) do
-      spec_builder.stop if should_stop
-    end
-  end
-end
-
-spec_builder.start
-should_stop = true
-spec_builder.declare_suites