sketch 0.0.2 → 0.0.3

data/Gemfile

@@ -3,6 +3,8 @@ source 'http://rubygems.org'
 # Specify your gem's dependencies in sketch.gemspec
 gemspec
 
+gem 'nokogiri'
+
 group :test do
   gem 'test-unit'
   gem 'mocha'

data/examples/star.rb

@@ -0,0 +1,7 @@
+class Star < Sketch
+
+  def draw(canvas)
+    Sketch::Star.new(:radius => self.width.to_f / 2.1, :x => self.width.to_f / 2, :y => self.width.to_f / 2, :fill => 'yellow', :stroke => 'black', :stroke_width => 1, :orientation => 45).draw(canvas)
+  end
+end
+

data/lib/sketch.rb

@@ -48,4 +48,5 @@ require 'sketch/ellipse'
 require 'sketch/rect'
 require 'sketch/rectangle'
 require 'sketch/path'
+require 'sketch/star'
 

data/lib/sketch/line.rb

@@ -0,0 +1,13 @@
+class Sketch::Line < Sketch::Element
+  
+  has_value :x1
+  has_value :x2
+  has_value :y1
+  has_value :y2
+  has_value :stroke, :default => 'black'
+  has_value :stroke_width, :default => 1
+  has_value :stroke_linecap
+  has_value :stroke_opacity
+
+end
+

data/lib/sketch/path.rb

@@ -1,17 +1,14 @@
 class Sketch::Path < Sketch::Element
-
-  has_value :fill
-  has_value :stroke
-  has_value :stroke_width
+  
+  has_value :fill, :default => 'none'
+  has_value :stroke, :default => 'black'
+  has_value :stroke_width, :default => 1
   has_value :stroke_linecap
-  has_value :d, :alias => 'commands', :default => [] 
-
-  def draw(canvas)
-    canvas.path(svg_attributes)
-  end
+  has_value :d, :alias => 'commands', :default => []
 
   def svg_attributes
-    super.merge(:d => self.commands.join(' '))
+    out = super
+    out['d'] = out['d'].join(' ') if out.has_key('d')
   end
 end
 

data/lib/sketch/star.rb

@@ -5,17 +5,50 @@ class Sketch::Star < Sketch::Element
   has_value :radius
   has_value :orientation, :default => 0
 
+  has_value :number_of_points, :default => 5
+
+  has_value :fill
+  has_value :stroke 
+  has_value :stroke_width
+
   central_point :x, :y
 
+  def degrees_to_radians( degrees )
+    degrees * Math::PI / 180
+  end
+
+  def angle_between_points
+    360 / number_of_points
+  end
+
+  def drawing_order_indexes
+    self.number_of_points.times.map do |n|
+      (n*2) % self.number_of_points
+    end
+  end
+
+  def points_in_drawing_order
+    drawing_order_indexes.map do |index|
+      points[index]
+    end
+  end
+
+  def points
+    @points ||= list = number_of_points.times.map do |point_number|
+      current_angle = orientation + ( angle_between_points * point_number )
+      [ x + (radius * Math.sin( degrees_to_radians( current_angle ))), y - (radius * Math.cos( degrees_to_radians( current_angle ))) ]
+    end
+  end
+
   def draw(canvas)
-    top = [x, y - radius]
-    mid_right = [x + radius, y-(.3*radius)] 
-    lower_right = [x + (0.6 * radius), y + radius]
-    lower_left = [x - (0.6 * radius), y + radius]
-    mid_left = [x - radius, y-(0.3*radius)]
-    points = [ top, lower_right, mid_left, mid_right, lower_left, top ]
-    points.each{|point| point.join(',')}
-    points = points.join(' ')
-    canvas.polygon( :points => points)
+    if x && y && radius
+      atts = {}
+      atts['points'] = points_in_drawing_order.each{|point| point.join(',')}.join(' ')
+      atts['fill'] = attributes[:fill] if attributes.has_key?(:fill)
+      atts['stroke'] = attributes[:stroke] if attributes.has_key?(:stroke)
+      atts['stroke-width'] = attributes[:stroke_width] if attributes.has_key?(:stroke_width)
+
+      canvas.polygon( atts )
+    end
   end
 end

data/lib/sketch/triangle.rb

@@ -0,0 +1,27 @@
+class Sketch::Triangle < Sketch::Element
+
+  has_value :point
+  has_value :height
+  has_value :direction
+  has_value :stroke
+  has_value :stroke_width
+  has_value :fill
+
+  def draw(canvas)
+    case direction
+    when :up
+      point1 = "M#{point.join(',')}"
+      point2 = "l-#{0.5*height},#{height*0.5}"
+      point3 = "l#{height},0"
+      point4 = "l-#{height*0.5},-#{height*0.5}"
+    when :down
+      point1 = "M#{point.join(',')}"
+      point2 = "l-#{0.5*height},-#{height*0.5}"
+      point3 = "l#{height},0"
+      point4 = "l-#{height*0.5},#{height*0.5}"
+    end
+
+    Sketch::Path.new(:stroke_width => self.stroke_width, :fill => self.fill, :stroke => self.stroke, :commands => [point1, point2, point3, point4]).draw(canvas)
+  end
+end
+

data/sketch.version

@@ -1 +1 @@
-0.0.2
+0.0.3

data/test/star_test.rb

@@ -0,0 +1,12 @@
+require 'helper'
+
+class StarTest < Test::Unit::TestCase
+
+  def test_that_star_is_drawn_as_a_polygon
+    canvas = stub
+    canvas.expects(:polygon).with(:points => '100,10 40,180 190,60 10,60 160,180 100,10')
+    art = Sketch::Star.new.draw(canvas)
+  end
+
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sketch
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Johnathon Wright
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-10 00:00:00 -06:00
+date: 2011-11-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: valuable
-  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +30,11 @@ dependencies:
         - 0
         - 8
         version: "0.8"
-  type: :runtime
+  name: valuable
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,8 +45,9 @@ dependencies:
         - 1
         - 4
         version: "1.4"
-  type: :runtime
+  name: nokogiri
   version_requirements: *id002
+  prerelease: false
 description: build SVG images
 email: jw@mustmodify.com
 executables: []
@@ -63,17 +63,20 @@ files:
 - Rakefile
 - TODO.txt
 - examples/smile.rb
+- examples/star.rb
 - lib/sketch.rb
 - lib/sketch/base.rb
 - lib/sketch/canvas.rb
 - lib/sketch/circle.rb
 - lib/sketch/element.rb
 - lib/sketch/ellipse.rb
+- lib/sketch/line.rb
 - lib/sketch/path.rb
 - lib/sketch/polygon.rb
 - lib/sketch/rect.rb
 - lib/sketch/rectangle.rb
 - lib/sketch/star.rb
+- lib/sketch/triangle.rb
 - sketch.gemspec
 - sketch.version
 - test/.canvas_test.rb.swp
@@ -82,6 +85,7 @@ files:
 - test/doctype_test.rb
 - test/element_test.rb
 - test/helper.rb
+- test/star_test.rb
 - test/svg_namespace_test.rb
 has_rdoc: true
 homepage: http://sketch.mustmodify.com/