svgen 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba2bf72e26dc27ef68324a6cc8ed88bdaa06327d
-  data.tar.gz: 914b64c57e8d97d1082f19a09f298e2421542771
+  metadata.gz: bdc86f02b34189d954cf476880fa22bd083a2f1f
+  data.tar.gz: 2ec47b8e97adbe5447d5e41dbde7533385598c96
 SHA512:
-  metadata.gz: dd05c6d01bf5f58db290ebde74d35edd0c17fbe1de358c11ddb3829ec9453355aabf788d0c63ebe04fe8b289768d4996d6bbe4a4df548a5cc3946d86972f9bd3
-  data.tar.gz: c4b524f9c66918f231d6874ea7035d2d84cdf9e208df9d2b58ce5c9e66639cca0e777f8753eaf9f7926d799330d8d95b1e64fd73e022493111052297afcb3460
+  metadata.gz: f15074003e07481a35e56d687d9dd7c719d9a7279c18dfec46d0388af358ae21ff527ffd70a6d12c0cee375ecede891e176bc9074dbcf5bed34d6d3360db6f4d
+  data.tar.gz: cdd5ebada7f0a4977d474ebf474f9ec9316e8b7b9b0cfc6fc585e897bd2bfa6501a69a6f60324db3846a31d8d2cc33528806566f43a2db3adda72395f14a1236

data/README.md

@@ -22,8 +22,6 @@ svg = SVGen::SVG.new(width: 600, height: 400) do |svg|
 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">
 #   <rect width="300" height="200" fill="blue"/>
 #   <circle cx="100" cy="100" r="50" fill="red"/>
@@ -44,8 +42,6 @@ svg = SVGen::SVG.new(width: 600, height: 400) do |svg|
 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"/>

data/lib/svgen/element/circle.rb

@@ -1,25 +1,12 @@
 module SVGen
   module Element
-    class Circle < Base
+    class Circle
       def initialize(attrs = {})
-        super(attrs)
-        @cx = attrs[:cx] || 0
-        @cy = attrs[:cy] || 0
-        @r = attrs[:r] || 10
-        @fill = attrs[:fill] || "rgba(0, 0, 0, 0)"
+        @attrs = attrs
       end
 
       def generate(svg)
-        svg.circle(attributes)
-      end
-
-      protected
-
-      def attributes
-        attrs = super
-        attrs.delete(:x)
-        attrs.delete(:y)
-        attrs
+        svg.circle(@attrs)
       end
     end
   end

data/lib/svgen/element/group.rb

@@ -1,28 +1,19 @@
 module SVGen
   module Element
-    class Group < Base
+    class Group
       include Nestable
 
       def initialize(attrs = {}, &block)
         @children = []
-        @stroke = attrs[:stroke]
-        @stroke_width = attrs[:"stroke-width"] || attrs["stroke-width"]
+        @attrs = attrs
         block.call(self) if block_given?
       end
 
       def generate(svg)
-        svg.g(attributes) do |g|
+        svg.g(@attrs) 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

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

data/lib/svgen/element/rect.rb

@@ -1,15 +1,12 @@
 module SVGen
   module Element
-    class Rect < Base
+    class Rect
       def initialize(attrs = {})
-        super(attrs)
-        @width = attrs[:width] || 100
-        @height = attrs[:height] || 100
-        @fill = attrs[:fill] || "rgba(0, 0, 0, 0)"
+        @attrs = attrs
       end
 
       def generate(svg)
-        svg.rect(attributes)
+        svg.rect(@attrs)
       end
     end
   end

data/lib/svgen/element/text.rb

@@ -1,21 +1,13 @@
 module SVGen
   module Element
-    class Text < Base
+    class Text
       def initialize(text, attrs = {})
-        super(attrs)
         @text = text
+        @attrs = attrs
       end
 
       def generate(svg)
-        svg.text(@text, attributes)
-      end
-
-      protected
-
-      def attributes
-        attrs = super
-        attrs.delete(:text)
-        attrs
+        svg.text(@text, @attrs)
       end
     end
   end

data/lib/svgen/svg.rb

@@ -6,16 +6,13 @@ module SVGen
 
     def initialize(attrs = {}, &block)
       @children = []
-      @width = attrs[:width] || 400
-      @height = attrs[:height] || 300
+      @attrs = attrs
       block.call(self) if block_given?
     end
 
     def generate
       builder = Builder::XmlMarkup.new(indent: 2)
-      builder.instruct! :xml, version: "1.0", encoding: "UTF-8", standalone: "no"
-      builder.declare! :DOCTYPE, :svg, :PUBLIC, "-//W3C//DTD SVG 1.1//EN", "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"
-      builder.svg(width: @width, height: @height, xmlns: "http://www.w3.org/2000/svg") do |svg|
+      builder.svg(@attrs.merge({ xmlns: "http://www.w3.org/2000/svg" })) do |svg|
         @children.each { |child| child.generate(svg) }
       end
     end

data/lib/svgen.rb

@@ -1,9 +1,5 @@
-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"

data/spec/fixtures/circle.svg

@@ -0,0 +1,3 @@
+<svg width="600" height="300" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="100" cy="100" r="50" fill="red"/>
+</svg>

data/spec/fixtures/group.svg

@@ -0,0 +1,6 @@
+<svg width="600" height="300" xmlns="http://www.w3.org/2000/svg">
+  <g stroke="red" stroke-width="5">
+    <rect width="300" height="200" fill="red"/>
+    <circle cx="50" cy="50" r="10" fill="blue"/>
+  </g>
+</svg>

data/spec/fixtures/line.svg

@@ -0,0 +1,3 @@
+<svg width="600" height="300" xmlns="http://www.w3.org/2000/svg">
+  <line x1="10" y1="10" x2="50" y2="50" stroke="black" stroke-width="5"/>
+</svg>

data/spec/fixtures/rect.svg

@@ -0,0 +1,3 @@
+<svg width="600" height="300" xmlns="http://www.w3.org/2000/svg">
+  <rect width="400" height="300" fill="red"/>
+</svg>

data/spec/fixtures/sample.svg

@@ -0,0 +1,2 @@
+<svg width="600" height="300" xmlns="http://www.w3.org/2000/svg">
+</svg>

data/spec/fixtures/text.svg

@@ -0,0 +1,3 @@
+<svg width="600" height="300" xmlns="http://www.w3.org/2000/svg">
+  <text x="20" y="20">Sample Text</text>
+</svg>

data/spec/spec_helper.rb

@@ -2,7 +2,5 @@ require File.expand_path("../lib/svgen", File.dirname(__FILE__))
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
   config.order = "random"
 end

data/spec/svgen/svg_spec.rb

@@ -2,46 +2,47 @@ require "spec_helper"
 
 describe SVGen::SVG do
   describe "#generate" do
+    let(:fixtures_path) { Pathname.new("spec/fixtures") }
     after do
       data = @svg.generate
       expect(data).to eq @sample.read
     end
 
     it "returns simple SVG data" do
-      @sample = Pathname.new("spec/support/sample.svg")
+      @sample = fixtures_path.join("sample.svg")
       @svg = SVGen::SVG.new(width: 600, height: 300)
     end
 
     it "returns SVG data with rect" do
-      @sample = Pathname.new("spec/support/rect.svg")
+      @sample = fixtures_path.join("rect.svg")
       @svg = SVGen::SVG.new(width: 600, height: 300) do |svg|
         svg.rect(width: 400, height: 300, fill: "red")
       end
     end
 
     it "returns SVG data with circle" do
-      @sample = Pathname.new("spec/support/circle.svg")
+      @sample = fixtures_path.join("circle.svg")
       @svg = SVGen::SVG.new(width: 600, height: 300) do |svg|
         svg.circle(cx: 100, cy: 100, r: 50, fill: "red")
       end
     end
 
     it "returns SVG data with text" do
-      @sample = Pathname.new("spec/support/text.svg")
+      @sample = fixtures_path.join("text.svg")
       @svg = SVGen::SVG.new(width: 600, height: 300) do |svg|
         svg.text("Sample Text", x: 20, y: 20)
       end
     end
 
     it "returns SVG data with line" do
-      @sample = Pathname.new("spec/support/line.svg")
+      @sample = fixtures_path.join("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")
+      @sample = fixtures_path.join("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")

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.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Naoto Kaneko"]
   spec.email         = ["naoty.k@gmail.com"]
   spec.summary       = %q{SVG generator}

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: svgen
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Naoto Kaneko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
 description: 
@@ -73,13 +73,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/svgen.rb
-- lib/svgen/element/base.rb
 - lib/svgen/element/circle.rb
 - lib/svgen/element/group.rb
 - lib/svgen/element/line.rb
@@ -88,13 +87,13 @@ files:
 - lib/svgen/nestable.rb
 - lib/svgen/svg.rb
 - lib/svgen/version.rb
+- spec/fixtures/circle.svg
+- spec/fixtures/group.svg
+- spec/fixtures/line.svg
+- spec/fixtures/rect.svg
+- spec/fixtures/sample.svg
+- spec/fixtures/text.svg
 - 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
 - spec/svgen/svg_spec.rb
 - svgen.gemspec
 homepage: http://github.com/naoty/svgen
@@ -107,26 +106,26 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: SVG generator
 test_files:
+- spec/fixtures/circle.svg
+- spec/fixtures/group.svg
+- spec/fixtures/line.svg
+- spec/fixtures/rect.svg
+- spec/fixtures/sample.svg
+- spec/fixtures/text.svg
 - 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
 - spec/svgen/svg_spec.rb

data/lib/svgen/element/base.rb

@@ -1,30 +0,0 @@
-module SVGen
-  module Element
-    class Base
-      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)
-        raise NotImplementedError.new("Subclass must override SVGen::Element::Base#generate")
-      end
-
-      protected
-
-      def attributes
-        attrs = {}
-        instance_variables.each do |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
-    end
-  end
-end

data/spec/support/circle.svg

@@ -1,5 +0,0 @@
-<?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 cx="100" cy="100" r="50" fill="red"/>
-</svg>

data/spec/support/group.svg

@@ -1,8 +0,0 @@
-<?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

@@ -1,5 +0,0 @@
-<?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/support/rect.svg

@@ -1,5 +0,0 @@
-<?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">
-  <rect x="0" y="0" width="400" height="300" fill="red"/>
-</svg>

data/spec/support/sample.svg

@@ -1,4 +0,0 @@
-<?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">
-</svg>

data/spec/support/text.svg

@@ -1,5 +0,0 @@
-<?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">
-  <text x="20" y="20">Sample Text</text>
-</svg>