adyen-admin 0.0.4 → 0.0.5

data/CHANGES.md

@@ -7,6 +7,10 @@
   * add CLI binaries (to compile + upload) -> read from .adyenrc file
   * make compatible with Live system
 
+## v0.0.5
+  * fix name with multiple - issue
+  * added decompile with backup
+
 ## v0.0.4
   * get the default path right
   * add path to remote skins

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/adyen-admin/skin.rb

@@ -1,4 +1,4 @@
-require 'tmpdir'
+require 'tempfile'
 require 'zip/zip'
 
 module Adyen
@@ -22,7 +22,7 @@ module Adyen
 
         self.path ||= File.join(Skin.default_path, [name,code].compact.join("-"))
 
-        raise ArgumentError unless code
+        raise ArgumentError, "No Code given" unless code
       end
 
       def self.default_path
@@ -81,9 +81,9 @@ module Adyen
 
       def path=(new_path)
         if Skin.is_skin_path?(new_path)
-          new_code, new_name = File.basename(new_path).split("-").reverse
+          new_code, *new_name = File.basename(new_path).split("-").reverse
           self.code ||= new_code
-          self.name ||= new_name
+          self.name ||= new_name.reverse.join("-")
           raise ArgumentError if self.code && self.code != new_code
           @path = new_path
         end
@@ -124,33 +124,56 @@ module Adyen
       def download
         "#{code}.zip".tap do |filename|
           Adyen::Admin.client.download(DOWNLOAD % code, filename)
+        end
+      end
 
-          if path
-            # create backup of current
-            # compile
+      def decompile(filename, backup = true)
+        # create backup of current, include any files
+        if self.path
+          if backup
+            compile(/(zip|lock)$/, ".backup.zip")
+          end
+        else
+          File.join(Skin.default_path, [name,code].compact.join("-")).tap do |p|
+            `mkdir -p #{p}`
+            self.path = p
           end
-          # unzip
+        end
+
+        Zip::ZipFile.open(filename) do |zip_file|
+          zip_file.each do |file|
+            f_path = File.join(self.path, file.name.gsub("#{code}/", ""))
+            FileUtils.mkdir_p(File.dirname(f_path))
+            if File.directory?(f_path)
+              `mkdir -p #{f_path}`
+            else
+              `rm -f #{f_path}`
+              zip_file.extract(file, f_path)
+            end
+          end
+        end
+
+        if backup
+          `mv .backup.zip #{File.join(self.path, ".backup.zip")}`
         end
       end
 
-      def compile
-        raise ArgumentError unless path
+      def compile(exclude = /(yml|zip|erb)$/, outfile = "#{code}.zip")
+        raise ArgumentError, "No Path given" unless path
 
-        File.join(Dir.tmpdir, "#{code}.zip").tap do |filename|
-          `rm -rf #{filename}`
-          Zip::ZipFile.open(filename, 'w') do |zipfile|
+        outfile.tap do |filename|
+          `rm -f #{filename}`
+          Zip::ZipFile.open(filename, Zip::ZipFile::CREATE) do |zip_file|
             Dir["#{path}/**/**"].each do |file|
-              next if file.include?(".yml")
-              next if file.include?(".erb")
-              zipfile.add(file.sub(path, code), file)
+              next if file =~ exclude
+              zip_file.add(file.sub(path, code), file)
             end
 
             dir = File.join(File.dirname(path), parent_skin_code)
             Dir["#{dir}/**/**"].each do |file|
               begin
-                next if file.include?(".yml")
-                next if file.include?(".erb")
-                zipfile.add(file.sub(dir, code), file)
+                next if file =~ exclude
+                zip_file.add(file.sub(dir, code), file)
               rescue Zip::ZipEntryExistsError
                 # NOOP
               end
@@ -175,8 +198,6 @@ module Adyen
       end
 
       def publish
-        raise ArgumentError unless code
-
         page = Adyen::Admin.get(PUBLISH % code)
         page = Adyen::Admin.client.submit(page.form.tap do |form|
         end)

data/spec/adyen-admin/skin_spec.rb

@@ -94,6 +94,10 @@ module Adyen::Admin
           Skin.new(:path => path).code.should == "7hFAQnmt"
         end
 
+        it "auto sets name from path" do
+          Skin.new(:path => path).name.should == "example"
+        end
+
         it "raises error on wrong code for path" do
           expect do
             Skin.new(:code => "different", :path => path).path.should == path
@@ -105,10 +109,20 @@ module Adyen::Admin
             Skin.new
           end.to raise_error
         end
+
+        context "slash in name" do
+          let(:path) { "#{skin_fixtures}/example-test-7hFAQnmt" }
+
+          it "sets name" do
+            Skin.stub(:is_skin_path?).and_return(true)
+            Skin.new(:path => path).name.should == "example-test"
+          end
+        end
       end
 
       describe "#download"  do
-        let(:zip_filename) { "#{skin.code}.zip"}
+        let(:zip_filename) { "#{skin.code}.zip" }
+
         after do
           `rm -rf #{zip_filename}`
         end
@@ -119,17 +133,52 @@ module Adyen::Admin
         end
       end
 
+      describe "#decompile"  do
+        let(:skin_code) { "DV3tf95f" }
+        let(:skin) { Skin.new(:path => "#{skin_fixtures}/#{skin_code}") }
+        let!(:zip_filename) { skin.compile(nil) }
+        let(:backup_filename) { File.join(skin.path, '.backup.zip') }
+
+        before do
+          `cp -r #{skin_fixtures}/#{skin_code} #{skin_fixtures}/_backup`
+        end
+
+        after do
+          `rm -rf #{zip_filename} #{backup_filename} #{skin_fixtures}/#{skin_code}`
+          `mv #{skin_fixtures}/_backup #{skin_fixtures}/#{skin_code}`
+        end
+
+        it "creates backup" do
+          skin.decompile(zip_filename)
+
+          File.should be_exists(backup_filename)
+        end
+
+        it "unzips files" do
+          `rm -rf #{skin.path}`
+
+          expect do
+            skin.decompile(zip_filename)
+          end.to change { File.exists?(File.join(skin.path, 'inc', 'order_data.txt')) }
+        end
+      end
+
       describe "#compile" do
         let(:skin_code) { "DV3tf95f" }
         let(:skin) { Skin.new(:path => "#{skin_fixtures}/#{skin_code}") }
+        let(:zip_filename) { skin.compile }
 
-        def zip_contains(zip_filename, file)
-          Zip::ZipFile.open(zip_filename, 'r') do |zipfile|
+        def zip_contains(file)
+          Zip::ZipFile.open(zip_filename) do |zipfile|
             return true if zipfile.find_entry(File.join(skin_code, file))
           end
           false
         end
 
+        after do
+          `rm -f #{skin_code}.zip`
+        end
+
         context "without base" do
           before do
             `mv #{skin_fixtures}/base #{skin_fixtures}/base2`
@@ -140,32 +189,48 @@ module Adyen::Admin
           end
 
           it "includes screen file" do
-            zip_contains(skin.compile, "css/screen.css").should be_true
+            zip_contains("css/screen.css").should be_true
           end
 
           it "excludes print files" do
-            zip_contains(skin.compile, "css/print.css").should_not be_true
+            zip_contains("css/print.css").should_not be_true
           end
         end
 
         it "includes screen file" do
-          zip_contains(skin.compile, "css/screen.css").should be_true
+          zip_contains("css/screen.css").should be_true
         end
 
         it "includes print file" do
-          zip_contains(skin.compile, "css/print.css").should be_true
+          zip_contains("css/print.css").should be_true
         end
 
         it "excludes meta file" do
-          zip_contains(skin.compile, "metadata.yml").should_not be_true
+          zip_contains("metadata.yml").should_not be_true
         end
 
         it "excludes skin file" do
-          zip_contains(skin.compile, "skin.html.erb").should_not be_true
+          zip_contains("skin.html.erb").should_not be_true
+        end
+
+        context "no exlusion" do
+          let(:zip_filename) { skin.compile(nil) }
+
+          it "excludes meta file" do
+            zip_contains("metadata.yml").should be_true
+          end
+
+          it "excludes skin file" do
+            zip_contains("skin.html.erb").should be_true
+          end
         end
       end
 
       describe "#upload" do
+        after do
+          `rm -f #{skin_code}.zip`
+        end
+
         context "valid set" do
           it "increases version" do
             skin.path = "#{skin_fixtures}/example-7hFAQnmt"

data/spec/fixtures/skins/DV3tf95f/metadata.yml

@@ -0,0 +1,5 @@
+name:
+code: DV3tf95f
+version:
+version_live:
+version_test:

data/spec/fixtures/skins/DV3tf95f/skin.html.erb

@@ -0,0 +1,13 @@
+<!-- ### inc/cheader_[locale].txt or inc/cheader.txt (fallback) ### -->
+
+<% adyen_form_tag do %>
+  <!-- ### inc/pmheader_[locale].txt or inc/pmheader.txt (fallback) ### -->
+
+  <%= adyen_payment_fields %>
+
+  <!-- ### inc/pmfooter_[locale].txt or inc/pmfooter.txt (fallback) ### -->
+
+  <!-- ### inc/customfields_[locale].txt or inc/customfields.txt (fallback) ### -->
+<% end %>
+
+<!-- ### inc/cfooter_[locale].txt or inc/cfooter.txt (fallback) ### -->

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adyen-admin
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000Z
+date: 2012-04-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &70296435524120 !ruby/object:Gem::Requirement
+  requirement: &70322653878160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70296435524120
+  version_requirements: *70322653878160
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70296435523640 !ruby/object:Gem::Requirement
+  requirement: &70322653877680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70296435523640
+  version_requirements: *70322653877680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70296435523060 !ruby/object:Gem::Requirement
+  requirement: &70322653877100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296435523060
+  version_requirements: *70322653877100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70296435522600 !ruby/object:Gem::Requirement
+  requirement: &70322653876640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296435522600
+  version_requirements: *70322653876640
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70296435522140 !ruby/object:Gem::Requirement
+  requirement: &70322653876180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296435522140
+  version_requirements: *70322653876180
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70296435521680 !ruby/object:Gem::Requirement
+  requirement: &70322653875720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296435521680
+  version_requirements: *70322653875720
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &70296435521220 !ruby/object:Gem::Requirement
+  requirement: &70322653875260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296435521220
+  version_requirements: *70322653875260
 description: A little Gem to make your life easier when dealing with Adyen skins
 email:
 - tobi@soundcloud.com
@@ -126,6 +126,8 @@ files:
 - spec/fixtures/cassettes/login.yml
 - spec/fixtures/skins/DV3tf95f/css/screen.css
 - spec/fixtures/skins/DV3tf95f/inc/order_data.txt
+- spec/fixtures/skins/DV3tf95f/metadata.yml
+- spec/fixtures/skins/DV3tf95f/skin.html.erb
 - spec/fixtures/skins/JH0815/css/screen.css
 - spec/fixtures/skins/JH0815/skin.html.erb
 - spec/fixtures/skins/base/css/print.css
@@ -204,6 +206,8 @@ test_files:
 - spec/fixtures/cassettes/login.yml
 - spec/fixtures/skins/DV3tf95f/css/screen.css
 - spec/fixtures/skins/DV3tf95f/inc/order_data.txt
+- spec/fixtures/skins/DV3tf95f/metadata.yml
+- spec/fixtures/skins/DV3tf95f/skin.html.erb
 - spec/fixtures/skins/JH0815/css/screen.css
 - spec/fixtures/skins/JH0815/skin.html.erb
 - spec/fixtures/skins/base/css/print.css