adyen-admin 0.0.13 → 0.0.14

data/CHANGES.md

@@ -2,11 +2,14 @@
 
 ## vx.x.x - ???
   * update Docu
-  * parent (instead of base)
   * add CLI binaries (to compile + upload) -> read from .adyenrc file
   * make compatible with Live system
 
-## v0.0.12 - 2-05-2012
+## v0.0.14 - 19-06-2012
+  * config parent_skin via skin file
+  * throw exception when including subdirectory of subdirectories.
+
+## v0.0.13 - 2-05-2012
   * fixed missing path when folder doesn't match `name-code` pattern
 
 ## v0.0.12 - 23-04-2012

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/lib/adyen-admin/skin.rb

@@ -118,6 +118,10 @@ module Adyen
         skin_data[:version_test]
       end
 
+      def parent_skin
+        skin_data[:parent_skin] || "base"
+      end
+
       ##########################################
 
       def update
@@ -193,13 +197,15 @@ module Adyen
           Zip::ZipFile.open(filename, Zip::ZipFile::CREATE) do |zip_file|
             Dir["#{path}/**/**"].each do |file|
               next if file =~ exclude
+              raise if nested_subdirectory?(path, file)
               zip_file.add(file.sub(path, code), file)
             end
 
-            dir = File.join(File.dirname(path), parent_skin_code)
+            dir = File.join(File.dirname(path), parent_skin)
             Dir["#{dir}/**/**"].each do |file|
               begin
                 next if file =~ exclude
+                raise if nested_subdirectory?(path, file)
                 zip_file.add(file.sub(dir, code), file)
               rescue Zip::ZipEntryExistsError
                 # NOOP
@@ -209,10 +215,6 @@ module Adyen
         end
       end
 
-      def parent_skin_code
-        "base"
-      end
-
       # http://stackoverflow.com/questions/3420587/ruby-mechanize-multipart-form-with-file-upload-to-a-mediawiki
       def upload
         file = self.compress
@@ -273,6 +275,10 @@ module Adyen
         false
       end
 
+      def nested_subdirectory?(path, file)
+        (file.count("/") - path.count("/")) > 2
+      end
+
       ##################################
 
       def remote_version(scope = nil)

data/spec/adyen-admin/skin_spec.rb

@@ -371,6 +371,23 @@ module Adyen::Admin
           end
         end
 
+        context "with sub subfolders" do
+          before do
+            `mkdir #{path}/css/vendor`
+            `touch #{path}/css/vendor/test.css`
+          end
+
+          after do
+            `rm -rf #{path}/css/vendor`
+          end
+
+          it "throws exception" do
+            expect do
+              skin.compress
+            end.to raise_error
+          end
+        end
+
         context "no exlusion" do
           let(:zip_filename) { skin.compress(nil) }
 
@@ -382,6 +399,18 @@ module Adyen::Admin
             zip_contains("skin.html.erb").should be_true
           end
         end
+
+        context "with parent_skin" do
+          let(:skin_code) { "JH0815" }
+
+          before do
+            skin.stub(:parent_skin).and_return("example-7hFAQnmt")
+          end
+
+          it "excludes meta file" do
+            zip_contains("img/bg.gif").should be_true
+          end
+        end
       end
 
       describe "#upload" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adyen-admin
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000Z
+date: 2012-06-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &70183613017020 !ruby/object:Gem::Requirement
+  requirement: &70114033458460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70183613017020
+  version_requirements: *70114033458460
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70183613016540 !ruby/object:Gem::Requirement
+  requirement: &70114033457980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70183613016540
+  version_requirements: *70114033457980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70183613015960 !ruby/object:Gem::Requirement
+  requirement: &70114033457400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183613015960
+  version_requirements: *70114033457400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70183613015500 !ruby/object:Gem::Requirement
+  requirement: &70114033456940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183613015500
+  version_requirements: *70114033456940
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70183613015040 !ruby/object:Gem::Requirement
+  requirement: &70114029439580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183613015040
+  version_requirements: *70114029439580
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70183613014580 !ruby/object:Gem::Requirement
+  requirement: &70114029439120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183613014580
+  version_requirements: *70114029439120
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &70183613014120 !ruby/object:Gem::Requirement
+  requirement: &70114029438660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183613014120
+  version_requirements: *70114029438660
 description: A little Gem to make your life easier when dealing with Adyen skins
 email:
 - tobi@soundcloud.com