json_fields 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7079d62f287d66cddd4463fd928cb5d2a09baaf8
-  data.tar.gz: dba147269b49c31a3e48fc17b3d5be977fae4f6b
+  metadata.gz: 0a8758cdcd2c0994b7c11a807f8584f0e41e3305
+  data.tar.gz: e14f2e6d1d0065014e4fa836c2a7d45c5b95f116
 SHA512:
-  metadata.gz: e06ec241e16a7de469b77ee68fea07078b7eff34da9f40a6a215deb8fb0f36963a55f0591d2ae155a2640aafa51ea4cfec0356e54be764ba8d6782eb083e23ba
-  data.tar.gz: 76437d955afa436fafc02ef0b324706c7ab1c1fcfb2abfd2be0233c9725fab32e6d25bb1af5ea0b6bd93cd423acce596eb8de00f3aa8df572f99521288e9750c
+  metadata.gz: 560180df54686f5c14663742491b1a97c4c3b21d4ca6b317880e16a40c2cab732bde695d5dd6c9105aa89cd279e4fcac6a7653089616f92d2d080288facb333e
+  data.tar.gz: 4bd300120e051dd59f9971188f8268a048708f3f5d6f86c2159a5146ede219fc6f06da4be81af4deedf687f52c2aa6a80e572c04f24f50ac1e0be2419e870998

data/lib/json_fields/array_simple_structure.rb

@@ -11,7 +11,7 @@ module JsonFields
 
       content_tag(:div, id: id) do
         html = content_tag(:a, 'Add Field', href: '#', class: 'btn btn-add add-json-fields', 'data-target' => id)
-        Array(obj.send(method)).collect.with_index { |value, idx|
+        (Array(obj.send(method)) + [""]).collect.with_index { |value, idx|
           html += content_tag(:div, class: ['template', options.delete(:wrapper_class)].compact.join(' ')) do
             [text_field_tag("#{object_name}[#{method}][]", nil, value: value, class: 'json-field-control', id: nil, name: "#{object_name}[#{method}][]"),
              content_tag(:a, '-', href: '#', class: 'btn btn-remove remove-json-fields')
@@ -25,7 +25,11 @@ module JsonFields
 
     # Takes in values and returns a normal structure that can be saved
     def assemble(values)
-      values
+      if allow_blank
+        values
+      else
+        values.delete_if(&:blank?)
+      end
     end
   end
 end

data/lib/json_fields/base_structure.rb

@@ -4,6 +4,12 @@ module JsonFields
     include ActionView::Helpers::FormTagHelper
     include ActionView::Helpers::TagHelper
 
+    attr_accessor :allow_blank
+
+    def initialize(options)
+      @allow_blank = options[:allow_blank] || false
+    end
+
     def template(object_name, method, options)
       raise "template must be defined in the subclass"
     end

data/lib/json_fields/configurable.rb

@@ -2,8 +2,9 @@ module JsonFields
   module Configurable
     @@fields = {}
 
-    def json_field(attribute, json_structure)
-      @@fields[attribute] = JsonFields::ConfigurationParser.parse!(json_structure)
+    def json_field(attribute, json_structure, options = {})
+      options[:allow_blank] ||= false
+      @@fields[attribute] = JsonFields::ConfigurationParser.parse!(json_structure, options)
       define_method("#{attribute}=") do |values|
         value = self.class.json_fields[attribute].assemble(values)
         self.write_attribute(attribute, value)

data/lib/json_fields/configuration_parser.rb

@@ -2,12 +2,12 @@ module JsonFields
   class ConfigurationParser
 
     # returns a Structure class based on the parsed data
-    def self.parse!(data)
+    def self.parse!(data, options = {})
       data.match(/(\A[A-Z][A-Za-z]+)\((\w+)\)/)
       raise JsonFields::ConfigurationError.new("Configuration data is incorrect: #{data}") if $1.nil? || $2.nil?
       klass = "JsonFields::#{$1}#{$2}Structure".safe_constantize
       raise JsonFields::ConfigurationError.new("No Structure found") if klass.nil?
-      klass.new
+      klass.new(options)
     end
   end
 end

data/lib/json_fields/hash_simple_structure.rb

@@ -7,7 +7,7 @@ module JsonFields
 
       content_tag(:div, id: id) do
         html = content_tag(:a, 'Add Field', href: '#', class: 'btn btn-add add-json-fields', 'data-target' => id)
-        Hash(obj.send(method)).collect.with_index { |(key, value), idx|
+        Hash(obj.send(method)).merge({""=>""}).collect.with_index { |(key, value), idx|
           html += content_tag(:div, class: ['template', options.delete(:wrapper_class)].compact.join(' ')) do
             [
               text_field_tag("#{object_name}[#{method}][key][]", nil, value: key, class: 'json-field-control', id: nil),
@@ -22,7 +22,13 @@ module JsonFields
     end
 
     def assemble(values)
-      Hash[values[:key].zip(values[:value])]
+      if allow_blank
+        Hash[values[:key].zip(values[:value])]
+      else
+        keys = values[:key].delete_if(&:blank?)
+        vals = values[:value].delete_if(&:blank?)
+        Hash[keys.zip(vals)]
+      end
     end
   end
 end

data/lib/json_fields/version.rb

@@ -1,3 +1,3 @@
 module JsonFields
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_fields
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jeremy Woertink
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-14 00:00:00.000000000 Z
+date: 2017-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties