websocket-gui 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 810ab8cd2d4babe30b454e23331a26ca3157098a
-  data.tar.gz: 7c52fdad5960f6f53b9edd756e1f8619d890371e
+  metadata.gz: 9002a935110186c94b8c3a51e2e70396f445af4f
+  data.tar.gz: 40428bc42041557c35b511733dba4e35312ef022
 SHA512:
-  metadata.gz: 8580c9917dc555e4a3e04debbe011a9dfcd51051705f2ad10ae52d2fde2f905c3db2fecf4af7c04b6b1088a7ce64b43d10739ad6c3fe2946404b2048a279a9ea
-  data.tar.gz: 695ae7d48e95d493b0d7feffea44e66b03227b6b05beba145f5a2efddf09728b68ba0afd95c11c44fb5ce47537b38c8a1b25c4282f32e65a4731d880e05228ad
+  metadata.gz: d4e65a9522527651c1e73a630f49433e07931ed93e4f0f7d7bdb1fc516fc82dd009ec5f3cb7b6bb2b64c249c123b54279d5c8a2ae98c7c7aeeecf60d77617ab1
+  data.tar.gz: 99cf03e0e5351f26bda15455e7f543f6389bccb815c6d95ad0d845fe2259b581895594ae790d3ea8623251ac3942d6c759369b4d0bfdb2362fae6d66c03e727b

data/lib/websocket-gui.rb

@@ -2,7 +2,6 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require "em-websocket"
 require "sinatra"
-require "thin"
 require "launchy"
 require "json"
 

data/lib/websocket-gui/base.rb

@@ -4,7 +4,7 @@ module WebsocketGui
 
 		#	class-level config, so you can wire your settings into your class
 		#	These can also be provided when calling run!
-		@@config = {
+		@@websocket_config = {
 			socket_port: 8080,
 			socket_host: '127.0.0.1',
 			http_port: 3000,
@@ -14,30 +14,30 @@ module WebsocketGui
 		}
 		def self.method_missing(method, *args, &block)
 			if block_given?
-				@@config[method] = block
+				@@websocket_config[method] = block
 			else
-				@@config[method] = args.first
+				@@websocket_config[method] = args.first
 			end
 		end
 
-		attr_reader :config
+		attr_reader :websocket_config
 
 		def initialize(config = {})
-			@config = @@config.merge(config)
+			@websocket_config = @@websocket_config.merge(config)
 		end
 
 		#	start the socket server and the web server, and launch a browser to fetch the view from the web server
 		def run!(runtime_config = {})
-			@config.merge! runtime_config
+			@websocket_config.merge! runtime_config
 
 			EM.run do
-				if @config[:tick_interval]
-					EM.add_periodic_timer(@config[:tick_interval]) do
+				if @websocket_config[:tick_interval]
+					EM.add_periodic_timer(@websocket_config[:tick_interval]) do
 						socket_trigger(:on_tick, @socket_connected)
 					end
 				end
 
-				EventMachine::WebSocket.run(host: @config[:socket_host], port: @config[:socket_port]) do |socket|
+				EventMachine::WebSocket.run(host: @websocket_config[:socket_host], port: @websocket_config[:socket_port]) do |socket|
 					@socket_active = socket
 					socket.onopen do |handshake|
 						@socket_connected = true
@@ -54,11 +54,11 @@ module WebsocketGui
 					end
 				end
 			 
-				Launchy.open("http://#{@config[:http_host]}:#{@config[:http_port]}/")
-				WebsocketGui::SinatraWrapper.view_path = @config[:view]
+				Launchy.open("http://#{@websocket_config[:http_host]}:#{@websocket_config[:http_port]}/")
+				WebsocketGui::SinatraWrapper.view_path = @websocket_config[:view]
 				WebsocketGui::SinatraWrapper.run!(
-					port: @config[:http_port], 
-					bind: @config[:http_host])
+					port: @websocket_config[:http_port], 
+					bind: @websocket_config[:http_host])
 			end
 		end
 
@@ -73,11 +73,11 @@ module WebsocketGui
 		private
 
 		def handler_exists?(method)
-			@config[method].kind_of? Proc
+			@websocket_config[method].kind_of? Proc
 		end
 
 		def socket_trigger(method, *args)
-			self.instance_exec(*args, &@config[method]) if handler_exists? method
+			self.instance_exec(*args, &@websocket_config[method]) if handler_exists? method
 		end
 
 		def process_message(msg)

data/lib/websocket-gui/version.rb

@@ -1,3 +1,3 @@
 module WebsocketGui
-	VERSION = '0.0.2'
+	VERSION = '0.0.3'
 end

data/spec/base_spec.rb

@@ -6,13 +6,13 @@ describe ExampleWebSocketApp do
 	it { should respond_to(:run!) }
 	it { should respond_to(:socket_send) }
 	it { should respond_to(:socket_close) }
-	its(:config) { should be_an_instance_of(Hash) }
+	its(:websocket_config) { should be_an_instance_of(Hash) }
 
 	context "override Base defaults" do
 		let(:example) {
 			ExampleWebSocketApp.new(http_port: 80, http_host: "localhost")
 		}
-		let(:config) { example.config }
+		let(:config) { example.websocket_config }
 
 		it "has defaults inherited from Base" do
 			config[:socket_port].should equal(8080)
@@ -34,7 +34,7 @@ describe ExampleWebSocketApp do
 		let(:example) {
 			ExampleWebSocketApp.new(tick_interval: 1)
 		}
-		let(:config) { example.config }
+		let(:config) { example.websocket_config }
 
 		it "overrides already overridden defaults in constructor" do
 			config[:tick_interval].should equal(1)

data/websocket-gui.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_runtime_dependency 'em-websocket', '~> 0.5.0'
   spec.add_runtime_dependency 'sinatra', '~> 1.4.3'
-  spec.add_runtime_dependency 'thin', '>= 1.5.1'
+  spec.add_runtime_dependency 'thin', '~> 1.5.1'
   spec.add_runtime_dependency 'launchy', '~> 2.3.0'
   spec.add_runtime_dependency 'json', '>= 1.7.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-gui
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jason Pollentier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-05 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,14 +84,14 @@ dependencies:
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency