adyen-admin 0.0.17 → 0.0.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzI5NzJjMjQ2ZGZlMWIyMTUxODBlNTJkYzg1ZjgyOGJjNDllMGQxYw==
+    OGVjODc0NDA1NzRiN2RlZDYyMDI4OGMwMTY0YWZmMDkxNDY2ODI0Ng==
   data.tar.gz: !binary |-
-    YzQ1OGY5ZTZlN2RjOWRkZjRkZmJlMjY1YTc3ZGY4NjYxMjJkZjcyZA==
+    YmExZDNiMGZkMDBhZDU0OGM3M2EwY2VkN2JiZGZkMjViZjViOTkxMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWRhZjM1NzExYzJiYzliNzk0Mzk4YWRhNDVjNWM0YWU5ODQzMWNmZWI2NjEy
-    NWQ2NTRlMDU2NWNmZTM4YTc4OTc1ZTdkMjA2ZDg4Yzc2OGJlNzU2M2FmNjA4
-    MTBhMTA1ZWRjNjU3ZTZlOGQ3YTkzYzcwZmU4NjNkMTg4YjdhMjk=
+    ZTQxZTYwMjkwODRlY2ZkMTdjMzNiNmVhNTZkM2RlNDlkNTI4OTM5MmYxZWRh
+    NTY1Y2U5MjE3YWEwN2M2ZWE0MjQ1NGYxOWUzYzE3Y2Y2ZDBlNTY2YWYwYTIy
+    OTEyYjMwNzI1NTBkMDFiZmI0YmJlZWUxZjc5NDFkZjBhMzAwZWQ=
   data.tar.gz: !binary |-
-    OTE0MGI0MmM1NjY1NzljY2UyYmQzNzMyZTRkMGZlOTUxNjdmNzY3NGY3YmY3
-    YmQ3MmVkZGQ3MzE0Y2IzM2NhODZkOThmOWE2Y2UzNjA2NDAyNjI1MWFjZTc5
-    YjNmNDkzNzMyNmVkYzBlZmM3MmIzOTQ3ZmIzMWFjY2RlMDlhYzk=
+    MTYxNmRmN2VjNjBiZDU0NDA0MDJkMWJhMzNmNjUyMjNmMDg4OTk3NzAwZTQx
+    MGZkMmQyOTViOTQ0OWNjODNiY2EwMmNkMzIwY2FmMDA2YTg4NGU4ZjMzZWQ2
+    OTFiMzUyY2I5NDYzNGM5ZmEzN2YzMTU1ZDQ1NGY3ZDhiMTg0NmI=

data/CHANGES.md

@@ -5,6 +5,11 @@
   * add CLI binaries (to compile + upload) -> read from .adyenrc file
   * make compatible with Live system
 
+## v0.0.18 - 16-11-2013
+  * include default_data in skin
+  * explicit path or code+name
+  * code cleanup
+
 ## v0.0.17 - 15-11-2013
   * fixed upload
   * gem updates

data/VERSION

@@ -1 +1 @@
-0.0.17
+0.0.18

data/lib/adyen-admin/skin.rb

@@ -17,91 +17,99 @@ module Adyen
       attr_reader :code, :name, :path
 
       def initialize(attributes = {})
-        attributes.each do |key, value|
-          send("#{key}=", value)
+        if attributes[:path] && attributes[:code]
+          raise ArgumentError, "Either :path or :code has to be provided"
         end
 
-        self.path ||= File.expand_path File.join(Skin.default_path, [name,code].compact.join("-"))
-        self.path ||= File.expand_path File.join(Skin.default_path, name.to_s)
-        self.path ||= File.expand_path File.join(Skin.default_path, code.to_s)
-
-        raise ArgumentError, "No Code given" unless code
+        if new_path = attributes[:path]
+          raise ArgumentError, ":path '#{new_path}' is not a valid skin" unless Skin.is_skin_path?(new_path)
+          @path = new_path
+          @code = skin_data[:code] || code_from_path(path)
+          @name = skin_data[:name] || name_from_path(path)
+        else
+          @code = attributes[:code]
+          raise ArgumentError, ":code is not provided" unless code
+          @name = attributes[:name]
+          @path = Skin.path_from_code(code) || Skin.generate_path(code, name)
+        end
       end
 
-      def self.default_path
-        @default_path || "."
-      end
+      class << self
+        def default_path
+          @default_path || "."
+        end
 
-      def self.default_path=(default_path)
-        @default_path = default_path
-      end
+        def default_path=(default_path)
+          @default_path = default_path
+        end
 
-      # union remote and local skins. Local skins are frozen to
-      # indicate no availble remote counter part which avoid update
-      def self.all
-        @all ||= {}.tap do |hash|
-          if Adyen::Admin.authenticated?
-            self.all_remote.each do |skin|
+        # union remote and local skins. Local skins are frozen to
+        # indicate no availble remote counter part which avoid update
+        def all
+          @all ||= {}.tap do |hash|
+            if Adyen::Admin.authenticated?
+              all_remote.each do |skin|
+                hash[skin.code] = skin unless hash[skin.code]
+              end
+            end
+            all_local.each do |skin|
               hash[skin.code] = skin unless hash[skin.code]
             end
+          end.values
+        end
+
+        # fetch all remote skins
+        def all_remote
+          page = Adyen::Admin.get(SKINS)
+          page.search(".data tbody tr").map do |node|
+            Skin.new({
+              :code => node.search("a")[0].content.strip,
+              :name => node.search("td")[1].content.strip,
+            })
           end
-          self.all_local.each do |skin|
-            hash[skin.code] = skin unless hash[skin.code]
-          end
-        end.values
-      end
+        end
 
-      # fetch all remote skins
-      def self.all_remote
-        page = Adyen::Admin.get(SKINS)
-        page.search(".data tbody tr").map do |node|
-          Skin.new({
-            :code => node.search("a")[0].content.strip,
-            :name => node.search("td")[1].content.strip,
-          })
+        # fetch all local skins
+        def all_local
+          Dir[File.join(default_path.to_s, "*")].map do |skin_path|
+            Skin.new(:path => skin_path).freeze rescue nil
+          end.compact
         end
-      end
 
-      # fetch all local skins
-      def self.all_local
-        Dir[File.join(default_path.to_s, "*")].map do |skin_path|
-          Skin.new(:path => skin_path).freeze rescue nil
-        end.compact
-      end
+        # find a skin within remote + local ones
+        def find(skin_code)
+          all.select do |skin|
+            skin.code == skin_code
+          end.first
+        end
 
-      # find a skin within remote + local ones
-      def self.find(skin_code)
-        self.all.select do |skin|
-          skin.code == skin_code
-        end.first
-      end
+        def purge_cache
+          @all = nil
+        end
 
-      def self.purge_cache
-        @all = nil
-      end
+        def is_skin_path?(skin_path)
+          %w(skin.yml inc css js).any? do |sub_path|
+            File.exists?(File.join(skin_path.to_s, sub_path))
+          end
+        end
 
-      ##################################
+        def path_from_code(code)
+          Dir[File.join(Skin.default_path, "**/*#{code}*")].first
+        end
 
-      def path=(new_path)
-        if Skin.is_skin_path?(new_path)
-          @path = new_path
-          if !skin_data.empty?
-            self.code = skin_data[:code]
-            self.name = skin_data[:name]
-          else
-            new_code, *new_name = File.basename(new_path).split("-").reverse
-            self.code ||= new_code
-            self.name ||= new_name.reverse.join("-")
-            raise ArgumentError if self.code && self.code != new_code
-          end
+        def generate_path(name, code)
+          dir_name = name.gsub(' ', '-').gsub(/[^a-z0-9-]/i, '')
+          File.expand_path File.join(Skin.default_path, [dir_name, code].compact.join("-"))
         end
       end
 
+      ##################################
+
       def get_file(filename)
-        if self.path
-          File.join(self.path, filename).tap do |file|
+        if path
+          File.join(path, filename).tap do |file|
             if !File.exists?(file)
-              return File.join(File.dirname(self.path), parent_skin, filename)
+              return File.join(File.dirname(path), parent_skin, filename)
             end
           end
         end
@@ -140,13 +148,14 @@ module Adyen
 
       def update
         @skin_data = {
-          :name => name,
-          :code => code,
-          :uploaded_at => Time.now,
-          :version => remote_version,
+          :name         => name,
+          :code         => code,
+          :uploaded_at  => Time.now.iso8601,
+          :version      => remote_version,
           :version_live => remote_version(:live),
           :version_test => remote_version(:test),
           :parent_skin  => parent_skin,
+          :default_data => default_data,
         }
         File.open(skin_data_file, "w") do |file|
           file.write @skin_data.to_yaml
@@ -163,7 +172,7 @@ module Adyen
 
       def decompile(filename, backup = true)
         # create backup of current, include any files
-        if self.path
+        if path
           if backup
             compress(/(zip|lock)$/, ".backup.zip")
           end
@@ -175,7 +184,7 @@ module Adyen
 
         Zip::File.open(filename) do |zip_file|
           zip_file.each do |file|
-            f_path = File.join(self.path || decompile_path, file.name.gsub("#{code}/", ""))
+            f_path = File.join(path || decompile_path, file.name.gsub("#{code}/", ""))
             FileUtils.mkdir_p(File.dirname(f_path))
             if File.directory?(f_path)
               `mkdir -p #{f_path}`
@@ -188,12 +197,12 @@ module Adyen
         self.path ||= decompile_path
 
         if backup
-          `mv .backup.zip #{File.join(self.path, ".backup.zip")}`
+          `mv .backup.zip #{File.join(path, ".backup.zip")}`
         end
       end
 
       def compile(output, pattern = /<!-- ### inc\/([a-z]+) -->(.+?)<!-- ### -->/m)
-        raise ArgumentError, "No Path given" unless self.path
+        raise ArgumentError, "No Path given" unless path
 
         output.scan(pattern) do |name, content|
           file = File.join(path, "inc/#{name}.txt")
@@ -232,7 +241,7 @@ module Adyen
 
       # http://stackoverflow.com/questions/3420587/ruby-mechanize-multipart-form-with-file-upload-to-a-mediawiki
       def upload
-        file = self.compress
+        file = compress
 
         page = Adyen::Admin.get(UPLOAD_SELECT)
         page = page.link_with(:href => Regexp.new(Regexp.escape(UPLOAD % code))).click
@@ -264,33 +273,26 @@ module Adyen
       end
 
       def to_s
-        self.code
+        code
       end
 
       def ==(skin)
-        self.code == skin.code
+        code == skin.code
       end
 
-      protected
-      def code=(c)
-        @code = c
+      private
+      def code_from_path(path)
+        File.basename(path).split("-").last
       end
 
-      def name=(n)
-        @name = n
+      def name_from_path(path)
+        File.basename(path).split("-")[0..-2].join('-')
       end
 
       def skin_data_file
         File.join(path, 'skin.yml')
       end
 
-      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(skin_path.to_s, sub_path))
-        end
-        false
-      end
-
       def nested_subdirectory?(skin_path, file)
         (file.count("/") - skin_path.count("/")) > 2
       end

data/spec/adyen-admin/skin_spec.rb

@@ -16,6 +16,10 @@ module Adyen::Admin
       end
     end
 
+    before do
+      Adyen::Admin::Skin.default_path = skin_fixtures
+    end
+
     describe ".all" do
       it 'returns all local skins' do
         Skin.all.should == Skin.all_local
@@ -42,7 +46,6 @@ module Adyen::Admin
         end
 
         it 'sets local path' do
-          Adyen::Admin::Skin.default_path = skin_fixtures
           Skin.find(skin_code).path.should == "#{skin_fixtures}/example-#{skin_code}"
         end
       end
@@ -134,11 +137,11 @@ module Adyen::Admin
           let(:skin) { Skin.new(:path => path) }
 
           it "sets name" do
-            skin.name.should == "DV3tf95f"
+            skin.name.should == "custom name"
           end
 
           it "sets code" do
-            skin.code.should == "customCode"
+            skin.code.should == "DV3tf95f"
           end
 
           it "sets version_live" do
@@ -165,7 +168,7 @@ module Adyen::Admin
             end
 
             it "sets version_live" do
-              skin.path.should == "#{skin_fixtures}/DV3tf95f"
+              skin.path.should == "#{skin_fixtures}/customCode-DV3tf95f"
             end
           end
         end
@@ -173,10 +176,7 @@ module Adyen::Admin
 
       describe "#update"  do
         let(:path) { "#{skin_fixtures}/example-#{skin_code}" }
-
-        before do
-          skin.path = path
-        end
+        let(:skin) { Skin.new(:path => path) }
 
         after do
           `rm -f #{path}/skin.yml`
@@ -413,9 +413,7 @@ module Adyen::Admin
         end
 
         context "valid set" do
-          before do
-            skin.path = path
-          end
+          let(:skin) { Skin.new(:path => path) }
 
           it "increases version" do
             expect { subject }.to change { skin.send(:remote_version) }.by(1)

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

@@ -1,6 +1,6 @@
 ---
-:name: DV3tf95f
-:code: customCode
+:name: custom name
+:code: DV3tf95f
 :uploaded_at:
 :version: 12
 :version_test: 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adyen-admin
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Tobias Bielohlawek