strict_struct 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3116577a84563531a4392bcce1b8ac20fe4aa0b
-  data.tar.gz: 455f97ea2ff70b305cd0128574f65984c6cef07a
+  metadata.gz: e5940d1c83ecfa23afa0cb7d348cbb34b72f397a
+  data.tar.gz: 8dfc4803fd53e15b7b975651a2db7283a6bdffde
 SHA512:
-  metadata.gz: c526f693fd588d2276ed72ba0502a03bd88f96bbde7970dc8c6f49332099065690c9c27afea9a54cd9e6b6ffeb1c63eb6cd63ea6f39349bbe89d01b74d3089a2
-  data.tar.gz: b266b021735623a0f17ad29f43a64b8e8efe6a90d3494e46a8fbebc6ac4dd8d983cff165d760d618a5c695e8ad6de9f4d32c0f9153b8021e3af37a5908612b2d
+  metadata.gz: fa96254650eabfe6f8d0fc2aae953c5bdca43cd9a9087a958700c78f0d38bea5ea93e4a3b84dad161e860bde509ecf5b4f79bc4a9e546816c8b9f1169d4c09db
+  data.tar.gz: ad2b62577ef0f6f8ae44eb466be05ce161ee0799a82d62b668c182f437a3f27c5f65e19a5a623da92811b7d67e252de6f98f63c8b6e8c27f70b6a35d96d56928

data/lib/strict_struct/version.rb

@@ -1,3 +1,3 @@
 module StrictStruct
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/strict_struct.rb

@@ -20,7 +20,7 @@ module StrictStruct
   end
 
   def self.new(*attributes, &block)
-    klass = Class.new do
+    mod = Module.new do
       define_method :initialize do |hash={}|
         Helper.validate_arguments(hash.keys, attributes)
         @_strict_struct_hash = Hash[hash.to_a].freeze
@@ -33,13 +33,25 @@ module StrictStruct
       end
 
       def to_h
+        to_hash
+      end
+
+      def to_hash
         Hash[@_strict_struct_hash.to_a]
       end
 
       define_method :== do |other|
+        return false unless self.class == other.class
+
         attributes.all? {|name| self.send(name) == other.send(name)}
       end
+
+      define_method :hash do
+        @_strict_struct_hash.hash
+      end
     end
+    klass = Class.new
+    klass.send :include, mod
     klass.class_eval(&block) if block_given?
     klass
   end

data/spec/strict_struct_spec.rb

@@ -137,6 +137,78 @@ describe 'StrictStruct' do
 
       a_foo.to_h.should eq({bar: 'baz', baz: 3})
     end
+
+    it "is possible to override, and reuse using super" do
+      foo = StrictStruct.new(:bar, :baz) do
+        def to_h
+          super.merge pirate: 'captain'
+        end
+      end
+
+      a_foo = foo.new(bar: 'baz', baz: 3)
+
+      a_foo.to_h.should eq({bar: 'baz', baz: 3, pirate: 'captain'})
+    end
+  end
+
+  describe '#to_hash' do
+    it "returns all the values the object is defined by" do
+      foo = StrictStruct.new(:bar, :baz)
+
+      a_foo = foo.new(bar: 'baz', baz: 3)
+
+      a_foo.to_hash.should eq({bar: 'baz', baz: 3})
+    end
+  end
+
+  describe "extending to_h with extra fields" do
+    it "extends to_h, leaves to_hash alone" do
+      foo = StrictStruct.new(:bar, :baz) do
+        def to_h
+          super.merge pirate: 'captain'
+        end
+      end
+
+      a_foo = foo.new(bar: 'baz', baz: 3)
+
+      a_foo.to_h.should eq({bar: 'baz', baz: 3, pirate: 'captain'})
+      a_foo.to_hash.should eq({bar: 'baz', baz: 3})
+    end
+  end
+
+  describe "extending to_hash with extra fields" do
+    it "extends both to_hash and to_h" do
+      foo = StrictStruct.new(:bar, :baz) do
+        def to_hash
+          super.merge pirate: 'captain'
+        end
+      end
+
+      a_foo = foo.new(bar: 'baz', baz: 3)
+
+      a_foo.to_h.should eq({bar: 'baz', baz: 3, pirate: 'captain'})
+      a_foo.to_hash.should eq({bar: 'baz', baz: 3, pirate: 'captain'})
+    end
+  end
+
+  describe "extending to_h and to_hash" do
+    it "extends both with the extensions to to_hash, and to_h also with its own extensions" do
+      foo = StrictStruct.new(:bar, :baz) do
+        def to_hash
+          super.merge pirate: 'captain'
+        end
+
+        def to_h
+          super.merge samurai: 'sword'
+        end
+      end
+
+      a_foo = foo.new(bar: 'baz', baz: 3)
+
+      a_foo.to_h.should eq({bar: 'baz', baz: 3, pirate: 'captain', samurai: 'sword'})
+      a_foo.to_hash.should eq({bar: 'baz', baz: 3, pirate: 'captain'})
+
+    end
   end
 
   describe '#==' do
@@ -148,7 +220,8 @@ describe 'StrictStruct' do
 
       a_foo.should eq another_foo
     end
-    it "returns true if the values are the same" do
+
+    it "returns false if the values are not the same" do
       foo = StrictStruct.new(:bar)
 
       a_foo = foo.new(bar: 'baz')
@@ -156,5 +229,43 @@ describe 'StrictStruct' do
 
       a_foo.should_not eq another_foo
     end
+
+    it "returns false if two values are different StrictStructs" do
+      chicken_class = StrictStruct.new(:wings)
+      plane_class = StrictStruct.new(:wings)
+
+      chicken = chicken_class.new(wings: 2)
+      plane = plane_class.new(wings: 2)
+
+      plane.should_not eq chicken
+    end
+  end
+
+  describe '#hash' do
+    it "returns the same value for two empty objects" do
+      empty = StrictStruct.new
+      empty.new.hash.should == empty.new.hash
+    end
+
+    it "returns a different value for two non-empty objects with different content" do
+      container = StrictStruct.new(:a)
+
+      first = container.new(a: 1)
+      second = container.new(a: 2)
+
+      first.hash.should_not == second.hash
+    end
+
+    it "returns the same value for two non-empty objects with the same content" do
+      container = StrictStruct.new(:a)
+
+      first = container.new(a: 1)
+      second = container.new(a: 1)
+
+      first.hash.should == second.hash
+    end
+
+    # we need no guarantee that objects with the same content, but different classes
+    # return different hashes
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strict_struct
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Mark IJbema
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: StrictStruct is an immutable, named parameters based, replacement for Struct