mymedia-card 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b38381d519d349f8b650391aa8a1d9db8d55a50f
-  data.tar.gz: 241e3abced2967e2c2d1640596f0f65de98a5268
+  metadata.gz: c478040da872c3ef77085590d2f7093af45164fd
+  data.tar.gz: cca9389c75cf63b5ddda8a21e182ab9ce00fb20f
 SHA512:
-  metadata.gz: 10bc3565f7a495019d9a534a22ebf4d10f4c06a370cf3ee36551a20e7848e7bd02e2b45e996d371671af37c0607ac430bbdc4fa88f360dd7cb8d66985f46e49e
-  data.tar.gz: 90565a73cd546cbe34cc26c617f6c376c14b9deb775c4cac0fab518fd4c8f254b82a00b87d5ccf5b873fca621ca52ff70537346327b5933bb38953acd923f0ae
+  metadata.gz: 5e04e94cb99bc5478d5e37f81c279a3c7d4391e578059e58223c4b974eb0a1e788d10fa0838bb1016e4995b1cff036032a5cbb2802d1e0f87bbe60614f657b12
+  data.tar.gz: 169cde6331f037612a6c14d9731122e7ef5691a6394a84a9e019f1e95846e15f8668ac7e06db1631aa3a53860e4912fb55dbc37307b26c87ee21937d4741fd8e

data/lib/mymedia-card.rb

@@ -13,8 +13,7 @@ class MyMediaCard < MyMediaKvx
                                                      config: nil, ext: 'txt')
     
     super(media_type: media_type, public_type: public_type, 
-                                                    config: config, ext: ext)
-    
+                                                    config: config, ext: ext)    
     @prefix = 'meta'
     @txt_filepath = File.join(@media_src, \
                               Time.now.strftime('meta%d%m%yT%H%M') + '.txt' )
@@ -29,10 +28,12 @@ class MyMediaCard < MyMediaKvx
     raw_s = dir.select_by_ext(@ext).sort_by_lastmodified.last[:name]
     
     s,ext = raw_s.split(/(?=\.\w+$)/)
+    ext = '' if ext == '.dir'
     raw_name, raw_tags = s.split(/--/,2)
     tags = raw_tags ? raw_tags.split(/--/) : []
     desc = raw_name.gsub(/-/,' ')
     desc.capitalize! unless desc[0] == desc[0].upcase
+    
     filename = raw_name.downcase + ext
 
     static_path = "%s/%s/%s" % [@public_type, \
@@ -43,12 +44,11 @@ class MyMediaCard < MyMediaKvx
     summary = {title: desc, tags: tags.join(' ')}
     body = {file: raw_static_destination}    
 
-    kvx = Kvx.new({summary: summary, body: body}, attributes: {type: @media_type})
-    
+    kvx = Kvx.new({summary: summary, body: body}, \
+                                             attributes: {type: @media_type})
     Dir.chdir @media_src
-    
     File.write @txt_filepath, kvx.to_s
-    
+
     FileUtils.mv raw_s, filename
   end
   
@@ -58,11 +58,26 @@ class MyMediaCard < MyMediaKvx
   def copy_edit(src_path, destination, raw='')
 
     kvx, raw_msg = super(src_path, destination)
-    
+
     # copy the media file to the destination
     destination = kvx.body[:file]
-    file = destination[/[^\/]+$/]
-    FileUtils.cp File.join(@media_src, file), File.join(@home, destination)
+    file = File.basename(destination)
+    
+    subdir = file[/.*(?=\.\w+$)|.*/]
+    
+    if File.exists? File.join(@media_src, subdir) then
+      
+      FileUtils.cp_r File.join(@media_src, subdir), File.join(@home, File.dirname(destination))
+      
+      if File.basename(destination) != subdir then
+        FileUtils.cp File.join(@media_src, file), File.join(@home, destination)
+      end
+      
+    else
+      
+      FileUtils.cp File.join(@media_src, file), File.join(@home, destination)
+      
+    end
     
     [kvx, raw_msg]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymedia-card
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   Fel3ZehmfCVTepbDhmN9wy+aNa/pfEaGrRqjtvpPYQwVqzZBqxM39Y+hopVu2SCv
   2Atqh3hHPujBHw==
   -----END CERTIFICATE-----
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mymedia-kvx

metadata.gz.sig

@@ -1,2 +1,2 @@
-�L���Aj��*dZd��YqV��J�/e��4��g�
-p��+9�_]n��,��>�`��B#FӇD��@�N�j���8�m�`B��J�Y"��5��3O���p�]-ʙ��Qe��f@v	fHk)''#�Rm�/�4����{� ����&V��{=b>�
+62e�����Z�
+t�e�e<�?���ƅ�_wf�Mz��'q���0$w��ˌٚB.Q��	�u�U�� ��B����%�e� l�JnK�D�J�U�K…��%!zW#(��e�,���|ln