clearwater 1.0.0.beta3 → 1.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f3b1ded6dac98af01bec9bdaedc42f78ddafc4e
-  data.tar.gz: 284c6c9a0481dd5e6991709422bb879ede4f9586
+  metadata.gz: 252e364a39c3d73e7e056b0209411d92d55a6a48
+  data.tar.gz: f43ad3eac92c94faff4fdfa8c000bfc5307ad7ae
 SHA512:
-  metadata.gz: be833a327efea9000a92d936c1e78b33843e8f0222290d77175d797a87e2646e22c362e2960f27068d7bbd111ccd13c8cee5cf25c7e40a4ae07e68c85bad0036
-  data.tar.gz: 5ac50a1cca2683d81683dea330b613fa32841e5c1df92ddb98d6ffce400978c171189cf986a868cd870f5d8afadc4c74946da0538fdc1c4b4534c543e0d24153
+  metadata.gz: 4d02fb2d91600e1f61e842f36b4bc4d06da201c6049f420d7a18ef19a296887adfd2c97a90ed265d3a2cc65aea72fc5077c9ee388d2340d825d74383f3d495c9
+  data.tar.gz: 2237acc5c21b6786413c323e1ce7330fa94e2fff5e59061eb607549ccda94dd3329d03b718d7006dd1968843ca305a8703c8402306cf24faf555151ce118f0d9

data/lib/clearwater/version.rb

@@ -1,3 +1,3 @@
 module Clearwater
-  VERSION = "1.0.0.beta3"
+  VERSION = "1.0.0.beta4"
 end

data/opal/clearwater/svg_component.rb

@@ -89,6 +89,295 @@ module Clearwater
       vkern: 'vkern',
     }
 
+    SVG_ATTRIBUTES = {
+      accent_height: 'accent-height',
+      accumulate: 'accumulate',
+      additive: 'additive',
+      alignment_baseline: 'alignment-baseline',
+      alphabetic: 'alphabetic',
+      amplitude: 'amplitude',
+      arabic_form: 'arabic-form',
+      ascent: 'ascent',
+      attribute_name: 'attributeName',
+      attribute_type: 'attributeType',
+      azimuth: 'azimuth',
+      base_frequency: 'baseFrequency',
+      base_profile: 'baseProfile',
+      baseline_shift: 'baseline-shift',
+      bbox: 'bbox',
+      begin: 'begin',
+      bias: 'bias',
+      by: 'by',
+      calc_mode: 'calcMode',
+      cap_height: 'cap-height',
+      class: 'class',
+      clip: 'clip',
+      clip_path: 'clip-path',
+      clip_rule: 'clip-rule',
+      clip_path_units: 'clipPathUnits',
+      color: 'color',
+      color_interpolation: 'color-interpolation',
+      color_interpolation_filters: 'color-interpolation-filters',
+      color_profile: 'color-profile',
+      color_rendering: 'color-rendering',
+      content_script_type: 'contentScriptType',
+      content_style_type: 'contentStyleType',
+      cursor: 'cursor',
+      cx: 'cx',
+      cy: 'cy',
+      d: 'd',
+      descent: 'descent',
+      diffuse_constant: 'diffuseConstant',
+      direction: 'direction',
+      display: 'display',
+      divisor: 'divisor',
+      dominant_baseline: 'dominant-baseline',
+      dur: 'dur',
+      dx: 'dx',
+      dy: 'dy',
+      edge_mode: 'edgeMode',
+      elevation: 'elevation',
+      enable_background: 'enable-background',
+      end: 'end',
+      exponent: 'exponent',
+      external_resources_required: 'externalResourcesRequired',
+      fill: 'fill',
+      fill_opacity: 'fill-opacity',
+      fill_rule: 'fill-rule',
+      filter: 'filter',
+      filter_res: 'filterRes',
+      filter_units: 'filterUnits',
+      flood_color: 'flood-color',
+      flood_opacity: 'flood-opacity',
+      font_family: 'font-family',
+      font_size: 'font-size',
+      font_size_adjust: 'font-size-adjust',
+      font_stretch: 'font-stretch',
+      font_style: 'font-style',
+      font_variant: 'font-variant',
+      font_weight: 'font-weight',
+      format: 'format',
+      from: 'from',
+      fx: 'fx',
+      fy: 'fy',
+      g1: 'g1',
+      g2: 'g2',
+      glyph_name: 'glyph-name',
+      glyph_orientation_horizontal: 'glyph-orientation-horizontal',
+      glyph_orientation_vertical: 'glyph-orientation-vertical',
+      glyph_ref: 'glyphRef',
+      gradient_transform: 'gradientTransform',
+      gradient_units: 'gradientUnits',
+      hanging: 'hanging',
+      height: 'height',
+      horiz_adv_x: 'horiz-adv-x',
+      horiz_origin_x: 'horiz-origin-x',
+      horiz_origin_y: 'horiz-origin-y',
+      id: 'id',
+      ideographic: 'ideographic',
+      image_rendering: 'image-rendering',
+      in: 'in',
+      in2: 'in2',
+      intercept: 'intercept',
+      k: 'k',
+      k1: 'k1',
+      k2: 'k2',
+      k3: 'k3',
+      k4: 'k4',
+      kernel_matrix: 'kernelMatrix',
+      kernel_unit_length: 'kernelUnitLength',
+      kerning: 'kerning',
+      key_points: 'keyPoints',
+      key_splines: 'keySplines',
+      key_times: 'keyTimes',
+      lang: 'lang',
+      length_adjust: 'lengthAdjust',
+      letter_spacing: 'letter-spacing',
+      lighting_color: 'lighting-color',
+      limiting_cone_angle: 'limitingConeAngle',
+      local: 'local',
+      marker_end: 'marker-end',
+      marker_mid: 'marker-mid',
+      marker_start: 'marker-start',
+      marker_height: 'markerHeight',
+      marker_units: 'markerUnits',
+      marker_width: 'markerWidth',
+      mask: 'mask',
+      mask_content_units: 'maskContentUnits',
+      mask_units: 'maskUnits',
+      mathematical: 'mathematical',
+      max: 'max',
+      media: 'media',
+      method: 'method',
+      min: 'min',
+      mode: 'mode',
+      name: 'name',
+      num_octaves: 'numOctaves',
+      offset: 'offset',
+      onabort: 'onabort',
+      onactivate: 'onactivate',
+      onbegin: 'onbegin',
+      onclick: 'onclick',
+      onend: 'onend',
+      onerror: 'onerror',
+      onfocusin: 'onfocusin',
+      onfocusout: 'onfocusout',
+      onload: 'onload',
+      onmousedown: 'onmousedown',
+      onmousemove: 'onmousemove',
+      onmouseout: 'onmouseout',
+      onmouseover: 'onmouseover',
+      onmouseup: 'onmouseup',
+      onrepeat: 'onrepeat',
+      onresize: 'onresize',
+      onscroll: 'onscroll',
+      onunload: 'onunload',
+      onzoom: 'onzoom',
+      opacity: 'opacity',
+      operator: 'operator',
+      order: 'order',
+      orient: 'orient',
+      orientation: 'orientation',
+      origin: 'origin',
+      overflow: 'overflow',
+      overline_position: 'overline-position',
+      overline_thickness: 'overline-thickness',
+      panose_1: 'panose-1',
+      path: 'path',
+      path_length: 'pathLength',
+      pattern_content_units: 'patternContentUnits',
+      pattern_transform: 'patternTransform',
+      pattern_units: 'patternUnits',
+      pointer_events: 'pointer-events',
+      points: 'points',
+      points_at_x: 'pointsAtX',
+      points_at_y: 'pointsAtY',
+      points_at_z: 'pointsAtZ',
+      preserve_alpha: 'preserveAlpha',
+      preserve_aspect_ratio: 'preserveAspectRatio',
+      primitive_units: 'primitiveUnits',
+      r: 'r',
+      radius: 'radius',
+      ref_x: 'refX',
+      ref_y: 'refY',
+      rendering_intent: 'rendering-intent',
+      repeat_count: 'repeatCount',
+      repeat_dur: 'repeatDur',
+      required_extensions: 'requiredExtensions',
+      required_features: 'requiredFeatures',
+      restart: 'restart',
+      result: 'result',
+      rotate: 'rotate',
+      rx: 'rx',
+      ry: 'ry',
+      scale: 'scale',
+      seed: 'seed',
+      shape_rendering: 'shape-rendering',
+      slope: 'slope',
+      spacing: 'spacing',
+      specular_constant: 'specularConstant',
+      specular_exponent: 'specularExponent',
+      spread_method: 'spreadMethod',
+      start_offset: 'startOffset',
+      std_deviation: 'stdDeviation',
+      stemh: 'stemh',
+      stemv: 'stemv',
+      stitch_tiles: 'stitchTiles',
+      stop_color: 'stop-color',
+      stop_opacity: 'stop-opacity',
+      strikethrough_position: 'strikethrough-position',
+      strikethrough_thickness: 'strikethrough-thickness',
+      string: 'string',
+      stroke: 'stroke',
+      stroke_dasharray: 'stroke-dasharray',
+      stroke_dashoffset: 'stroke-dashoffset',
+      stroke_linecap: 'stroke-linecap',
+      stroke_linejoin: 'stroke-linejoin',
+      stroke_miterlimit: 'stroke-miterlimit',
+      stroke_opacity: 'stroke-opacity',
+      stroke_width: 'stroke-width',
+      style: 'style',
+      surface_scale: 'surfaceScale',
+      system_language: 'systemLanguage',
+      table_values: 'tableValues',
+      target: 'target',
+      target_x: 'targetX',
+      target_y: 'targetY',
+      text_anchor: 'text-anchor',
+      text_decoration: 'text-decoration',
+      text_rendering: 'text-rendering',
+      text_length: 'textLength',
+      title: 'title',
+      to: 'to',
+      transform: 'transform',
+      type: 'type',
+      u1: 'u1',
+      u2: 'u2',
+      underline_position: 'underline-position',
+      underline_thickness: 'underline-thickness',
+      unicode: 'unicode',
+      unicode_bidi: 'unicode-bidi',
+      unicode_range: 'unicode-range',
+      units_per_em: 'units-per-em',
+      v_alphabetic: 'v-alphabetic',
+      v_hanging: 'v-hanging',
+      v_ideographic: 'v-ideographic',
+      v_mathematical: 'v-mathematical',
+      values: 'values',
+      version: 'version',
+      vert_adv_y: 'vert-adv-y',
+      vert_origin_x: 'vert-origin-x',
+      vert_origin_y: 'vert-origin-y',
+      view_box: 'viewBox',
+      view_target: 'viewTarget',
+      visibility: 'visibility',
+      width: 'width',
+      widths: 'widths',
+      word_spacing: 'word-spacing',
+      writing_mode: 'writing-mode',
+      x: 'x',
+      x_height: 'x-height',
+      x1: 'x1',
+      x2: 'x2',
+      x_channel_selector: 'xChannelSelector',
+      xlinkactuate: 'xlinkactuate',
+      xlinkarcrole: 'xlinkarcrole',
+      xlinkhref: 'xlinkhref',
+      xlinkrole: 'xlinkrole',
+      xlinkshow: 'xlinkshow',
+      xlinktitle: 'xlinktitle',
+      xlinktype: 'xlinktype',
+      xmlbase: 'xmlbase',
+      xmllang: 'xmllang',
+      xmlspace: 'xmlspace',
+      y: 'y',
+      y1: 'y1',
+      y2: 'y2',
+      y_channel_selector: 'yChannelSelector',
+      z: 'z',
+      zoom_and_pan: 'zoomAndPan',
+    }
+
+    def self.sanitize_attributes attributes
+      return attributes unless `attributes.$$is_hash`
+
+      sanitized = attributes.each_with_object({}) do |(key, value), hash|
+        if svg_attr = SVG_ATTRIBUTES[key]
+          hash[svg_attr] = value
+        elsif key[0, 2] == 'on'
+          hash[key] = proc do |event|
+            value.call(Bowser::Event.new(event))
+          end
+        else
+          hash[key] = value
+        end
+      end
+
+      sanitized
+    end
+
+    module_function
+
     SVG_TAGS.each do |method_name, tag_name|
       define_method(method_name) do |attributes, content|
         tag(tag_name, attributes, content)
@@ -103,7 +392,7 @@ module Clearwater
 
       VirtualDOM.svg(
         tag_name,
-        Component.sanitize_attributes(attributes),
+        SVGComponent.sanitize_attributes(attributes),
         Component.sanitize_content(content)
       )
     end

data/spec/clearwater/application_spec.rb

@@ -28,7 +28,7 @@ module Clearwater
         include Clearwater::SVGComponent
 
         def render
-          svg({ view_box: '0 0 120 120' }, [
+          svg({ class: 'mysvg', marker_height: 10, marker_end: "url(#arrow)" }, [
             circle(cx: 50, cy: 50, r: 30),
           ])
         end
@@ -39,7 +39,7 @@ module Clearwater
     it 'renders to the specified element' do
       app.perform_render
 
-      expect(element.inner_html).to eq '<div><p class="foo">Hello world</p><svg viewBox="0 0 120 120"><circle cx="50" cy="50" r="30"></circle></svg></div>'
+      expect(element.inner_html).to eq '<div><p class="foo">Hello world</p><svg class="mysvg" markerHeight="10" marker-end="url(#arrow)"><circle cx="50" cy="50" r="30"></circle></svg></div>'
     end
 
     it 'calls queued blocks after rendering' do

metadata

@@ -1,94 +1,94 @@
 --- !ruby/object:Gem::Specification
 name: clearwater
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta3
+  version: 1.0.0.beta4
 platform: ruby
 authors:
 - Jamie Gaskins
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-28 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-  type: :runtime
+  name: opal
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: bowser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
-  type: :runtime
+  name: bowser
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: opal-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0.beta2
-  type: :development
+  name: opal-rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0.beta2
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-  type: :development
+  name: pry
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -127,7 +127,7 @@ homepage: https://clearwater-rb.github.io/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -142,15 +142,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.8
+signing_key:
 specification_version: 4
 summary: Front-end Ruby web framework for fast, reasonable, and composable applications
 test_files:
+- spec/component_spec.rb
 - spec/clearwater/application_spec.rb
 - spec/clearwater/black_box_node_spec.rb
 - spec/clearwater/cached_render_spec.rb
 - spec/clearwater/dom_reference_spec.rb
 - spec/clearwater/router_spec.rb
-- spec/component_spec.rb