data-provider 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a3741c94c674bb6ad2ee0762253ecf194461c56
-  data.tar.gz: 1bd6a82594d5fbd771624ea23b05fc8ff6cfda33
+  metadata.gz: 83fa8bd4be333b6f8270042fdd45a36715bca717
+  data.tar.gz: 4d325d45f0dda818c3f31203053aa31428c65fa3
 SHA512:
-  metadata.gz: 0971fffc5e2d70131d87e63c05dd9a6e2a9ac754cd9b8c5b7e4e45cc9391cb5639a9ede46b1ae8b50e3d531ef0414d3053f9be3976be5e71299a6115f145cb7a
-  data.tar.gz: 0bdbdc59f3a61fd6c7ad8f52a610305134c8a58ed21e9c5494cc4b479e01243ee0f5d29ba409983ad2c224bdc2f8e7e326b9ca4a88c9f0ab472b61ae43e12298
+  metadata.gz: cf0452e4da45cb8e89276369b30f71c250e6820b2a2fef3b335562de10a082b3ec73dfb1de6b2858db6a500836f5cc128e31aff40956b168fa39054a35770c86
+  data.tar.gz: 685221df20098653c37366fde7082fa0cf10e537dbe8b86d2c198316edc6541671a33f2ccfd160f14a9a754c0bb6ab19730a0d603478168deea8a45e78279c31

data/data-provider.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "data-provider"
-  s.version = '0.2.1'
+  s.version = '0.2.2'
   s.files = `git ls-files`.split($/)
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]

data/lib/data_provider/base.rb

@@ -98,6 +98,10 @@ module DataProvider
       def provider_id *args
         dpc.provider_id *args
       end
+
+      def take_super
+        dpc.take_super(:scope => self)
+      end
     end
 
     module ClassMethods

data/lib/data_provider/container.rb

@@ -75,16 +75,18 @@ module DataProvider
       logger.debug "DataProvider::Container#take with id: #{id.inspect}"
 
       # first try the simple providers
-      if provides.has_key?(id)
+      if provides.has_key?(id) && opts[:skip].nil?
         provider = provides[id]
         return provider.is_a?(Proc) ? provider.call : provider
       end
 
       # try to get a provider object
-      provider = get_provider(id)
+      provider = get_provider(id, :skip => opts[:skip])
       if provider
-        @stack = (@stack || []) + [id]
+        @stack = (@stack || []) + [provider]
+        @skip_stack = (@skip_stack || []) + [opts[:skip].to_i]
         result = (opts[:scope] || self).instance_eval(&provider.block) 
+        @skip_stack.pop
         @stack.pop
         # execute provider object's block within the scope of self
         return result
@@ -93,10 +95,12 @@ module DataProvider
       # try to get a scoped provider object
       if scope.length > 0
         scoped_id = [scope, id].flatten
-        provider = get_provider(scoped_id)
+        provider = get_provider(scoped_id, :skip => opts[:skip])
         if provider
-          @stack = (@stack || []) + [scoped_id]
+          @stack = (@stack || []) + [provider]
+          @skip_stack = (@skip_stack || []) + [opts[:skip].to_i]
           result = (opts[:scope] || self).instance_eval(&provider.block) 
+          @skip_stack.pop
           @stack.pop
           # execute provider object's block within the scope of self
           return result
@@ -108,8 +112,10 @@ module DataProvider
         # temporarily set the @missing_provider instance variable, so the
         # fallback provider can use it through the missing_provider private method
         @missing_provider = id
-        @stack = (@stack || []) + [id]
+        @stack = (@stack || []) + [provider]
+        @skip_stack = (@skip_stack || []) + [opts[:skip].to_i]
         result = (opts[:scope] || self).instance_eval(&provider.block) # provider.block.call # with the block.call method the provider can't access private methods like missing_provider
+        @skip_stack.pop
         @stack.pop # = nil
         @missing_provider = nil
         return result
@@ -125,6 +131,12 @@ module DataProvider
       return nil
     end
 
+    # take_super is only meant to be called form inside a provider
+    # returns the result of next provider with the same ID
+    def take_super(opts = {})
+      take(provider_id, opts.merge(:skip => current_skip + 1))
+    end
+
     #
     # "adding existing containers"-related methods
     #
@@ -239,18 +251,26 @@ module DataProvider
       (@stack || []).clone
     end
 
-    def provider_id
+    def current_provider
       provider_stack.last
     end
 
+    def provider_id
+      current_provider ? current_provider.id : nil
+    end
+
     def scopes
-      provider_stack.map{|provider_id| provider_id.is_a?(Array) ? provider_id[0..-2] : []}
+      provider_stack.map{|provider| provider.id.is_a?(Array) ? provider.id[0..-2] : []}
     end
 
     def scope
       scopes.last || []
     end
 
+    def current_skip
+      (@skip_stack || []).last.to_i
+    end
+
   private
 
     def add_provider(identifier, opts = {}, block = nil)
@@ -269,8 +289,14 @@ module DataProvider
     end
 
     # returns the requested provider as a Provider object
-    def get_provider(id)
-      args = providers.find{|args| args.first == id}
+    def get_provider(id, opts = {})
+      if opts[:skip]
+        matches = providers.find_all{|args| args.first == id}
+        args = matches[opts[:skip].to_i]
+      else
+        args = providers.find{|args| args.first == id}
+      end
+
       return args.nil? ? nil : Provider.new(*args)
     end
   end # class Container

data/spec/base_spec.rb

@@ -795,8 +795,12 @@ describe DataProvider::Base do
         end
       }
 
+      it "gives Provider objects" do
+        expect(instance.take(:one).map(&:class)).to eq [DataProvider::Provider]*2
+      end
+
       it "gives the provider's callstack" do
-        expect(instance.take(:one)).to eq [:one, :two]
+        expect(instance.take(:one).map(&:id)).to eq [:one, :two]
       end
     end
 
@@ -814,5 +818,54 @@ describe DataProvider::Base do
         expect(instance.take(:narcissist)).to eq :narcissist
       end
     end
+
+    describe "#take_super" do
+      module HelloExtension
+        include DataProvider::Base
+        provider :new do
+          'Hello!'
+        end
+      end
+
+      let(:instance){
+        Class.new(Object) do
+          include DataProvider::Base
+          provider :name do
+            'Arno'
+          end
+
+          provider :name do
+            add HelloExtension
+            'Bob'
+          end
+
+          provider :name do
+            "[super] #{take_super}"
+          end
+        end
+      }
+
+      it "gives the result of the previous provider with the same name" do
+        expect{
+          expect(instance.take(:name)).to eq '[super] Bob'
+        # NoMethodError happened when the take_super accidentally got executed inside
+        # the container's instance scope instead of the object instance scope
+        }.to_not raise_error
+
+        instance.provider :name do
+          "[ultra] #{take_super}"
+        end
+
+        expect(instance.take(:name)).to eq '[ultra] [super] Bob'
+      end
+
+      it "raises the ProviderMissingException if there is no older provider with the same ID" do
+        instance.provider :age do
+          take_super
+        end
+
+        expect{instance.take(:age)}.to raise_error(DataProvider::ProviderMissingException)
+      end
+    end
   end
 end

data/spec/container_spec.rb

@@ -617,9 +617,13 @@ describe DataProvider::Container do
       end
     }
 
+    it "gives Provider objects" do
+      expect(container.take(:a).map(&:class)).to eq [DataProvider::Provider]*4
+    end
+
     it "gives providers an array resembling the current provider 'callstack'" do
-      expect(container.take(:a)).to eq [:a, :b, ['prefix', :c], ['prefix', :d]]
-      expect(container.take(:b)).to eq [:b, ['prefix', :c], ['prefix', :d]]
+      expect(container.take(:a).map(&:id)).to eq [:a, :b, ['prefix', :c], ['prefix', :d]]
+      expect(container.take(:b).map(&:id)).to eq [:b, ['prefix', :c], ['prefix', :d]]
     end
   end
 
@@ -646,7 +650,7 @@ describe DataProvider::Container do
       expect(container.take(['prefix', :d])).to eq ['prefix', :d]
     end
 
-    it "gives nil when called fmor outside a provider" do
+    it "gives nil when called from outside a provider" do
       expect(container.provider_id).to eq nil
     end
   end
@@ -789,4 +793,52 @@ describe DataProvider::Container do
       expect(c.fallback_provider?).to eq true
     end
   end
+
+  describe "#take_super" do
+    let(:container){
+      DataProvider::Container.new.tap do |c|
+        c.provider :value do
+          "original"
+        end
+      end
+    }
+
+    let(:extension1){
+      DataProvider::Container.new.tap do |c|
+        c.provider :value do
+          "new"
+        end
+      end
+    }
+
+    let(:extension2){
+      DataProvider::Container.new.tap do |c|
+        c.provider :value do
+          "#{take_super} [extended]"
+        end
+      end
+    }
+
+    it "gives the result of the provider with the same identifier that was added before it" do
+      c = container.add extension2
+      expect(c.take(:value)).to eq 'original [extended]'
+      c.add! extension1
+      expect(c.take(:value)).to eq 'new'
+      c.add! extension2
+      expect(c.take(:value)).to eq 'new [extended]'
+      c.add! extension2
+      expect(c.take(:value)).to eq 'new [extended] [extended]'
+    end
+
+    it "raises the ProviderMissingException if there is no older provider with the same ID" do
+      instance = DataProvider::Container.new.tap do |c|
+        c.provider :whatever do
+          take_super
+        end
+      end
+
+      expect{instance.take(:whatever)}.to raise_error(DataProvider::ProviderMissingException)
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data-provider
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mark van de Korput