adyen-skinbuilder 0.2.2 → 0.2.3

data/README.markdown

@@ -54,4 +54,14 @@ Also, providing environment variables will work:
 
     rake adyen:skin:build SKIN=/path/to/skin/directory TARGET=/path/to/target
 
-Why is it better than just zipping together skin directory by yourself? Just because we can and it also looks into base directory for shared files if you happen to have several skin directories.
+### More meaningful file naming
+
+Adyen requires the name of root directory within the zip file to exactly match the skincode, e.g. `DV3tf95f`.
+These skincodes are not very meaningful and hard to remember.
+
+Therefore, the skin builder allows you to name the skin directories more meaningful by prepending the skin code, e.g. like this:
+`BrandX-shop-DV3tf95f`, where the only thing that matters is that it ends with `-SKINCODE`.
+The zip file will be named like the original folder name (with `.zip` appended), but the root directory within the zip has the skin code as its name.
+So in this example, the zip file would be called `BrandX-shop-DV3tf95f.zip`, and the root directory whithin it `DV3tf95f`.
+
+If the skin directory does not match this pattern, the zip and root directory within the zip will both be named after the original skin directory name.

data/adyen/main_content.html

@@ -94,7 +94,7 @@
 
 <ul id="paymentMethods">
   <li style="list-style-type: none;">
-	  <button type="submit" name="brandName" value="VISA" class="imgB pmB pmBvisa" onclick="return show(collapsevisa, 'completeCard.shtml', 'card', 'visa');">VISA</button>
+	  <input type="submit" name="brandName" value="VISA" class="imgB pmB pmBvisa" onclick="return show(collapsevisa, 'completeCard.shtml', 'card', 'visa');" />
 	  <span id="pmmextracosts-visa" class="pmmextracosts"></span><span id="pmvisadescription" class="pmmdescription"></span>
 		<div id="pmmdetails-visa" class="pmmdetails">
 			<script type="text/javascript">

data/lib/adyen-skinbuilder/tasks/skin.rake

@@ -18,20 +18,37 @@ namespace :adyen do
     task :build, :skin_directory, :target_directory do |t, args|
       skin_directory = File.expand_path(args[:skin_directory] || ENV['SKIN'])
       base_directory = File.expand_path(File.join(skin_directory, '..', 'base'))
+      # Allow the folder of a skin to have a meaningful name in this format:
+      # some-nice-name-SKINCODE (use a dash as last charachter before SKINCODE)
+      # Give the zip the full name, but give the top level directory in the zip
+      # archive only the SKINCODE, otherwise adyen will not accept it
       skin_name = File.basename(skin_directory)
+      skin_code = skin_name[/(?<=\-)[a-zA-Z0-9]+$/] || skin_name
       target_directory = File.expand_path((args[:target_directory] || ENV['TARGET']))
 
+      # Whether we do or do not have/use a base directory
+      use_base = File.directory?(base_directory)
+      puts use_base ? "Using base directory" : "Not using a base directory"
+
       if File.directory?(skin_directory) and File.directory?(target_directory)
         Zip::ZipOutputStream::open(File.join(target_directory, "#{skin_name}.zip")) do |io|
           %w(css img inc js res).each do |d|
-            if File.directory?(File.join(base_directory, d))
+            # First see what files the skin itself provides: 
+            if File.directory?(File.join(skin_directory, d))
+              Dir.new(File.join(skin_directory, d)).each do |file|
+                if File.file?(File.join(skin_directory, d, file))
+                  io.put_next_entry("#{skin_code}/#{d}/#{file}")
+                  io.write File.read(File.join(skin_directory, d, file))
+                end
+              end
+            end
+            # Then, let's see whether the base directory has more than what we got already:
+            if use_base && File.directory?(File.join(base_directory, d))
               Dir.new(File.join(base_directory, d)).each do |file|
-                if File.file?(File.join(base_directory, d, file))
-                  io.put_next_entry("#{skin_name}/#{d}/#{file}")
-                  
-                  if File.file?(File.join(skin_directory, d, file))
-                    io.write File.read(File.join(skin_directory, d, file))
-                  else
+                # Only use base file if skin does not provide it itself:
+                if !File.file?(File.join(skin_directory, d, file)) && File.file?(File.join(base_directory, d, file))
+                  io.put_next_entry("#{skin_code}/#{d}/#{file}")
+                  if File.file?(File.join(base_directory, d, file))
                     io.write File.read(File.join(base_directory, d, file))
                   end
                 end
@@ -39,10 +56,9 @@ namespace :adyen do
             end
           end
         end
-      
         puts "Skin zip package was created to #{File.join(target_directory, "#{skin_name}.zip")}"
       else
-        puts "Usage: rake adyen:buildskin[<skin_directory>,<target_directory>] or rake:adyen:buildskin FROM=/from/dir TO=/to/dir"
+        puts "Usage: rake adyen:buildskin[<skin_directory>,<target_directory>] or rake:adyen:buildskin SKIN=/from/dir TARGET=/to/dir"
       end
     end
   end

data/lib/adyen-skinbuilder/version.rb

@@ -1,5 +1,5 @@
 module Adyen
   module Skinbuilder
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adyen-skinbuilder
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Priit Haamer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 +03:00
+date: 2011-06-28 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency