navfund 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e29ce8ec42cb69880b6867d11b72fd790eab996
-  data.tar.gz: d891a0a72a91581e158e774e4b1e3dadde95cca2
+  metadata.gz: 03eb8d04c7d9c941df5026c24f0dc1c0a8bd5314
+  data.tar.gz: eafdea69b1881522d2acde04193807d5b9cce213
 SHA512:
-  metadata.gz: 4bf57bc9746646b8fde2cdaad6db0ad82cb5f13b99b3d43fdffc6db4772fb79b6e432761d5885a530f7700f08f2f503330733e802719e6374b397ebca18ac5a2
-  data.tar.gz: 455324835bbe4972ce8c003e9855789dc6d0e0928dd9e35a38aba8dbd61648892f0ff24c2f1f5437a1737a92ced4a93682600f9bd53ffec92ab22a1bcd925bc3
+  metadata.gz: 55aedd2bae504d6ba33f1009012b267d63fb2b872f17d8e0b32b06e34221ff3eb64cbd4e7b4fb767a9a0d1106201b42fd6247d081015b0d831c44277d1ef51da
+  data.tar.gz: b5bb48a5ec1d79d84c7f8c8036f1aa3b356179b55ee750f41dc6de90418fbe6c9c39f850d3841908fe90b6783c5e89f34c3f4932920bd7c01b23af37de59ea4d

data/lib/navfund/provider.rb

@@ -52,7 +52,7 @@ module Navfund
         if fname
           fval = fname.ancestors('tr').first.search("td[data-title='NAVpu'] div").first rescue nil
         end
-        val = Provider.strip_value(fval.text) if fval
+        val = Provider.strip_value(fval.text).to_f if fval
       else
         raise InvalidFund
       end

data/lib/navfund/providers/metrobank.rb

@@ -5,17 +5,17 @@ module Navfund
     # List of funds
     MAIN_URL = "http://www.uitf.com.ph/daily_navpu.php?bank_id=1"
     Funds = [
-      {:name => "Money Market Fund", :currency => "PHP", :ticker => "MBSTART:PM"}, 
-      {:name => "Max-3 Bond Fund", :currency => "PHP", :ticker => "MBELITE:PM"},
-      {:name => "Wealth Builder Fund", :currency => "PHP", :ticker => "MBIPLUS:PM"},
-      {:name => "Max-5 Bond Fund", :currency => "PHP", :ticker => "MBPKEAR:PM"},
-      {:name => "Balanced Fund", :currency => "PHP", :ticker => "MBCAPGR:PM"},
-      {:name => "Equity Fund", :currency => "PHP", :ticker => "MBEQITY:PM"},
-      {:name => "High Dividend Yield Fund", :currency => "PHP", :ticker => ""},
-      {:name => "PSEi Tracker Fund", :currency => "PHP", :ticker => ""},
-      {:name => "$ Money Market Fund", :currency => "USD", :ticker => "MBDMMKF:PM"},
-      {:name => "$ Max-3 Bond Fund", :currency => "USD", :ticker => "MBPHLIQ:PM"},
-      {:name => "$ Max-5 Bond Fund", :currency => "USD", :ticker => "MBPHLBD:PM"}
+      {:name => "Metro Money Market Fund", :currency => "PHP", :ticker => "MBSTART:PM"}, 
+      {:name => "Metro Max-3 Bond Fund", :currency => "PHP", :ticker => "MBELITE:PM"},
+      {:name => "Metro Wealth Builder Fund", :currency => "PHP", :ticker => "MBIPLUS:PM"},
+      {:name => "Metro Max-5 Bond Fund", :currency => "PHP", :ticker => "MBPKEAR:PM"},
+      {:name => "Metro Balanced Fund", :currency => "PHP", :ticker => "MBCAPGR:PM"},
+      {:name => "Metro Equity Fund", :currency => "PHP", :ticker => "MBEQITY:PM"},
+      {:name => "Metro High Dividend Yield Fund", :currency => "PHP", :ticker => ""},
+      {:name => "Metro PSEi Tracker Fund", :currency => "PHP", :ticker => ""},
+      {:name => "Metro$ Money Market Fund", :currency => "USD", :ticker => "MBDMMKF:PM"},
+      {:name => "Metro$ Max-3 Bond Fund", :currency => "USD", :ticker => "MBPHLIQ:PM"},
+      {:name => "Metro$ Max-5 Bond Fund", :currency => "USD", :ticker => "MBPHLBD:PM"}
       ]
     
     def initialize(main_url=nil)

data/lib/navfund/providers/philamlife.rb

@@ -23,7 +23,7 @@ module Navfund
       {:name => "GROWTH INVEST FUND 3", :currency => "PHP", :ticker => ""}
       ]
       
-   def initialize(main_url=nil)
+    def initialize(main_url=nil)
       @url = main_url ||= MAIN_URL
       @funds = Funds
       self.scrape(:check_ssl => false)

data/lib/navfund/providers/sunlife.rb

@@ -2,20 +2,25 @@
 
 module Navfund
   class Sunlife < Provider
-    MAIN_URL = "http://www.sunlife.com.ph/philippines/Products+and+Services/Sun+Life+Prosperity+Funds?vgnLocale=en_CA"
+    MAIN_URL = "https://www.sunlife.com.ph/PH/Investments/NAVPS?vgnLocale=en_CA"
     Funds = [
       {:name => "Bond Fund", :currency => "PHP", :ticker => "SNCPRBF:PM"}, 
       {:name => "Balanced Fund", :currency => "PHP", :ticker => "SNCPRBA:PM"},
       {:name => "Equity Fund", :currency => "PHP", :ticker => "SNCPPEA:PM"},
       {:name => "Money Market Fund", :currency => "PHP", :ticker => "SNLFMNY:PM"},
       {:name => "GS Fund", :currency => "PHP", :ticker => "SNLPRGS:PM"},
+      {:name => "Dynamic Fund", :currency => "PHP", :ticker => "SLPVU22:PM"},
+      {:name => "Index Fund", :currency => "PHP", :ticker => "SLFPSIF:PM"},
       {:name => "Dollar Advantage Fund", :currency => "USD", :ticker => "SUNPDAA:PM"},
-      {:name => "Dollar Abundance Fund", :currency => "USD", :ticker => "SNLPRDA:PM"}
+      {:name => "Dollar Abundance Fund", :currency => "USD", :ticker => "SNLPRDA:PM"},
+      {:name => "Dollar Wellspring Fund", :currency => "USD", :ticker => "SLDWELL:PM"},
+      {:name => "World Voyager Fund", :currency => "USD", :ticker => "SLWVOYA:PM"},
+      {:name => "Dollar Starter Fund", :currency => "USD", :ticker => "SLDSTAR:PM"}
       ]
    
     def initialize(main_url=nil)
       @url = main_url ||= MAIN_URL
-      @url = MAIN_URL
+      @funds = Funds
       self.scrape
     end 
     
@@ -23,9 +28,8 @@ module Navfund
     def value(fund, fund_type=nil)
       val = nil
       if valid_fund?(fund)
-        fname = @wrapped_document.search("[text()*='#{fund}']").first
-        fval = fname.parent.next_element rescue nil
-        val = Provider.strip_value(fval.text) if fval
+        fval = fund_table.search("[text()*='#{fund}']").first.next_element.children.last.text rescue nil
+        val = fval.scan(/\d./).join('').to_f if fval
       else
         raise InvalidFund
       end
@@ -33,11 +37,16 @@ module Navfund
     end
     
     def value_at
-      dcontainer = @wrapped_document.search("div.newsHeadlineTitle[align='left']").first
-      dtext = dcontainer.text
+      dtext = fund_table.search("[text()*='As of']").first.text
       dstr = dtext.split("As of").last.strip
       Date.strptime(dstr, "%m/%d/%Y")
     end
+
+    private
+
+    def fund_table
+      @fund_table ||= @wrapped_document.xpath('//div[@id="PesoFunds"]').first
+    end
     
   end
 end

data/lib/navfund/version.rb

@@ -1,3 +1,3 @@
 module Navfund
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/test/lib/navfund/provider_test.rb

@@ -2,11 +2,12 @@ require File.expand_path('../../../test_helper.rb', __FILE__)
 
 describe Navfund do
   #@providers = Navfund::Providers
-  @providers = [Navfund::Metrobank, Navfund::Sunlife, Navfund::Philamlife]
+  @providers = [Navfund::Metrobank, Navfund::Sunlife]
   @providers.each do |provider_klass|
     before do
-      google_cache_url = "http://webcache.googleusercontent.com/search?q=cache:"
+      google_cache_url = "https://webcache.googleusercontent.com/search?q=cache:"
       test_url = "#{google_cache_url}#{provider_klass::MAIN_URL}"
+      puts test_url
       @provider = provider_klass.new(test_url)
     end
     describe "for the #{provider_klass.to_s} provider" do
@@ -15,7 +16,7 @@ describe Navfund do
       end
       it "should get the current values of #{provider_klass.to_s}" do
         @provider.funds.each do |fund|
-          @provider.value(fund[:name]).wont_be_empty
+          @provider.value(fund[:name]).to_s.wont_be_empty
         end
       end
       it "should get the value date of #{provider_klass.to_s}" do

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: navfund
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Marvin Baltazar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 description: Data scraper for Investment Fund Net Asset Values (NAVs)
@@ -45,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -98,17 +98,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Navfund is a ruby gem that fetches the current NAVPU/NAVPS of UITFs/Mutual