svggvs 0.0.9 → 0.0.10

data/README.md

@@ -29,6 +29,10 @@ unless they have the following names:
 
 * (visible): The layer is always visible, regardless if it's specified in `#active_layers`
 * (protect): The layer will not be deleted if it is hidden. Good for clone sources.
+* (child visible): The layer will be visible if its parent layer is also made visible. Good if you
+                   break artwork up into multiple layers (inks, colors, shading, etc.)
+* (inject filename.svg): Include all the layers of another SVG file as child layers of this layer.
+                         Does not copy patterns/gradients yet!
 
 Hiding/showing layers is the way that you make certain card elements appear/disappear on
 different types of cards with with different properties. You can also replace the text in

data/lib/svggvs/file.rb

@@ -29,12 +29,28 @@ module SVGGVS
       @target ||= doc.at_css('g[inkscape|label="Target"]')
     end
 
+    def defs
+      @defs ||= doc.at_css('defs')
+    end
+
+    def original_defs
+      @original_defs ||= defs.dup
+    end
+
+    def reset_defs!
+      defs.children.each(&:remove)
+
+      defs << original_defs.children
+    end
+
     def doc
       return @doc if @doc
 
       @doc = Nokogiri::XML(::File.read(@path))
       clear_targets!
 
+      original_defs
+
       @doc
     end
 
@@ -49,6 +65,8 @@ module SVGGVS
 
       target_obj = Target.new(new_target)
 
+      reset_defs!
+
       yield target_obj
 
       target_obj.replaced
@@ -56,6 +74,10 @@ module SVGGVS
 
       target << target_obj.target
 
+      target_obj.injected_defs.values.each do |v|
+        defs << v
+      end
+
       @instance += 1
     end
 

data/lib/svggvs/session.rb

@@ -66,6 +66,7 @@ module SVGGVS
           end
 
           with_new_target do |target|
+            target.inject!
             target.active_layers = card[:active_layers]
             target.replacements = card[:replacements]
           end

data/lib/svggvs/target.rb

@@ -12,6 +12,32 @@ module SVGGVS
       @target
     end
 
+    def injected_sources
+      @injected_sources ||= {}
+    end
+
+    def injected_defs
+      @injected_defs ||= {}
+    end
+
+    def inject!
+      css("g[inkscape|groupmode='layer']").each do |layer|
+        if filename = layer['inkscape:label'][/inject (.*\.svg)/, 1]
+          injected_sources[filename] ||= begin
+                                            data = Nokogiri::XML(::File.read(filename))
+
+                                            injected_defs[filename] = data.css("svg > defs")
+
+                                            data.css("svg > g[inkscape|groupmode='layer']")
+                                          end
+
+          injected_sources[filename].each do |additional_layer|
+            layer << additional_layer.to_xml
+          end
+        end
+      end
+    end
+
     def active_layers=(layers)
       css("g[inkscape|groupmode='layer']").each do |layer|
         if layers.include?(layer['inkscape:label'])
@@ -32,6 +58,18 @@ module SVGGVS
                            end
         end
       end
+
+      loop do
+        any_changed = false
+        css("g[inkscape|groupmode='layer']").each do |layer|
+          if layer['inkscape:label'].include?('(child visible)') && layer['style'] != '' && layer.parent['style'] == ''
+            layer['style'] = ''
+
+            any_changed = true
+          end
+        end
+        break if !any_changed
+      end
     end
 
     def replacements=(replacements)

data/lib/svggvs/version.rb

@@ -1,3 +1,3 @@
 module SVGGVS
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svggvs
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 -05:00
+date: 2014-05-29 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &72324050 !ruby/object:Gem::Requirement
+  requirement: &80918420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72324050
+  version_requirements: *80918420
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &72323840 !ruby/object:Gem::Requirement
+  requirement: &80918210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72323840
+  version_requirements: *80918210
 - !ruby/object:Gem::Dependency
   name: parallel
-  requirement: &72323630 !ruby/object:Gem::Requirement
+  requirement: &80918000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72323630
+  version_requirements: *80918000
 - !ruby/object:Gem::Dependency
   name: roo
-  requirement: &72323420 !ruby/object:Gem::Requirement
+  requirement: &80917790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72323420
+  version_requirements: *80917790
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &72323210 !ruby/object:Gem::Requirement
+  requirement: &80917580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72323210
+  version_requirements: *80917580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &72323000 !ruby/object:Gem::Requirement
+  requirement: &80959270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72323000
+  version_requirements: *80959270
 description: Generate sets of card game cards using Inkscape templates and Ruby
 email:
 - john@coswellproductions.com