ledger_get_prices 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41c009059067525d46e9499b59d27afd58c6d5cb
-  data.tar.gz: 50562e2f41338701f426c9b7c73ed7ab2399e924
+  metadata.gz: 82002be160f52fc01564edb64715b8126b57dcef
+  data.tar.gz: 266d9a38f944428cf3fcf84c3454cc3bdc75d91c
 SHA512:
-  metadata.gz: e334b3491995b5815d7785648c0e6a676b62272a6d913154482b0f9f7c4b24bd792591b2c563487d4b92bcb5c866b5bcdafa2a7b455e494c96ba191885d7c0c5
-  data.tar.gz: 5d2e26fc192954bbad458f81c1224aa3905f0d6fa56fbfdd1d0a422c48c5ac1077e99934df6d43ec69981aa929fa4174685d329b5272b425831f4efa6ecd0924
+  metadata.gz: 93fc33cf7c01e3195b02ede4b468bfc66487ce6e0fff35dec66bc0b7927d52bab2b7a2048d8530562f096a8ccb7bb2a79230e005786dca9f308039393753992f
+  data.tar.gz: b06564e0d3208a20b2a4124590eb5b4dd7062908e032e4cc806e98693d971a6edab65f71fccf3562249b8b1ac304e324afea7adbf4fe0e0c37d6469eeee5f4f3

data/ledger_get_prices.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_runtime_dependency "yahoo-finance", "~> 1.0.0"
+  spec.add_runtime_dependency "yahoo-finance", "~> 1.1.0"
 end

data/lib/ledger_get_prices.rb

@@ -17,16 +17,17 @@ module LedgerGetPrices
   # running +ledger+ vanilla knows where to get the journal and
   # pricedb.
   #
+  # Yahoo works best when fetching all prices relative to USD.
+  # So regardless of whether or not USD is actually used, it will
+  # always appear in the resulting prices file.
+  #
   # = Options
   #
-  # +LEDGER_BASE_CURRENCY+: Defaults to USD, change this to your reporting currency.
   # +LEDGER_PRICE_DATE_FORMAT+: The date format of the outputted pricedb. Defaults to +%Y/%m/%d+.
   class GetPrices
     class << self
 
-      # Yahoo finance works best in USD, if the base currency is
-      # different we will also store the USD price of that currency
-      # to allow for conversion.
+      # The base currency should be the currency that the dollar sign represents in your reports.
       BASE_CURRENCY = ENV['LEDGER_BASE_CURRENCY'] || "USD"
 
       PRICE_DB_PATH = ENV['LEDGER_PRICE_DB'] || ENV['PRICE_HIST'] # PRICE_HIST is <v3
@@ -51,15 +52,18 @@ module LedgerGetPrices
       #
       # @return [Array] an array of formatted prices
       def new_prices
-        commodities.reduce(existing_prices) do |db, c|
-          # `|` is a shortcut for merge
-          db | prices_for_symbol(c, start_date: start_date, end_date: end_date)
-              .map { |x| price_string_from_result(x, symbol: c) }
-        end
+        # Since everything is relative to USD, we don't need to fetch it.
+        commodities
+          .reject { |c| c == "USD" }
+          .reduce(existing_prices) do |db, c|
+            # `|` is a shortcut for merge
+            db | prices_for_symbol(c, start_date: start_date, end_date: end_date)
+                .map { |x| price_string_from_result(x, symbol: c) }
+          end
       end
 
       # @return [Array] of YahooFinance results (OpenStruct)
-      def prices_for_symbol(symbol, start_date: start_date, end_date: end_date) # -> Array
+      def prices_for_symbol(symbol, start_date: nil, end_date: nil) # -> Array
         puts "Getting historical quotes for: #{symbol}"
 
         if COMMODITY_BLACKLIST.include?(symbol)
@@ -77,7 +81,11 @@ module LedgerGetPrices
         while quote_strings.length > 0 && result.nil?
           begin
             result = YahooFinance::Client.new.historical_quotes(
-              quote_strings.shift, start_date: start_date, end_date: end_date, period: :daily)
+              quote_strings.shift,
+              start_date: start_date,
+              end_date: end_date,
+              period: :daily)
+
           rescue OpenURI::HTTPError => e
             err = e
           end
@@ -97,8 +105,8 @@ module LedgerGetPrices
         PRICE_FORMAT % {
           date: Date.strptime(data.trade_date, '%Y-%m-%d').strftime(DATE_FORMAT),
           time: '23:59:59',
-          symbol: (BASE_CURRENCY == 'USD' ? '$' : 'USD'),
-          price: (BASE_CURRENCY == symbol ? '$' : symbol)+ data.close
+          symbol: 'USD',
+          price: symbol + data.close
         }
       end
 
@@ -131,11 +139,10 @@ module LedgerGetPrices
 
       def commodities
         # All the commodities we care about.
-        @commodities ||= `ledger commodities`.split("\n").reject { |x| x == "$" }.tap do |c|
-          # Since all quotes will be in USD, we don't need to bother
-          # retrieving USD/USD quotes.
-          c << BASE_CURRENCY if BASE_CURRENCY != 'USD'
-        end
+        @commodities ||= `ledger commodities`.split("\n")
+          .reject { |x| x == "$" }
+          .tap { |c| c << BASE_CURRENCY }
+          .uniq
       end
 
     end

data/lib/ledger_get_prices/version.rb

@@ -1,3 +1,3 @@
 module LedgerGetPrices
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ledger_get_prices
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Nathan Kot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 description: 
 email:
 - nk@nathankot.com
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Intelligently update your ledger pricedb