ns_settings_ui 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e938a275b6f69bf9f4804e1f19ae5511a813af5
-  data.tar.gz: e35f2e9a35e4a641162b17dc1bd7ab789228dfaa
+  metadata.gz: 4d9b2b4a991c36cc2be310f19940b957cb8f6c65
+  data.tar.gz: 65a18901d726cdea6b777bffd12d8600ebd036de
 SHA512:
-  metadata.gz: fabe9533121c6ca027c457484154a1ff04b25822344e200a3e0f78ef26a17efae1e6e0b3c99e2acbfaf74d2fb4256fc679b3881ed881ec19c02cbaaeb90b548b
-  data.tar.gz: 88b24f570fe1c62ce14b15e1b88ff273057dfaf3e8ac8d9a9a6aa22642f04938d273025ad038b83124284880d94fb95307196abe8d68174e9937becfdb8b6206
+  metadata.gz: 2634b223242bf47f936c8a0fbf0fd997c891d61f1a5ef23dbb8cb8750c77a7e18e6bb13d63e3b1a41f02d70da3724cb2a59ad53fcf70a93a0eb39496eafa506b
+  data.tar.gz: 6014bd6f271e65ab697db33c41931efa503888c2912e264e60e59dee4e897db8df2f3d88a2c71b1948891fe7ff308f1510ff3a5ba5cdd4323b357386f45fd9fe

data/app/helpers/ns_settings_ui/settings_helper.rb

@@ -6,8 +6,24 @@ module NsSettingsUi
       ''
     end
 
+    def render_value_field(form, setting)
+      render_field(form, setting.value_type, :value, setting_value_class(setting))
+    end
+
+    def render_default_value_field(form, setting)
+      render_field(form, setting.value_type, :default_value)
+    end
+
     private
 
+    def render_field(form, value_type, name, additional_class = '')
+      if [NsSettingsUi::Setting::TYPES[:boolean], NsSettingsUi::Setting::TYPES[:nullable_boolean]].include?(value_type)
+        form.select(name, [[:true, 'true'], [:false, 'false']], include_blank: true)
+      else
+        form.text_field(name, size: 10, class: "form-control #{additional_class}")
+      end
+    end
+
     def recursive_hash
       Hash.new { |hash, key| hash[key] = recursive_hash }
     end

data/app/models/ns_settings_ui/setting.rb

@@ -2,9 +2,35 @@ module NsSettingsUi
   class Setting < ActiveRecord::Base
     TYPES = {
       string: 1,
-      integer: 2
+      integer: 2,
+      boolean: 3,
+      nullable_string: 4,
+      nullable_integer: 5,
+      nullable_boolean: 6
     }.freeze
 
+    TYPE_HANDLERS = {
+      1 => :string_value,
+      2 => :integer_value,
+      3 => :boolean_value,
+      4 => :nullable_string,
+      5 => :nullable_integer,
+      6 => :nullable_boolean
+    }.freeze
+
+    NULL_VALUES = [nil, ''].freeze
+
+    # TODO: in Nttr
+    # belongs_to :country
+    #
+    # def self.get(country, *keys)
+    #   where(country: country, key: keys.join('.')).first_or_create
+    # end
+    #
+    # def country_code
+    #   country.try(:alpha2).to_s
+    # end
+
     def self.get(*keys)
       where(key: keys.join('.')).first_or_create
     end
@@ -14,13 +40,37 @@ module NsSettingsUi
     end
 
     def formatted_value
-      return nil if value.nil?
-      case value_type
-      when TYPES[:string] then value.to_s
-      when TYPES[:integer] then value.to_i
-      else
-        value
-      end
+      TYPE_HANDLERS[value_type] ? send(TYPE_HANDLERS[value_type]) : value
+    end
+
+    private
+
+    def nullify?
+      NULL_VALUES.include?(value)
+    end
+
+    def nullable_string
+      string_value unless nullify?
+    end
+
+    def nullable_integer
+      integer_value unless nullify?
+    end
+
+    def nullable_boolean
+      boolean_value unless nullify?
+    end
+
+    def string_value
+      value.to_s
+    end
+
+    def integer_value
+      value.to_i
+    end
+
+    def boolean_value
+      value == 'true'
     end
   end
 end

data/app/views/ns_settings_ui/settings/_edit.html.erb

@@ -1,9 +1,9 @@
 <div id="setting_<%= setting.id -%>">
   <%= form_for(setting, url: ns_settings_ui.setting_path(setting), method: :put, remote: true, html: {class: 'form-inline'}) do |f| %>
       <%= f.label(:value) %>
-      <%= f.text_field(:value, size: 10, class: "form-control #{setting_value_class(setting)}" )  %>
+      <%= render_value_field(f, setting) %>
       <%= f.label(:default_value) %>
-      <%= f.text_field(:default_value, size: 10, class: 'form-control') %>
+      <%= render_default_value_field(f, setting) %>
       <%= f.submit('Update', class: 'btn btn-default') %>
   <% end %>
   <%= form_for(setting, url: ns_settings_ui.reset_setting_path(setting), method: :put, remote: true) do |f| %>

data/lib/ns_settings_ui/version.rb

@@ -1,3 +1,3 @@
 module NsSettingsUi
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0'.freeze
 end