catobills 0.4 → 0.5

data/lib/catobills/bill.rb

@@ -3,6 +3,10 @@ module Catobills
     
     attr_reader :bill_number, :bill_body, :version, :congress, :bill_type, :federal_bodies, :acts
 
+    FILTER_LIST = ['Commission', 'Board', 'Secretary', 'Department', 'Administrator', 'Administration', 'House', 'Senate', 'Director', 'Advisory Committee', 'Task Force', 
+      "Secretary's", "Under Secretary", "Administrator's", "Board's", "Service", "Department of State's", "CSCC's", "Bureau", "Inspector General of the Office", "Office",
+      "Commissioner", "Assistant Secretary"]
+
     def initialize(params={})
       params.each_pair do |k,v|
         instance_variable_set("@#{k}", v)
@@ -20,13 +24,16 @@ module Catobills
       response = HTTParty.get(url)
       bill = Oj.load(response.body)
       bill_body = Ox.load(bill['billbody'])
-      self.new(:bill_number => bill['billnumber'],
-      :bill_body => bill_body,
-      :version => bill['billversion'],
-      :congress => bill['congress'],
-      :bill_type => bill['billtype'],
-      :federal_bodies => self.populate_federal_bodies(bill_body),
-      :acts => self.populate_acts(bill_body))
+
+      self.new(
+        bill_number:    bill['billnumber'],
+        bill_body:      bill_body,
+        version:        bill['billversion'],
+        congress:       bill['congress'],
+        bill_type:      bill['billtype'],
+        federal_bodies: self.populate_federal_bodies(bill_body),
+        acts:           self.populate_acts(bill_body)
+      )
     end
     
     def self.populate_acts(bill_body)
@@ -37,7 +44,7 @@ module Catobills
     # collects mentions of federal bodies, removing 'Congress', leadership offices, 'Commission', 'Board' and offices within agencies.
     def self.populate_federal_bodies(bill_body)
       results = bill_body.locate('legis-body/*/cato:entity-ref').select{|ref| ref['entity-type'] == 'federal-body'}
-      array_count(results.flatten.reject{|ref| ref['entity-id'] == "0001"}.reject{|ref| ref['entity-parent-id'] == '0050'}.reject{|ref| ref['entity-parent-id'] == '0010'}.map{|ref| ref.text.gsub(/\s+/, " ").strip}.compact.reject{|x| ['Commission', 'Board', 'Secretary', 'Department', 'Administrator', 'Administration', 'House', 'Senate', 'Director', 'Advisory Committee', 'Task Force', "Secretary's", "Under Secretary", "Administrator's"].include?(x)})
+      array_count(results.flatten.reject{|ref| ref['entity-id'] == "0001"}.reject{|ref| ref['entity-parent-id'] == '0050'}.reject{|ref| ref['entity-parent-id'] == '0010'}.map{|ref| ref.text.gsub(/\s+/, " ").strip}.compact.reject{|x| FILTER_LIST.include?(x)})
     end
     
     def self.array_count(array)

data/lib/catobills/version.rb

@@ -1,3 +1,3 @@
 module Catobills
-  VERSION = "0.4"
+  VERSION = "0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catobills
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors: