city-watch 0.7.4 → 0.7.5

data/lib/city_watch/util/watchman.rb

@@ -64,7 +64,7 @@ module Watchman
 		end
 		
 		def get_watchman_options
-			CityWatch.config[:watchmen] && CityWatch.config[:watchmen][self.name.to_sym] ? CityWatch.config[:watchmen][self.name.to_sym] : {}
+			CityWatch.config[:watchmen] && CityWatch.config[:watchmen][self.name.to_sym] && CityWatch.config[:watchmen][self.name.to_sym].is_a?(Hash) ? CityWatch.config[:watchmen][self.name.to_sym] : {}
 		end
 		
 	end

data/lib/city_watch/watchmen.rb

@@ -10,7 +10,7 @@ module Watchmen
 	
 	def self.data
 		@watchmen.inject({}) do |acc,watchman|
-			if !CityWatch.config[:watchmen] || CityWatch.config[:watchmen][watchman.name.to_sym]
+			if !CityWatch.config[:watchmen] || (CityWatch.config[:watchmen].is_a?(Array) ? CityWatch.config[:watchmen].include?(watchman.name.to_sym) : CityWatch.config[:watchmen][watchman.name.to_sym])
 				acc[watchman.name] = watchman.data
 			end
 			acc

data/lib/version.rb

@@ -1,3 +1,3 @@
 module CityWatch
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: city-watch
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors: