constructor 1.0.2 → 1.0.3

data/Manifest.txt

@@ -3,4 +3,6 @@ Manifest.txt
 README.txt
 Rakefile
 lib/constructor.rb
+lib/constructor_struct.rb
 specs/constructor_spec.rb
+specs/constructor_struct_spec.rb

data/lib/constructor.rb

@@ -1,4 +1,4 @@
-CONSTRUCTOR_VERSION = '1.0.2' #:nodoc:#
+CONSTRUCTOR_VERSION = '1.0.3' #:nodoc:#
 
 class Class #:nodoc:#
   def constructor(*attrs, &block)

data/lib/constructor_struct.rb

@@ -0,0 +1,33 @@
+class ConstructorStruct
+  def self.new(*accessors, &block)
+    defaults = {:accessors => true, :strict => false}
+    
+    accessor_names = accessors.dup
+    if accessors.last.is_a? Hash
+      accessor_names.pop
+      user_opts = accessors.last
+      user_opts.delete(:accessors)
+      defaults.each do |k,v|
+        user_opts[k] ||= v
+      end
+    else
+      accessors << defaults
+    end
+    
+    Class.new do
+      constructor *accessors
+
+      class_eval(&block) if block
+
+      comparator_code = accessor_names.map { |fname| "self.#{fname} == o.#{fname}" }.join(" && ")
+      eval %|
+        def ==(o)
+          (self.class == o.class) && #{comparator_code}
+        end
+        def eql?(o)
+          (self.class == o.class) && #{comparator_code}
+        end
+      |
+    end
+  end
+end

data/specs/constructor_struct_spec.rb

@@ -0,0 +1,84 @@
+require File.dirname(__FILE__) + '/../lib/constructor_struct'
+
+describe ConstructorStruct, "#new" do
+  def struct(*accessors)
+    ConstructorStruct.new(*accessors)
+  end
+  
+  def instance_of(clazz, args=nil)
+    args = [args] || []
+    clazz.new(*args)
+  end
+  
+  before do
+    AClass = struct(:hello, :world) unless defined?(AClass)
+  end
+  
+  it "creates a new class with accessors given a set of symbols or strings" do
+    instance_of(AClass, {:hello => "foo", :world => "bar"}).hello.should == "foo"
+    instance_of(AClass, {:hello => "foo", :world => "bar"}).world.should == "bar"
+  end
+  
+  it "creates a real class" do
+    instance_of(AClass).class.should == AClass
+  end
+  
+  it "has the option of creating a strict accessors" do
+    lambda { instance_of(struct(:foo, :strict => true)) }.should raise_error
+  end
+  
+  it "does not have the option of not creating accessors" do
+    instance_of(struct(:foo, :accessors => false), :foo => "bar").foo.should == "bar"
+  end
+
+  describe "equivalence" do
+    before do
+      @hello = "Hello"
+      @world = "World"
+      @args = { :hello => @hello, :world => @world }
+      @target = AClass.new(@args)
+    end
+
+    it "uses all accessors" do
+      [ nil, :hello, :world ].each do |field_to_alter|
+        alt = AClass.new(:hello => @hello, :world => @world)
+
+        unless field_to_alter
+          # Base case: they should be equal
+          @target.should == alt
+          @target.eql?(alt).should be_true #should eql(alt)
+        else
+          # Change 1 field and see not equal
+          alt.send("#{field_to_alter}=", "other data")
+          @target.should_not == alt
+          @target.should_not eql(alt)
+        end
+      end
+    end
+
+    it "will not compare to another class with same fields" do
+      BClass = ConstructorStruct.new(:hello, :world)
+      alt = BClass.new(:hello => @hello, :world => @world)
+      @target.should_not == alt
+      @target.should_not eql(alt)
+    end
+  end
+
+  describe "extra method definitions" do
+    NightTrain = ConstructorStruct.new(:beer, :conductor) do
+      def setup
+        @conductor ||= "Bill"
+      end
+    end
+
+    it "lets you declare instance methods within a block" do
+      night_train = NightTrain.new(:beer => "Founders")
+      night_train.beer.should == "Founders"
+      night_train.conductor.should == "Bill"
+
+      other_train = NightTrain.new(:beer => "Bells", :conductor => "Dave")
+      other_train.conductor.should == "Dave"
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: constructor
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Atomic Object
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 01:00:00 -04:00
+date: 2009-11-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,9 @@ files:
 - README.txt
 - Rakefile
 - lib/constructor.rb
+- lib/constructor_struct.rb
 - specs/constructor_spec.rb
+- specs/constructor_struct_spec.rb
 has_rdoc: true
 homepage: http://atomicobjectrb.rubyforge.org/constructor
 licenses: []