trax_core 0.0.78 → 0.0.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2b7a8eaa68c5ba0e58ce17e426d9888212bb2d2
-  data.tar.gz: d6c4d99b50c554de6dfc0090f6c2853a4af1882a
+  metadata.gz: bb038c42261e07a3b01048fc35fa99c4a1ee8b93
+  data.tar.gz: 6ecb73367f017583abb6e27d854a398713c9d339
 SHA512:
-  metadata.gz: e3d6f6e388fd4e729b4c012dce5dca53c76e794b25a660beb24b106b7a141b9f8a9cde451903d0fbbce49fcfef3272b859aad9535392e9e67a903e286921e767
-  data.tar.gz: 2ec398604380438ff8414522351a79835077a18870521b8332276383456c54578c37c23ac23232bfb999a40c050fb53ce1bad989c95c103e5bf3b46b938dec95
+  metadata.gz: 73a01218a18838ea372bb4245381734d8cb107d30745d86723197ce116b0054946e0bcd679ab7110c8dc69998b5633079aad5a8f9563e3ab7cc926ba0577c38c
+  data.tar.gz: 6fa0352b4e6d2f1fa5ca4ec49e20546acaf37b9580c7a35a7e1e25c1b2a5436f0d8397842a1b39826225dfbfd876ddd65ed9103092dcdca2ac034b595356f00a

data/lib/trax/core/types/enum.rb

@@ -143,8 +143,16 @@ module Trax
 
         ### Hooks ###
         def self.inherited(subklass)
-          subklass.instance_variable_set(:@_values_hash, ::Hash.new)
-          subklass.instance_variable_set(:@_names_hash, ::Hash.new)
+          super(subklass)
+
+          if self.instance_variable_defined?(:@_values_hash)
+            subklass.instance_variable_set(:@_values_hash, ::Hash.new.merge(@_values_hash.deep_dup))
+            subklass.instance_variable_set(:@_names_hash, ::Hash.new.merge(@_names_hash.deep_dup))
+          else
+            subklass.instance_variable_set(:@_values_hash, ::Hash.new)
+            subklass.instance_variable_set(:@_names_hash, ::Hash.new)
+          end
+
           subklass.allow_nil = false
           subklass.raise_on_invalid = false
         end

data/lib/trax_core/version.rb

@@ -1,3 +1,3 @@
 module TraxCore
-  VERSION = "0.0.78"
+  VERSION = "0.0.79"
 end

data/spec/trax/core/types/enum_spec.rb

@@ -10,6 +10,18 @@ describe ::Trax::Core::Types::Enum do
         define :da, 2
         define :ca, 3
       end
+
+      enum :Category do
+        define :default, 1
+        define :clothing, 2
+        define :shoes, 3
+        define :accessories, 4
+      end
+
+      enum :ExtendedCategory, :extend => "MyFakeEnumNamespace::Category" do
+        define :watches,    5
+        define :sunglasses, 6
+      end
     end
   end
 
@@ -28,4 +40,93 @@ describe ::Trax::Core::Types::Enum do
 
     it { expect(subject).to eq nil }
   end
+
+  context "category enum" do
+    subject do
+      "::MyFakeEnumNamespace::Category".constantize
+    end
+
+    let(:expected_names) {  [:default, :clothing, :shoes, :accessories] }
+    let(:expected_values) { [1,2,3,4] }
+
+    describe ".key?" do
+      it { subject.key?(:default).should eq true }
+    end
+
+    describe "[](val)" do
+      it { subject[:default].to_i.should eq 1 }
+    end
+
+    describe "[](val)" do
+      it { subject["default"].to_i.should eq 1 }
+    end
+
+    describe ".value?" do
+      it { subject.value?(1).should eq true }
+    end
+
+    describe ".keys" do
+      it { subject.keys.should eq [:default, :clothing, :shoes, :accessories] }
+    end
+
+    describe ".names" do
+      it { subject.keys.should eq expected_names }
+    end
+
+    describe ".values" do
+      it { subject.values.should eq expected_values }
+    end
+
+    context "duplicate enum name" do
+      it { expect{subject.define_enum_value(:default, 6)}.to raise_error(::Trax::Core::Errors::DuplicateEnumValue) }
+    end
+
+    context "duplicate enum value" do
+      it {expect{subject.define_enum_value(:newthing, 1)}.to raise_error(::Trax::Core::Errors::DuplicateEnumValue) }
+    end
+
+    context "InstanceMethods" do
+      let(:described_object) do
+        "::MyFakeEnumNamespace::Category".constantize
+      end
+      subject { described_object.new(:clothing) }
+
+      it { subject.choice.should eq :clothing }
+      it { subject.choice.should eq 2 }
+      it { expect(subject.next_value.to_sym).to eq :shoes }
+      it { expect(subject.previous_value.to_sym).to eq :default }
+
+      context "selection of values" do
+        it { subject.select_next_value.should eq described_object.new(:shoes).choice }
+      end
+      context "value is last" do
+        subject { described_object.new(:accessories) }
+        it { subject.next_value?.should eq false }
+        it { subject.previous_value?.should eq true }
+
+        context "selection of value" do
+          it { expect(subject.select_next_value).to eq described_object.new(:accessories) }
+          it { expect(subject.select_previous_value).to eq described_object.new(:shoes) }
+        end
+      end
+    end
+  end
+
+  context "inheritance" do
+    let(:described_object) do
+      "::MyFakeEnumNamespace::ExtendedCategory".constantize
+    end
+
+    it { expect(described_object.names).to include(:watches)}
+    it { expect(described_object.new(:clothing).to_i).to eq 2 }
+    it { expect(described_object.new(:watches).to_i).to eq 5 }
+
+    context "does not mutate original hash" do
+      let(:described_object) do
+        "::MyFakeEnumNamespace::Category".constantize
+      end
+      
+      it { expect(described_object.names).to_not include(:watches)}
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trax_core
 version: !ruby/object:Gem::Version
-  version: 0.0.78
+  version: 0.0.79
 platform: ruby
 authors:
 - Jason Ayre