lib/ridley/resources/data_bag_resource.rb in ridley-0.10.2 vs lib/ridley/resources/data_bag_resource.rb in ridley-0.11.0.rc1

@@ -1,74 +1,33 @@
 require 'ridley/resources/data_bag_item_resource'
-require 'ridley/resources/encrypted_data_bag_item_resource'
 
 module Ridley
   # @author Jamie Winsor <[e-mail]>
-  # @api private
-  class DBIChainLink
-    attr_reader :data_bag
-    attr_reader :client
-    attr_reader :klass
-
-    # @param [Ridley::DataBagResource] data_bag
-    # @param [Ridley::Client] client
-    #
-    # @option options [Boolean] :encrypted (false)
-    def initialize(data_bag, client, options = {})
-      options[:encrypted] ||= false
-
-      @data_bag = data_bag
-      @client = client
-      @klass = options[:encrypted] ? Ridley::EncryptedDataBagItemResource : Ridley::DataBagItemResource
-    end
-
-    def new(*args)
-      klass.send(:new, client, data_bag, *args)
-    end
-
-    def method_missing(fun, *args, &block)
-      klass.send(fun, client, data_bag, *args, &block)
-    end
-  end
-
-  # @author Jamie Winsor <[e-mail]>
   class DataBagResource < Ridley::Resource
-    class << self
-      # @param [Ridley::Client] client
-      # @param [String, #chef_id] object
-      #
-      # @return [nil, Ridley::DataBagResource]
-      def find(client, object)
-        find!(client, object)
-      rescue Errors::HTTPNotFound
-        nil
-      end
-
-      # @param [Ridley::Client] client
-      # @param [String, #chef_id] object
-      #
-      # @raise [Errors::HTTPNotFound]
-      #   if a resource with the given chef_id is not found
-      #
-      # @return [Ridley::DataBagResource]
-      def find!(client, object)
-        chef_id = object.respond_to?(:chef_id) ? object.chef_id : object
-        client.connection.get("#{self.resource_path}/#{chef_id}")
-        new(client, name: chef_id)
-      end
-    end
-
-    set_chef_id "name"
     set_resource_path "data"
+    represented_by Ridley::DataBagObject
 
-    attribute :name,
-      required: true
+    attr_reader :item_resource
 
-    def item
-      DBIChainLink.new(self, client)
+    finalizer do
+      item_resource.terminate if item_resource && item_resource.alive?
     end
 
-    def encrypted_item
-      DBIChainLink.new(self, client, encrypted: true)
+    # @param [Celluloid::Registry] connection_registry
+    # @param [String] data_bag_secret
+    def initialize(connection_registry, data_bag_secret)
+      super(connection_registry)
+      @item_resource = DataBagItemResource.new_link(connection_registry, data_bag_secret)
+    end
+
+    # @param [String, #chef_id] object
+    #
+    # @return [nil, Ridley::DataBagResource]
+    def find(object)
+      chef_id = object.respond_to?(:chef_id) ? object.chef_id : object
+      connection.get("#{self.class.resource_path}/#{chef_id}")
+      new(name: chef_id)
+    rescue Errors::HTTPNotFound
+      nil
     end
   end
 end