immutable-struct 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9c0a785dd4e418fdae0fe7dfd89f3ceef53077b
-  data.tar.gz: 4411b12c43b62e461b86489e55cf2d7996e45172
+  metadata.gz: dfa246553af45d507992e2fbdc6ba2e5306159cc
+  data.tar.gz: 03989eeb4d23aeb1a0fd1c38745191b9275af538
 SHA512:
-  metadata.gz: 7c5c10d71cea0da0ae00f11d349a19e3f06557f1cfe80195c9f1131681a3e860ed68c5581a9df8971fe26c0a4b3793f6e75568adf5440eeb8a713121fc48b4c4
-  data.tar.gz: fe3d852d289626c1314e323b6610558470ad330feadd5b39509141261d80fa5c4a596f61a860ca3d9ffc8752c51f40c3c41c3c66437b774c57bf5bdd43769606
+  metadata.gz: 15e9a7c7a40de80ca4b5204b1e3e37e7c60916af8138ed48fd532deb03924d5f50307f39f7cc0f681e13484fa5c077d307faaa506f9949f78d56680a529f824f
+  data.tar.gz: 239e4695f40c61705bdff234e3eeabe1ad6ad98278dd5542ddc157f2e70b4870c90ccd1f70b7c9a95783195eec5964677f818760e53947bbe566bc7280421295

data/.travis.yml

@@ -6,5 +6,4 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.2.2
-  - rbx-2
   - ruby-head

data/Gemfile.lock

@@ -1,26 +1,26 @@
 PATH
   remote: .
   specs:
-    immutable-struct (2.2.2)
+    immutable-struct (2.2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    rake (10.5.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.2)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.3)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
 
 PLATFORMS
   ruby
@@ -32,4 +32,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.10.6
+   1.14.6

data/lib/immutable-struct.rb

@@ -6,7 +6,7 @@
 # will be evaluated as if it were inside a class definition, allowing you
 # to add methods, include or extend modules, or do whatever else you want.
 class ImmutableStruct
-  VERSION='2.2.2' #:nodoc:
+  VERSION='2.2.3' #:nodoc:
   # Create a new class with the given read-only attributes.
   #
   # attributes:: list of symbols or strings that can be used to create attributes.
@@ -88,7 +88,12 @@ class ImmutableStruct
 
       define_method(:==) do |other|
         return false unless other.is_a?(klass)
-        attributes.all? { |attribute| self.send(attribute) == other.send(attribute) }
+        attributes.all? do |attribute|
+          if attribute.kind_of?(Array) and attribute.size == 1
+            attribute = attribute[0].to_s
+          end
+          self.send(attribute) == other.send(attribute)
+        end
       end
 
       define_method(:merge) do |new_attrs|
@@ -99,7 +104,12 @@ class ImmutableStruct
       alias_method :eql?, :==
 
       define_method(:hash) do
-        attribute_values = attributes.map { |attr| self.send(attr) }
+        attribute_values = attributes.map do |attribute|
+          if attribute.kind_of?(Array) and attribute.size == 1
+            attribute = attribute[0].to_s
+          end
+          self.send(attribute)
+        end
         (attribute_values + [self.class]).hash
       end
     end

data/spec/immutable_struct_spec.rb

@@ -192,12 +192,12 @@ describe ImmutableStruct do
   describe "equality" do
 
     before do
-      klass_1 = ImmutableStruct.new(:foo, :bar)
-      klass_2 = ImmutableStruct.new(:foo, :bar)
-      @k1_a = klass_1.new(foo: 'foo', bar: 'bar')
-      @k1_b = klass_1.new(foo: 'xxx', bar: 'yyy')
-      @k1_c = klass_1.new(foo: 'foo', bar: 'bar')
-      @k2_a = klass_2.new(foo: 'foo', bar: 'bar')
+      klass_1 = ImmutableStruct.new(:foo, [:bars])
+      klass_2 = ImmutableStruct.new(:foo, [:bars])
+      @k1_a = klass_1.new(foo: 'foo', bars: ['bar', 'baz'])
+      @k1_b = klass_1.new(foo: 'xxx', bars: ['yyy'])
+      @k1_c = klass_1.new(foo: 'foo', bars: ['bar', 'baz'])
+      @k2_a = klass_2.new(foo: 'foo', bars: ['bar'])
     end
 
     describe "==" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: immutable-struct
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Stitch Fix Engineering
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler