svggvs 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29c1636f89126ee8986e8cf114eed283f2440e6b
-  data.tar.gz: 709063890719e5e75b6dbcc0ab2a010e25cc5ef8
+  metadata.gz: a0d8732594ac89df68876713b8aa039126ea6de9
+  data.tar.gz: f89a9f042223f2f46295b16013edea94fe7e4905
 SHA512:
-  metadata.gz: 76f3ddacf87dc548dfe2b89a00acd18c4b5a3448f5957d6d73a1220d4fae399bf0cc3a23d87a60aa9bf0b4ccaad92cb3869b1caebbfb3b99a3c7503e65463c68
-  data.tar.gz: b74974b4db359bed549423b7c5e0fdc6c19b55b3388d239bb73ee878e48915d9a085566aab05f506169da1af5bb898e56e25f298c77accd214e14810751f16e4
+  metadata.gz: 325bc63df8ea205bec22df72ba0e7a9f14bc671a9165dddece6f885bbe750f7f29f0cafdfd4cc79954ac97a72fdf3ce4d9138ca4f4d7daf4fa64a4a0d677a23f
+  data.tar.gz: 2ac8833777e80fc0b1b0253c8fe06cc3b07dd5aa8fb7e36c75e5293db7617e43ebe793e48946d4a7bbefdd88ed9faf60392b6fca743480c2acae7400054d7799

data/README.md

@@ -83,6 +83,8 @@ Create a `Cardfile` in your working directory. It should look something like thi
 @session.configure do |c|
   # manipulate the data after reading from the spreadsheet
   # c.post_read_data = proc { |data|
+  #  data[:active_layers] << "My Cool Layer"
+  #  data[:active_layers] << /a regular expression/i
   #  data[:replacements]['Superpower Text'] << '!!'
   # }
 

data/lib/svggvs/data_source.rb

@@ -13,7 +13,7 @@ module SVGGVS
     def settings
       settings = {}
 
-      doc.each_with_pagename do |name, sheet|
+      sheets.each do |name, sheet|
         if name['SVGGVS Settings']
           sheet.each do |setting, value|
             settings[setting.spunderscore.to_sym] = value
@@ -24,8 +24,20 @@ module SVGGVS
       settings
     end
 
-    def each_card(card_sheet_identifier)
+    def sheets
+      return @sheets if @sheets
+
+      @sheets = []
+
       doc.each_with_pagename do |name, sheet|
+        @sheets << [ name, sheet.dup ]
+      end
+
+      @sheets
+    end
+
+    def each_card(card_sheet_identifier)
+      sheets.each do |name, sheet|
         if name[card_sheet_identifier]
           headers = sheet.row(1)
 

data/lib/svggvs/file.rb

@@ -1,4 +1,5 @@
 require 'nokogiri'
+require 'delegate'
 
 module SVGGVS
   class File
@@ -58,12 +59,42 @@ module SVGGVS
       target.children.each(&:remove)
     end
 
+    class SVGCache < SimpleDelegator
+      def initialize(doc)
+        @doc = doc
+      end
+
+      def __getobj__
+        @doc
+      end
+
+      def is_clone_dup_type(href)
+        @is_clone_dup_type ||= {}
+
+        return @is_clone_dup_type[href] if @is_clone_dup_type[href] != nil
+
+        if source = css(href).first
+          if source.name == 'flowRoot' || source.name == 'text'
+            @is_clone_dup_type[href] = source
+          end
+        end
+
+        @is_clone_dup_type[href] ||= false
+
+        @is_clone_dup_type[href]
+      end
+    end
+
+    def svg_cache
+      @svg_cache ||= SVGCache.new(source)
+    end
+
     def with_new_target
       new_target = source.dup
       new_target[:id] = new_target[:id] + "_#{@instance}"
       new_target['inkscape:label'] = new_target['inkscape:label'] + "_#{@instance}"
 
-      target_obj = Target.new(new_target)
+      target_obj = Target.new(new_target, cache: svg_cache)
 
       reset_defs!
 

data/lib/svggvs/session.rb

@@ -55,6 +55,27 @@ module SVGGVS
       card_finished!
     end
 
+    class ActiveLayerMatcher < SimpleDelegator
+      def initialize(layers)
+        @layers = layers
+      end
+
+      def __getobj__
+        @layers
+      end
+
+      def include?(name)
+        @layers.any? { |layer|
+          case layer
+          when Regexp
+            layer =~ name
+          else
+            layer == name
+          end
+        }
+      end
+    end
+
     def data_source=(source)
       data_source = DataSource.new(source)
 
@@ -68,7 +89,7 @@ module SVGGVS
 
           with_new_target do |target|
             target.inject!
-            target.active_layers = card[:active_layers]
+            target.active_layers = ActiveLayerMatcher.new(card[:active_layers])
             target.replacements = card[:replacements]
           end
         end

data/lib/svggvs/target.rb

@@ -4,8 +4,8 @@ module SVGGVS
   class Target < SimpleDelegator
     attr_reader :target
 
-    def initialize(target)
-      @target = target
+    def initialize(target, options)
+      @target, @options = target, options
     end
 
     def __getobj__
@@ -20,8 +20,16 @@ module SVGGVS
       @injected_defs ||= {}
     end
 
+    def file_layers
+      @file_layers ||= css("g[inkscape|groupmode='layer']")
+    end
+
+    def child_visible_layers
+      @child_visible_layers ||= file_layers.find_all { |layer| layer['inkscape:label'].include?('(child visible)') }
+    end
+
     def inject!
-      css("g[inkscape|groupmode='layer']").each do |layer|
+      file_layers.each do |layer|
         if filename = layer['inkscape:label'][/inject (.*\.svg)/, 1]
           injected_sources[filename] ||= begin
                                             data = Nokogiri::XML(::File.read(filename))
@@ -39,30 +47,36 @@ module SVGGVS
     end
 
     def active_layers=(layers)
-      css("g[inkscape|groupmode='layer']").each do |layer|
+      file_layers.each do |layer|
+        layer['style'] = if layer['inkscape:label'].include?('(visible)')
+                           ''
+                         else
+                           'display:none'
+                         end
+      end
+
+      file_layers.each do |layer|
         if layers.include?(layer['inkscape:label'])
           layer['style'] = ''
 
           current_parent = layer.parent
 
-          while current_parent && current_parent.name == "g"
+          while current_parent && current_parent.name == "g" && current_parent['style'] != ''
             current_parent['style'] = ''
 
             current_parent = current_parent.parent
           end
-        else
-          layer['style'] = if layer['inkscape:label'].include?('(visible)')
-                             ''
-                           else
-                             'display:none'
-                           end
+
+          layers.delete(layer)
         end
+
+        break if layers.empty?
       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'] == ''
+        child_visible_layers.each do |layer|
+          if layer['style'] != '' && layer.parent['style'] == ''
             layer['style'] = ''
 
             any_changed = true
@@ -106,11 +120,15 @@ module SVGGVS
       end
     end
 
+    def cache
+      @options[:cache]
+    end
+
     # only uncloning text
     def unclone
-      css('svg|use').each do |clone|
-        if source = css(clone['xlink:href']).first
-          if source.name == 'flowRoot' || source.name == 'text'
+      file_layers.find_all { |layer| layer['style'] == '' }.each do |layer|
+        layer.css('svg|use').each do |clone|
+          if source = cache.is_clone_dup_type(clone['xlink:href'])
             new_group = clone.add_next_sibling("<g />").first
 
             clone.attributes.each do |key, attribute|

data/lib/svggvs/version.rb

@@ -1,3 +1,3 @@
 module SVGGVS
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svggvs
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - John Bintz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Generate sets of card game cards using Inkscape templates and Ruby