virtus-group 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmNlZDQwZmZhNGYwNTFjZGQ4NThmODdmMGMyMjgyNGRhODc4YWE1MA==
+    NjdlNTExNGFjNjgyOTQ1ZWMzNzJlMDczNGUyNmI0MmYzOTZmNmRkZA==
   data.tar.gz: !binary |-
-    YjhiMWI0MjE5YTA4NDE0MTZlYzc2N2U0Yzc4YzI4ODQ0ODcyZjQ5Yw==
+    Y2NjYjg1NDZjYWRiNmY0NzdiOTMxMTgwMmFmMjRiZTU5ODU5Y2NhOQ==
 SHA512:
   metadata.gz: !binary |-
-    NWI5MzQ3YWZiYTJkODVhYzRmMDIwNjNiZTA1OGUyY2ZiMjZkOGRiYzFhNGRh
-    ZTMyMGIwYjc0OWZjNTkyMWNhZTA4NGQzZGE1OWEzYmE0MmQwMmQ1ODgyNDIy
-    ZmM0YTNhOTYyNDI2ZmEwODI2NzE2ZDQ2ZDU5NmM0ZGVkOTFhYzA=
+    YjVjZjc0YzJjZmE1ZjM2ZGQxNjg4NWViZjQ1OGU5OTQ1YjQyNTRiZTY1YmIx
+    NmI1Mjk4OTE0ODE4YTNmMDFlZDAzMTI1MmI3ZmY0ZWQ1NGJmNjc3Y2U0MjEx
+    ZGMzMjJiZjczNTg2MWRkMzFlZGRjMDVlYWMyZTM3MWQxMTZmYTk=
   data.tar.gz: !binary |-
-    ZDE2ODE0ODJkZDgyNDg3ZjdlNDdjNzBlZTBlNTBkMzlkNzIzODQ1NWVlMDg5
-    MGJlOTE5YmEzZTYxMDkzNmY3YzJmODNkZmVkN2U3MGVkMjIyNzA5ZWZiZjZl
-    MmUyMDFlYzU3YjRmM2UxMjg1YTYwZDZlNmZlYjkyN2IwMmI5Mzk=
+    ODJjODMwZjY1Mzk5ZjE4MDUwOWY2ZjQ4ZmQyZDE2MjVmZWI2MDNkMjA0Zjc5
+    NDRiMTAyOWU2YjdjYTVkNjdjZWVmYTM3YjEwNDcyMTc3Yjc3MjQ0MjY1ODA1
+    MGNkM2ZhYWU3MzlkOGU5NmMwYzBhMmU2ZDI5ODk4MjNhNjgyZWE=

data/lib/virtus/group.rb

@@ -25,7 +25,13 @@ module Virtus
 
       def group(name, &block)
         attribute_tracker = AttributeTracker.new(self, &block)
-        attribute_group[name] = attribute_tracker.tracked_attributes
+
+        if attribute_group.has_key?(name)
+          attribute_group[name] ||= []
+          attribute_group[name] |= attribute_tracker.tracked_attributes
+        else
+          attribute_group[name] = attribute_tracker.tracked_attributes
+        end
       end
 
       def attribute_group

data/lib/virtus/group/attribute_groups.rb

@@ -1,5 +1,3 @@
-require 'delegate'
-
 module Virtus
   module Group
 

data/lib/virtus/group/version.rb

@@ -1,5 +1,5 @@
 module Virtus
   module Group
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/spec/integration/horizontal_inheritance_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Virtus::Group, "horizontal inheritance" do
+  let!(:base_class) do
+    Class.new do
+      include Virtus.model
+      include Virtus.group
+    end
+  end
+
+  let!(:user_class) do
+    Class.new(base_class) do
+      group :user do
+        attribute :email, String
+      end
+    end
+  end
+
+  let!(:address_class) do
+    Class.new(base_class) do
+      group :address do
+        attribute :city, String
+      end
+    end
+  end
+
+  describe "base class" do
+    it "should have no attribute groups" do
+      expect(base_class.attribute_group).to be_empty
+    end
+  end
+
+  describe "user class" do
+    it "should have only the user attributes" do
+      expect(user_class.attribute_group).to include :user
+      expect(user_class.attribute_group).not_to include :address
+    end
+  end
+
+  describe "address class" do
+    it "should have only the address attributes" do
+      expect(address_class.attribute_group).to include :address
+      expect(address_class.attribute_group).not_to include :user
+    end
+  end
+end

data/spec/integration/inherit_from_same_group_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe Virtus::Group, "inherit from same group" do
+  let!(:user_base_class) do
+    Class.new do
+      include Virtus.model
+      include Virtus.group
+
+      group :user do
+        attribute :email
+      end
+    end
+  end
+
+  let!(:user_class) do
+    Class.new(user_base_class) do
+      group :user do
+        attribute :password, String
+      end
+    end
+  end
+
+  let!(:other_user_class) do
+    Class.new(user_base_class) do
+      group :user do
+        attribute :token, String
+      end
+    end
+  end
+
+  let!(:mega_user_class) do
+    Class.new(user_class) do
+      group :user do
+        attribute :token, String
+      end
+    end
+  end
+
+  describe "user class" do
+    it "should have the email and password attribute" do
+      expect(user_class.attribute_group[:user]).to eq [:email, :password]
+    end
+  end
+
+  describe "other user class" do
+    it "should have the email and token attribute" do
+      expect(other_user_class.attribute_group[:user]).to eq [:email, :token]
+    end
+  end
+
+  describe "mega user class" do
+    it "should have the email, password and token attribute" do
+      expect(mega_user_class.attribute_group[:user]).to eq [:email, :password, :token]
+    end
+  end
+
+  context "when accidentally adding same attribute twice" do
+    let!(:user_class) do
+      Class.new(user_base_class) do
+        group :user do
+          attribute :email, String
+          attribute :password, String
+        end
+      end
+    end
+
+    it "should not add email twice" do
+      expect(user_class.attribute_group[:user]).to eq [:email, :password]
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: virtus-group
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Spas Poptchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -71,6 +71,8 @@ files:
 - lib/virtus/group/attribute_groups.rb
 - lib/virtus/group/attribute_tracker.rb
 - lib/virtus/group/version.rb
+- spec/integration/horizontal_inheritance_spec.rb
+- spec/integration/inherit_from_same_group_spec.rb
 - spec/integration/virtus_group_integration_spec.rb
 - spec/spec_helper.rb
 - spec/unit/group/attribute_groups_spec.rb
@@ -102,6 +104,8 @@ signing_key:
 specification_version: 4
 summary: Define groups over virtus attributes.
 test_files:
+- spec/integration/horizontal_inheritance_spec.rb
+- spec/integration/inherit_from_same_group_spec.rb
 - spec/integration/virtus_group_integration_spec.rb
 - spec/spec_helper.rb
 - spec/unit/group/attribute_groups_spec.rb