strict_struct 0.0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5940d1c83ecfa23afa0cb7d348cbb34b72f397a
-  data.tar.gz: 8dfc4803fd53e15b7b975651a2db7283a6bdffde
+  metadata.gz: c74573f10c24a66bc073f1246d89c381b94adc4b
+  data.tar.gz: 0dac3d83c4dd1d86972abb9521c3ae618885ab19
 SHA512:
-  metadata.gz: fa96254650eabfe6f8d0fc2aae953c5bdca43cd9a9087a958700c78f0d38bea5ea93e4a3b84dad161e860bde509ecf5b4f79bc4a9e546816c8b9f1169d4c09db
-  data.tar.gz: ad2b62577ef0f6f8ae44eb466be05ce161ee0799a82d62b668c182f437a3f27c5f65e19a5a623da92811b7d67e252de6f98f63c8b6e8c27f70b6a35d96d56928
+  metadata.gz: c36bbfe1ed0fad71cd0909ea43b586fd463d7df1c839c3e1727271e54959bd19364196c86d17ded8100de56fcff9ec2151e0ec5d0568f0f25d5fa229052ce03a
+  data.tar.gz: 0093c350d87be13f0160a97a814a2854fd9ef5fc9a6a37a55ffdaae0aa59e41f3a32c5fb02cb26381f5a534e34d537a2cf7b5f3207b8baa92b7084f8b96a9f94

data/.travis.yml

@@ -1,11 +1,9 @@
 language: ruby
-gemfile:
-  - Gemfile.travis
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
   - ruby-head
-  - rbx
+  - rbx-2
   - jruby-head
 cache: bundler

data/README.md

@@ -34,6 +34,17 @@ class Rectange
     @y = y
   end
 
+  def to_h
+    to_h
+  end
+
+  def to_hash
+    {
+      x: x,
+      y: y
+    }
+  end
+
   def area
     x * y
   end
@@ -42,6 +53,21 @@ end
 
 Since this is meant to create immutable objects, the values aren't actually assigned to instance variables but safed internally in a hash.
 
+### Changing behaviour
+
+You can also choose to override behaviour. You can just use super in the initialization block like you are used to with normal classes:
+
+```ruby
+Rectangle = StrictStruct.new(:x, :y) do
+  def area
+    x * y
+  end
+
+  def to_hash
+    super.merge({area: area})
+  end
+end
+```
 
 ## Installation
 

data/lib/strict_struct.rb

@@ -1,4 +1,4 @@
-#require "strict_struct/version"
+require "strict_struct/version"
 
 module StrictStruct
   module Helper
@@ -19,40 +19,45 @@ module StrictStruct
     end
   end
 
-  def self.new(*attributes, &block)
-    mod = Module.new do
-      define_method :initialize do |hash={}|
-        Helper.validate_arguments(hash.keys, attributes)
-        @_strict_struct_hash = Hash[hash.to_a].freeze
-      end
+  class AttributeModule < Module
+    def initialize *attributes
+      super() do
+        define_method :initialize do |hash={}|
+          Helper.validate_arguments(hash.keys, attributes)
+          @_strict_struct_hash = Hash[hash.to_a].freeze
+        end
 
-      attributes.each do |attribute|
-        define_method(attribute) do
-          @_strict_struct_hash[attribute]
+        attributes.each do |attribute|
+          define_method(attribute) do
+            @_strict_struct_hash[attribute]
+          end
         end
-      end
 
-      def to_h
-        to_hash
-      end
+        def to_h
+          to_hash
+        end
 
-      def to_hash
-        Hash[@_strict_struct_hash.to_a]
-      end
+        def to_hash
+          Hash[@_strict_struct_hash.to_a]
+        end
 
-      define_method :== do |other|
-        return false unless self.class == other.class
+        define_method :== do |other|
+          return false unless self.class == other.class
 
-        attributes.all? {|name| self.send(name) == other.send(name)}
-      end
+          attributes.all? {|name| self.send(name) == other.send(name)}
+        end
 
-      define_method :hash do
-        @_strict_struct_hash.hash
+        define_method :hash do
+          @_strict_struct_hash.hash
+        end
       end
     end
-    klass = Class.new
-    klass.send :include, mod
-    klass.class_eval(&block) if block_given?
-    klass
+  end
+
+  def self.new(*attributes, &block)
+    Class.new do
+      include AttributeModule.new(*attributes)
+      class_eval(&block) if block_given?
+    end
   end
 end

data/lib/strict_struct/version.rb

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

data/spec/spec_helper.rb

@@ -1,3 +1,7 @@
 require 'rspec'
 
 $LOAD_PATH << './lib/'
+
+RSpec.configure do |c|
+  c.raise_errors_for_deprecations!
+end

data/spec/strict_struct_spec.rb

@@ -8,7 +8,7 @@ describe 'StrictStruct' do
 
       a_foo = foo.new
 
-      a_foo.should_not be_nil
+      expect(a_foo).to_not be_nil
     end
 
     it "works with parameters" do
@@ -16,7 +16,7 @@ describe 'StrictStruct' do
 
       a_foo = foo.new(bar: 'baz')
 
-      a_foo.should_not be_nil
+      expect(a_foo).to_not be_nil
     end
 
     it "raises an error when an argument is missing" do
@@ -77,7 +77,7 @@ describe 'StrictStruct' do
 
       rectangle = rectangle_class.new(x: 3, y: 5)
 
-      rectangle.area.should == 15
+      expect(rectangle.area).to eq 15
     end
   end
 
@@ -87,8 +87,8 @@ describe 'StrictStruct' do
 
       a_foo = foo.new(bar: 'baz')
 
-      a_foo.bar.should eq 'baz'
-      a_foo.should respond_to 'bar'
+      expect(a_foo.bar).to eq 'baz'
+      expect(a_foo).to respond_to 'bar'
     end
 
     it "is not defined when the value isn't defined by the class" do
@@ -96,7 +96,7 @@ describe 'StrictStruct' do
 
       a_foo = foo.new(bar: 'baz')
 
-      a_foo.should_not respond_to 'gerard'
+      expect(a_foo).to_not respond_to 'gerard'
     end
 
     it "raises a NoMethodError when called for a value which isn't defined" do
@@ -117,7 +117,7 @@ describe 'StrictStruct' do
       k = klass.new(params)
       params[:x] = 'bar'
 
-      k.x.should eq 'foo'
+      expect(k.x).to eq 'foo'
     end
 
     it "isn't broken by modifying output of to_h" do
@@ -125,7 +125,7 @@ describe 'StrictStruct' do
       hash = k.to_h
       hash[:x] = 'bar'
 
-      k.x.should eq 'foo'
+      expect(k.x).to eq 'foo'
     end
   end
 
@@ -135,7 +135,7 @@ describe 'StrictStruct' do
 
       a_foo = foo.new(bar: 'baz', baz: 3)
 
-      a_foo.to_h.should eq({bar: 'baz', baz: 3})
+      expect(a_foo.to_h).to eq({ bar: 'baz', baz: 3 })
     end
 
     it "is possible to override, and reuse using super" do
@@ -147,7 +147,7 @@ describe 'StrictStruct' do
 
       a_foo = foo.new(bar: 'baz', baz: 3)
 
-      a_foo.to_h.should eq({bar: 'baz', baz: 3, pirate: 'captain'})
+      expect(a_foo.to_h).to eq({ bar: 'baz', baz: 3, pirate: 'captain' })
     end
   end
 
@@ -157,7 +157,7 @@ describe 'StrictStruct' do
 
       a_foo = foo.new(bar: 'baz', baz: 3)
 
-      a_foo.to_hash.should eq({bar: 'baz', baz: 3})
+      expect(a_foo.to_hash).to eq({ bar: 'baz', baz: 3 })
     end
   end
 
@@ -171,8 +171,8 @@ describe 'StrictStruct' do
 
       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})
+      expect(a_foo.to_h).to eq({ bar: 'baz', baz: 3, pirate: 'captain' })
+      expect(a_foo.to_hash).to eq({ bar: 'baz', baz: 3 })
     end
   end
 
@@ -186,8 +186,8 @@ describe 'StrictStruct' do
 
       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'})
+      expect(a_foo.to_h).to eq({ bar: 'baz', baz: 3, pirate: 'captain' })
+      expect(a_foo.to_hash).to eq({ bar: 'baz', baz: 3, pirate: 'captain' })
     end
   end
 
@@ -205,9 +205,8 @@ describe 'StrictStruct' do
 
       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'})
-
+      expect(a_foo.to_h).to eq({ bar: 'baz', baz: 3, pirate: 'captain', samurai: 'sword' })
+      expect(a_foo.to_hash).to eq({ bar: 'baz', baz: 3, pirate: 'captain' })
     end
   end
 
@@ -218,7 +217,7 @@ describe 'StrictStruct' do
       a_foo = foo.new(bar: 'baz')
       another_foo = foo.new(bar: 'baz')
 
-      a_foo.should eq another_foo
+      expect(a_foo).to eq another_foo
     end
 
     it "returns false if the values are not the same" do
@@ -227,7 +226,7 @@ describe 'StrictStruct' do
       a_foo = foo.new(bar: 'baz')
       another_foo = foo.new(bar: 'not_baz')
 
-      a_foo.should_not eq another_foo
+      expect(a_foo).to_not eq another_foo
     end
 
     it "returns false if two values are different StrictStructs" do
@@ -237,14 +236,14 @@ describe 'StrictStruct' do
       chicken = chicken_class.new(wings: 2)
       plane = plane_class.new(wings: 2)
 
-      plane.should_not eq chicken
+      expect(plane).to_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
+      expect(empty.new.hash).to eq empty.new.hash
     end
 
     it "returns a different value for two non-empty objects with different content" do
@@ -253,7 +252,7 @@ describe 'StrictStruct' do
       first = container.new(a: 1)
       second = container.new(a: 2)
 
-      first.hash.should_not == second.hash
+      expect(first.hash).to_not eq second.hash
     end
 
     it "returns the same value for two non-empty objects with the same content" do
@@ -262,10 +261,16 @@ describe 'StrictStruct' do
       first = container.new(a: 1)
       second = container.new(a: 1)
 
-      first.hash.should == second.hash
+      expect(first.hash).to eq second.hash
     end
 
-    # we need no guarantee that objects with the same content, but different classes
-    # return different hashes
+    it "returns a different value for two different objects" do |variable|
+      container = StrictStruct.new(:a)
+
+      first = container.new(a: 1)
+      second = container.new(a: 2)
+
+      expect(first.hash).to_not eq second.hash
+    end
   end
 end

data/strict_struct.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", '3.0.0.beta2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strict_struct
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Mark IJbema
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-15 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.beta2
 description: Extremely simple value objects
 email:
 - markijbema@gmail.com
@@ -62,7 +62,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.travis
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.travis

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-end
-
-eval_gemfile File.expand_path('../Gemfile', __FILE__)