open_parliament 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c3aedb0b5ca2f066d7af2cd90f96b18ad392f8a
-  data.tar.gz: 5a6994212e32c030b8dd19102c5252af1ae783e8
+  metadata.gz: c98dbb25ff004ba689bba2aed053e95565c0647a
+  data.tar.gz: a7b70eae9faa073fa005bcfa99d34f04cb11d4b0
 SHA512:
-  metadata.gz: e4c10bbf28368847002d4fb8a2ce1099a69adcfbdcca977e03d173d8e2cee78b4751d1eb71a863269f2161b59513010142d165f4b83700a1d06a5fc0c61016f4
-  data.tar.gz: 0c32439aea2fb125d566c7d9d9d4525c03b888f9bba841d4c1104ba466ed0e365682a405ee19440ae808818d6134078963fdb91b05fe83b007855aad970ade5a
+  metadata.gz: 88b8228dab66079d676d531875a9e03b66a7547e22f8ac965df8199b36c37c7cbe94f2872c59bd65ecd55cbf92daab8c91d10e713e5711f357eb59c88934a353
+  data.tar.gz: 6303b731f2603d16c5437b49ce60c2225c4e24983a75fac9e60b7848b0822cc32cbad0f615c8924ba78ef63cef88b60ce23c1884220c1a669fdcf63c9bbfdca3

data/lib/open_parliament.rb

@@ -14,37 +14,27 @@ module OpenParliament
   API_URL = 'http://api.openparliament.ca'
 
   def self.bills(params = {})
-    url = "/bills/"
-    json = RequestService.make_request(url: url, method: :get, params: params)
-    bills = json["objects"]
-    bills.map { |bill_json| Bill.new(bill_json) }
+    bills_service = RequestService.new(Bill)
+    bills_service.get(params)
   end
 
   def self.committees(params = {})
-    url = "/committees/"
-    json = RequestService.make_request(url: url, method: :get, params: params)
-    committees = json["objects"]
-    committees.map { |committee_json| Committee.new(committee_json) }
+    committees_service = RequestService.new(Committee)
+    committees_service.get(params)
   end
 
   def self.debates(params = {})
-    url = "/debates/"
-    json = RequestService.make_request(url: url, method: :get, params: params)
-    debates = json["objects"]
-    debates.map { |debate_json| Debate.new(debate_json) }
+    debates_service = RequestService.new(Debate)
+    debates_service.get(params)
   end
 
   def self.votes(params = {})
-    url = "/votes/"
-    json = RequestService.make_request(url: url, method: :get, params: params)
-    votes = json["objects"]
-    votes.map { |vote_json| Vote.new(vote_json) }
+    votes_service = RequestService.new(Vote)
+    votes_service.get(params)
   end
 
   def self.politicians(params = {})
-    url = "/politicians/"
-    json = RequestService.make_request(url: url, method: :get, params: params)
-    politicians = json["objects"]
-    politicians.map { |politician_json| Politician.new(politician_json) }
+    politicians_service = RequestService.new(Politician)
+    politicians_service.get(params)
   end
 end

data/lib/open_parliament/bill.rb

@@ -1,4 +1,23 @@
 module OpenParliament
   class Bill < OpenStruct
+
+    def self.resource_url
+      "/bills/"
+    end
+
+    def self.valid_filters
+      [
+        :introduced,
+        :law,
+        :legisinfo_id,
+        :number,
+        :private_member_bill,
+        :session,
+        :sponsor_politician,
+        :sponsor_politician_membership,
+        :status_code,
+      ]
+    end
+
   end
 end

data/lib/open_parliament/committee.rb

@@ -1,4 +1,12 @@
 module OpenParliament
   class Committee < OpenStruct
+
+    def self.resource_url
+      "/committees/"
+    end
+
+    def self.valid_filters
+      [:session]
+    end
   end
 end

data/lib/open_parliament/debate.rb

@@ -1,4 +1,17 @@
 module OpenParliament
   class Debate < OpenStruct
+
+    def self.resource_url
+      "/debates/"
+    end
+
+    def self.valid_filters
+      [
+        :date,
+        :number,
+        :session,
+      ]
+    end
+
   end
 end

data/lib/open_parliament/politician.rb

@@ -1,4 +1,18 @@
 module OpenParliament
   class Politician < OpenStruct
+
+    def self.resource_url
+      "/politicians/"
+    end
+
+    def self.valid_filters
+      [
+        :family_name,
+        :given_name,
+        :include,
+        :name,
+      ]
+    end
+
   end
 end

data/lib/open_parliament/request_service.rb

@@ -1,33 +1,47 @@
 module OpenParliament
-  module RequestService
+  class RequestService
 
     VALID_PARAMS = [:limit, :offset]
 
-    def self.make_request(url:, method:, params: {})
-      full_url = "#{OpenParliament::API_URL}#{url}"
+    def initialize(klass)
+      @klass = klass
+    end
+
+    def get(params = {})
+      json = make_request(url: @klass.resource_url, method: :get, params: params)
+      objects = json["objects"]
+      objects.map { |object_json| @klass.new(object_json) }
+    end
 
+
+    private
+
+    def make_request(url:, method:, params: {})
+      @params = params
+
+      full_url = "#{OpenParliament::API_URL}#{url}"
       resp = RestClient::Request.execute(method: method, 
                                          url: full_url,
                                          timeout: 10,
-                                         headers: build_headers(params),
+                                         headers: build_headers,
                                          )
       JSON.parse(resp)
     end
 
-    def self.build_headers(params)
+    def build_headers
       {
         "API-Version" => "v1",
         accept: :json,
-        params: build_params(params),
+        params: build_params,
       }
     end
 
-    def self.build_params(params)
-      allowed_params = params.select { |k| VALID_PARAMS.include?(k) }
-      default_params.merge(allowed_params)
+    def build_params
+      filtered_params = @params.select { |k| (VALID_PARAMS + @klass.valid_filters).include?(k) }
+      default_params.merge(filtered_params)
     end
 
-    def self.default_params
+    def default_params
       {
         limit: 20,
         offset: 0,

data/lib/open_parliament/vote.rb

@@ -1,4 +1,22 @@
 module OpenParliament
   class Vote < OpenStruct
+
+    def self.resource_url
+      "/votes/"
+    end
+
+    def self.valid_filters
+      [
+        :bill,
+        :date,
+        :nay_total,
+        :number,
+        :paired_total,
+        :result,
+        :session,
+        :yea_total,
+      ]
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_parliament
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Dylan Runkel