odrl-ruby 0.2.3 → 0.2.4

data/lib/odrl/constraint.rb

@@ -1,110 +1,110 @@
-# frozen_string_literal: true
-
-module ODRL
-  class Constraint < Base
-    attr_accessor :uid, :rightOperand, :leftOperand, :operator, :rightOperandReference, :dataType, :unit, :status
-
-    def initialize(
-      rightOperand:, operator:, leftOperand:, uid: nil,
-      rightOPerandReference: nil,
-      dataType: nil,
-      unit: nil,
-      status: nil,
-      type: CCONSTRAINT,
-      **args
-    )
-
-      @uid = uid
-      @uid ||= Base.baseURI + "#constraint_" + Base.getuuid
-      super(uid: @uid, type: type, **args)
-
-      @rightOperand = rightOperand
-      raise "Constraints must haves a Right operand such as 'event' - I'm dead!" unless @rightOperand
-
-      # if it is already a URI, then let it go
-      # @rightOperand = "http://www.w3.org/ns/odrl/2/#{@rightOperand}" unless @rightOperand =~ %r{https?://}
-
-      @leftOperand = leftOperand
-      unless LEFTOPERANDS.include?(@leftOperand)
-        warn "The selected leftOperand is not part of the default set... just sayin'"
-      end
-      unless @leftOperand
-        raise "Constraints must haves a Left Operand such as 'http://some.event.org/on-now' - I'm dead!"
-      end
-
-      # if it is already a URI, then let it go
-      @leftOperand = "http://www.w3.org/ns/odrl/2/#{@leftOperand}" unless @leftOperand =~ %r{https?://}
-
-      @operator = operator
-      raise "Constraints must haves an operator such as 'eq' - I'm dead!" unless @operator
-
-      warn "The selected operator is not part of the default set... just sayin'" unless OPERATORS.include?(@operator)
-
-      # if it is already a URI, then let it go
-      @operator = "http://www.w3.org/ns/odrl/2/#{@operator}" unless @operator =~ %r{https?://}
-
-      @rightOperandReference = rightOperandReference
-      @dataType = dataType
-      @unit = unit
-      @status = status
-    end
-
-    def load_graph
-      super
-      # TODO: This is bad DRY!!  Put the bulk of this method into the base object
-      if rightOperand
-        predicate = PRIGHT
-        object = rightOperand
-        subject = uid
-        repo = repository
-        triplify(subject, predicate, object, repo)
-      end
-      if leftOperand
-        predicate = PLEFT
-        object = leftOperand
-        subject = uid
-        repo = repository
-        triplify(subject, predicate, object, repo)
-      end
-      if operator
-        predicate = POPERATOR
-        object = operator
-        subject = uid
-        repo = repository
-        triplify(subject, predicate, object, repo)
-      end
-      if rightOperandReference
-        predicate = POPERANDREFERENCE
-        object = rightOperandReference
-        subject = uid
-        repo = repository
-        triplify(subject, predicate, object, repo)
-      end
-      if dataType
-        predicate = PDATATYPE
-        object = dataType
-        subject = uid
-        repo = repository
-        triplify(subject, predicate, object, repo)
-      end
-      if unit
-        predicate = PUNIT
-        object = unit
-        subject = uid
-        repo = repository
-        triplify(subject, predicate, object, repo)
-      end
-      return unless status
-
-      predicate = PSTATUS
-      object = status
-      subject = uid
-      repo = repository
-      triplify(subject, predicate, object, repo)
-    end
-
-    def serialize(format:)
-      super
-    end
-  end
-end
+# frozen_string_literal: true
+
+module ODRL
+  class Constraint < Base
+    attr_accessor :uid, :rightOperand, :leftOperand, :operator, :rightOperandReference, :dataType, :unit, :status
+
+    def initialize(
+      rightOperand:, operator:, leftOperand:, uid: nil,
+      rightOPerandReference: nil,
+      dataType: nil,
+      unit: nil,
+      status: nil,
+      type: CCONSTRAINT,
+      **args
+    )
+
+      @uid = uid
+      @uid ||= Base.baseURI + "#constraint_" + Base.getuuid
+      super(uid: @uid, type: type, **args)
+
+      @rightOperand = rightOperand
+      raise "Constraints must haves a Right operand such as 'event' - I'm dead!" unless @rightOperand
+
+      # if it is already a URI, then let it go
+      # @rightOperand = "http://www.w3.org/ns/odrl/2/#{@rightOperand}" unless @rightOperand =~ %r{https?://}
+
+      @leftOperand = leftOperand
+      unless LEFTOPERANDS.include?(@leftOperand)
+        warn "The selected leftOperand is not part of the default set... just sayin'"
+      end
+      unless @leftOperand
+        raise "Constraints must haves a Left Operand such as 'http://some.event.org/on-now' - I'm dead!"
+      end
+
+      # if it is already a URI, then let it go
+      @leftOperand = "http://www.w3.org/ns/odrl/2/#{@leftOperand}" unless @leftOperand =~ %r{https?://}
+
+      @operator = operator
+      raise "Constraints must haves an operator such as 'eq' - I'm dead!" unless @operator
+
+      warn "The selected operator is not part of the default set... just sayin'" unless OPERATORS.include?(@operator)
+
+      # if it is already a URI, then let it go
+      @operator = "http://www.w3.org/ns/odrl/2/#{@operator}" unless @operator =~ %r{https?://}
+
+      @rightOperandReference = rightOperandReference
+      @dataType = dataType
+      @unit = unit
+      @status = status
+    end
+
+    def load_graph
+      super
+      # TODO: This is bad DRY!!  Put the bulk of this method into the base object
+      if rightOperand
+        predicate = PRIGHT
+        object = rightOperand
+        subject = uid
+        repo = repository
+        triplify(subject, predicate, object, repo)
+      end
+      if leftOperand
+        predicate = PLEFT
+        object = leftOperand
+        subject = uid
+        repo = repository
+        triplify(subject, predicate, object, repo)
+      end
+      if operator
+        predicate = POPERATOR
+        object = operator
+        subject = uid
+        repo = repository
+        triplify(subject, predicate, object, repo)
+      end
+      if rightOperandReference
+        predicate = POPERANDREFERENCE
+        object = rightOperandReference
+        subject = uid
+        repo = repository
+        triplify(subject, predicate, object, repo)
+      end
+      if dataType
+        predicate = PDATATYPE
+        object = dataType
+        subject = uid
+        repo = repository
+        triplify(subject, predicate, object, repo)
+      end
+      if unit
+        predicate = PUNIT
+        object = unit
+        subject = uid
+        repo = repository
+        triplify(subject, predicate, object, repo)
+      end
+      return unless status
+
+      predicate = PSTATUS
+      object = status
+      subject = uid
+      repo = repository
+      triplify(subject, predicate, object, repo)
+    end
+
+    def serialize(format:)
+      super
+    end
+  end
+end

data/lib/odrl/odrl/version.rb

@@ -1,7 +1,7 @@
-# frozen_string_literal: true
-
-module ODRL
-  module ODRL
-    VERSION = "0.2.3"
-  end
-end
+# frozen_string_literal: true
+
+module ODRL
+  module ODRL
+    VERSION = "0.2.4"
+  end
+end

data/lib/odrl/party.rb

@@ -1,97 +1,97 @@
-# frozen_string_literal: true
-
-module ODRL
-  class Party < Base
-    attr_accessor :uid, :refinements, :partOf, :predicate, :type
-
-    def initialize(
-      uid: nil,
-      refinements: nil,
-      partOf: nil,
-      predicate: nil,
-      type: CPARTY,
-      **args
-    )
-
-      @uid = uid
-      @uid ||= Base.baseURI + "#party_" + Base.getuuid
-      super(uid: @uid, type: type, **args)
-
-      @refinements = {}
-      @partOf = {}
-      @predicate = predicate.to_s
-
-      if @predicate&.match(/https?:/)
-        # do nothing! It's their choice to send a full predicate!
-      elsif @predicate  # we're guessing it will be a string from the valid list?
-        unless PARTYFUNCTIONS.include? @predicate
-          raise "You didn't indicate a valid predicate"
-          # @predicate = ODRLV.assigner
-        else
-          @predicate = "#{ODRLV.to_s}#{predicate}" # make the URI form of the valid predicate
-        end
-      elsif @predicate.nil?
-        raise "If you don't indicate a predicate at all"
-        # @predicate = ODRLV.assigner
-      end
-
-      refinements = [refinements] unless refinements.is_a? Array
-      unless refinements.first.nil?
-        refinements.each do |c|
-          addRefinement(refinement: c)
-        end
-      end
-
-      partOf = [partOf] unless partOf.is_a? Array
-      unless partOf.first.nil?
-        partOf.each do |p|
-          p.addPart(part: self)
-        end
-      end
-
-      unless @partOf and !(@partOf.is_a? PartyCollection) # if it exists and is the wrong type
-        raise "The parent collection of a Party must be of type ODRL::PaertyCollection."
-      end
-
-    end
-
-    def addRefinement(refinement: args)
-      raise "Refinement is not an ODRL Constraint" unless refinement.is_a?(Constraint)
-
-      refinements[refinement.uid] = [PREFINEMENT, refinement]
-    end
-
-    def addPart(part: args)
-      raise "Party cannot be added as part of something that is not an PartyCollection" unless self.is_a?(PartyCollection)
-      part.partOf[uid] = [PPARTOF, self]
-    end
-
-    def load_graph
-      super
-      # TODO: This is bad DRY!!  Put the bulk of this method into the base object
-      # TODO:  Currently we don't support partOf
-      %i[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
-    end
-
-    def serialize(format:)
-      super
-    end
-  end
-
-  class PartyCollection < Party
-    def initialize(type: CPARTYCOLLECTION, **args)
-      super(type: type, **args)
-    end
-  end
-end
+# frozen_string_literal: true
+
+module ODRL
+  class Party < Base
+    attr_accessor :uid, :refinements, :partOf, :predicate, :type
+
+    def initialize(
+      uid: nil,
+      refinements: nil,
+      partOf: nil,
+      predicate: nil,
+      type: CPARTY,
+      **args
+    )
+
+      @uid = uid
+      @uid ||= Base.baseURI + "#party_" + Base.getuuid
+      super(uid: @uid, type: type, **args)
+
+      @refinements = {}
+      @partOf = {}
+      @predicate = predicate.to_s
+
+      if @predicate&.match(/https?:/)
+        # do nothing! It's their choice to send a full predicate!
+      elsif @predicate  # we're guessing it will be a string from the valid list?
+        unless PARTYFUNCTIONS.include? @predicate
+          raise "You didn't indicate a valid predicate"
+          # @predicate = ODRLV.assigner
+        else
+          @predicate = "#{ODRLV.to_s}#{predicate}" # make the URI form of the valid predicate
+        end
+      elsif @predicate.nil?
+        raise "If you don't indicate a predicate at all"
+        # @predicate = ODRLV.assigner
+      end
+
+      refinements = [refinements] unless refinements.is_a? Array
+      unless refinements.first.nil?
+        refinements.each do |c|
+          addRefinement(refinement: c)
+        end
+      end
+
+      partOf = [partOf] unless partOf.is_a? Array
+      unless partOf.first.nil?
+        partOf.each do |p|
+          p.addPart(part: self)
+        end
+      end
+
+      unless @partOf and !(@partOf.is_a? PartyCollection) # if it exists and is the wrong type
+        raise "The parent collection of a Party must be of type ODRL::PaertyCollection."
+      end
+
+    end
+
+    def addRefinement(refinement: args)
+      raise "Refinement is not an ODRL Constraint" unless refinement.is_a?(Constraint)
+
+      refinements[refinement.uid] = [PREFINEMENT, refinement]
+    end
+
+    def addPart(part: args)
+      raise "Party cannot be added as part of something that is not an PartyCollection" unless self.is_a?(PartyCollection)
+      part.partOf[uid] = [PPARTOF, self]
+    end
+
+    def load_graph
+      super
+      # TODO: This is bad DRY!!  Put the bulk of this method into the base object
+      # TODO:  Currently we don't support partOf
+      %i[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
+    end
+
+    def serialize(format:)
+      super
+    end
+  end
+
+  class PartyCollection < Party
+    def initialize(type: CPARTYCOLLECTION, **args)
+      super(type: type, **args)
+    end
+  end
+end

data/lib/odrl/policy.rb

@@ -1,97 +1,97 @@
-# frozen_string_literal: true
-
-require_relative "odrl/version"
-
-module ODRL
-  class Error < StandardError; end
-
-  class Policy < Base
-    attr_accessor :rules, :profiles
-
-    def initialize(uid: nil, type: CPOLICY, **args)
-      @uid = uid
-      self.uid = Base.baseURI + "#policy_" + Base.getuuid unless @uid
-      super(uid: @uid, type: type, **args)
-
-      @rules = {}
-      @profiles = {}
-    end
-
-    def addDuty(rule:)
-      uid = rule.uid
-      rules[uid] = [POBLIGATION, rule]
-    end
-
-    def addPermission(rule:)
-      uid = rule.uid
-      rules[uid] = [PPERMISSION, rule]
-    end
-
-    def addProhibition(rule:)
-      uid = rule.uid
-      rules[uid] = [PPROHIBITION, rule]
-    end
-
-    def addProfile(profile:)
-      uid = profile.uid
-      profiles[uid] = [PPROFILE, uid]
-    end
-
-    def load_graph
-      super
-      rules.each do |_uid, rulepair|
-        predicate, ruleobject = rulepair # e.g. "permission", RuleObject
-        object = ruleobject.uid
-        subject = uid
-        repo = repository
-        triplify(subject, predicate, object, repo)
-        ruleobject.load_graph # start the cascade
-      end
-
-      # TODO make test for profiles
-      profiles.each do |_uid, profile_pair|
-        predicate, profileuri = profile_pair # e.g. "permission", RuleObject
-        object = profileuri
-        subject = uid
-        repo = repository
-        triplify(subject, predicate, object, repo)
-      end
-
-    end
-
-    def serialize(format:)
-      super
-    end
-  end
-
-  class Set < Policy
-    def initialize(type: CSET, **args)
-      super(type: type, **args)
-    end
-  end
-
-  class Offer < Set
-    def initialize(type: COFFER, **args)
-      super(type: type, **args)
-    end
-  end
-
-  class Agreement < Set
-    def initialize(type: CAGREEMENT, **args)
-      super(type: type, **args)
-    end
-  end
-
-  class Request < Set
-    def initialize(type: CREQUEST, **args)
-      super(type: type, **args)
-    end
-  end
-
-  class Privacy < Set
-    def initialize(type: CPRIVACY, **args)
-      super(type: type, **args)
-    end
-  end
-  # ====================================================
-end
+# frozen_string_literal: true
+
+require_relative "odrl/version"
+
+module ODRL
+  class Error < StandardError; end
+
+  class Policy < Base
+    attr_accessor :rules, :profiles
+
+    def initialize(uid: nil, type: CPOLICY, **args)
+      @uid = uid
+      self.uid = Base.baseURI + "#policy_" + Base.getuuid unless @uid
+      super(uid: @uid, type: type, **args)
+
+      @rules = {}
+      @profiles = {}
+    end
+
+    def addDuty(rule:)
+      uid = rule.uid
+      rules[uid] = [POBLIGATION, rule]
+    end
+
+    def addPermission(rule:)
+      uid = rule.uid
+      rules[uid] = [PPERMISSION, rule]
+    end
+
+    def addProhibition(rule:)
+      uid = rule.uid
+      rules[uid] = [PPROHIBITION, rule]
+    end
+
+    def addProfile(profile:)
+      uid = profile.uid
+      profiles[uid] = [PPROFILE, uid]
+    end
+
+    def load_graph
+      super
+      rules.each do |_uid, rulepair|
+        predicate, ruleobject = rulepair # e.g. "permission", RuleObject
+        object = ruleobject.uid
+        subject = uid
+        repo = repository
+        triplify(subject, predicate, object, repo)
+        ruleobject.load_graph # start the cascade
+      end
+
+      # TODO make test for profiles
+      profiles.each do |_uid, profile_pair|
+        predicate, profileuri = profile_pair # e.g. "permission", RuleObject
+        object = profileuri
+        subject = uid
+        repo = repository
+        triplify(subject, predicate, object, repo)
+      end
+
+    end
+
+    def serialize(format:)
+      super
+    end
+  end
+
+  class Set < Policy
+    def initialize(type: CSET, **args)
+      super(type: type, **args)
+    end
+  end
+
+  class Offer < Set
+    def initialize(type: COFFER, **args)
+      super(type: type, **args)
+    end
+  end
+
+  class Agreement < Set
+    def initialize(type: CAGREEMENT, **args)
+      super(type: type, **args)
+    end
+  end
+
+  class Request < Set
+    def initialize(type: CREQUEST, **args)
+      super(type: type, **args)
+    end
+  end
+
+  class Privacy < Set
+    def initialize(type: CPRIVACY, **args)
+      super(type: type, **args)
+    end
+  end
+  # ====================================================
+end