exchange_rates_nbp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 660739a3cfd2ed77321e72db05a94c9d3f3136c2
-  data.tar.gz: 2c81afbd697cc12b0594e199385efd58465bc4ae
+  metadata.gz: 41009cf622b4fb1042aa0db0dae7a2dd9b963c65
+  data.tar.gz: 613dbe94db7fb1dfe6931a2a190bd0f5a0b6052a
 SHA512:
-  metadata.gz: dc236b567256cf7e6d7a240e19e6ab25688a24cdf385665c6f837b442f127cecca7ece7eb348bbe53a7331e7b3b56b5cac8b9dd47daf8d0bbe598a428c00902a
-  data.tar.gz: 72156e389610fdd165f48ffc3336ba3366ec752b68a0fd1cde3b4d9acdf140b9cdb5f8596d28db18d84fc844b2ba1c7bb6285e1bcffce4e442c42364ff9718f1
+  metadata.gz: 2527f8c435f7c7a8904b9daa8190ea243ba462d63a4ab3153dd22341752ce37f6e7307eaf9487d269ec28602d914a53190a2093b976fdfa2eaa1446698d1d356
+  data.tar.gz: a215f1692f1f18ce3f4120befc50ccfd345c48ab64ad08e41d8b03d8e1f86dcc59a6555e4045303341771063d6d3c7e5ef58e524184ff2cdb6f68fa4ec6f7360

data/.rubocop.yml

@@ -1,7 +1,4 @@
 Style/Documentation:
   Enabled: false
 
-Lint/UnusedBlockArgument:
-  Enabled: false
-
 require: rubocop-rspec

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# 0.1.2 / 2016-10-01
+
+* Add verbose mode
+
+# 0.1.1 / 2016-03-06 
+
+* Fixed gemset runtime dependency definitions
+
+# 0.1.0 / 2016-03-06
+
+* Initial release

data/README.md

@@ -1,6 +1,7 @@
 # ExchangeRatesNBP
 
 [![Build Status](https://travis-ci.org/maciejmajewski/exchange_rates_nbp.svg?branch=master)](https://travis-ci.org/maciejmajewski/exchange_rates_nbp)
+[![Gem Version](https://badge.fury.io/rb/exchange_rates_nbp.svg)](https://badge.fury.io/rb/exchange_rates_nbp)
 
 Library for accessing exchange rates from nbp.pl.
 
@@ -31,11 +32,26 @@ ExchangeRatesNBP.exchange_rate(Date.new(2016, 1, 1), 'EUR')
 
 ### Via command line
 
-```
+```sh
 exchange_rates_nbp --date DATE --currency_code CURRENCY_CODE --table a
 # => 4.2615
 ```
 
+#### Getting latest exchange rate
+
+```sh
+exchange_rates_nbp --latest --currency-code=EUR
+# => 4.312
+```
+#### Verbose mode
+
+```sh
+exchange_rates_nbp --latest --currency-code=EUR --verbose
+# => Publish date: 2016-09-30
+# => Conversion factor: 1
+# => Exchange rate: 4.312
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment. Run `bundle exec exchange_rates_nbp` to use the gem in this directory, ignoring other installed copies of this gem.

data/exchange_rates_nbp.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'http'
   spec.add_runtime_dependency 'oga'
+  spec.add_runtime_dependency 'colorize'
 
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'

data/exe/exchange_rates_nbp

@@ -3,6 +3,7 @@
 require 'exchange_rates_nbp'
 
 require 'optparse'
+require 'colorize'
 
 options = {}
 
@@ -21,12 +22,26 @@ parser = OptionParser.new do |opts|
   opts.on('--latest', 'Print latest exchange rate') do
     options[:date] = Date.today
   end
+
+  opts.on('-v', '--verbose', 'Show verbose info') do
+    options[:verbose] = true
+  end
 end
 
 parser.parse!
 
 if options[:currency_code].nil? || options[:date].nil?
+  puts '`currency_code` and `date` params are required'.red
   puts parser.help
 else
-  puts ExchangeRatesNBP.exchange_rate(options[:date], options[:currency_code])
+  info = ExchangeRatesNBP.exchange_rate_info(options[:date],
+                                             options[:currency_code])
+
+  if options[:verbose]
+    puts "Publish date: #{info[:publish_date]}"
+    puts "Conversion factor: #{info[:conversion_factor]}"
+    puts "Exchange rate: #{info[:exchange_rate]}"
+  else
+    puts info[:exchange_rate]
+  end
 end

data/lib/exchange_rates_nbp.rb

@@ -22,16 +22,25 @@ module ExchangeRatesNBP
   DEFAULT_TABLE_TYPES = TABLE_TYPES.values.first
 
   def self.exchange_rate(date, currency_code, table = DEFAULT_TABLE_TYPES)
-    table_id = find_table_id(date, table)
-    extract_currency(table_id, currency_code)
+    exchange_rate_info(date, currency_code, table)[:exchange_rate]
   end
 
-  def self.find_table_id(date, table)
-    Clients::TableList.new(date.year, table).fetch_closest_to(date)
+  def self.exchange_rate_info(date, currency_code, table = DEFAULT_TABLE_TYPES)
+    table_id = find_table_id(date, table)
+    exchange_rate_hash(table_id, currency_code)
   end
 
-  def self.extract_currency(table_id, currency_code)
-    ExchangeRatesNBP::Clients::CurrencyDataSet.new(table_id)
-                                              .exchange_rate(currency_code)
+  class << self
+    private
+
+    def find_table_id(date, table)
+      Clients::TableList.new(date.year, table).fetch_closest_to(date)
+    end
+
+    def exchange_rate_hash(table_id, currency_code)
+      ExchangeRatesNBP::Clients::CurrencyDataSet
+        .new(table_id)
+        .exchange_rate(currency_code)
+    end
   end
 end

data/lib/exchange_rates_nbp/clients/currency_data_set.rb

@@ -4,25 +4,57 @@ module ExchangeRatesNBP
   module Clients
     class CurrencyDataSet
       SELECTOR_CURRENCY_ELEMENT = 'tabela_kursow pozycja'.freeze
-      FIELD_AVERAGE_CURRENCY_CODE = 'kurs_sredni'.freeze
+
+      FIELD_AVERAGE_EXCHANGE_RATE = 'kurs_sredni'.freeze
       FIELD_CURRENCY_CODE = 'kod_waluty'.freeze
+      FIELD_TABLE_NAME = 'numer_tabeli'.freeze
+      FIELD_PUBLISH_DATE = 'data_publikacji'.freeze
+      FIELD_CONVERSION_FACTOR = 'przelicznik'.freeze
 
       def initialize(table_id)
         @table_id = table_id
       end
 
       def exchange_rate(currency_code)
-        doc = Oga.parse_xml(data).css(SELECTOR_CURRENCY_ELEMENT).detect do |p|
+        xml = Oga.parse_xml(data)
+
+        doc = selected_currency_element(xml, currency_code)
+
+        currency_element_to_hash(xml, doc)
+      end
+
+      private
+
+      def currency_element_to_hash(xml, doc)
+        {
+          exchange_rate: to_exchange_rate(doc),
+          publish_date: to_publish_date(xml),
+          conversion_factor: to_conversion_factor(doc)
+        }
+      end
+
+      def to_publish_date(xml)
+        Date.parse(xml.css(FIELD_PUBLISH_DATE).text)
+      end
+
+      def to_exchange_rate(doc)
+        doc.css(FIELD_AVERAGE_EXCHANGE_RATE).text.tr(',', '.').to_f
+      end
+
+      def to_conversion_factor(doc)
+        doc.css(FIELD_CONVERSION_FACTOR).text.to_i
+      end
+
+      def selected_currency_element(xml, currency_code)
+        doc = xml.css(SELECTOR_CURRENCY_ELEMENT).detect do |p|
           p.css(FIELD_CURRENCY_CODE).text == currency_code
         end
 
         raise "Invalid currency code: #{currency_code}" if doc.nil?
 
-        doc.css(FIELD_AVERAGE_CURRENCY_CODE).text.tr(',', '.').to_f
+        doc
       end
 
-      private
-
       def data
         HTTP.get(BASE_URL + "#{@table_id}.xml").to_s
       end

data/lib/exchange_rates_nbp/version.rb

@@ -1,3 +1,3 @@
 module ExchangeRatesNBP
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exchange_rates_nbp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Maciej Majewski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +205,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -223,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Collects exchange rates from nbp.pl