ari_fetch 0.0.6 → 0.0.7

data/lib/ari_fetch/ari_read_file.rb

@@ -4,6 +4,8 @@ module AriFetch
   class AriReadFile < ActiveRecord::Base
     attr_accessible :name, :data_read
 
+    scope :read_done, where("data_read = 1")
+
     attr_accessor :content, :vehicles
 
     def fetch_data(ftp_instance, include_cancel)

data/lib/ari_fetch/vehicle.rb

@@ -20,7 +20,9 @@ module AriFetch
 
     def vehicle_data_with_downcased_keys
       downcased_hash = {}
-      vehicle.map{|k, v| downcased_hash.merge!({"#{k.downcase}" => v}) }
+      vehicle.map{|k, v| 
+        downcased_hash.merge!({"#{k.downcase}" => v}) if k && v
+      }
       downcased_hash
     end
 

data/lib/ari_fetch/version.rb

@@ -1,3 +1,3 @@
 module AriFetch
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/ari_fetch.rb

@@ -16,7 +16,7 @@ module AriFetch
     end
 
     def read_files
-      @read_files = AriFetch::AriReadFile.pluck(:name) rescue @read_files = AriFetch::Files.new([]).files
+      @read_files = AriFetch::AriReadFile.read_done.pluck(:name) rescue @read_files = AriFetch::Files.new([]).files
     end
 
     def ftp_files
@@ -28,7 +28,7 @@ module AriFetch
     end
 
     def fetch_vehicles_from_files(how_many=1)
-      unread_files.first(how_many).map {|file| AriFetch::AriReadFile.create(name: file, data_read: false).fetch_data(ftp_instance, include_cancel?) }.flatten!
+      unread_files.first(how_many).map {|file| AriFetch::AriReadFile.where(name: file).first_or_create(data_read: false).fetch_data(ftp_instance, include_cancel?) }.flatten!
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ari_fetch
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: