odrl-ruby 0.1.4 → 0.2.0

data/lib/odrl/action.rb

@@ -1,114 +1,106 @@
 # frozen_string_literal: true
 
 module ODRL
-
-        # ODRL::Action
-        # Describes an action like "use"
-        # 
-        # @author Mark D Wilkinson
-        # @attr [URI] (optional) uid the URI of the Action node
-        # @attr [[ODRL::Refinement]] (optional) ODRL Refinement objects
-        # @attr [URI] predicate (optional) the predicate you wish to use with this action
-        # @attr [string] value (required) a string like "use"
-        # @attr [string] vallabel (optional) a string like "use"
-        class Action < Base
-
-        attr_accessor :uid, :refinements, :predicate, :type, :value, :vallabel
-
-
-        # constructor
-        # @param  [Hash] opts  the options to create a message with.
-        # @option opts [String] :value   the string value of rthe action, like "use"
-        # @option opts [String] :vallabel    the string for the label, like "use"
-        #
-        def initialize(value:, vallabel: "", type: CACTION, **args)
-            @value = value
-            @vallabel = vallabel || @value
-            raise "Actions must haves a value such as 'use' - I'm dead!" unless @value
-            @value = "http://www.w3.org/ns/odrl/2/#{@value}" unless @value =~ /http:\/\//  # if it is already a URI, then let it go
-
-            @uid = @value
-            # unless @uid
-            #     self.uid = Base.baseURI + "#action_" + Base.getuuid
-            # end
-            super(uid: @uid, type: type, **args)
-
-
-            @refinements = Hash.new
-
-            args[:refinements] = [args[:refinements]] unless args[:refinements].is_a? Array
-            if !(args[:refinements].first.nil?)
-                args[:refinements].each do |c|
-                    self.addRefinement(refinement:  c)
-                end
-            end
-
-            self.predicate = PACTION unless self.predicate
-
+  # ODRL::Action
+  # Describes an action like "use"
+  #
+  # @author Mark D Wilkinson
+  # @attr [URI] (optional) uid the URI of the Action node
+  # @attr [[ODRL::Refinement]] (optional) ODRL Refinement objects
+  # @attr [URI] predicate (optional) the predicate you wish to use with this action
+  # @attr [string] value (required) a string like "use"
+  # @attr [string] vallabel (optional) a string like "use"
+  class Action < Base
+    attr_accessor :uid, :refinements, :predicate, :type, :value, :vallabel
+
+    # constructor
+    # @param  [Hash] opts  the options to create a message with.
+    # @option opts [String] :value   the string value of rthe action, like "use"
+    # @option opts [String] :vallabel    the string for the label, like "use"
+    #
+    def initialize(value:, vallabel: "", type: CACTION, **args)
+      @value = value
+      @vallabel = vallabel || @value
+      raise "Actions must haves a value such as 'use' - I'm dead!" unless @value
+
+      # if it is already a URI, then let it go
+      @value = "http://www.w3.org/ns/odrl/2/#{@value}" unless @value =~ %r{http://}
+
+      @uid = @value
+      # unless @uid
+      #     self.uid = Base.baseURI + "#action_" + Base.getuuid
+      # end
+      super(uid: @uid, type: type, **args)
+
+      @refinements = {}
+
+      args[:refinements] = [args[:refinements]] unless args[:refinements].is_a? Array
+      unless args[:refinements].first.nil?
+        args[:refinements].each do |c|
+          addRefinement(refinement: c)
         end
+      end
 
-        # Adds an ODRL Refinement
-        #
-        # @param refinement [ODRL::Refinement]  the refinement to the action
-        #
-        def addRefinement(refinement: args)
-            unless refinement.is_a?(Constraint)
-                raise "Refinement is not an ODRL Constraint" 
-            else
-                self.refinements[refinement.uid] = [PREFINEMENT, refinement] 
-            end
-        end
+      self.predicate = PACTION unless predicate
+    end
 
+    # Adds an ODRL Refinement
+    #
+    # @param refinement [ODRL::Refinement]  the refinement to the action
+    #
+    def addRefinement(refinement: args)
+      raise "Refinement is not an ODRL Constraint" unless refinement.is_a?(Constraint)
 
-        # Causes the triples of this object to be formed in the in-memory store
-        # This includes any "cascading" objects for which this is the subject of the triple
-        #
-        def load_graph
-            super
-            # TODO  This is bad DRY!!  Put the bulk of this method into the base object
-            [:refinements].each do |connected_object_type|
-                next unless self.send(connected_object_type)
-                self.send(connected_object_type).each do |uid, typedconnection|
-                    predicate, odrlobject = typedconnection  # e.g. "refinement", RefinementObject
-                    object = odrlobject.uid
-                    subject = self.uid
-                    repo = self.repository
-                    triplify(subject, predicate, object, repo)
-                    odrlobject.load_graph  # start the cascade
-                end
-            end
-            subject = self.uid
-            object = self.vallabel
-            predicate = SCHEMA.name
-            repo = self.repository
-            triplify(subject, predicate, object, repo)
-            object = self.vallabel
-            predicate = RDFS.label
-            repo = self.repository
-            triplify(subject, predicate, object, repo)
-        end
+      refinements[refinement.uid] = [PREFINEMENT, refinement]
+    end
 
-        # Returns the serialized RDF for this object and cascading related objects
-        #
-        # @param format [Symbol] a valid RDF::Writer format (e.g. :turtle)
-        #
-        def serialize(format:)
-            super
+    # Causes the triples of this object to be formed in the in-memory store
+    # This includes any "cascading" objects for which this is the subject of the triple
+    #
+    def load_graph
+      super
+      # TODO: This is bad DRY!!  Put the bulk of this method into the base object
+      [:refinements].each do |connected_object_type|
+        next unless send(connected_object_type)
+
+        send(connected_object_type).each do |_uid, typedconnection|
+          predicate, odrlobject = typedconnection # e.g. "refinement", RefinementObject
+          object = odrlobject.uid
+          subject = uid
+          repo = repository
+          triplify(subject, predicate, object, repo)
+          odrlobject.load_graph # start the cascade
         end
-
+      end
+      subject = uid
+      object = vallabel
+      predicate = SCHEMA.name
+      repo = repository
+      triplify(subject, predicate, object, repo)
+      object = vallabel
+      predicate = RDFS.label
+      repo = repository
+      triplify(subject, predicate, object, repo)
     end
 
-
-
-    class Use < Action 
-        def initialize(type: CACTION, **args)
-            super(type: :type, **args)
-        end
+    # Returns the serialized RDF for this object and cascading related objects
+    #
+    # @param format [Symbol] a valid RDF::Writer format (e.g. :turtle)
+    #
+    def serialize(format:)
+      super
     end
-    class Transfer < Action
-        def initialize(type: CACTION, **args)
-            super(type: :type, **args)
-        end
+  end
+
+  class Use < Action
+    def initialize(type: CACTION, **args)
+      super(type: :type, **args)
     end
+  end
 
+  class Transfer < Action
+    def initialize(type: CACTION, **args)
+      super(type: :type, **args)
+    end
+  end
 end

data/lib/odrl/asset.rb

@@ -1,90 +1,77 @@
 # frozen_string_literal: true
 
 module ODRL
+  # ODRL::Action
+  # Describes an action like "use"
+  #
+  # @author Mark D Wilkinson
+  class Asset < Base
+    attr_accessor :uid, :hasPolicy, :refinements, :partOf
+
+    def initialize(type: CASSET, hasPolicy: nil, refinements: nil, partOf: nil, **args)
+      @uid = uid
+      self.uid = Base.baseURI + "#asset_" + Base.getuuid unless @uid
+      super(type: type, uid: @uid, **args)
+
+      @partOf = partOf
+      @hasPolicy = hasPolicy
+
+      if @hasPolicy and !(@hasPolicy.is_a? Policy) # if it exists and is the wrong type
+        raise "The policy of an Asset must be of type ODRL::Policy.  The provided value will be discarded"
+        @hasPolicy = nil
+      end
+      if @partOf and !(@partOf.is_a? AssetCollection) # if it exists and is the wrong type
+        raise "The parent collection of an Asset must be of type ODRL::AssetCollection.  The provided value will be discarded"
+        @partOf = nil
+      end
+
+      @refinements = {}
+      refinements = [refinements] unless refinements.is_a? Array
+      return if refinements.first.nil?
+
+      refinements.each do |c|
+        addRefinement(refinement: c)
+      end
+    end
 
+    def addPart(part: args)
+      raise "Asset cannot be added as part of something that is not an asset collection" unless is_a?(AssetCollection)
+      raise "Only Assets can be added as part of asset collections" unless part.is_a?(Asset)
 
-    # ODRL::Action
-    # Describes an action like "use"
-    # 
-    # @author Mark D Wilkinson
-    class Asset < Base
-        attr_accessor :uid, :hasPolicy, :refinements, :partOf
-
-        def initialize(type: CASSET, hasPolicy: nil, refinements: nil, partOf: nil, **args)
-            @uid = uid
-            unless @uid
-                self.uid = Base.baseURI + "#asset_" + Base.getuuid
-            end
-            super(type: type, uid: @uid, **args)
-
-            @partOf = partOf
-            @hasPolicy = hasPolicy
-
-            if @hasPolicy and !(@hasPolicy.is_a? Policy) # if it exists and is the wrong type
-                raise "The policy of an Asset must be of type ODRL::Policy.  The provided value will be discarded" 
-                @hasPolicy = nil
-            end
-            if @partOf and !(@partOf.is_a? AssetCollection) # if it exists and is the wrong type
-                raise "The parent collection of an Asset must be of type ODRL::AssetCollection.  The provided value will be discarded" 
-                @partOf = nil
-            end
-
-            @refinements = Hash.new
-            refinements = [refinements] unless refinements.is_a? Array
-            if !(refinements.first.nil?)
-                refinements.each do |c|
-                    self.addRefinement(refinement:  c)
-                end
-            end
-        end
-
-
-        def addPart(part: args)
-            unless self.is_a?(AssetCollection)
-                raise "Asset cannot be added as part of something that is not an asset collection" 
-            end
-            unless part.is_a?(Asset)
-                raise "Only Assets can be added as part of asset collections" 
-            end
-            part.partOf[self.uid] = [PPARTOF, self] 
-        end
-
-        def addRefinement(refinement: args)
-            unless refinement.is_a?(Constraint)
-                raise "Refinement is not an ODRL Constraint" 
-            else
-                self.refinements[refinement.uid] = [PREFINEMENT, refinement] 
-            end
-        end
-
-        def load_graph
-            super
-            # TODO  This is bad DRY!!  Put the bulk of this method into the base object
-            [:refinements, :partOf, :hasPolicy].each do |connected_object_type|
-                next unless self.send(connected_object_type)
-                self.send(connected_object_type).each do |uid, typedconnection|
-                    predicate, odrlobject = typedconnection  # e.g. "refinement", RefinementObject
-                    object = odrlobject.uid
-                    subject = self.uid
-                    repo = self.repository
-                    triplify(subject, predicate, object, repo)
-                    odrlobject.load_graph  # start the cascade
-                end
-            end
-        end
+      part.partOf[uid] = [PPARTOF, self]
+    end
 
-        def serialize(format:)
-            super
-        end
+    def addRefinement(refinement: args)
+      raise "Refinement is not an ODRL Constraint" unless refinement.is_a?(Constraint)
 
+      refinements[refinement.uid] = [PREFINEMENT, refinement]
     end
 
-    class AssetCollection < Asset
-
-        def initialize(type: CASSETCOLLECTION, **args)
-            super(type: type, **args)
+    def load_graph
+      super
+      # TODO: This is bad DRY!!  Put the bulk of this method into the base object
+      %i[refinements partOf hasPolicy].each do |connected_object_type|
+        next unless send(connected_object_type)
+
+        send(connected_object_type).each do |_uid, typedconnection|
+          predicate, odrlobject = typedconnection # e.g. "refinement", RefinementObject
+          object = odrlobject.uid
+          subject = uid
+          repo = repository
+          triplify(subject, predicate, object, repo)
+          odrlobject.load_graph  # start the cascade
         end
+      end
     end
 
+    def serialize(format:)
+      super
+    end
+  end
 
+  class AssetCollection < Asset
+    def initialize(type: CASSETCOLLECTION, **args)
+      super(type: type, **args)
+    end
+  end
 end