kokkai 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a0327d198e22e0b915b21cdf213d2b5ccf542c9a5450740f35b761a581a4721
-  data.tar.gz: c2f47122de057d6d40cd16516fc96ad0c87d333aa05a97d11fa150b5a9e01385
+  metadata.gz: 2d55e93920f786bbb3978bf6c43f974781720a7a7db843d88dde7d91a31eca4d
+  data.tar.gz: 6a3a546d9db2361c68e096bd13553390ed52b030846369afe3ce7ed75a92a21c
 SHA512:
-  metadata.gz: abeecebd58ed9512cb2b12e9c34990c1baf78f7089bb6ffddab06f8407a8c1e119073a516d5c416b02a4e33f5d9d5aeba33fa09e69967e354ab1e98496341205
-  data.tar.gz: 816dd7b690972a4bb1759eb00738859b7329d7c5c74c31dacbdbbf470de0a45f9ea60c3e7c556b05b9655cf0bd8953d243fa924de3064b56c57cd2a4bf12f05a
+  metadata.gz: 9b7fc77b81c04801e973a73fdcfeb1b4d2de3c8a7da77f03d49e73aa05361135fa825fe445c567c51e58a015aaadc9cb03355505c9abf9895b7b9674eaac4178
+  data.tar.gz: 2d84485521d8ce4334ce8253c4f332776b1ab6382623695a896c6c449aee967ec4231e34b1e668de30ad9a0f02d1198fed55565026d280c4b2b961703be52959

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1

data/README.md

@@ -1,8 +1,8 @@
 # Kokkai
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/kokkai`. To experiment with that code, run `bin/console` for an interactive prompt.
+[![Build Status](https://travis-ci.org/kimihito/kokkai.svg?branch=master)](https://travis-ci.org/kimihito/kokkai)
 
-TODO: Delete this and the text above, and describe your gem
+http://kokkai.ndl.go.jp/api.html client library, written in Ruby
 
 ## Installation
 
@@ -22,7 +22,23 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+```
+# Initialization
+client = Kokkai::Client.new
+
+# Call speech data
+client.speech(any: "アベノミクス", speaker: "安倍晋三", start_record: 1, maximum_records: 5).body.data
+
+
+# call meeting API
+
+client.meeting(name_of_house: "両院", name_of_meeting: "国家基本政策委員会合同審査会").body.data
+
+
+```
+
+More information about parameters and attributes is [here](http://kokkai.ndl.go.jp/api.html#specification) (Japanese).
+
 
 ## Development
 
@@ -32,7 +48,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/kokkai.
+Bug reports and pull requests are welcome on GitHub at https://github.com/kimihito/kokkai.
 
 ## License
 

data/lib/kokkai/api_methods.rb

@@ -3,5 +3,9 @@ module Kokkai
     def speech(params = nil)
       send_get("/api/1.0/speech", params)
     end
+
+    def meeting(params = nil)
+      send_get("/api/1.0/meeting", params)
+    end
   end
 end

data/lib/kokkai/client.rb

@@ -1,12 +1,11 @@
 require 'erb'
-require 'kokkai/errors'
 require 'kokkai/api_methods'
 require 'kokkai/response'
+require 'kokkai/utils/string_formatter'
 
 module Kokkai
   class Client
     include ApiMethods
-
     def initialize
     end
 
@@ -54,10 +53,14 @@ module Kokkai
   end
 
   class ParamsEncoder
+    using Utils::StringFormatter
+
     def self.encode(params)
-      str = params.map {|(key, value)|
+      camelized_params = Hash[params.map {|k,v| [k.to_s.to_camel.to_sym, v]}]
+      str = camelized_params.map {|(key, value)|
         "#{key}=#{value}"
       }.join('&')
+
       return ERB::Util.url_encode(str)
     end
 

data/lib/kokkai/data.rb

@@ -1,6 +1,8 @@
 require 'memoist'
 require 'kokkai/utils/string_formatter.rb'
 require 'kokkai/speech'
+require 'kokkai/meeting'
+
 module Kokkai
   class Data
     extend Memoist

data/lib/kokkai/error.rb

@@ -0,0 +1,44 @@
+module Kokkai
+  class Error < StandardError
+    attr_reader :code
+
+    ClientError = Class.new(self)
+    BadRequest = Class.new(ClientError)
+
+    ERRORS = {
+      400 => Kokkai::Error::BadRequest
+    }.freeze
+
+    ATTRIBUTES = %w(data diagnostics diagnostic)
+
+    class << self
+      def from_response(body)
+        message, code = parse_error(body)
+        new(message, code)
+      end
+
+      private
+
+        def parse_error(body)
+          if body.nil?  || body.empty?
+            ['', nil]
+          elsif body.dig("data", "diagnostics")
+            extract_message_from_error(body.dig(*ATTRIBUTES))
+          end
+        end
+
+        def extract_message_from_error(body)
+          message = body.dig("details").nil? ? body.dig("message") : body.dig("details")
+          message = message.first if message.is_a?(Array)
+          match = message.match(/\([0-9]{5}\)/)
+          [match.post_match, match[0].gsub(/\(|\)/, '').to_i]
+        end
+
+    end
+
+    def initialize(message, code)
+      super(message)
+      @code = code
+    end
+  end
+end

data/lib/kokkai/meeting.rb

@@ -0,0 +1,19 @@
+require 'kokkai/record'
+require 'kokkai/speech'
+
+module Kokkai
+  class Meeting < Record
+
+    def initialize(raw)
+      super
+      @raw_record = @raw_record.dig("meetingRecord")
+    end
+
+    def speeches
+      @raw_record.dig("speechRecord").map do |record|
+        recordData = { "recordData" => { "speechRecord" => record } }
+        Kokkai::Speech.new(recordData)
+      end
+    end
+  end
+end

data/lib/kokkai/parser.rb

@@ -1,10 +1,23 @@
 require "kokkai/data"
+require "kokkai/error"
 module Kokkai
   class Parser
     attr_reader :raw_data, :data
 
-    def initialize(raw_data)
-      @data = Data.new(raw_data.dig("data"))
+    def initialize(raw_data, raw_status)
+      if raw_status == 200
+        @data = Data.new(raw_data.dig("data"))
+      else
+        error = error(raw_data, raw_status)
+        raise(error)
+      end
     end
+
+    private
+
+      def error(raw_data, raw_status)
+        klass = Kokkai::Error::ERRORS[raw_status]
+        klass.from_response(raw_data)
+      end
   end
 end

data/lib/kokkai/response.rb

@@ -9,7 +9,7 @@ module Kokkai
     end
 
     def body
-      Parser.new(@raw_body)
+      Parser.new(@raw_body, @raw_status)
     end
 
     def headers

data/lib/kokkai/version.rb

@@ -1,3 +1,3 @@
 module Kokkai
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kokkai
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - kimihito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -200,6 +200,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - MIT-LICENSE
@@ -212,7 +213,8 @@ files:
 - lib/kokkai/api_methods.rb
 - lib/kokkai/client.rb
 - lib/kokkai/data.rb
-- lib/kokkai/errors.rb
+- lib/kokkai/error.rb
+- lib/kokkai/meeting.rb
 - lib/kokkai/parser.rb
 - lib/kokkai/record.rb
 - lib/kokkai/response.rb

data/lib/kokkai/errors.rb

@@ -1,4 +0,0 @@
-module Kokkai
-  class KokkaiError < StandardError; end
-  class ServiceUnavailableError < KokkaiError; end
-end