config_manager 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbcb94a00798944a7fe23c4e55b0f3b713f0930a
-  data.tar.gz: e48834ef55b1d32eddc19fa124a2fc6fbfaf9624
+  metadata.gz: 83bed3fc27cfd3df8f900fc2e124ffa9c6a34975
+  data.tar.gz: 9fa864a17f89669e0274031f52e9c95aca13c945
 SHA512:
-  metadata.gz: b691cf5b37a8e279355583ac765b3be4226c762a18fc78bdcb33c0fbd445239d0cc1f10f85d81f54576520d6fe6226cb0d9598e86c783cf7e14d4ab45fc59dbd
-  data.tar.gz: 15fb2269b029877e4dbe68efc0b3114edab34ad73a6114af58c4f5b1caeb9d864ab5a0ef3c7d08c4a77c91ec5cfeff2ed7c65f822a9dc18111c7f48524a85d98
+  metadata.gz: 8159683de5b762192127ccc7a0839f329397271f9c669103539b2952fd4c881f4bfce2eff6277541c65dad1217cbae7ce3aba19b53650b89fe6d165f8627eaef
+  data.tar.gz: b3851cb20b512e75e1cbed524a78d32c6eebcd6aa792cfff35318e067baa3eab98b273a1a1b231d924e61f7a37bdb5bcaae4def7222ec4e9082ed4b14adf7ffe

data/app/controllers/config_manager/settings_controller.rb

@@ -27,5 +27,25 @@ module ConfigManager
 
 			redirect_to settings_url
 		end
+
+		# GET /settings/dump
+		def dump
+			send_data Setting.to_yaml, :filename => 'setting.yml'
+		end
+
+		# POST /settings/load
+		def load
+			if params[:file]
+				loads, failures = Setting.from_yaml(params[:file].tempfile)
+				flash[:notice] = "#{loads} settings have been loaded from the yaml file." if loads > 0
+				flash[:error] = "#{failures} settings failed to be loaded from the yaml file." if failures > 0
+			else
+				flash[:error] = "You must choose a file."
+			end
+		rescue
+			flash[:error] = "Couldn't load settings. Did you choose a valid file?"
+		ensure
+			redirect_to settings_url
+		end
 	end
 end

data/app/controllers/config_manager/toggles_controller.rb

@@ -30,28 +30,24 @@ module ConfigManager
   		redirect_to toggles_url
   	end
 
-  	# POST /toggles/load_default
-  	def load_default
-			loads, failures = Toggle.from_yaml(Rails.root.join('config/config_manager_toggles.yml'))
-			flash[:notice] = "#{loads} toggles have been loaded from the yaml file." if loads > 0
-			flash[:error] = "#{failures} toggles failed to be loaded from the yaml file" if failures > 0
-		
-			redirect_to toggles_url
-
-		rescue Errno::ENOENT
-  		flash[:error] = "Couldn't load toggles. config_manager_toggles.yml not found in config directory."
+  	# POST /toggles/load
+  	def load
+			if params[:file]
+				loads, failures = Toggle.from_yaml(params[:file].tempfile)
+				flash[:notice] = "#{loads} toggles have been loaded from the yaml file." if loads > 0
+				flash[:error] = "#{failures} toggles failed to be loaded from the yaml file" if failures > 0
+			else
+				flash[:error] = "You must choose a file"
+			end
+		rescue 
+  		flash[:error] = "Couldn't load toggles. Did you choose a valid file?"
+  	ensure
   		redirect_to toggles_url
   	end
 
   	# POST /toggles/dump
   	def dump
-  		path = Rails.root.join('config/config_manager_toggles.yml')
-  		Toggle.to_yaml(path)
-  		flash[:notice] = "Toggles dumped to #{path}"
-  	rescue
-			flash[:error] = "Failed to dump toggles to #{path}"
-		ensure
-			redirect_to toggles_url
+  		send_data Toggle.to_yaml, :filename => 'toggles.yml'
 		end
 	end
 end

data/app/views/config_manager/settings/index.html.slim

@@ -26,3 +26,13 @@ section.clearfix
   div.col-sm-4
     h3 Create/Edit Setting
     = render 'form'
+    - unless Rails.env.production?
+      h3 Load From YAML
+      = form_tag load_settings_path, :multipart => true do
+        div.form-group
+          = file_field_tag :file
+        div.buttons
+          = submit_tag "Load", :class => "btn-block btn btn-warning"
+    h3 Dump to YAML
+    div.text-center
+      = link_to "Dump", dump_settings_path, :class => 'btn-block btn btn-warning'

data/app/views/config_manager/toggles/index.html.slim

@@ -29,18 +29,11 @@ section.clearfix
     = render 'form'
     - unless Rails.env.production?
       h3 Load From YAML
-      p.text-muted
-        small Load toggles from config/config_manager_toggles.yml
-      div.text-center
-        = link_to "Load",
-                  load_default_toggles_path,
-                  :method => :post,
-                  :class => 'btn-block btn btn-warning'
+      = form_tag load_toggles_path, :multipart => true do
+        div.form-group
+          = file_field_tag :file
+        div.buttons
+          = submit_tag "Load", :class => "btn-block btn btn-warning"
     h3 Dump To YAML
-    p.text-muted
-      small Dump toggles to config/config_manager_toggles.yml
     div.text-center
-      = link_to "Dump",
-                dump_toggles_path,
-                :method => :post,
-                :class => 'btn-block btn btn-warning'
+      = link_to "Dump", dump_toggles_path, :class => 'btn-block btn btn-warning'

data/config/routes.rb

@@ -6,11 +6,16 @@ ConfigManager::Engine.routes.draw do
 	resources :admins, :except => [:show]
 	resources :toggles, :only => [:index, :create, :destroy] do
 		collection do
-			post :load_default
-			post :dump
+			post :load
+			get :dump
+		end
+	end
+	resources :settings, :only => [:index, :create, :destroy] do
+		collection do
+			post :load
+			get :dump
 		end
 	end
-	resources :settings, :only => [:index, :create, :destroy]
 
 	# change root later
 	root :to => "admins#index"

data/lib/config_manager/setting.rb

@@ -1,5 +1,10 @@
 module ConfigManager
 	class Setting
+		include Settings::Persistence
+		include Settings::Querying
+		include Settings::Values
+		include Settings::Yaml
+
 		attr_reader :id, :value, :tags
 
 		def initialize(id, value, tags)
@@ -16,109 +21,17 @@ module ConfigManager
 			@tags && @tags.join(', ')
 		end
 
-		def persist
-			Setting.persist(@id, @value, *@tags)
-		end
-
 		def message
 			return "missing name(id)" unless @id.present?
 			return "missing value" unless !!@value
 		end
 
-		class << self
-			def build(params)
-				tags = (params[:tags] || params[:formatted_tags] || "").
-						gsub(/\s*,\s*/,',').
-						split(',')
-				new(params[:id], params[:value], tags)
-			end
-
-			def value(id)
-				(find(id) || build({})).value
-			end
-
-			def create(params)
-				setting = build(params)
-				if setting.valid?
-					setting.persist
-					find(params[:id], true)
-				else
-					setting
-				end
-			end
-
-			def persist(id, value, *indexes)
-				$redis.set(generate_key(id), value)
-				unless indexes.empty?
-					$redis.sadd(generate_tags_key(id), indexes) 
-					$redis.sadd(tag_global_key, indexes)
-				end
-				
-				# update global and tag indexes
-				indexes = indexes.map{|index| generate_index(index)}
-				indexes << global_key
-				index_by(id, indexes)
-			end
-
-			def find(id, with_tags=false)
-				key = generate_key(id)
-				value = $redis.get(key)
-
-				return nil unless value
-
-				index = generate_tags_key(id)
-				tags = with_tags ? $redis.smembers(index) : []
-
-				new(id, value, tags)
-			end
-
-			def all
-				keys = $redis.smembers(global_key)
-				return [] if keys.empty?
-
-				values = $redis.mget(*keys)
-
-				# remove deleted keys
-				obsolete_keys = Range.new(0, keys.size, true).inject([]) do |memo, i|
-					values.at(i) ? memo : (memo << keys.at(i))
-				end
-
-				unless obsolete_keys.empty?
-					Rails.logger.info("DELETING OBSOLETE KEYS IN GLOBAL INDEX: #{obsolete_keys}")
-					$redis.srem(global_key, obsolete_keys)
-					keys = keys - obsolete_keys
-					values.compact!
-				end
-
-				# get tags
-				ids = keys.map {|k| k.gsub("#{prefix}:", '') }
-				tag_keys = ids.map {|id| generate_tags_key(id) }
-				tags = tag_keys.map {|key| $redis.smembers(key) }
-
-				ids.zip(values, tags).map do |i,v, t|
-					Setting.new(i, v, t)
-				end
-			end
-
-			def tags
-				$redis.smembers(tag_global_key)
-			end
-
-			def delete(id)
-				$redis.del(generate_key(id), generate_tags_key(id))
-			end
+		def to_hash
+			{'id' => id, 'value' => value, 'tags' => formatted_tags}
+		end
 
+		class << self
 		private
-			
-			# stores the setting id under the requested indexes
-      # this allows us to search all keys for a given index
-      # such as the global index returning all keys or a tag
-			def index_by(id, indexes)
-				indexes.each do |index|
-					$redis.sadd(index, generate_key(id))
-				end
-			end
-
 			def generate_key(id)
 				"#{prefix}:#{id}"
 			end

data/lib/config_manager/settings/persistence.rb

@@ -0,0 +1,59 @@
+module ConfigManager
+	module Settings
+		module Persistence
+			def self.included(base)
+				base.extend ClassMethods
+			end
+
+			def persist
+				Setting.persist(@id, @value, *@tags)
+			end
+
+			module ClassMethods
+				def build(params)
+					tags = (params[:tags] || params[:formatted_tags] || "").
+							gsub(/\s*,\s*/,',').
+							split(',')
+					new(params[:id], params[:value], tags)
+				end
+
+				def create(params)
+					setting = build(params)
+					if setting.valid?
+						setting.persist
+						find(params[:id], true)
+					else
+						setting
+					end
+				end
+
+				def persist(id, value, *indexes)
+					$redis.set(generate_key(id), value)
+					unless indexes.empty?
+						$redis.sadd(generate_tags_key(id), indexes) 
+						$redis.sadd(tag_global_key, indexes)
+					end
+					
+					# update global and tag indexes
+					indexes = indexes.map{|index| generate_index(index)}
+					indexes << global_key
+					index_by(id, indexes)
+				end
+
+				def delete(id)
+					$redis.del(generate_key(id), generate_tags_key(id))
+				end
+
+			private
+				# stores the setting id under the requested indexes
+      	# this allows us to search all keys for a given index
+      	# such as the global index returning all keys or a tag
+				def index_by(id, indexes)
+					indexes.each do |index|
+						$redis.sadd(index, generate_key(id))
+					end
+				end
+			end
+		end
+	end
+end

data/lib/config_manager/settings/querying.rb

@@ -0,0 +1,55 @@
+module ConfigManager
+	module Settings
+		module Querying
+			def self.included(base)
+				base.extend ClassMethods
+			end
+
+			module ClassMethods
+				def find(id, with_tags=false)
+					key = generate_key(id)
+					value = $redis.get(key)
+
+					return nil unless value
+
+					index = generate_tags_key(id)
+					tags = with_tags ? $redis.smembers(index) : []
+
+					new(id, value, tags)
+				end
+
+				def all
+					keys = $redis.smembers(global_key)
+					return [] if keys.empty?
+
+					values = $redis.mget(*keys)
+
+					# remove deleted keys
+					obsolete_keys = Range.new(0, keys.size, true).inject([]) do |memo, i|
+						values.at(i) ? memo : (memo << keys.at(i))
+					end
+
+					unless obsolete_keys.empty?
+						Rails.logger.info("DELETING OBSOLETE KEYS IN GLOBAL INDEX: #{obsolete_keys}")
+						$redis.srem(global_key, obsolete_keys)
+						keys = keys - obsolete_keys
+						values.compact!
+					end
+
+					# get tags
+					ids = keys.map {|k| k.gsub("#{prefix}:", '') }
+					tag_keys = ids.map {|id| generate_tags_key(id) }
+					tags = tag_keys.map {|key| $redis.smembers(key) }
+
+					ids.zip(values, tags).map do |i,v, t|
+						Setting.new(i, v, t)
+					end
+				end
+
+				def tags
+					$redis.smembers(tag_global_key)
+				end
+			end
+		end
+	end
+end

data/lib/config_manager/settings/values.rb

@@ -0,0 +1,39 @@
+module ConfigManager
+	module Settings
+		module Values
+			def self.included(base)
+				base.extend ClassMethods
+			end
+
+			module ClassMethods
+				def value(id)
+					(find(id) || build({})).value
+				end
+
+				def date_value(id)
+					value(id).to_date
+				rescue NoMethodError
+					nil
+				end
+
+				def time_value(id)
+					value(id).to_time
+				rescue NoMethodError
+					nil
+				end
+
+				def integer_value(id)
+					value(id).to_i
+				rescue NoMethodError
+					nil
+				end
+
+				def number_value(id)
+					value(id).to_f
+				rescue NoMethodError
+					nil
+				end
+			end
+		end
+	end
+end

data/lib/config_manager/settings/yaml.rb

@@ -0,0 +1,41 @@
+module ConfigManager
+	module Settings
+		module Yaml
+			def self.included(base)
+				base.extend ClassMethods
+			end
+
+			module ClassMethods
+				#def to_yaml(path)
+				#	File.open(path, 'w') do |file|
+				#		settings_hash = all.map(&:to_hash)
+				#		YAML.dump(settings_hash, file)
+				#	end
+				#end
+				def to_yaml
+					YAML.dump(all.map(&:to_hash))
+				end
+
+				def from_yaml(path)
+					settings = YAML::load(File.open path)
+					settings.reduce([0,0]) do |memo, hash|
+						begin
+							setting = create(hash.symbolize_keys)
+							if setting.valid?
+								memo[0] += 1
+							else
+								Rails.logger.error "Bad setting definition. #{setting.message}"
+								memo[1] += 1
+							end
+						rescue RuntimeError
+							Rails.logger.error "Bad setting definition. #{$!}"
+							memo[1] += 1
+						end
+
+						memo
+					end
+				end
+			end
+		end
+	end
+end

data/lib/config_manager/toggle.rb

@@ -50,7 +50,7 @@ module ConfigManager
 								 	:formatted_acceptable_values => values['acceptable_values']})
 					counts[0] += 1
 				rescue RuntimeError
-					Rails.logger.error " Bad toggle definition. #{$!}"
+					Rails.logger.error "Bad toggle definition. #{$!}"
 					counts[1] += 1
 				end
 			end
@@ -58,11 +58,9 @@ module ConfigManager
 			counts
 		end
 
-		def self.to_yaml(path)
-			File.open(path, 'w') do |file|
-				toggles_hash = Hash[toggles.map(&:to_hash).map{|t| [t.keys.first, t.values.first]}]
-				YAML.dump(toggles_hash, file)
-			end
+		def self.to_yaml
+			toggles_hash = Hash[toggles.map(&:to_hash).map{|t| [t.keys.first, t.values.first]}]
+			YAML.dump(toggles_hash)
 		end
 
 		def self.quick(name, acceptable_values='test')

data/lib/config_manager/version.rb

@@ -1,3 +1,3 @@
 module ConfigManager
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end