svgen 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ac4edd0774ebc4189f3b37d4bdcb2cfa1cc9d9b
-  data.tar.gz: 9241392aed9ead03e300d2a8dead528e111a52c0
+  metadata.gz: ba2bf72e26dc27ef68324a6cc8ed88bdaa06327d
+  data.tar.gz: 914b64c57e8d97d1082f19a09f298e2421542771
 SHA512:
-  metadata.gz: 16975f7fd1044f56c0a1cb630175404f0c4b7b6455d2ea7b81e4a598e0554fe056ac0f97b3cfd3d48a0eb051567249a7c297aba47d26abff4f7f1580cd2d0f6a
-  data.tar.gz: 1ac64515a7a7d4765f96c3ca6568ec583e7bbfb69a050fd936d72149fda20d1eb16e391e110bc2d0fe55b3b09d06022227a17adb1b6a60a0a25c5c39643a3b78
+  metadata.gz: dd05c6d01bf5f58db290ebde74d35edd0c17fbe1de358c11ddb3829ec9453355aabf788d0c63ebe04fe8b289768d4996d6bbe4a4df548a5cc3946d86972f9bd3
+  data.tar.gz: c4b524f9c66918f231d6874ea7035d2d84cdf9e208df9d2b58ce5c9e66639cca0e777f8753eaf9f7926d799330d8d95b1e64fd73e022493111052297afcb3460

data/README.md

@@ -10,12 +10,15 @@ $ gem install svgen
 
 ## Usage
 
+### rect, circle, text
+
 ```rb
 require "svgen"
 
 svg = SVGen::SVG.new(width: 600, height: 400) do |svg|
   svg.rect(width: 300, height: 200, fill: "blue")
   svg.circle(cx: 100, cy: 100, r: 50, fill: "red")
+  svg.text("Sample Text", x: 20, y: 20)
 end
 svg.generate
 #=>
@@ -24,5 +27,29 @@ svg.generate
 # <svg width="600" height="300" xmlns="http://www.w3.org/2000/svg">
 #   <rect width="300" height="200" fill="blue"/>
 #   <circle cx="100" cy="100" r="50" fill="red"/>
+#   <text x="20" cy="20">Sample Text</text>
+# </svg>
+```
+
+### group
+
+```rb
+require "svgen"
+
+svg = SVGen::SVG.new(width: 600, height: 400) do |svg|
+  svg.g(stroke: "red", "stroke-width" => 5) do |g|
+    g.rect(x: 50, y: 50, width: 100, height: 100)
+    g.circle(cx: 200, cy: 200, r: 50)
+  end
+end
+svg.generate
+#=>
+# <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+# <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+# <svg width="600" height="300" xmlns="http://www.w3.org/2000/svg">
+#   <g stroke="red" stroke-width="5">
+#     <rect x="50" y="50" width="100" height="100"/>
+#     <circle cx="200" cy="200" r="50"/>
+#   </g>
 # </svg>
 ```

data/lib/svgen/element/base.rb

@@ -4,6 +4,8 @@ module SVGen
       def initialize(attrs = {})
         @x = attrs[:x] || 0
         @y = attrs[:y] || 0
+        @stroke = attrs[:stroke]
+        @stroke_width = attrs[:"stroke-width"] || attrs["stroke-width"]
       end
 
       def generate(svg)
@@ -15,8 +17,11 @@ module SVGen
       def attributes
         attrs = {}
         instance_variables.each do |instance_variable|
-          key = instance_variable.to_s.gsub(/@/) { "" }.to_sym
-          attrs[key] = instance_variable_get(instance_variable)
+          value = instance_variable_get(instance_variable)
+          next if value.nil?
+          key = instance_variable.to_s.gsub(/@/) { "" }
+          key = key.gsub(/_/) { "-" }
+          attrs[key.to_sym] = value
         end
         attrs
       end

data/lib/svgen/element/circle.rb

@@ -6,12 +6,21 @@ module SVGen
         @cx = attrs[:cx] || 0
         @cy = attrs[:cy] || 0
         @r = attrs[:r] || 10
-        @fill = attrs[:fill] || "white"
+        @fill = attrs[:fill] || "rgba(0, 0, 0, 0)"
       end
 
       def generate(svg)
         svg.circle(attributes)
       end
+
+      protected
+
+      def attributes
+        attrs = super
+        attrs.delete(:x)
+        attrs.delete(:y)
+        attrs
+      end
     end
   end
 end

data/lib/svgen/element/group.rb

@@ -0,0 +1,28 @@
+module SVGen
+  module Element
+    class Group < Base
+      include Nestable
+
+      def initialize(attrs = {}, &block)
+        @children = []
+        @stroke = attrs[:stroke]
+        @stroke_width = attrs[:"stroke-width"] || attrs["stroke-width"]
+        block.call(self) if block_given?
+      end
+
+      def generate(svg)
+        svg.g(attributes) do |g|
+          @children.each { |child| child.generate(g) }
+        end
+      end
+
+      protected
+
+      def attributes
+        attrs = super
+        attrs.delete(:children)
+        attrs
+      end
+    end
+  end
+end

data/lib/svgen/element/line.rb

@@ -0,0 +1,26 @@
+module SVGen
+  module Element
+    class Line < Base
+      def initialize(attrs = {})
+        super(attrs)
+        @x1 = attrs[:x1] || @x
+        @y1 = attrs[:y1] || @y
+        @x2 = attrs[:x2] || @x
+        @y2 = attrs[:y2] || @y
+      end
+
+      def generate(svg)
+        svg.line(attributes)
+      end
+
+      protected
+
+      def attributes
+        attrs = super
+        attrs.delete(:x)
+        attrs.delete(:y)
+        attrs
+      end
+    end
+  end
+end

data/lib/svgen/element/rect.rb

@@ -5,7 +5,7 @@ module SVGen
         super(attrs)
         @width = attrs[:width] || 100
         @height = attrs[:height] || 100
-        @fill = attrs[:fill] || "white"
+        @fill = attrs[:fill] || "rgba(0, 0, 0, 0)"
       end
 
       def generate(svg)

data/lib/svgen/nestable.rb

@@ -0,0 +1,24 @@
+module SVGen
+  module Nestable
+    def rect(attrs = {})
+      @children << Element::Rect.new(attrs)
+    end
+
+    def circle(attrs = {})
+      @children << Element::Circle.new(attrs)
+    end
+
+    def text(text, attrs = {})
+      @children << Element::Text.new(text, attrs)
+    end
+
+    def line(attrs = {})
+      @children << Element::Line.new(attrs)
+    end
+
+    def group(attrs = {}, &block)
+      @children << Element::Group.new(attrs, &block)
+    end
+    alias :g :group
+  end
+end

data/lib/svgen/svg.rb

@@ -2,23 +2,13 @@ require "builder"
 
 module SVGen
   class SVG
-    def initialize(attrs = {})
+    include Nestable
+
+    def initialize(attrs = {}, &block)
       @children = []
       @width = attrs[:width] || 400
       @height = attrs[:height] || 300
-      yield(self) if block_given?
-    end
-
-    def rect(attrs = {})
-      @children << Element::Rect.new(attrs)
-    end
-
-    def circle(attrs = {})
-      @children << Element::Circle.new(attrs)
-    end
-
-    def text(text, attrs = {})
-      @children << Element::Text.new(text, attrs)
+      block.call(self) if block_given?
     end
 
     def generate

data/lib/svgen.rb

@@ -1,8 +1,11 @@
 lib = File.dirname(__FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+require "svgen/nestable"
 require "svgen/svg"
 require "svgen/element/base"
 require "svgen/element/rect"
 require "svgen/element/circle"
 require "svgen/element/text"
+require "svgen/element/line"
+require "svgen/element/group"

data/spec/support/circle.svg

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg width="600" height="300" xmlns="http://www.w3.org/2000/svg">
-  <circle x="0" y="0" cx="100" cy="100" r="50" fill="red"/>
+  <circle cx="100" cy="100" r="50" fill="red"/>
 </svg>

data/spec/support/group.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="600" height="300" xmlns="http://www.w3.org/2000/svg">
+  <g stroke="red" stroke-width="5">
+    <rect x="0" y="0" width="300" height="200" fill="red"/>
+    <circle cx="50" cy="50" r="10" fill="blue"/>
+  </g>
+</svg>

data/spec/support/line.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="600" height="300" xmlns="http://www.w3.org/2000/svg">
+  <line stroke="black" stroke-width="5" x1="10" y1="10" x2="50" y2="50"/>
+</svg>

data/spec/svgen/svg_spec.rb

@@ -32,5 +32,22 @@ describe SVGen::SVG do
         svg.text("Sample Text", x: 20, y: 20)
       end
     end
+
+    it "returns SVG data with line" do
+      @sample = Pathname.new("spec/support/line.svg")
+      @svg = SVGen::SVG.new(width: 600, height: 300) do |svg|
+        svg.line(x1: 10, y1: 10, x2: 50, y2: 50, stroke: "black", :"stroke-width" => "5")
+      end
+    end
+
+    it "returns SVG data with group" do
+      @sample = Pathname.new("spec/support/group.svg")
+      @svg = SVGen::SVG.new(width: 600, height: 300) do |svg|
+        svg.g(stroke: "red", "stroke-width" => 5) do |g|
+          g.rect(width: "300", height: "200", fill: "red")
+          g.circle(cx: "50", cy: "50", r: "10", fill: "blue")
+        end
+      end
+    end
   end
 end

data/svgen.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "svgen"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Naoto Kaneko"]
   spec.email         = ["naoty.k@gmail.com"]
   spec.summary       = %q{SVG generator}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svgen
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Naoto Kaneko
@@ -81,12 +81,17 @@ files:
 - lib/svgen.rb
 - lib/svgen/element/base.rb
 - lib/svgen/element/circle.rb
+- lib/svgen/element/group.rb
+- lib/svgen/element/line.rb
 - lib/svgen/element/rect.rb
 - lib/svgen/element/text.rb
+- lib/svgen/nestable.rb
 - lib/svgen/svg.rb
 - lib/svgen/version.rb
 - spec/spec_helper.rb
 - spec/support/circle.svg
+- spec/support/group.svg
+- spec/support/line.svg
 - spec/support/rect.svg
 - spec/support/sample.svg
 - spec/support/text.svg
@@ -119,6 +124,8 @@ summary: SVG generator
 test_files:
 - spec/spec_helper.rb
 - spec/support/circle.svg
+- spec/support/group.svg
+- spec/support/line.svg
 - spec/support/rect.svg
 - spec/support/sample.svg
 - spec/support/text.svg