finer_struct 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efc9874761281c4def8fcadbb25882b1c80946d0
-  data.tar.gz: f2b19060bc14eb3af7c2b8d021c52f061245d141
+  metadata.gz: 3e77234d562a38294c85ca067153e4e7fadc076d
+  data.tar.gz: b143677a32cd55a07a1c14d709923f754102c20f
 SHA512:
-  metadata.gz: c8d08f594eccc29b4ecd5a12caa9fc2c4501ca25ea2360988e059053617e554f3cc8650796b7c7ef596bab2f78ea2e6c28b5d51f08e9bdfdfa53e40678beaeb2
-  data.tar.gz: b7aaae5aae267c3499dba6a47e21a92794d29957db92bd47382dc435775d778bdcc5b55e5fec538387fd173e32c677fa111f6928089359296d935858b1bfbd5e
+  metadata.gz: 2f5acd6d885fd1f0347277d6653b7365c20bb56dbf87448e15e1e486af76c394fc24001932e9ec9a7e7d1ffae1d81ff740fc51b7a8d61cb52efc7ab91272d2e6
+  data.tar.gz: cd328a7638545efd05cb5f353f14465ba714b8f3c4e9f9a0d089885f6fcb6fd5aae67835e3d9f48c6f951be8b6ba4f1b313f608551097ef440c777638648bf32

data/lib/finer_struct.rb

@@ -1,4 +1,6 @@
 require "finer_struct/version"
-require "finer_struct/immutable"
-require "finer_struct/mutable"
+require "finer_struct/anonymous_immutable"
+require "finer_struct/anonymous_mutable"
+require "finer_struct/named_immutable"
+require "finer_struct/named_mutable"
 

data/lib/finer_struct/{immutable.rb → anonymous_immutable.rb}

@@ -1,8 +1,6 @@
-require 'finer_struct/named'
-
 module FinerStruct
-
   class Immutable
+
     def initialize(attributes = {})
       @attributes = attributes.dup.freeze
       freeze
@@ -23,10 +21,10 @@ module FinerStruct
     def to_hash
       @attributes
     end
-  end
 
-  def self.Immutable(*attribute_names)
-    Named.build_class(Immutable, attribute_names)
-  end
+    def ==(other)
+      other.class == self.class && other.to_hash == to_hash
+    end
 
+  end
 end

data/lib/finer_struct/{mutable.rb → anonymous_mutable.rb}

@@ -1,9 +1,6 @@
-require 'finer_struct/immutable'
-require 'finer_struct/named'
-
 module FinerStruct
-
   class Mutable
+
     def initialize(attributes)
       @attributes = attributes.dup
     end
@@ -26,6 +23,10 @@ module FinerStruct
       @attributes.dup
     end
 
+    def ==(other)
+      other.class == self.class && other.to_hash == to_hash
+    end
+
   private
 
     def is_assigment?(method)
@@ -35,11 +36,7 @@ module FinerStruct
     def key_for_assignment(method)
       method.to_s[0..-2].to_sym
     end
-  end
 
-  def self.Mutable(*attribute_names)
-    Named.build_class(Mutable, attribute_names)
   end
-
 end
 

data/lib/finer_struct/named.rb

@@ -1,5 +1,4 @@
 module FinerStruct
-
   module Named
 
     def initialize(attributes = {})
@@ -8,17 +7,22 @@ module FinerStruct
         raise(ArgumentError, "unknown attributes: #{unknown_attributes.join(', ')}")
       end
 
-      nil_attributes = Hash[attribute_names.zip()]
-      super(nil_attributes.merge!(attributes))
+      super
     end
 
-    def self.build_class(superclass, attribute_names)
+    def self.build_class(superclass, attribute_names, &block)
       Class.new(superclass) do
+        include Named
+
         define_method(:attribute_names, -> { attribute_names })
 
-        include Named
+        attribute_names.each do |name|
+          define_method(name) { @attributes[name]  }
+        end
+
+        class_eval(&block) if block_given?
       end
     end
-  end
 
+  end
 end

data/lib/finer_struct/named_immutable.rb

@@ -0,0 +1,8 @@
+require 'finer_struct/anonymous_immutable'
+require 'finer_struct/named'
+
+module FinerStruct
+  def self.Immutable(*attribute_names)
+    Named.build_class(Immutable, attribute_names)
+  end
+end

data/lib/finer_struct/named_mutable.rb

@@ -0,0 +1,12 @@
+require 'finer_struct/anonymous_mutable'
+require 'finer_struct/named'
+
+module FinerStruct
+  def self.Mutable(*attribute_names)
+    Named.build_class(Mutable, attribute_names) do
+      attribute_names.each do |name|
+        define_method(:"#{name}=") {|value| @attributes[name] = value }
+      end
+    end
+  end
+end

data/lib/finer_struct/version.rb

@@ -1,3 +1,3 @@
 module FinerStruct
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/anonymous_immutable_spec.rb

@@ -0,0 +1,12 @@
+require 'finer_struct'
+require 'shared_examples/struct'
+require 'shared_examples/immutable'
+
+describe "an anonymous immutable struct" do
+  subject { FinerStruct::Immutable.new(a: 1, b: 2) }
+  let(:identical) { FinerStruct::Immutable.new(a: 1, b: 2) }
+  let(:different) { FinerStruct::Immutable.new(a: 3, b: 4) }
+
+  it_behaves_like "a struct"
+  it_behaves_like "an immutable struct"
+end

data/spec/anonymous_mutable_spec.rb

@@ -0,0 +1,12 @@
+require 'finer_struct'
+require 'shared_examples/struct'
+require 'shared_examples/mutable'
+
+describe "an anonymous mutable struct" do
+  subject { FinerStruct::Mutable.new(a: 1, b: 2) }
+  let(:identical) { FinerStruct::Mutable.new(a: 1, b: 2) }
+  let(:different) { FinerStruct::Mutable.new(a: 3, b: 4) }
+
+  it_behaves_like "a struct"
+  it_behaves_like "a mutable struct"
+end

data/spec/named_immutable_spec.rb

@@ -0,0 +1,15 @@
+require 'finer_struct'
+require 'shared_examples/struct'
+require 'shared_examples/named'
+require 'shared_examples/immutable'
+
+describe "a named immutable struct" do
+  let(:klass) { FinerStruct::Immutable(:a, :b) }
+  subject { klass.new(a: 1, b: 2) }
+  let(:identical) { klass.new(a: 1, b: 2) }
+  let(:different) { klass.new(a: 3, b: 4) }
+
+  it_behaves_like "a struct"
+  it_behaves_like "a named struct"
+  it_behaves_like "an immutable struct"
+end

data/spec/named_mutable_spec.rb

@@ -0,0 +1,24 @@
+require 'finer_struct'
+require 'shared_examples/struct'
+require 'shared_examples/named'
+require 'shared_examples/mutable'
+
+describe "a named mutable struct" do
+  let(:klass) { FinerStruct::Mutable(:a, :b) }
+  subject { klass.new(a: 1, b: 2) }
+  let(:identical) { klass.new(a: 1, b: 2) }
+  let(:different) { klass.new(a: 3, b: 4) }
+
+  it_behaves_like "a struct"
+  it_behaves_like "a named struct"
+  it_behaves_like "a mutable struct"
+
+  it "allows you alias attribute assignments" do
+    subclass = Class.new(klass) do
+      alias_method :c=, :a=
+    end
+    struct = subclass.new(a: 1)
+    struct.c = 3
+    expect(struct.a).to eq(3)
+  end
+end

data/spec/shared_examples/immutable.rb

@@ -0,0 +1,13 @@
+shared_examples "an immutable struct" do
+  it "complains if you try to write an attribute" do
+    expect { subject.a = 3 }.to raise_error(NoMethodError)
+  end
+
+  it "is frozen" do
+    expect(subject).to be_frozen
+  end
+
+  it "converts to a frozen hash" do
+    expect(subject.to_hash).to be_frozen
+  end
+end

data/spec/shared_examples/mutable.rb

@@ -0,0 +1,6 @@
+shared_examples "a mutable struct" do
+  it "lets you write attributes" do
+    subject.a = 3
+    expect(subject.a).to eq(3)
+  end
+end

data/spec/shared_examples/named.rb

@@ -0,0 +1,16 @@
+shared_examples "a named struct" do
+  it "complains if you set attributes that the struct doesn't have" do
+    expect { klass.new(c: 3, d: 4) }.to raise_error(ArgumentError, "unknown attributes: c, d")
+  end
+
+  it "returns nil for attributes that aren't explicitly set" do
+    expect(klass.new(a: 1).b).to be_nil
+  end
+
+  it "allows you to alias attributes" do
+    subclass = Class.new(klass) do
+      alias_method :c, :a
+    end
+    expect(subclass.new(a: 1).c).to eq(1)
+  end
+end

data/spec/shared_examples/struct.rb

@@ -0,0 +1,35 @@
+shared_examples "a struct" do
+  it "lets you read attributes" do
+    expect(subject.a).to eq(1)
+    expect(subject.b).to eq(2)
+  end
+
+  it "responds to attribute names" do
+    expect(subject).to respond_to(:a)
+    expect(subject).to respond_to(:b)
+  end
+
+  it "doesn't respond to attribute names that the struct doesn't have" do
+    expect(subject).not_to respond_to(:c)
+  end
+
+  it "responds to non-attribute methods" do
+    expect(subject).to respond_to(:class)
+  end
+
+  it "converts to a hash" do
+    expect(subject.to_hash).to eq(a: 1 ,b: 2)
+  end
+
+  it "is equal to an identical struct" do
+    expect(subject).to eq(identical)
+  end
+
+  it "is not equal to a different struct" do
+    expect(subject).to_not eq(different)
+  end
+
+  it "is not equal to an object of a different class" do
+    expect(subject).to_not eq("rhubarb")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finer_struct
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Pete Yandell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,13 +66,20 @@ files:
 - Rakefile
 - finer_struct.gemspec
 - lib/finer_struct.rb
-- lib/finer_struct/immutable.rb
-- lib/finer_struct/mutable.rb
+- lib/finer_struct/anonymous_immutable.rb
+- lib/finer_struct/anonymous_mutable.rb
 - lib/finer_struct/named.rb
+- lib/finer_struct/named_immutable.rb
+- lib/finer_struct/named_mutable.rb
 - lib/finer_struct/version.rb
-- spec/finer_struct/immutable_spec.rb
-- spec/finer_struct/mutable_spec.rb
-- spec/finer_struct/shared_examples.rb
+- spec/anonymous_immutable_spec.rb
+- spec/anonymous_mutable_spec.rb
+- spec/named_immutable_spec.rb
+- spec/named_mutable_spec.rb
+- spec/shared_examples/immutable.rb
+- spec/shared_examples/mutable.rb
+- spec/shared_examples/named.rb
+- spec/shared_examples/struct.rb
 homepage: https://github.com/notahat/finer_struct
 licenses:
 - MIT
@@ -98,6 +105,11 @@ signing_key:
 specification_version: 4
 summary: A nicer replacement for Ruby's Struct and OpenStruct
 test_files:
-- spec/finer_struct/immutable_spec.rb
-- spec/finer_struct/mutable_spec.rb
-- spec/finer_struct/shared_examples.rb
+- spec/anonymous_immutable_spec.rb
+- spec/anonymous_mutable_spec.rb
+- spec/named_immutable_spec.rb
+- spec/named_mutable_spec.rb
+- spec/shared_examples/immutable.rb
+- spec/shared_examples/mutable.rb
+- spec/shared_examples/named.rb
+- spec/shared_examples/struct.rb

data/spec/finer_struct/immutable_spec.rb

@@ -1,36 +0,0 @@
-require 'finer_struct/immutable'
-require 'finer_struct/shared_examples'
-
-shared_examples "an immutable struct" do
-  it_behaves_like "a struct"
-
-  it "complains if you try to write an attribute" do
-    expect { subject.a = 3 }.to raise_error(NoMethodError)
-  end
-
-  it "is frozen" do
-    expect(subject).to be_frozen
-  end
-
-  it "converts to a frozen hash" do
-    expect(subject.to_hash).to be_frozen
-  end
-end
-
-module FinerStruct
-
-  describe "an anonymous immutable struct" do
-    subject { FinerStruct::Immutable.new(a: 1, b: 2) }
-
-    it_behaves_like "an immutable struct"
-  end
-
-  describe "a named immutable struct" do
-    let(:klass)  { Class.new(FinerStruct::Immutable(:a, :b)) }
-    subject      { klass.new(a: 1, b: 2) }
-
-    it_behaves_like "an immutable struct"
-    it_behaves_like "a named struct"
-  end
-
-end

data/spec/finer_struct/mutable_spec.rb

@@ -1,29 +0,0 @@
-require 'finer_struct/mutable'
-require 'finer_struct/shared_examples'
-
-shared_examples "a mutable struct" do
-  it_behaves_like "a struct"
-
-  it "lets you write attributes" do
-    subject.a = 3
-    expect(subject.a).to eq(3)
-  end
-end
-
-module FinerStruct
-
-  describe "an anonymous mutable struct" do
-    subject { FinerStruct::Mutable.new(a: 1, b: 2) }
-
-    it_behaves_like "a mutable struct"
-  end
-
-  describe "a named mutable struct" do
-    let(:klass)  { Class.new(FinerStruct::Mutable(:a, :b)) }
-    subject      { klass.new(a: 1, b: 2) }
-
-    it_behaves_like "a mutable struct"
-    it_behaves_like "a named struct"
-  end
-
-end

data/spec/finer_struct/shared_examples.rb

@@ -1,33 +0,0 @@
-shared_examples "a struct" do
-  it "lets you read attributes" do
-    expect(subject.a).to eq(1)
-    expect(subject.b).to eq(2)
-  end
-
-  it "responds to attribute names" do
-    expect(subject).to respond_to :a
-    expect(subject).to respond_to :b
-  end
-
-  it "responds to :class" do
-    expect(subject).to respond_to :class
-  end
-
-  it "doesn't respond to attribute names that the struct doesn't have" do
-    expect(subject).not_to respond_to :c
-  end
-
-  it "converts to a hash" do
-    expect(subject.to_hash).to eq(a: 1 ,b: 2)
-  end
-end
-
-shared_examples "a named struct" do
-  it "complains if you set attributes that the struct doesn't have" do
-    expect { klass.new(c: 3, d: 4) }.to raise_error(ArgumentError, "unknown attributes: c, d")
-  end
-
-  it "returns nil for attributes that aren't explicitly set" do
-    expect(klass.new(a: 1).b).to be_nil
-  end
-end