apple_epf 1.0.3 → 1.1.0

data/lib/apple_epf/downloader.rb

@@ -77,7 +77,16 @@ module AppleEpf
 
       # Return false if no url was suggested or file does not exist
       raise AppleEpf::DownloaderError.new("Unable to find out what file do you want to download") if path.empty?
-      raise AppleEpf::FileNotExist.new("File does not exist #{path}") unless file_exists?(path)
+
+      unless file_exists?(path)
+        if @type == 'incremental'
+          #force prev week. Apple sometimes put files for Sunday to prev week, not current.
+          path = "#{main_dir_date(true)}/incremental/#{date_of_file}/#{@filename}#{date_of_file}.tbz"
+          raise AppleEpf::FileNotExist.new("File does not exist #{path}") unless file_exists?(path)
+        else
+          raise AppleEpf::FileNotExist.new("File does not exist #{path}")
+        end
+      end
 
       @apple_filename_full_path = path
       @apple_filename_full_path
@@ -98,10 +107,10 @@ module AppleEpf
       FileUtils.mkpath(dirpath)
     end
 
-    def main_dir_date
+    def main_dir_date(force_last = false)
       if @type == "incremental"
         # from Mon to Thurday dumps are in prev week folder
-        this_or_last = @filedate.wday <= 4 ? 'last' : 'this'
+        this_or_last = @filedate.wday <= 4 || force_last ? 'last' : 'this'
       elsif @type == "full"
         # full downloads usually are done only once. user can determine when it should be done
         this_or_last = 'this'
@@ -124,7 +133,9 @@ module AppleEpf
       request = Net::HTTP::Head.new(full_url)
       request.basic_auth(AppleEpf.apple_id, AppleEpf.apple_password)
 
-      response = Net::HTTP.new(uri.host, uri.port).start { |http| http.request(request) }
+      r = Net::HTTP.new(uri.host, uri.port)
+      r.use_ssl = true
+      response = r.start { |http| http.request(request) }
 
       raise AppleEpf::BadCredentialsError.new('Bad credentials') if response.code == "401"
 

data/lib/apple_epf/version.rb

@@ -1,3 +1,3 @@
 module AppleEpf
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/spec/lib/apple_epf/downloader_spec.rb

@@ -34,9 +34,8 @@ describe AppleEpf::Downloader do
       end
 
       context "and file does not exists" do
-        let(:file_exists) { false }
-
         it "should raise exception" do
+          downloader.stub(:file_exists?).and_return(false, false)
           downloader.filedate = Date.parse('17-01-2013')
           expect {
             downloader.get_filename_by_date_and_type
@@ -56,12 +55,18 @@ describe AppleEpf::Downloader do
           downloader.filedate = Date.parse('17-01-2013')
           downloader.get_filename_by_date_and_type.should == "20130109/incremental/20130117/popularity20130117.tbz"
         end
+
+
+        it "should return valid url if file exists but in prev catalog" do
+          downloader.stub(:file_exists?).and_return(false, true)
+          downloader.filedate = Date.parse('26-04-2013')
+          downloader.get_filename_by_date_and_type.should == "20130417/incremental/20130426/popularity20130426.tbz"
+        end
       end
 
       context "and file does not exists" do
-        let(:file_exists) { false }
-
         it "should raise exception" do
+          downloader.stub(:file_exists?).and_return(false, false)
           downloader.filedate = Date.parse('17-01-2013')
           expect {
             downloader.get_filename_by_date_and_type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apple_epf
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-04-28 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: 1456211595176392472
+      hash: 2270709244037227608
 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: 1456211595176392472
+      hash: 2270709244037227608
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23