adyen-admin 0.0.15 → 0.0.16

data/CHANGES.md

@@ -5,9 +5,10 @@
   * add CLI binaries (to compile + upload) -> read from .adyenrc file
   * make compatible with Live system
 
-## v0.0.14 - 19-06-2012
+## v0.0.16 - 19-06-2012
   * config parent_skin via skin file
   * throw exception when including subdirectory of subdirectories.
+  * added get_file to find files within skin, fall back to parent_skin
 
 ## v0.0.13 - 2-05-2012
   * fixed missing path when folder doesn't match `name-code` pattern

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

data/lib/adyen-admin/skin.rb

@@ -32,8 +32,8 @@ module Adyen
         @default_path || "."
       end
 
-      def self.default_path=(path)
-        @default_path = path
+      def self.default_path=(default_path)
+        @default_path = default_path
       end
 
       # union remote and local skins. Local skins are frozen to
@@ -64,8 +64,8 @@ module Adyen
 
       # fetch all local skins
       def self.all_local
-        Dir[File.join(default_path.to_s, "*")].map do |path|
-          Skin.new(:path => path).freeze rescue nil
+        Dir[File.join(default_path.to_s, "*")].map do |skin_path|
+          Skin.new(:path => skin_path).freeze rescue nil
         end.compact
       end
 
@@ -97,6 +97,16 @@ module Adyen
         end
       end
 
+      def get_file(filename)
+        if self.path
+          File.join(self.path, filename).tap do |file|
+            if !File.exists?(file)
+              return File.join(File.dirname(self.path), parent_skin, filename)
+            end
+          end
+        end
+      end
+
       def skin_data(force_update = false)
         update if force_update
         @skin_data ||= YAML.load_file(skin_data_file) rescue {}
@@ -179,7 +189,7 @@ module Adyen
       end
 
       def compile(output, pattern = /<!-- ### inc\/([a-z]+) -->(.+?)<!-- ### -->/m)
-        raise ArgumentError, "No Path given" unless path
+        raise ArgumentError, "No Path given" unless self.path
 
         output.scan(pattern) do |name, content|
           file = File.join(path, "inc/#{name}.txt")
@@ -206,7 +216,7 @@ module Adyen
             Dir["#{dir}/**/**"].each do |file|
               begin
                 next if file =~ exclude
-                raise if nested_subdirectory?(path, file)
+                raise if nested_subdirectory?(dir, file)
                 zip_file.add(file.sub(dir, code), file)
               rescue Zip::ZipEntryExistsError
                 # NOOP
@@ -269,15 +279,15 @@ module Adyen
         File.join(path, 'skin.yml')
       end
 
-      def self.is_skin_path?(path)
+      def self.is_skin_path?(skin_path)
         %w(skin.html.erb skin.yml inc css js).each do |sub_path|
-          return true if File.exists?(File.join(path.to_s, sub_path))
+          return true if File.exists?(File.join(skin_path.to_s, sub_path))
         end
         false
       end
 
-      def nested_subdirectory?(path, file)
-        (file.count("/") - path.count("/")) > 2
+      def nested_subdirectory?(skin_path, file)
+        (file.count("/") - skin_path.count("/")) > 2
       end
 
       ##################################

data/spec/adyen-admin/skin_spec.rb

@@ -29,7 +29,7 @@ module Adyen::Admin
 
       describe ".all_remote" do
         it 'returns the skins' do
-          Skin.all_remote.should == [
+          Skin.all_remote.should =~ [
             skin,
             Skin.new(:code => "Kx9axnRf", :name => "demo"),
             Skin.new(:code => "vQW0fEo8", :name => "test"),
@@ -44,10 +44,10 @@ module Adyen::Admin
 
       describe ".all_local" do
         it 'returns the skins' do
-          Skin.all_local.should == [
+          Skin.all_local.should =~ [
             Skin.new(:code => "base"),
-            Skin.new(:code => "DV3tf95f"),
             skin,
+            Skin.new(:code => "DV3tf95f"),
             Skin.new(:code => "JH0815"),
           ]
         end
@@ -55,7 +55,7 @@ module Adyen::Admin
 
       describe ".all" do
         it 'returns the skins' do
-          Skin.all.should == [
+          Skin.all.should =~ [
             skin,
             Skin.new(:code => "Kx9axnRf", :name => "demo"),
             Skin.new(:code => "vQW0fEo8", :name => "test"),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adyen-admin
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &70233332460240 !ruby/object:Gem::Requirement
+  requirement: &70340051676700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233332460240
+  version_requirements: *70340051676700
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70233332459760 !ruby/object:Gem::Requirement
+  requirement: &70340051676220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233332459760
+  version_requirements: *70340051676220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70233332459180 !ruby/object:Gem::Requirement
+  requirement: &70340051675640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233332459180
+  version_requirements: *70340051675640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70233332458720 !ruby/object:Gem::Requirement
+  requirement: &70340051675180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233332458720
+  version_requirements: *70340051675180
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70233332477960 !ruby/object:Gem::Requirement
+  requirement: &70340051697240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233332477960
+  version_requirements: *70340051697240
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70233332477500 !ruby/object:Gem::Requirement
+  requirement: &70340051696780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233332477500
+  version_requirements: *70340051696780
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &70233332477040 !ruby/object:Gem::Requirement
+  requirement: &70340051696320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233332477040
+  version_requirements: *70340051696320
 description: A little Gem to make your life easier when dealing with Adyen skins
 email:
 - tobi@soundcloud.com