dyi 1.0.0 → 1.0.1

data/CHANGES

@@ -1,5 +1,10 @@
 = DYI Changelog
 
+== Version 1.0.1 / 2011-09-28
+* Bug Fixes
+  * A event listeners dose not work properly.
+  * CSS class name is not outputed properly.
+
 == Version 1.0.0 / 2011-09-05
 
 * Major Enhancements

data/README

@@ -23,6 +23,11 @@ along with DYI.  If not, see <http://www.gnu.org/licenses/>.
 
 == Support
 
-We plan to make up a mailing list for support of DYI ,but it is
-under construction.
-We're going to set up it in a few days.
+We support DYI using SourceForge.net.  URL of DYI Project is
+"http://sourceforge.net/projects/dyi/".  This page has a tracker
+and forums.
+
+We are also preparing the Japanese mailing list.  More infomation
+about the mailing list is indicated to 
+<http://open-dyi.org/contents.html#community> in Japanese,
+including how to join it.

data/lib/dyi/canvas.rb

@@ -27,7 +27,7 @@ module DYI #:nodoc:
     attr_reader *IMPLEMENT_ATTRIBUTES
     attr_reader :child_elements
     # @since 1.0.0
-    attr_reader :event_listeners, :stylesheets
+    attr_reader :event_listeners, :stylesheets, :scripts
 
     def initialize(width, height,
                    real_width = nil, real_height = nil,
@@ -84,11 +84,6 @@ module DYI #:nodoc:
       self
     end
 
-    # @since 1.0.0
-    def event_listeners
-      @event_listeners ||= {}
-    end
-
     def write_as(formatter, io=$>)
       formatter.write_canvas(self, io)
     end
@@ -133,14 +128,21 @@ module DYI #:nodoc:
       @receive_event
     end
 
-    # @since 1.0.0
-    def scripts
-      @init_script ? [@init_script].push(*@scripts) : @scripts
-    end
-
+    # @overload add_script(script)
+    #   Registers a script object with this canvas
+    #   @param [Script::SimpleScript] script a script that is registered
+    # @overload add_script(script_body, content_type='application/ecmascript')
+    #   Registers a script.  Create a script object and Registers it with this
+    #   canvas.
+    #   @param [String] script_body a string that is script body
+    #   @param [String] content_type a content-type of the script
     # @since 1.0.0
     def add_script(script_body, content_type = 'application/ecmascript')
-      @scripts << Script::SimpleScript.new(script_body, content_type)
+      if script_body.respond_to?(:include_external_file?)
+        @scripts << script_body unless @scripts.include?(script_body)
+      else
+        @scripts << Script::SimpleScript.new(script_body, content_type)
+      end
     end
 
     # @since 1.0.0
@@ -169,24 +171,6 @@ module DYI #:nodoc:
       end
     end
 
-    # @since 1.0.0
-    def add_event_listener(event_name, event_listener)
-      if event_listeners.key?(event_name)
-        unless event_listeners[event_name].include?(event_listener)
-          event_listeners[event_name] << event_listener
-        end
-      else
-        event_listeners[event_name] = [event_listener]
-      end
-    end
-
-    # @since 1.0.0
-    def remove_event_listener(event_name, event_listener)
-      if event_listeners.key?(event_name)
-        event_listeners[event_name].delete(event_listener)
-      end
-    end
-
     private
 
     def get_formatter(format=nil) #:nodoc:

data/lib/dyi/chart/array_reader.rb

@@ -32,7 +32,7 @@ module DYI #:nodoc:
       # @return [Array] array of a struct
       # @since 1.0.0
       def records
-        @records.dup
+        @records.clone
       end
 
       # @return [Integer] number of the records
@@ -70,7 +70,7 @@ module DYI #:nodoc:
 
       # @since 1.0.0
       def has_field?(field_name)
-        @schema.members.include?(field_name.to_s)
+        @schema.members.include?(RUBY_VERSION >= '1.9' ? field_name.to_sym : field_name.to_s)
       end
 
       # @return [void]

data/lib/dyi/chart/base.rb

@@ -265,8 +265,8 @@ module DYI #:nodoc:
       end
 
       def chart_color(index) #:nodoc:
-        if data.has_field?(:color) && (color = data.records[index].color)
-          color
+        if data.has_field?(:color)
+          color = Color.new_or_nil(data.records[index].color)
         end
         if color.nil? && respond_to?(:chart_colors) && chart_colors
           color = chart_colors[index]

data/lib/dyi/chart/csv_reader.rb

@@ -29,7 +29,7 @@ module DYI #:nodoc:
 
     class CsvReader < ArrayReader
       def read(path, options={})
-        options = options.dup
+        options = options.clone
         @date_format = options.delete(:date_format)
         @datetime_format = options.delete(:datetime_format)
         nkf_options =
@@ -56,7 +56,7 @@ module DYI #:nodoc:
         if type.is_a?(Symbol) || type.is_a?(String)
           case type.to_sym
           when :string
-            value || ''
+            value
           when :number, :decimal
             value ? BigDecimal.new(value) : nil
           when :float

data/lib/dyi/chart/pie_chart.rb

@@ -268,7 +268,6 @@ module DYI #:nodoc:
                                format_string(format, record, toatal)
                              end
           end
-          require 'pp'
           max_lengths = legend_labels.inject(Array.new(formats.size, 0)) do |maxs, labels|
                           (0...formats.size).each do |i|
                             maxs[i] = labels[i].bytesize if maxs[i] < labels[i].bytesize

data/lib/dyi/coordinate.rb

@@ -217,7 +217,7 @@ module DYI #:nodoc:
       # all other characters:: The character is copied to the result string
       #                        unchanged.
       def default_format=(fromat)
-        @@default_format = fromat.dup
+        @@default_format = fromat.clone
       end
     end
   end

data/lib/dyi/drawing/pen.rb

@@ -45,7 +45,7 @@ module DYI #:nodoc:
       Painting::IMPLEMENT_ATTRIBUTES.each do |painting_attr|
         define_method(painting_attr) {| | @painting.__send__(painting_attr)}
         define_method("#{painting_attr}=".to_sym) {|value|
-          @painting = @painting.dup
+          @painting = @painting.clone
           @painting.__send__("#{painting_attr}=".to_sym, value)
         }
       end
@@ -158,7 +158,7 @@ module DYI #:nodoc:
       #:startdoc:
 
       def initialize(options={})
-        options = options.dup
+        options = options.clone
         ALIAS_ATTRIBUTES.each do |key, value|
           options[value] = options.delete(key) if options.key?(key) && !options.key?(value)
         end
@@ -209,7 +209,7 @@ module DYI #:nodoc:
       #:startdoc:
 
       def initialize(options={})
-        options = options.dup
+        options = options.clone
         ALIAS_ATTRIBUTES.each do |key, value|
           options[value] = options.delete(key) if options.key?(key) && !options.key?(value)
         end

data/lib/dyi/drawing/pen_3d.rb

@@ -143,10 +143,10 @@ module DYI #:nodoc:
         radius_y = ry
 
         shape = Shape::ShapeGroup.draw_on(canvas)
-        top_painting = @painting.dup
+        top_painting = @painting.clone
         top_painting.fill = top_color
         Shape::Ellipse.create_on_center_radius(Coordinate.new(left_top_point) + [width.quo(2), 0], radius_x, radius_y, merge_option(:painting => top_painting)).draw_on(shape)
-        body_painting = @painting.dup
+        body_painting = @painting.clone
         body_painting.fill = body_gradient(canvas)
         Shape::Path.draw(left_top_point, merge_option(:painting => body_painting)) {|path|
           path.rarc_to([width, 0], radius_x, radius_y, 0, false, false)

data/lib/dyi/element.rb

@@ -87,6 +87,7 @@ module DYI #:nodoc:
     CLASS_REGEXP = /\A[A-Z_a-z][\-0-9A-Z_a-z]*\z/
 
     def css_class=(css_class)
+      return @css_class = nil if css_class.nil?
       classes = css_class.to_s.split(/\s+/)
       classes.each do |c|
         if c.to_s !~ CLASS_REGEXP
@@ -97,7 +98,7 @@ module DYI #:nodoc:
     end
 
     def css_classes
-      css_class.split(/\s+/)
+      css_class.to_s.split(/\s+/)
     end
 
     def add_css_class(css_class)
@@ -105,7 +106,7 @@ module DYI #:nodoc:
         raise ArgumentError, "`#{css_class}' is a illegal class-name"
       end
       unless css_classes.include?(css_class.to_s)
-        @css_class += " #{css_class}"
+        @css_class = css_classes.push(scc_class).join(' ')
         css_class
       end
       nil
@@ -114,7 +115,7 @@ module DYI #:nodoc:
     def remove_css_class(css_class)
       classes = css_classes
       if classes.delete(css_class.to_s)
-        @css_class = classes.join(' ')
+        @css_class = classes.empty? ? nil : classes.join(' ')
         css_class
       else
         nil
@@ -142,21 +143,24 @@ module DYI #:nodoc:
 
     # Associates the element with a event listener
     # @param [Symbol] event_name a event name
-    # @param [Script::SimpleScript|String] event_listener a event listener
+    # @param [Script::SimpleScript] event_listener a event listener
     # @return [void]
     def add_event_listener(event_name, event_listener)
+      event_listener.related_to(DYI::Event.new(event_name, self))
       if event_listeners.key?(event_name)
         unless event_listeners[event_name].include?(event_listener)
           event_listeners[event_name] << event_listener
+          canvas.add_script(event_listener)
         end
       else
         event_listeners[event_name] = [event_listener]
+        canvas.add_script(event_listener)
       end
     end
 
     # Removes asociation with given event listener
     # @param [Symbol] event_name a event name
-    # @param [Script::SimpleScript|String] event_listener a event listener
+    # @param [Script::SimpleScript] event_listener a event listener
     # @return [void]
     def remove_event_listener(event_name, event_listener)
       if event_listeners.key?(event_name)

data/lib/dyi/event.rb

@@ -43,9 +43,6 @@ module DYI
     # @return [GraphicalElement] an element to which the event applied
     attr_reader :target
 
-    # @return [Array] a list of event listener
-    attr_reader :listeners
-
     # @param [Symbol] event_name event name, one of followings: focusin,
     #                            focusout, click, mousedown, mouseup, mouseover,
     #                            mousemove, mouseout, load
@@ -57,7 +54,6 @@ module DYI
         raise ArgumentError, "`#{event_name}' is unknown event"
       end
       @event_name = event_name
-      @listeners = []
       (@target = target).set_event(self)
     end
 
@@ -79,6 +75,21 @@ module DYI
       event_listener.unrelated_to(self)
     end
 
+    # @since 1.0.1
+    def ==(other)
+      event_name == other.event_name && target == other.target
+    end
+
+    # @since 1.0.1
+    def eql?(other)
+      self == other
+    end
+
+    # @since 1.0.1
+    def hash
+      event_name.hash ^ target.hash
+    end
+
     class << self
 
       # Creates a new focus-in event.

data/lib/dyi/formatter/eps_formatter.rb

@@ -384,7 +384,7 @@ module DYI #:nodoc:
       def clip_path(io, shape) #:nodoc:
         if shape.respond_to?(:clipping) && shape.clipping
           shape.clipping.each_shapes do |shape, rule|
-            s = shape.dup
+            s = shape.clone
             s.painting.fill = nil
             s.painting.stroke = nil
             s.write_as(self, io) {

data/lib/dyi/formatter/svg_formatter.rb

@@ -67,7 +67,7 @@ module DYI #:nodoc:
           unless listeners.empty?
             methods = listeners.map do |listener|
                         if listener.name
-                          "#{listener.name}(#{listener.arguments.join(',')})"
+                          "#{listener.name}(evt)"
                         end
                       end
             attrs["on#{event_name}"] = methods.compact.join(';')
@@ -405,6 +405,17 @@ module DYI #:nodoc:
 
       # @since 1.0.0
       def write_node(shape, io, attrs, tag_name, &create_child_node)
+        shape.event_listeners.each do |event_name, listeners|
+          unless listeners.empty?
+            methods = listeners.inject([]) do |array, listener|
+                        if listener.name
+                          array << "#{listener.name}(evt)"
+                        end
+                        array
+                      end
+            attrs["on#{event_name}"] = methods.join(';') unless methods.empty?
+          end
+        end
         if shape.anchor_href
           link_attrs = {:'xlink:href' => shape.anchor_href}
           link_attrs[:target] = shape.anchor_target if shape.anchor_target
@@ -535,7 +546,7 @@ module DYI #:nodoc:
       def common_attributes(shape) #:nodoc:
         attributes = {}
         create_style(shape, attributes)
-        attributes[:class] = shape.css_class unless shape.css_class.empty?
+        attributes[:class] = shape.css_class if shape.css_class
         transform = create_transform(shape)
         attributes[:transform] = transform if transform
         attributes[:'clip-path'] = "url(##{shape.clipping.id})" if shape.clipping

data/lib/dyi/length.rb

@@ -392,7 +392,7 @@ module DYI #:nodoc:
       # +U+:: (unit placeholder) Placeholder '+U+' is replaced as a unit. If
       #       the unit is user unit, '+U+' is replece as empty string.
       def default_format=(fromat)
-        @@default_format = fromat.dup
+        @@default_format = fromat.clone
       end
     end
   end

data/lib/dyi/script/ecmascript.rb

@@ -28,7 +28,8 @@
 
 module DYI
   module Script
-    # Module for using ECMAScript.
+    # Module for using ECMAScript.  The script generated by this module comfirms
+    # to ECMAScript 5.1 (Ecma International Standard ECMA-262).
     module EcmaScript
 
       # This Module includes helper methods for generating a client-script.
@@ -227,7 +228,9 @@ module DYI
         # @param [Event] event an event that is related to
         # @return [void]
         def related_to(event)
-          @events << event
+          unless @events.include?(event)
+            @events << event
+          end
         end
 
         # Removes the relation to an event.
@@ -243,13 +246,13 @@ module DYI
             super
           else
             parts = []
-            parts << "setTimeout(function() {\n"
+            parts << "addEventListener(\"load\", function(evt) {\n"
             @events.each do |event|
               if event.event_name == :load
                 parts << @body
               elsif
                 if event.target.root_element?
-                  parts << '  document.rootElement.addEventListener("'
+                  parts << '  document.documentElement.addEventListener("'
                 else
                   parts << '  document.getElementById("'
                   parts << event.target.id
@@ -263,7 +266,7 @@ module DYI
                 parts << "  }, false);\n"
               end
             end
-            parts << "}, 0);\n"
+            parts << "}, false);\n"
             parts.join
           end
         end

data/lib/dyi/shape/base.rb

@@ -461,7 +461,7 @@ module DYI #:nodoc:
       end
 
       def points
-        @points.dup
+        @points.clone
       end
 
       def undo

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dyi
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Yuo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-05 00:00:00 Z
+date: 2011-09-28 00:00:00 Z
 dependencies: []
 
 description: "    DYI is a 2D graphics library, very rich and expressive.\n    DYI have been optimized for SVG format, but it is also possible\n    to output other format; for example, EPS.\n"