sketch 0.0.1 → 0.0.2

data/.gitignore

@@ -3,4 +3,6 @@
 Gemfile.lock
 pkg/*
 .irbrc
+vendor
+README.html
 

data/Gemfile

@@ -6,5 +6,6 @@ gemspec
 group :test do
   gem 'test-unit'
   gem 'mocha'
+  gem 'rake'
 end
 

data/README.markdown

@@ -1,6 +1,9 @@
 Introducing Sketch
 ====================
 
+Sketch allows you to create reuseable, inheritable visual 
+elements which can then be rendered on the web. 
+
 
 Examples
 -------
@@ -9,4 +12,28 @@ _basic syntax_
 
       class Smile < Sketch::Base
         
+_html5's data attribute_
+
+  For svg elements and sketches, you can add data which can then be
+  retrieved via javascript.
+
+      Circle.new(:klass => 'data-point', 
+                 :data => {:country_name => 'USA', 
+                           :gdp => '13.1 Trillion'})
+
+  will produce this HTML... note then underscores become dashes. 
+  This is because data-country_name freaks me out.
+
+      <circle class="data-point" 
+                 data-country-name="USA" 
+                 data-gdp="13.1 Trillion" />
+
+  The you can retrieve the data using jQuery, like this:
+
+      $('.data-point').click(function()
+      { 
+        country_name = $(this).data('country-name');
+        gdp = $(this).data('gdp');
+        alert( country_name + ' has a gdp of ' + gdp ); 
+      });
 

data/lib/sketch.rb

@@ -6,6 +6,7 @@ class Sketch < Valuable
   has_value :width
   has_value :baseProfile, :alias => :base_profile
   has_value :doctype
+  has_value :data, :default => {}
 
   def draw(canvas)
     raise NotImplementedError
@@ -42,6 +43,7 @@ require 'sketch/element'
 require 'sketch/canvas'
 
 require 'sketch/circle'
+require 'sketch/polygon'
 require 'sketch/ellipse'
 require 'sketch/rect'
 require 'sketch/rectangle'

data/lib/sketch/base.rb

@@ -4,10 +4,17 @@ module Sketch::Base
 
     #svg is heavy in dashes. Ruby symbols can't handle them.
     attributes.each do |name, value|
+      next if name == :data
       out[name.to_s.gsub('_', '-')] = value
     end
 
-    out[:class] = out.delete(:klass) if out.has_key?(:klass)
+    if attributes.has_key?( :data )
+      attributes[:data].each do |name, value|
+        out["data-#{name.to_s.gsub('_', '-')}"] = value
+      end
+    end
+
+    out['class'] = out.delete('klass') if out.has_key?('klass')
 
     out
   end

data/lib/sketch/circle.rb

@@ -4,11 +4,11 @@ class Sketch::Circle < Sketch::Element
   has_value :cy
   has_value :r, :alias => :radius
   has_value :fill
+  has_value :fill_opacity
   has_value :stroke 
   has_value :stroke_width
 
-  def draw(canvas)
-    canvas.circle(:cx => self.cx, :cy => self.cy, :r => self.radius, :fill => self.fill, :stroke => self.stroke, 'stroke_width' => self.stroke_width)
-  end
+  central_point :cx, :cy
+
 end
 

data/lib/sketch/element.rb

@@ -4,6 +4,7 @@ class Sketch::Element < Valuable
   has_value :id
   has_value :klass
   has_value :style
+  has_value :data, :default => {}
 
   def draw(canvas)
     canvas.send( self.svg_node, svg_attributes )
@@ -12,5 +13,17 @@ class Sketch::Element < Valuable
   def svg_node
     self.class.name.split('::').last.downcase
   end
+
+  class << self
+    def central_point( x_param = :x, y_param = :y )
+      define_method :point= do |coordinates|
+        attributes[x_param], attributes[y_param] = *coordinates
+      end
+  
+      define_method :point do
+        [attributes[x_param], attributes[y_param]]
+      end
+    end
+  end
 end
 

data/lib/sketch/ellipse.rb

@@ -9,5 +9,7 @@ class Sketch::Ellipse < Sketch::Element
   has_value :stroke 
   has_value :stroke_width
 
+  central_point :cx, :cy
+
 end
 

data/lib/sketch/polygon.rb

@@ -0,0 +1,16 @@
+class Sketch::Polygon < Sketch::Element
+
+  has_collection :points
+  has_value :fill
+  has_value :stroke
+  has_value :stroke_width
+  has_value :fill_rule
+
+  def svg_attributes
+    out = super
+    out['points'] = attributes[:points].map{|point| point.join(',')}.join(' ')
+    out
+  end
+
+end
+

data/lib/sketch/rect.rb

@@ -10,5 +10,7 @@ class Sketch::Rect < Sketch::Element
   has_value :stroke
   has_value :stroke_width
 
+  central_point :x, :y
+
 end
 

data/lib/sketch/star.rb

@@ -0,0 +1,21 @@
+class Sketch::Star < Sketch::Element
+
+  has_value :x
+  has_value :y
+  has_value :radius
+  has_value :orientation, :default => 0
+
+  central_point :x, :y
+
+  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)
+  end
+end

data/sketch.version

@@ -1 +1 @@
-0.0.1
+0.0.2

data/test/base_test.rb

@@ -12,5 +12,16 @@ class SketchTest < Test::Unit::TestCase
     Squigly.new.draw(canvas)
   end
 
+  def test_that_underscores_become_dashes
+    canvas = stub
+    canvas.expects(:squigly).with(has_entry('reflective-coating', 'dark'))
+    Squigly.new(:reflective_coating => 'dark').draw(canvas)
+  end
+
+  def test_that_data_is_added_in_html5_format
+    canvas = stub
+    canvas.expects(:squigly).with('data-visit-id' => 21)
+    Squigly.new(:data => {:visit_id => 21}).draw(canvas)
+  end
 end
 

data/test/element_test.rb

@@ -0,0 +1,16 @@
+require 'helper'
+
+class ElementTest < Test::Unit::TestCase
+
+  def test_that_point_is_broken_into_coordinates
+    c = Sketch::Circle.new(:point => [10, 20])
+    assert_equal 10, c.cx
+    assert_equal 20, c.cy
+  end
+
+  def test_that_coordinates_are_available_as_point
+    r = Sketch::Rectangle.new(:x => 33, :y => 55)
+    assert_equal [33, 55], r.point
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sketch
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Johnathon Wright
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 Z
+date: 2011-11-10 00:00:00 -06:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: valuable
@@ -69,16 +70,20 @@ files:
 - lib/sketch/element.rb
 - lib/sketch/ellipse.rb
 - lib/sketch/path.rb
+- lib/sketch/polygon.rb
 - lib/sketch/rect.rb
 - lib/sketch/rectangle.rb
+- lib/sketch/star.rb
 - sketch.gemspec
 - sketch.version
 - test/.canvas_test.rb.swp
 - test/base_test.rb
 - test/canvas_test.rb
 - test/doctype_test.rb
+- test/element_test.rb
 - test/helper.rb
 - test/svg_namespace_test.rb
+has_rdoc: true
 homepage: http://sketch.mustmodify.com/
 licenses: 
 - MIT
@@ -108,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: build SVG images