apple_epf 1.1.2 → 1.1.3

data/lib/apple_epf/downloader.rb

@@ -8,21 +8,26 @@ module AppleEpf
     include AppleEpf::Logging
     ITUNES_FLAT_FEED_URL = 'https://feeds.itunes.apple.com/feeds/epf/v3/full'.freeze
 
-    attr_accessor :type, :filename, :filedate
+    attr_accessor :type, :filename, :filedate, :force_url
 
     attr_reader :download_to, :apple_filename_full
     attr_writer :dirpath
-    def initialize(type, filename, filedate)
+    def initialize(type, filename, filedate, force_url = nil)
       @type = type
       @filename = filename #itunes, popularity, match, pricing
       @filedate = filedate
+      @force_url = force_url
     end
 
     def download
       _prepare_folders
-      get_filename_by_date_and_type
+      if @force_url
+        @apple_filename_full = @force_url
+      else
+        get_filename_by_date_and_type
+        @apple_filename_full = apple_filename_full_url(@apple_filename_full_path)
+      end
 
-      @apple_filename_full = apple_filename_full_url(@apple_filename_full_path)
       @download_to = File.join(dirpath, File.basename(@apple_filename_full))
 
       logger_info "Download file: #{@apple_filename_full}"
@@ -172,4 +177,4 @@ module AppleEpf
     end
 
   end
-end
+end

data/lib/apple_epf/main.rb

@@ -21,10 +21,14 @@ module AppleEpf
         curl.max_redirects = 5
         curl.perform
         body = curl.body_str
-        files =  Nokogiri::HTML(body).xpath("//td/a").map(&:text).select{|s| s=~/.*tbz$/}.map{|f| f.chomp('.tbz')}
+
+        files =  Nokogiri::HTML(body).xpath("//td/a").map(&:text).select{|s| s=~/.*tbz$/}
+
         files.inject({}) do |all, e|
-          e.match(/([a-z]*)(\d*)/)
-          all[$1] = $2
+          e.match(/([a-z]*)(\d*.tbz)/)
+          all[$1] = {}
+          all[$1][:base] = $2.chomp(".tbz")
+          all[$1][:full_url] = self.current_url + "/#{$2}"
           all
         end
     end

data/lib/apple_epf/version.rb

@@ -1,3 +1,3 @@
 module AppleEpf
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/spec/lib/apple_epf/main_spec.rb

@@ -160,10 +160,10 @@ describe AppleEpf::Main do
           to_return(:status => 200, :body => File.read(filename), :headers => {})
 
         list = {
-          'itunes' => '20130130',
-          'match' => '20130130',
-          'popularity' => '20130130',
-          'pricing' => '20130130'
+               "itunes" => {:base=>"20130130", :full_url=>"https://feeds.itunes.apple.com/feeds/epf/v3/full/current/20130130.tbz"},
+       "match" => {:base=>"20130130", :full_url=>"https://feeds.itunes.apple.com/feeds/epf/v3/full/current/20130130.tbz"},
+       "popularity" => {:base=>"20130130", :full_url=>"https://feeds.itunes.apple.com/feeds/epf/v3/full/current/20130130.tbz"},
+       "pricing" => {:base=>"20130130", :full_url=>"https://feeds.itunes.apple.com/feeds/epf/v3/full/current/20130130.tbz"}
         }
         AppleEpf::Full.get_current_list.should == list
       end
@@ -177,9 +177,13 @@ describe AppleEpf::Main do
         stub_request(:get, "https://test:test@feeds.itunes.apple.com/feeds/epf/v3/full/current/incremental/current").
           to_return(:status => 200, :body => File.read(filename), :headers => {})
 
-        list = {"itunes"=>"20130205", "match"=>"20130205", "popularity"=>"20130205", "pricing"=>"20130205"}
+        list = {"itunes" => {:base=>"20130205", :full_url=>"https://feeds.itunes.apple.com/feeds/epf/v3/full/current/incremental/current/20130205.tbz"},
+       "match" => {:base=>"20130205", :full_url=>"https://feeds.itunes.apple.com/feeds/epf/v3/full/current/incremental/current/20130205.tbz"},
+       "popularity" => {:base=>"20130205", :full_url=>"https://feeds.itunes.apple.com/feeds/epf/v3/full/current/incremental/current/20130205.tbz"},
+       "pricing" => {:base=>"20130205", :full_url=>"https://feeds.itunes.apple.com/feeds/epf/v3/full/current/incremental/current/20130205.tbz"}
+        }
         AppleEpf::Incremental.get_current_list.should == list
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apple_epf
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -221,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1349011800637248115
+      hash: -2723133082959436123
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1349011800637248115
+      hash: -2723133082959436123
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23