structure 0.27.2 → 0.27.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4694de108ebd90aae0a0077a210dea2e5d4280ea
-  data.tar.gz: f7c78c9ba1eed15bce911abdf71fdbac979a6d5f
+  metadata.gz: 543ffd06f050b41405d2760cd7acc6e5ba3fd4f7
+  data.tar.gz: c8bb827aaed4acde43fd70386724d1c92c9bd759
 SHA512:
-  metadata.gz: d09ca4303c082e13fd42af04282aee4727f482159559a16bd2ea3847e6374f39da91bf7d9ffd245b585d574e8d7c425e72f81f576db7897f100f8d1b1e2721ac
-  data.tar.gz: d8384a70e163d54a6e11eb7ae115b0346ee7ed6cdee441f2c90ce99d5c09fe7d2a180815dc02f01b3e266973de82465489964aea22da829a2b97093930375573
+  metadata.gz: 0a9a4282f5186062d454f901f1b518afd9054fd8041add41ac97339ba6a01cef52581113eb03bdb31244aa4b2f29d4db55b7f80553032beaeb5ac281132a101b
+  data.tar.gz: 5484b1f51b1c8c6ff7fc0e6e0200fba2b703fddfa38de3782c1df37943ac9e387e858f7c227005a69bbd28d93839c928152828dba8ef9c11688a9a0c3af0f632

data/structure.rb

@@ -18,7 +18,7 @@ module Structure
   def inspect
     "#<#{self.class} #{
       attributes
-        .map { |k, v| "#{k}=#{v.inspect}" }
+        .map { |key, val| "#{key}=#{val.inspect}" }
         .join(', ')
     }>"
   end
@@ -31,19 +31,22 @@ module Structure
     attr_reader :attribute_names
 
     def to_struct
+      return Struct.const_get(name, false) if Struct.const_defined?(name, false)
+
       Struct.new(name, *attribute_names) do
         def initialize(data = {})
-          data.each { |k, v| self.send("#{k}=", v) }
+          data.each { |key, val| self.send("#{key}=", val) }
         end
       end
     end
 
     def inherited(subclass)
-      subclass.instance_variable_set(:@attribute_names, attribute_names.dup)
+      subclass.instance_variable_set(:@attribute_names, @attribute_names.dup)
     end
 
     def attribute(name, &blk)
-      @attribute_names << define_method(name, &blk)
+      define_method(name, &blk)
+      @attribute_names << name
     end
   end
 end

data/structure_test.rb

@@ -9,45 +9,52 @@ end
 
 class StructureTest < MiniTest::Test
   def setup
-    @location = Location.new(latitude: 10, longitude: 100)
+    @location = Location.new(latitude: 10, longitude: 20)
   end
 
   def test_class_returns_attribute_names
     assert_equal [:latitude, :longitude], Location.attribute_names
   end
 
-  def test_class_casts_to_struct
+  def test_casts_itself_to_struct
     struct = Location.to_struct
     assert_equal 'Struct::Location', struct.name
     assert_equal 1, struct.new(latitude: 1).latitude
   end
 
+  def test_cast_to_struct_only_once
+    out, err = capture_io do
+      2.times { Location.to_struct }
+    end
+    assert_empty err
+  end
+
   def test_subclassing_does_not_have_side_effects
     subclass = Class.new(Location) do
       attribute(:name) { 'foo' }
     end
-    obj = subclass.new(latitude: 10, longitude: 100)
-    assert_equal({ latitude: 10, longitude: 100, name: 'foo' }, obj.attributes)
+    obj = subclass.new(latitude: 10, longitude: 20)
+    assert_equal({ latitude: 10, longitude: 20, name: 'foo' }, obj.attributes)
   end
 
   def test_attributes
     assert_equal 10, @location.latitude
-    assert_equal 100, @location.longitude
+    assert_equal 20, @location.longitude
   end
 
   def test_returns_attributes
-    assert_equal({ latitude: 10, longitude: 100 }, @location.attributes)
+    assert_equal({ latitude: 10, longitude: 20 }, @location.attributes)
     assert_equal @location.to_h, @location.attributes
   end
 
   def test_compares
-    @other = Location.new(longitude: 100, latitude: 10)
+    @other = Location.new(longitude: 20, latitude: 10)
     assert @location == @other
     assert @location.eql?(@other)
   end
 
   def test_pretty_inspects
-    assert_equal '#<Location latitude=10, longitude=100>', @location.inspect
+    assert_equal '#<Location latitude=10, longitude=20>', @location.inspect
     assert_equal @location.to_s, @location.inspect
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: structure
 version: !ruby/object:Gem::Version
-  version: 0.27.2
+  version: 0.27.3
 platform: ruby
 authors:
 - Hakan Ensari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -59,7 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="