From 01f2ab4e3d5694de81f6ebb594e0e852616ebbd9 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 5 Jan 2013 12:42:53 +0100 Subject: Added GsParameter model as a replacement for gemeinschaft_parameters.rb --- app/models/gs_parameter.rb | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 app/models/gs_parameter.rb (limited to 'app/models/gs_parameter.rb') diff --git a/app/models/gs_parameter.rb b/app/models/gs_parameter.rb new file mode 100644 index 0000000..d0cc37a --- /dev/null +++ b/app/models/gs_parameter.rb @@ -0,0 +1,28 @@ +class GsParameter < ActiveRecord::Base + validates :name, + :presence => true, + :uniqueness => true + + validates :value, + :presence => true + + validates :class_type, + :presence => true, + :inclusion => { :in => ['String', 'Integer', 'Boolean', 'YAML'] } + + def generate_contant + Kernel.const_set(self.name, self.value.to_i) if self.class_type == 'Integer' + Kernel.const_set(self.name, self.value.to_s) if self.class_type == 'String' + + if self.class_type == 'Boolean' + Kernel.const_set(self.name, true) if self.value == 'true' + Kernel.const_set(self.name, false) if self.value == 'false' + end + + Kernel.const_set(self.name, YAML.load(self.value)) if self.class_type == 'YAML' + end + + def to_s + name + end +end -- cgit v1.2.3 From 6d809427f7dbff9509603cab3339c6fbda9ea992 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 5 Jan 2013 12:50:17 +0100 Subject: Add the initializer to set the constants. --- app/models/gs_parameter.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'app/models/gs_parameter.rb') diff --git a/app/models/gs_parameter.rb b/app/models/gs_parameter.rb index d0cc37a..aac10b0 100644 --- a/app/models/gs_parameter.rb +++ b/app/models/gs_parameter.rb @@ -10,19 +10,19 @@ class GsParameter < ActiveRecord::Base :presence => true, :inclusion => { :in => ['String', 'Integer', 'Boolean', 'YAML'] } - def generate_contant - Kernel.const_set(self.name, self.value.to_i) if self.class_type == 'Integer' - Kernel.const_set(self.name, self.value.to_s) if self.class_type == 'String' + def generate_constant + Kernel.const_set(self.name, self.value.to_i) if self.class_type == 'Integer' + Kernel.const_set(self.name, self.value.to_s) if self.class_type == 'String' - if self.class_type == 'Boolean' - Kernel.const_set(self.name, true) if self.value == 'true' - Kernel.const_set(self.name, false) if self.value == 'false' - end + if self.class_type == 'Boolean' + Kernel.const_set(self.name, true) if self.value == 'true' + Kernel.const_set(self.name, false) if self.value == 'false' + end - Kernel.const_set(self.name, YAML.load(self.value)) if self.class_type == 'YAML' + Kernel.const_set(self.name, YAML.load(self.value)) if self.class_type == 'YAML' end def to_s - name + name end end -- cgit v1.2.3 From e76890d5f4634d47514a592d501d9792ae2ff7bb Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 5 Jan 2013 21:00:52 +0100 Subject: Different scaffold for GsParameter. --- app/models/gs_parameter.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/models/gs_parameter.rb') diff --git a/app/models/gs_parameter.rb b/app/models/gs_parameter.rb index aac10b0..8e30583 100644 --- a/app/models/gs_parameter.rb +++ b/app/models/gs_parameter.rb @@ -1,4 +1,6 @@ class GsParameter < ActiveRecord::Base + attr_accessible :name, :section, :value, :class_type, :description + validates :name, :presence => true, :uniqueness => true -- cgit v1.2.3 From ddb3dfa92ec0878240211cb2b7a8e125961b1360 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 5 Jan 2013 23:01:16 +0100 Subject: Moved to GsParemeter.get and set defaults for a couple of validations. --- app/models/gs_parameter.rb | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'app/models/gs_parameter.rb') diff --git a/app/models/gs_parameter.rb b/app/models/gs_parameter.rb index 8e30583..9d9e996 100644 --- a/app/models/gs_parameter.rb +++ b/app/models/gs_parameter.rb @@ -12,16 +12,23 @@ class GsParameter < ActiveRecord::Base :presence => true, :inclusion => { :in => ['String', 'Integer', 'Boolean', 'YAML'] } - def generate_constant - Kernel.const_set(self.name, self.value.to_i) if self.class_type == 'Integer' - Kernel.const_set(self.name, self.value.to_s) if self.class_type == 'String' - - if self.class_type == 'Boolean' - Kernel.const_set(self.name, true) if self.value == 'true' - Kernel.const_set(self.name, false) if self.value == 'false' + def self.get(wanted_variable) + if GsParameter.table_exists? + item = GsParameter.where(:name => wanted_variable).first + if item.nil? + return nil + else + return item.value.to_i if item.class_type == 'Integer' + return item.value.to_s if item.class_type == 'String' + if item.class_type == 'Boolean' + return true if item.value == 'true' + return false if item.value == 'false' + end + return YAML.load(item.value) if item.class_type == 'YAML' + end + else + nil end - - Kernel.const_set(self.name, YAML.load(self.value)) if self.class_type == 'YAML' end def to_s -- cgit v1.2.3 From af1a7678582e2e629ed4c8c06528b9a62bf62242 Mon Sep 17 00:00:00 2001 From: spag Date: Wed, 9 Jan 2013 11:08:49 +0100 Subject: entity added to GsParameter --- app/models/gs_parameter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/models/gs_parameter.rb') diff --git a/app/models/gs_parameter.rb b/app/models/gs_parameter.rb index 9d9e996..de09df6 100644 --- a/app/models/gs_parameter.rb +++ b/app/models/gs_parameter.rb @@ -1,9 +1,9 @@ class GsParameter < ActiveRecord::Base - attr_accessible :name, :section, :value, :class_type, :description + attr_accessible :entity, :name, :section, :value, :class_type, :description validates :name, :presence => true, - :uniqueness => true + :uniqueness => { :scope => [ :entity, :section ] } validates :value, :presence => true -- cgit v1.2.3 From c05c78f1eaa2cbfff68f15287d6bb62cdd6f3a54 Mon Sep 17 00:00:00 2001 From: spag Date: Wed, 9 Jan 2013 12:39:24 +0100 Subject: allow empty strings and nil values --- app/models/gs_parameter.rb | 3 --- 1 file changed, 3 deletions(-) (limited to 'app/models/gs_parameter.rb') diff --git a/app/models/gs_parameter.rb b/app/models/gs_parameter.rb index de09df6..520d07f 100644 --- a/app/models/gs_parameter.rb +++ b/app/models/gs_parameter.rb @@ -5,9 +5,6 @@ class GsParameter < ActiveRecord::Base :presence => true, :uniqueness => { :scope => [ :entity, :section ] } - validates :value, - :presence => true - validates :class_type, :presence => true, :inclusion => { :in => ['String', 'Integer', 'Boolean', 'YAML'] } -- cgit v1.2.3 From 70c436c52c76cf866b03fcab6bc43437c9490cd1 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 10 Jan 2013 10:34:57 +0100 Subject: GsParameter :entity, :section and :name can't be changed in the GUI any more. --- app/models/gs_parameter.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'app/models/gs_parameter.rb') diff --git a/app/models/gs_parameter.rb b/app/models/gs_parameter.rb index 520d07f..fe2a845 100644 --- a/app/models/gs_parameter.rb +++ b/app/models/gs_parameter.rb @@ -1,5 +1,6 @@ class GsParameter < ActiveRecord::Base - attr_accessible :entity, :name, :section, :value, :class_type, :description + # https://github.com/rails/strong_parameters + include ActiveModel::ForbiddenAttributesProtection validates :name, :presence => true, @@ -7,12 +8,12 @@ class GsParameter < ActiveRecord::Base validates :class_type, :presence => true, - :inclusion => { :in => ['String', 'Integer', 'Boolean', 'YAML'] } + :inclusion => { :in => ['String', 'Integer', 'Boolean', 'YAML', 'Nil'] } def self.get(wanted_variable) if GsParameter.table_exists? item = GsParameter.where(:name => wanted_variable).first - if item.nil? + if item.nil? || item.class_type == 'Nil' return nil else return item.value.to_i if item.class_type == 'Integer' -- cgit v1.2.3