contact_congress_parser 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bedac01b6c721845094a5cf42b7c66fb3297b36
-  data.tar.gz: f5d5b9c753f9943848b6f1e9e1a4fc63d0b62421
+  metadata.gz: 9d01ba03b717555b89223cc3068d3aecc8d01255
+  data.tar.gz: 373699f8700199e8dac8dfd5deca599e96ef8b3c
 SHA512:
-  metadata.gz: 5e5acfd0f3a38131f339fdfb7f39ca5dc7a0264e44761acd9322c3b5f9f126e681cbe737e1534630843d58baded374505c23fcee59523ae06f3c60126e331d7b
-  data.tar.gz: c58407f68e87f6982433afeb355444cfbbabfcdafb2334c7fa3ae56b92dc0f407c2c64c71ef9a67cca43ca55c9046142fa8a786487163430958e647496d3eb0d
+  metadata.gz: a22c2c8de5d31837a794ba24b710cbc89d489f997ee41b632f31b9ed31b7c002a22631ac7b29aac73fdaeadb4dcfe2e0aaae80d11d3a76aacc80bc347ed26696
+  data.tar.gz: e43876bd5f73eb4af227ad6407765ec16765b4152d04c8e12a7783b4bf98912360997197c69592ada9df98f966b05ea5587f70182eb03498da2fe6f7619f648e

data/lib/contact_congress_parser/action.rb

@@ -34,11 +34,11 @@ module ContactCongressParser
     def fill_in_args
       '"' + escape_quotes(@data['selector']) + '"' +
       ', with: ' +
-      field(@data['value'])
+      field(@data['value'], required: @data['required'])
     end
 
     def select_args
-      field(@data['value'], options: @data['options'])
+      field(@data['value'], options: @data['options'], required: @data['required'])
     end
     
     def choose_args
@@ -62,7 +62,7 @@ module ContactCongressParser
       URI.parse(uri).path
     end
 
-    def field(name, options=nil)
+    def field(name, options={})
       Field.new(name, options).to_s
     end
 

data/lib/contact_congress_parser/field.rb

@@ -1,11 +1,11 @@
 module ContactCongressParser
   class Field
-    attr_reader :name, :field_options
+    attr_reader :name, :options, :field_options, :required
 
-    def initialize(name, options=nil)
+    def initialize(name, options={})
       @name = normalize_field_name(name)
       @options = options
-      @field_options = opts_to_array(options[:options]) if options
+      @field_options = opts_to_array(options[:options])
       @field_options = escape_opts_quotes(@field_options) if field_options
     end
 
@@ -13,7 +13,15 @@ module ContactCongressParser
       "field(\"#{name}\"#{options_str})"
     end
 
-  private
+    def required
+      @required ||= case options[:required]
+        when 'Yes', true then true
+        when 'No', false then false
+        when nil then nil
+        else raise "Unrecognized options[:required] => #{options[:required]}"
+      end
+    end
+
     def normalize_field_name(name)
       if name[0] == '$'
         case name
@@ -63,7 +71,15 @@ module ContactCongressParser
     end
 
     def options_str
+      options_field_options_str + options_required_str
+    end
+
+    def options_field_options_str
       field_options.nil? ? "" : ", options: [\"" + field_options.join("\", \"") + "\"]"
     end
+
+    def options_required_str
+      required.nil? ? "" : ", required: #{required}"
+    end
   end
 end

data/lib/contact_congress_parser/version.rb

@@ -1,3 +1,3 @@
 module ContactCongressParser
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/field_spec.rb

@@ -10,17 +10,25 @@ describe Field do
       expect(field.to_s).to match("field(\"name\")")
     end
 
-    it 'handles options properly' do
+    it 'parses field options properly' do
       field = Field.new('state', options: ['NY', 'CA'])
       expect(field.to_s).to match("field(\"state\", options: [\"NY\", \"CA\"])")
     end
 
-    it 'handles options with non-standard classes properly' do
+    it 'parses field options with non-standard classes properly' do
       hash = Field.new('f', options: {'Opt' => 'Opt'})
       string = Field.new('f', options: 'Opt')
 
       expect { hash.to_s }.to_not raise_error
       expect { string.to_s }.to_not raise_error
     end
+
+    it 'parses required properly' do
+      true_field = Field.new('f', required: 'Yes')
+      false_field = Field.new('f', required: 'No')
+
+      expect(true_field.to_s).to match("field(\"f\", required: true)")
+      expect(false_field.to_s).to match("field(\"f\", required: false)")
+    end
   end
 end

metadata

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