dbee 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e07996f0622fbf3eb19b8fa7bdd6ebfe963d3edc18745ccdf89f2a87f7a16dd
-  data.tar.gz: 0e25d666b9cd0a099741220caf423a670e832149bac26f27283c7a43987c14c5
+  metadata.gz: aac48262d54b0524c4c8ecbe241ec9896478f7b02917376b835b64a75f6401bb
+  data.tar.gz: 94285e874df6c27cabd1c212b3456ce77351ee91c34c58bbfc430c1c8183667f
 SHA512:
-  metadata.gz: 5290d4c90695c68b7d558c35cf4ca47cd24d60e50fc776ce2c4138a74d469e86bc9021d66a9645ddcb0e25924cad80d1dca239df610a1c01a41c02523159062e
-  data.tar.gz: b9023ad0e9a82db914a0c0c40b918fd52a87572718aadc31e82eb1ba96adbd7a8a50932d9d1968b72d73de9689f26d4ca71374e4a7c2fcba416fd5f4e992c696
+  metadata.gz: 893af6c116b4687dd80bd4f25c96c991950bdfb799f3de590a33a9780c86ba287f4767c96ea8c6c1f10766c410a9be52fe29194c22ea29d30c9474c59acd4eff
+  data.tar.gz: 5863a68e275638f4b1d34c4326ed3b19b5ef433abed897e8f2bcbf5ec7eb536f5b54c8f666c1e339e49059bbc3ff2a6771b03db8cef6596bd76328b0ebe204e8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.0.3 (August 27th, 2019)
+
+Additions:
+
+* Added 'parent' keyword for static constraints.  This makes it possible to have a static constraint apply to a parent and not just a child relationship.
+
 # 1.0.2 (August 26th, 2019)
 
 Fixes:

data/lib/dbee/model/constraints/base.rb

@@ -14,24 +14,23 @@ module Dbee
       class Base
         acts_as_hashable
 
-        attr_reader :name
+        attr_reader :name, :parent
 
-        def initialize(name:)
-          raise ArgumentError, 'name is required' if name.to_s.empty?
-
-          @name = name.to_s
+        def initialize(name: '', parent: '')
+          @name   = name.to_s
+          @parent = parent.to_s
         end
 
         def <=>(other)
-          name <=> other.name
+          "#{name}#{parent}" <=> "#{other.name}#{other.parent}"
         end
 
         def hash
-          name.hash
+          "#{name}#{parent}".hash
         end
 
         def ==(other)
-          other.name == name
+          other.name == name && other.parent == parent
         end
         alias eql? ==
       end

data/lib/dbee/model/constraints/reference.rb

@@ -19,23 +19,13 @@ module Dbee
         attr_reader :parent
 
         def initialize(name:, parent:)
-          super(name: name)
-
+          raise ArgumentError, 'name is required' if name.to_s.empty?
           raise ArgumentError, 'parent is required' if parent.to_s.empty?
 
-          @parent = parent.to_s
+          super(name: name, parent: parent)
 
           freeze
         end
-
-        def hash
-          "#{super}#{parent}".hash
-        end
-
-        def ==(other)
-          super && other.parent == parent
-        end
-        alias eql? ==
       end
     end
   end

data/lib/dbee/model/constraints/static.rb

@@ -12,14 +12,18 @@ require_relative 'base'
 module Dbee
   class Model
     class Constraints
-      # A static constraint is a equality constraint on a child column to a static value.
-      # It is usually used in conjunction with a ReferenceConstraint, further giving it more
-      # scoping.
+      # A static constraint is a equality constraint on a child and/or parent column to a
+      # static value. It is usually used in conjunction with a ReferenceConstraint,
+      # further giving it more scoping.
       class Static < Base
         attr_reader :value
 
-        def initialize(name:, value: nil)
-          super(name: name)
+        def initialize(name: '', parent: '', value: nil)
+          if name.to_s.empty? && parent.to_s.empty?
+            raise ArgumentError, "name (#{name}) and/or parent (#{parent}) required"
+          end
+
+          super(name: name, parent: parent)
 
           @value = value
 

data/lib/dbee/version.rb

@@ -8,5 +8,5 @@
 #
 
 module Dbee
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/spec/dbee/model/constraints/base_spec.rb

@@ -16,20 +16,31 @@ describe Dbee::Model::Constraints::Base do
   end
 
   context '#initialize' do
-    specify 'name is required' do
-      expect { described_class.new(name: '') }.to raise_error(ArgumentError)
-      expect { described_class.new(name: nil) }.to  raise_error(ArgumentError)
-      expect { described_class.new }.to             raise_error(ArgumentError)
+    it 'sets name correctly' do
+      expect(described_class.new.name).to               eq('')
+      expect(described_class.new(name: 123).name).to    eq('123')
+      expect(described_class.new(name: 'abc').name).to  eq('abc')
+    end
+
+    it 'sets parent correctly' do
+      expect(described_class.new.parent).to                 eq('')
+      expect(described_class.new(parent: 123).parent).to    eq('123')
+      expect(described_class.new(parent: 'abc').parent).to  eq('abc')
     end
   end
 
   context 'equality' do
-    let(:config) { { name: 'type' } }
+    let(:config) do
+      {
+        name: 'NAME!',
+        parent: 'PARENT!'
+      }
+    end
 
     subject { described_class.new(config) }
 
     specify '#hash produces same output as string hash of name' do
-      expect(subject.hash).to eq(config[:name].to_s.hash)
+      expect(subject.hash).to eq("#{config[:name]}#{config[:parent]}".hash)
     end
 
     specify '#== and #eql? compares attributes' do

data/spec/dbee/model/constraints/reference_spec.rb

@@ -24,7 +24,7 @@ describe Dbee::Model::Constraints::Reference do
     subject { described_class.new(config) }
 
     specify '#hash produces same output as concatenated string hash of name and parent' do
-      expect(subject.hash).to eq("#{config[:name].hash}#{config[:parent]}".hash)
+      expect(subject.hash).to eq("#{config[:name]}#{config[:parent]}".hash)
     end
 
     specify '#== and #eql? compare attributes' do

data/spec/dbee/model/constraints/static_spec.rb

@@ -15,6 +15,14 @@ describe Dbee::Model::Constraints::Static do
 
     subject { described_class.new(config) }
 
+    describe '#initialize' do
+      it 'requires either a name or parent' do
+        expect { described_class.new }.to                         raise_error(ArgumentError)
+        expect { described_class.new(name: '', parent: '') }.to   raise_error(ArgumentError)
+        expect { described_class.new(name: nil, parent: nil) }.to raise_error(ArgumentError)
+      end
+    end
+
     specify '#hash produces same output as concatenated string hash of name and parent' do
       expect(subject.hash).to eq("#{config[:name].hash}#{config[:value]}".hash)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbee
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Matthew Ruggio