gosu_enhanced 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bea4f4b1f3538d41a81836451633a5e06745c0b
-  data.tar.gz: beb3d14cf8e95ac215381424ca2a984243dd4bb2
+  metadata.gz: 0dc6fb4cc8601ab21b00c0d32b1f15c164e11286
+  data.tar.gz: 1eeb8f44e773cfeee38f073071816e50f6cd462d
 SHA512:
-  metadata.gz: a4758d0bfed48fca2d702f184c8e5ede573e882374520309a412ad3428a79d5c1009b02459a935dbab01a66c27ffd3ab432dd48ad1778998fad41f92e18e53d4
-  data.tar.gz: 4a97a509411c2ceb4ee633ef8271769e6f0e600c2e451fa29c072be24c4dc9b4fd1bb7db2d1a12f6a2ff7a06a82e966c2c826a71856d385a60aaef51e3dbdf77
+  metadata.gz: 5abb6c36d7f637e360a6264fa7b570f0c29e650a378e32279d03d6c5cfedf168dcdfe79d7231c7684d8abc10784111729f0c14287ba531a0d57fd057bc64f76b
+  data.tar.gz: cbbc81526079ec291068f354bd01f816d5af62d4678a3e210cfecc18320491bcb2c5c07558cd5e5f04e862ddb70295bb363faf058b6912b1fca8d3debeeb2831

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gosu_enhanced (0.3.2)
+    gosu_enhanced (0.3.3)
       gosu (~> 0.7)
 
 GEM
@@ -11,22 +11,26 @@ GEM
     diff-lcs (1.2.5)
     gosu (0.7.50)
     method_source (0.8.2)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (0.9.2.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-nc (0.0.6)
-      rspec (~> 2.9)
+    rake (0.9.6)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-nc (0.1.0)
+      rspec (>= 2.9)
       terminal-notifier (~> 1.4.2)
+    rspec-support (3.0.2)
     slop (3.5.0)
     terminal-notifier (1.4.2)
 
@@ -36,7 +40,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.6)
   gosu_enhanced!
-  pry (~> 0.9)
+  pry (~> 0.10)
   rake (~> 0.9)
-  rspec (~> 2.0)
+  rspec (~> 3.0)
   rspec-nc (~> 0.0)

data/Rakefile

@@ -4,7 +4,7 @@ require "bundler/gem_tasks"
 # Default directory for tests is ./spec
 # Run with rake spec
 RSpec::Core::RakeTask.new( :spec ) do |task|
-  task.rspec_opts = ['--color', '--format', 'nested']
+  task.rspec_opts = ['--color']
 end
 
 task :default => :spec

data/gosu_enhanced.gemspec

@@ -26,7 +26,7 @@ of text in a rectangle size.}
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 0.9"
-  spec.add_development_dependency "rspec", "~> 2.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-nc", "~> 0.0"
-  spec.add_development_dependency "pry", "~> 0.9"
+  spec.add_development_dependency "pry", "~> 0.10"
 end

data/lib/gosu_enhanced/point.rb

@@ -1,14 +1,8 @@
 module GosuEnhanced
   # Hold a (x, y) pixel position, and allow for offsetting and movement
-  class Point < Struct.new( :x, :y )
+  Point = Struct.new( :x, :y ) do
     def offset( by_x, by_y = nil )
-      if by_x.respond_to? :x
-        Point.new( x + by_x.x, y + by_x.y )
-      elsif by_x.respond_to? :width
-        Point.new( x + by_x.width, y + by_x.height )
-      else
-        Point.new( x + by_x, y + by_y )
-      end
+      self.dup.move_by!( by_x, by_y )
     end
 
     # Negative co-ordinates are allowed.
@@ -24,6 +18,8 @@ module GosuEnhanced
         self.x += by_x
         self.y += by_y
       end
+
+      self
     end
 
     def move_to!( new_x, new_y = nil )
@@ -32,6 +28,8 @@ module GosuEnhanced
       else
         self.x, self.y = new_x, new_y
       end
+
+      self
     end
   end
 end

data/lib/gosu_enhanced/size.rb

@@ -12,23 +12,11 @@ module GosuEnhanced
     end
 
     def inflate( by_w, by_h = nil )
-      if by_w.respond_to? :width
-        validate( by_w.width, by_w.height )
-
-        Size.new( width + by_w.width, height + by_w.height )
-      else
-        validate( by_w, by_h )
-
-        Size.new( width + by_w, height + by_h )
-      end
+      self.dup.inflate!( by_w, by_h )
     end
 
     def deflate( by_w, by_h = nil )
-      if by_w.respond_to? :width
-        inflate( -by_w.width, -by_w.height )
-      else
-        inflate( -by_w, -by_h )
-      end
+      self.dup.deflate!( by_w, by_h )
     end
 
     def inflate!( by_w, by_h = nil )
@@ -43,6 +31,8 @@ module GosuEnhanced
         @width  += by_w
         @height += by_h
       end
+
+      self
     end
 
     def deflate!( by_w, by_h = nil )
@@ -56,11 +46,11 @@ module GosuEnhanced
     def ==( other )
       width == other.width && height == other.height
     end
-    
+
     def to_s
       "<GosuEnhanced::Size #{width}x#{height}>"
     end
-    
+
     private
 
     def validate( by_w, by_h )

data/lib/gosu_enhanced/version.rb

@@ -1,4 +1,4 @@
 
 module GosuEnhanced
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/spec/point_spec.rb

@@ -141,4 +141,11 @@ describe GosuEnhanced::Point do
       expect( point.y ).to eq 20
     end
   end
+  
+  describe '#to_s' do
+    it 'should render usefully.' do
+      point  = GosuEnhanced::Point.new( 10, 20 )
+      expect( point.to_s ).to eq '#<struct GosuEnhanced::Point x=10, y=20>'
+    end
+  end
 end

data/spec/region_spec.rb

@@ -79,4 +79,14 @@ describe GosuEnhanced::Region do
       expect( reg.size ).to eq GosuEnhanced::Size.new( 30, 40 )
     end
   end
+  
+  describe '#to_s' do
+    it 'should render usefully' do
+      point   = GosuEnhanced::Point.new( 10, 20 )
+      size    = GosuEnhanced::Size.new( 30, 40 )
+      region  = GosuEnhanced::Region.new( point, size )
+      
+      expect( region.to_s ).to eq '<GosuEnhanced::Region: #<struct GosuEnhanced::Point x=10, y=20>, <GosuEnhanced::Size 30x40>>'
+    end
+  end
 end

data/spec/size_spec.rb

@@ -140,4 +140,11 @@ describe GosuEnhanced::Size do
       expect( size.height ).to eq 20
     end
   end
+  
+  describe '#to_s' do
+    it 'should render usefully' do
+      size  = GosuEnhanced::Size.new( 10, 20 )
+      expect( size.to_s ).to eq '<GosuEnhanced::Size 10x20>'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu_enhanced
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Julian Nicholls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-nc
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 description: |-
   Point, Size, and Region classes to hold pixel addresses
   and rectangle sizes respectively.
@@ -154,3 +154,4 @@ test_files:
 - spec/region_spec.rb
 - spec/size_spec.rb
 - spec/spec_helper.rb
+has_rdoc: