peritus_private_pub 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2d74b2ca28c9454171edb4bb8eb0e38bbd62bcb
-  data.tar.gz: 426e6520b232983706ccd0154cd61aa0de7824c7
+  metadata.gz: ecb5cfd2854e690c5ca9093deaa7cb7eb48b3863
+  data.tar.gz: 51f96b16162ea332c6ff2e1a2cf7e82d08ae0345
 SHA512:
-  metadata.gz: a104218d7fda5508ef4bf28515d541954a33e72bba3b5f0d303820511eaf4fb9a19f5f9b0d13d2c28f5683353132a6a90ccc7d035a44315ef212e4238cf439dd
-  data.tar.gz: da07fdb106ae2b6e6f82daea5a1f53dbf8252164d8fc3fa3731a17c7c093ef8d41e37d730b5b0696d15b678cf07f039bee49ceaeb69439115ffa532f8513ba58
+  metadata.gz: 14671721191294a08524a8d114f67f29751380dae039bdeb9c60cdf290a57f632085bbb57e2da5e5832bb00c9451830bed5db16e0f1260052fc7cc65023c3367
+  data.tar.gz: 9cccc0fc1b37b9481fb06db738aa381101b7d3be71324b46738c2ee4f4e85fc2014dc24c7f0c6b07321f5893eccb91f073be37e1b229404e9b1a477b0190df0c

data/lib/peritus_private_pub.rb

@@ -2,6 +2,7 @@ require "digest/sha1"
 require "net/http"
 require "net/https"
 require "erb"
+require "YAML"
 
 require "private_pub/faye_extension"
 require "private_pub/engine" if defined? Rails
@@ -22,6 +23,8 @@ module PrivatePub
       yaml = YAML.load(ERB.new(File.read(filename)).result)[environment.to_s]
       raise ArgumentError, "The #{environment} environment does not exist in #{filename}" if yaml.nil?
       yaml.each { |k, v| config[k.to_sym] = v }
+      url = URI.parse(config[:server])
+      raise Error, "No host defined. Ensure LOCAL_IP is defined" unless url.host
     end
 
     # Publish the given data to a specific channel. This ends up sending
@@ -32,9 +35,7 @@ module PrivatePub
 
     # Sends the given message hash to the Faye server using Net::HTTP.
     def publish_message(message)
-      if config[:server].nil? or config[:server].blank?
-        raise Error, "No server specified, ensure private_pub.yml was loaded properly and that LOCAL_IP is defined."
-      end
+      raise Error, "No server specified, ensure private_pub.yml was loaded properly." unless config[:server]
 
       url = URI.parse(config[:server])
 
@@ -60,10 +61,6 @@ module PrivatePub
     # Returns a subscription hash to pass to the PrivatePub.sign call in JavaScript.
     # Any options passed are merged to the hash.
     def subscription(options = {})
-      if config[:server].nil? or config[:server].blank?
-        raise Error, "No server specified, ensure private_pub.yml was loaded properly and that LOCAL_IP is defined."
-      end
-
       sub = {:server => config[:server], :timestamp => (Time.now.to_f * 1000).round}.merge(options)
       sub[:signature] = Digest::SHA1.hexdigest([config[:secret_token], sub[:channel], sub[:timestamp]].join)
       sub

data/peritus_private_pub.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name        = "peritus_private_pub"
-  s.version     = "1.0.4"
+  s.version     = "1.0.5"
   s.author      = "Tyler DeWitt"
   s.email       = "tdewitt@peritus.com"
   s.homepage    = "https://github.com/PeritusSolutions/peritus_private_pub"
   s.summary     = "Private pub/sub messaging in Rails."
   s.description = "Private pub/sub messaging in Rails through Faye."
 
-  s.files        = Dir["{app,lib,spec}/**/*", "[A-Z]*", "init.rb"] - ["Gemfile.lock"]
+  s.files        = Dir["{app,lib,spec}/**/*", "[A-Z]*", "init.rb"] - ["Gemfile.lock"] - Dir["*.gem"]
   s.require_path = "lib"
 
   s.add_dependency 'faye'

data/spec/fixtures/private_pub.yml

@@ -6,3 +6,7 @@ production:
   server: http://example.com/faye
   secret_token: PRODUCTION_SECRET_TOKEN
   signature_expiration: 600
+no_host:
+  server: http://:9292/faye
+  secret_token: NO_HOST_SECRET_TOKEN
+  signature_expiration: 600

data/spec/private_pub_spec.rb

@@ -26,6 +26,12 @@ describe PrivatePub do
     PrivatePub.config[:signature_expiration].should eq(600)
   end
 
+  it "raises an exception when no host is defined in server" do
+    lambda {
+    PrivatePub.load_config("spec/fixtures/private_pub.yml", "no_host")
+    }.should raise_error PrivatePub::Error
+  end
+
   it "raises an exception if an invalid environment is passed to load_config" do
     lambda {
       PrivatePub.load_config("spec/fixtures/private_pub.yml", :test)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peritus_private_pub
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Tyler DeWitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye
@@ -85,7 +85,6 @@ files:
 - lib/private_pub/engine.rb
 - lib/private_pub/faye_extension.rb
 - lib/private_pub/view_helpers.rb
-- peritus_private_pub-1.0.3.gem
 - peritus_private_pub.gemspec
 - spec/fixtures/private_pub.yml
 - spec/javascripts/private_pub_spec.js