voog-kit 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6694c0c2b460500662c877cdf54fae84d5ca7130
-  data.tar.gz: 1cbdd8d6b0f6d992e81c607f39436871dc944e59
+  metadata.gz: 6a548a2e4eae5cb8d20b0c5ba3b2204fda5e0dda
+  data.tar.gz: 9a44ca48c981e6973aafd25b24a4234021fcf1f7
 SHA512:
-  metadata.gz: 10bfc100f18dff6b618b52627350ac19c61b26a1797215423dbfa0576e0568c5b83ecda7fe93f3196fa629bb5aca6576384bc5f51f6942f97a525ab67a633c90
-  data.tar.gz: 80d27ec9c635c456f0dd298c256f05701926e7ad2b6eb2578003bb4fbd932c3d0e37ef87f233fcf8d7d83b65b8e49e46961fa6dc59cca14a347da0e22c8a864f
+  metadata.gz: 884e962e44fad82fbd7b0c9050ab9136ddaff2c9d02fc980d504b4d3d8db5a24e7de68ca4ddf67a4c2adc435741bd90cab7887bacdd16b01d1f03c70df03b87e
+  data.tar.gz: ca7a696c892b21c47833306b221894a6396fd19c5c28377c83176ac27b2a4cb632c26fd9f9240d90a05db25015b69255f107ba3c261bd9dc801c5808dd4cee43

data/lib/voog/dtk/filemanager.rb

@@ -246,7 +246,7 @@ module Voog::Dtk
           'title' => l.split('.').first.gsub('_', ' ').capitalize
         }
         if @old_manifest && @old_manifest.fetch('layouts')
-          old_layout = @old_manifest.fetch('layouts').reject(&:nil?).select { |ol| ol.fetch('file').include? l }.first || {}
+          old_layout = @old_manifest.fetch('layouts').select { |ol| ol.fetch('file').gsub('layouts/', '') == l }.first || {}
           attrs.merge! old_layout
         end
         attrs
@@ -265,7 +265,7 @@ module Voog::Dtk
           'title' => name
         }
         if @old_manifest && @old_manifest.fetch('layouts')
-          old_component = @old_manifest.fetch('layouts').reject(&:nil?).select { |ol| ol.fetch('file').include? c }.first || {}
+          old_component = @old_manifest.fetch('layouts').select { |ol| ol.fetch('file').gsub('components/', '') == c }.first || {}
           attrs.merge! old_component
         end
         attrs
@@ -288,7 +288,7 @@ module Voog::Dtk
             'filename' => file
           }
           if @old_manifest && @old_manifest.fetch('assets')
-            old_asset = @old_manifest.fetch('assets').reject(&:nil?).select { |ol| ol.fetch('file').include? file }.first || {}
+            old_asset = @old_manifest.fetch('assets').select { |ol| ol.fetch('filename') == file }.first || {}
             attrs.merge! old_asset
           end
           assets << attrs

data/lib/voog/dtk/version.rb

@@ -1,5 +1,5 @@
 module Voog
   module Dtk
-    VERSION = '0.3.6'
+    VERSION = '0.3.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voog-kit
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Mikk Pristavka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler