contact_congress_parser 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0f8d3f863eccc838fda533ac01475652568e7eb
-  data.tar.gz: a69134a888c381218e7edad074ee4e5a2cb428a9
+  metadata.gz: f606f2a626261c661b7a173b8a4d79741eee103b
+  data.tar.gz: ccc6e758a9665417c588b117f9347723fb03887e
 SHA512:
-  metadata.gz: c857664dcbe3b7c3f6cc0988812d48b02c7a21288fb431448762985cc606cb28520a2d657994443a48b560b2182d65c65543be702a5c02cabda3e8b015cf7c68
-  data.tar.gz: 7547db2184ee54fbd4025a9d11203e9341e1e62835f5366eee412a962bd8ff1e627983f177a8c9d18979544c3d4ad44705edc8aa9af942ec179f9901f1f8f051
+  metadata.gz: 303ebac0d3da7adb7daf45375b49684de875e721946e7dca3b0656a7daae9dbc7263f088c06e3af153ea370f301c44f057ce4a85adc13b265cf42033b98af0ec
+  data.tar.gz: c9ed5abfd075ff8e990d94763fb0abaf7abf641060d16c6e6989c51f4fdbb92ebad121ce0ba15a5d7b1579efce7d97b472217cb89c713462cd6e1445b5ef776c

data/lib/contact_congress_parser/field.rb

@@ -5,8 +5,6 @@ module ContactCongressParser
     def initialize(name, options={})
       @name = normalize_field_name(name)
       @options = options
-      @field_options = opts_to_array(options[:options])
-      @field_options = escape_opts_quotes(@field_options) if field_options
     end
 
     def to_s
@@ -58,28 +56,51 @@ module ContactCongressParser
       end
     end
 
-    def opts_to_array(opts)
-      case opts
-      when Array then opts
-      when Hash then opts.keys
-      when String then [opts]
-      end
+    def options_str
+      Options.new(options[:options]).to_s + options_required_str
     end
 
-    def escape_opts_quotes(opts)
-      opts.map { |str| str.gsub('"', '\"') }
+    def options_required_str
+      required.nil? ? "" : ", required: #{required}"
     end
 
-    def options_str
-      options_field_options_str + options_required_str
-    end
+    # Note this is a class for options[:options] not the entire set of options
+    # that include options[:required], etc.
+    class Options
+      def initialize(options)
+        @options = options
+        if @options
+          to_array
+          strip
+          escape_quotes
+          hashify
+        end
+      end
 
-    def options_field_options_str
-      field_options.nil? ? "" : ", options: [\"" + field_options.join("\", \"") + "\"]"
-    end
+      def to_s
+        @options || ''
+      end
+      
+    private
+      def to_array
+        @options = case @options
+          when Array then @options
+          when Hash then @options.keys
+          when String then [@options]
+        end
+      end
 
-    def options_required_str
-      required.nil? ? "" : ", required: #{required}"
+      def strip
+        @options.map! { |option| option.strip }
+      end
+
+      def escape_quotes
+        @options.map! { |option| option.gsub('"', '\"') }
+      end
+
+      def hashify
+        @options = ", options: [\"" + @options.join("\", \"") + "\"]"
+      end
     end
   end
 end

data/lib/contact_congress_parser/version.rb

@@ -1,3 +1,3 @@
 module ContactCongressParser
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contact_congress_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Nikias Kalpaxis