feedx 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78c9ab1f475804897ee6610107515f598c14590878a3134f14abecad23e151ab
-  data.tar.gz: 89d4d70a336b47ccba2db349fdcc4283e45ddb877599ac6618ba3da173ba8547
+  metadata.gz: 71dca5fd53dd7fe5f8a9db7222e0cd50deaa161247fb1648055f8c1475097f37
+  data.tar.gz: bd5d2840072c36370b2125f8decaccb2eb25fde22af4844641aff21ba6a1d265
 SHA512:
-  metadata.gz: 12a539f376dd128eb4eb9d26d7a31812f656c0601375eec8721c814f404326d52feaafa80c6856fc9cf7fe66f1e1e956b9c74621d3ee88f0f8a47307f2ef04c1
-  data.tar.gz: c1de172489a3404f3c811aa3c41bf6d00708f36e756f4db0d4e58db0adfe8aa3908189cc07a25703682c48293c747351781650582ca4f1f1e5d3ab5681237f7c
+  metadata.gz: b41727d4151602a97112c32874084b2486c72329cb4eee74f4dd6736176e0b925dac9071fe427d04f4ed657eac5748e42102cb05d558b5bf6c1ffc465709b7e1
+  data.tar.gz: ae9d45a9a91f5438a1ccf39f1f1470042955af79399d9cceec60192b033ebcf617aa30b7d19e1db24aba9f697d82234390404f7540c64e3116e57bc6fd4d39e0

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    feedx (0.12.0)
+    feedx (0.12.1)
       bfs (>= 0.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.1)
-    bfs (0.7.0)
-    diff-lcs (1.4)
+    bfs (0.7.1)
+    diff-lcs (1.4.4)
     extpp (0.0.8)
     gio2 (3.4.3)
       gobject-introspection (= 3.4.3)
@@ -59,7 +59,7 @@ GEM
       rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
+    rubocop-ast (0.1.0)
       parser (>= 2.7.0.1)
     rubocop-performance (1.6.1)
       rubocop (>= 0.71.0)

data/feedx.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'feedx'
-  s.version       = '0.12.0'
+  s.version       = '0.12.1'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Exchange data between components via feeds)

data/lib/feedx/consumer.rb

@@ -19,10 +19,10 @@ module Feedx
     # @option opts [Symbol,Class<Feedx::Compression::Abstract>] :compress enable compression. Default: from file extension.
     # @option opts [Feedx::Cache::Value] :cache cache value to store remote last modified time and consume conditionally.
     def initialize(url, klass, format_options: {}, cache: nil, **opts)
-      @klass  = klass
-      @stream = Feedx::Stream.new(url, **opts)
-      @cache  = cache
-      @opts   = opts.merge(format_options)
+      @klass = klass
+      @url = url
+      @opts = opts.merge(format_options)
+      @cache = cache
 
       return if format_options.empty? || (defined?(Gem::Deprecate) && Gem::Deprecate.skip)
 
@@ -31,21 +31,24 @@ module Feedx
 
     # @return [Boolean] returns true if performed.
     def each(&block)
+      stream = Feedx::Stream.new(@url, **@opts)
       remote_rev = nil
 
       if @cache
-        metadata   = @stream.blob.info.metadata
+        metadata   = stream.blob.info.metadata
         local_rev  = @cache.read.to_i
         remote_rev = (metadata[META_LAST_MODIFIED] || metadata[META_LAST_MODIFIED_DC]).to_i
         return false if remote_rev.positive? && remote_rev <= local_rev
       end
 
-      @stream.open do |fmt|
+      stream.open do |fmt|
         fmt.decode_each(@klass, **@opts, &block)
       end
       @cache.write(remote_rev) if @cache && remote_rev
 
       true
+    ensure
+      stream&.close
     end
   end
 end

data/lib/feedx/producer.rb

@@ -22,9 +22,9 @@ module Feedx
       @enum = enum || block
       raise ArgumentError, "#{self.class.name}.new expects an :enum option or a block factory" unless @enum
 
-      @stream   = Feedx::Stream.new(url, **opts)
+      @url  = url
+      @opts = opts.merge(format_options)
       @last_mod = last_modified
-      @opts     = opts.merge(format_options)
 
       return if format_options.empty? || (defined?(Gem::Deprecate) && Gem::Deprecate.skip)
 
@@ -32,23 +32,26 @@ module Feedx
     end
 
     def perform
-      enum      = @enum.is_a?(Proc) ? @enum.call : @enum
-      last_mod  = @last_mod.is_a?(Proc) ? @last_mod.call(enum) : @last_mod
+      stream = Feedx::Stream.new(@url, **@opts)
+      enum = @enum.is_a?(Proc) ? @enum.call : @enum
+      last_mod = @last_mod.is_a?(Proc) ? @last_mod.call(enum) : @last_mod
       local_rev = last_mod.is_a?(Integer) ? last_mod : (last_mod.to_f * 1000).floor
 
       begin
-        metadata   = @stream.blob.info.metadata
+        metadata   = stream.blob.info.metadata
         remote_rev = (metadata[META_LAST_MODIFIED] || metadata[META_LAST_MODIFIED_DC]).to_i
         return -1 unless local_rev > remote_rev
       rescue BFS::FileNotFound
         nil
       end if local_rev.positive?
 
-      @stream.create metadata: { META_LAST_MODIFIED => local_rev.to_s } do |fmt|
+      stream.create metadata: { META_LAST_MODIFIED => local_rev.to_s } do |fmt|
         iter = enum.respond_to?(:find_each) ? :find_each : :each
         enum.send(iter) {|rec| fmt.encode(rec, **@opts) }
       end
-      @stream.blob.info.size
+      stream.blob.info.size
+    ensure
+      stream&.close
     end
   end
 end

data/lib/feedx/stream.rb

@@ -6,6 +6,18 @@ module Feedx
   class Stream
     attr_reader :blob
 
+    # Behaves like new, but accepts an optional block.
+    # If a block is given, streams are automatically closed after the block is yielded.
+    def self.open(url, **opts)
+      stream = new(url, **opts)
+      begin
+        yield stream
+      ensure
+        stream.close
+      end if block_given?
+      stream
+    end
+
     # @param [String] url the blob URL.
     # @param [Hash] opts options
     # @option opts [Symbol,Class<Feedx::Format::Abstract>] :format custom formatter. Default: from file extension.
@@ -15,6 +27,8 @@ module Feedx
       @format   = detect_format(format)
       @compress = detect_compress(compress)
       @opts     = opts
+
+      BFS.defer(self, :close)
     end
 
     # Opens the remote for reading.
@@ -45,6 +59,11 @@ module Feedx
       end
     end
 
+    # Closes the underlying connection.
+    def close
+      @blob.close
+    end
+
     private
 
     def detect_format(val)

data/spec/feedx/stream_spec.rb

@@ -2,10 +2,13 @@ require 'spec_helper'
 
 RSpec.describe Feedx::Stream do
   let(:bucket) { BFS::Bucket::InMem.new }
-  before  { allow(BFS).to receive(:resolve).and_return(bucket) }
+  let(:compressed) { described_class.new('mock:///dir/file.json.gz') }
 
   subject { described_class.new('mock:///dir/file.json') }
-  let(:compressed) { described_class.new('mock:///dir/file.json.gz') }
+
+  before  { allow(BFS).to receive(:resolve).and_return(bucket) }
+  after { subject.close }
+  after { compressed.close }
 
   it 'should reject invalid inputs' do
     expect do
@@ -24,8 +27,9 @@ RSpec.describe Feedx::Stream do
       end
     end
 
-    stream = described_class.new('mock:///dir/file.txt', format: format.new)
-    stream.create {|s| s.encode Feedx::TestCase::Model.new('X') }
+    described_class.open('mock:///dir/file.txt', format: format.new) do |stream|
+      stream.create {|s| s.encode Feedx::TestCase::Model.new('X') }
+    end
 
     expect(bucket.read('dir/file.txt')).to eq(
       %({"title":"X","updated_at":"2018-01-05 11:25:15 UTC"}\n),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feedx
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bfs