adyen-admin 0.0.7 → 0.0.8

data/CHANGES.md

@@ -2,11 +2,13 @@
 
 ## vx.x.x - ???
   * update Docu
-  * parse metafile
   * parent (instead of base)
   * add CLI binaries (to compile + upload) -> read from .adyenrc file
   * make compatible with Live system
 
+## v0.0.8 - ???
+  * parse metafile
+
 ## v0.0.7
   * fix download issue
   * fix name with multiple - issue

data/README.md

@@ -29,6 +29,14 @@ zip_file = skin.download # get zip file
 
 skin.decompile(zip_file) # unzip file and move to skin path, backup + overwrite existing files
 
+zip_file = skin.compile # unzip file and move to skin path, backup + overwrite existing files
+
+skin.upload(zip_file)
+
+skin.update # to get latest version
+
+skin.test_url # a URL which you can use to 'live' test you skin
+
 ```
 
 ### Skins

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/adyen-admin/skin.rb

@@ -1,5 +1,6 @@
 require 'tempfile'
 require 'zip/zip'
+require 'yaml'
 
 module Adyen
   module Admin
@@ -81,44 +82,56 @@ module Adyen
 
       def path=(new_path)
         if Skin.is_skin_path?(new_path)
-          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
           @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
         end
       end
 
-      ##################################
+      def skin_data(force_update = false)
+        update if force_update
+        @skin_data ||= YAML.load_file(skin_data_file) rescue {}
+      end
 
-      def version(scope = :local)
-        case scope
-        when :test
-          page = Adyen::Admin.get(VERSION_TEST % code)
-          page.search("body p").first.content.scan(/Version:(\d+)/).flatten.first.to_i
-        when :live
-          page = Adyen::Admin.get(VERSION_LIVE % code)
-          page.search("body p").first.content.scan(/Version:(\d+)/).flatten.first.to_i
-        else
-          page = Adyen::Admin.get(TEST % code)
-          page.search(".data tr td")[2].content.to_i
-        end
+      def uploaded_at
+        skin_data["uploaded_at"]
       end
 
-      def test_url(options = {})
-        page = Adyen::Admin.get(TEST % code)
-        page = Adyen::Admin.client.submit(page.form.tap do |form|
-          #:amount => 199, :currency => :shopper_locale, :country_code, :merchant_reference, :merchant_account, :system, :skip, :one_page
-        end)
-        Addressable::URI.parse(page.form.action).tap do |uri|
-          uri.query_values = page.form.fields.inject({}) { |hash, node|
-            hash[node.name] = node.value; hash
-          }
-        end
+      def version
+        skin_data["version"]
+      end
+
+      def version_live
+        skin_data["version_live"]
+      end
+
+      def version_test
+        skin_data["version_test"]
       end
 
       ##########################################
 
+      def update
+        @skin_data = {
+          :name => name,
+          :code => code,
+          :uploaded_at => Time.now,
+          :version => remote_version,
+          :version_live => remote_version(:live),
+          :version_test => remote_version(:test),
+        }
+        File.open(skin_data_file, "w") do |file|
+          file.write @skin_data.to_yaml
+        end
+      end
+
       # http://stackoverflow.com/questions/4360043/using-wwwmechanize-to-download-a-file-to-disk-without-loading-it-all-in-memory
       # Adyen::Admin.client.pluggable_parser.default = Mechanize::FileSaver
       def download
@@ -195,6 +208,7 @@ module Adyen
         end)
         form = page.form
         page = form.submit(page.form.button_with(:name => 'submit'))
+        update
       end
 
       def publish
@@ -205,6 +219,18 @@ module Adyen
 
       #################################
 
+      def test_url(options = {})
+        page = Adyen::Admin.get(TEST % code)
+        page = Adyen::Admin.client.submit(page.form.tap do |form|
+          #:amount => 199, :currency => :shopper_locale, :country_code, :merchant_reference, :merchant_account, :system, :skip, :one_page
+        end)
+        Addressable::URI.parse(page.form.action).tap do |uri|
+          uri.query_values = page.form.fields.inject({}) { |hash, node|
+            hash[node.name] = node.value; hash
+          }
+        end
+      end
+
       def to_s
         self.code
       end
@@ -222,12 +248,36 @@ module Adyen
         @name = n
       end
 
+      def skin_data_file
+        File.join(path, 'skin.yml')
+      end
+
       def self.is_skin_path?(path)
-        %w(skin.html.erb inc css js).each do |sub_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))
         end
         false
       end
+
+      ##################################
+
+      def remote_version(scope = nil)
+        case scope
+        when :test
+          @version_local ||= begin
+            page = Adyen::Admin.get(VERSION_TEST % code)
+            page.search("body p").first.content.scan(/Version:(\d+)/).flatten.first.to_i
+          end
+        when :live
+          page = Adyen::Admin.get(VERSION_LIVE % code)
+          page.search("body p").first.content.scan(/Version:(\d+)/).flatten.first.to_i
+        else
+          page = Adyen::Admin.get(TEST % code)
+          page.search(".data tr td")[2].content.to_i
+        end
+      rescue
+        nil
+      end
     end
   end
 end

data/spec/adyen-admin/skin_spec.rb

@@ -118,6 +118,74 @@ module Adyen::Admin
             Skin.new(:path => path).name.should == "example-test"
           end
         end
+
+        context "with skin data file" do
+          let(:path) { "#{skin_fixtures}/DV3tf95f" }
+          let(:skin) { Skin.new(:path => path) }
+
+          it "sets name" do
+            skin.name.should == "from-file"
+          end
+
+          it "sets code" do
+            skin.code.should == "customCode"
+          end
+
+          it "sets version" do
+            skin.version.should == 12
+          end
+
+          it "sets version_test" do
+            skin.version_test.should == 3
+          end
+
+          it "sets version_live" do
+            skin.version_live.should == 2
+          end
+        end
+      end
+
+      describe "#update"  do
+        let(:path) { "#{skin_fixtures}/example-7hFAQnmt" }
+
+        before do
+          skin.path = path
+        end
+
+        after do
+          `rm -f #{path}/skin.yml`
+        end
+
+        it "create skin.yml file" do
+          expect do
+            skin.update
+          end.to change { File.exists?("#{path}/skin.yml") }
+        end
+
+        context "local skin" do
+          it "returns version" do
+            skin.version.should be_nil
+          end
+
+          it "returns version" do
+            skin.version_live.should be_nil
+          end
+
+          it "returns version" do
+            skin.version_test.should  be_nil
+          end
+        end
+
+        context "remote fails" do
+          before do
+            Adyen::Admin.stub(:get).and_raise(StandardError)
+          end
+
+          it "returns version" do
+            skin.update
+            skin.version.should be_nil
+          end
+        end
       end
 
       describe "#download"  do
@@ -193,59 +261,70 @@ module Adyen::Admin
 
       describe "#compile" do
         let(:skin_code) { "DV3tf95f" }
-        let(:skin) { Skin.new(:path => "#{skin_fixtures}/#{skin_code}") }
+        let(:path) { "#{skin_fixtures}/#{skin_code}" }
+        let(:skin) { Skin.new(:path => path) }
         let(:zip_filename) { skin.compile }
 
         def zip_contains(file)
           Zip::ZipFile.open(zip_filename) do |zipfile|
-            return true if zipfile.find_entry(File.join(skin_code, file))
+            return true if zipfile.find_entry(File.join(skin.code, file))
           end
           false
         end
 
         after do
-          `rm -f #{skin_code}.zip`
+          `rm -f #{skin.code}.zip`
         end
 
-        context "without base" do
+        context "no skin.yml" do
           before do
-            `mv #{skin_fixtures}/base #{skin_fixtures}/base2`
+            `mv #{path}/skin.yml #{path}/skin2.yml`
           end
 
           after do
-            `mv #{skin_fixtures}/base2 #{skin_fixtures}/base`
+            `mv #{path}/skin2.yml #{path}/skin.yml`
+          end
+
+          context "without base" do
+            before do
+              `mv #{skin_fixtures}/base #{skin_fixtures}/base2`
+            end
+
+            after do
+              `mv #{skin_fixtures}/base2 #{skin_fixtures}/base`
+            end
+
+            it "includes screen file" do
+              zip_contains("css/screen.css").should be_true
+            end
+
+            it "excludes print files" do
+              zip_contains("css/print.css").should_not be_true
+            end
           end
 
           it "includes screen file" do
             zip_contains("css/screen.css").should be_true
           end
 
-          it "excludes print files" do
-            zip_contains("css/print.css").should_not be_true
+          it "includes print file" do
+            zip_contains("css/print.css").should be_true
           end
-        end
-
-        it "includes screen file" do
-          zip_contains("css/screen.css").should be_true
-        end
 
-        it "includes print file" do
-          zip_contains("css/print.css").should be_true
-        end
-
-        it "excludes meta file" do
-          zip_contains("metadata.yml").should_not be_true
-        end
+          it "excludes meta file" do
+            zip_contains("skin2.yml").should_not be_true
+          end
 
-        it "excludes skin file" do
-          zip_contains("skin.html.erb").should_not be_true
+          it "excludes skin file" do
+            zip_contains("skin.html.erb").should_not be_true
+          end
         end
 
         context "no exlusion" do
           let(:zip_filename) { skin.compile(nil) }
 
           it "excludes meta file" do
-            zip_contains("metadata.yml").should be_true
+            zip_contains("skin.yml").should be_true
           end
 
           it "excludes skin file" do
@@ -255,34 +334,46 @@ module Adyen::Admin
       end
 
       describe "#upload" do
+        let(:path) { "#{skin_fixtures}/example-7hFAQnmt" }
+
         after do
           `rm -f #{skin_code}.zip`
+          `rm -f #{path}/skin.yml`
         end
 
         context "valid set" do
-          it "increases version" do
-            skin.path = "#{skin_fixtures}/example-7hFAQnmt"
+          before do
+            skin.path = path
+          end
 
+          it "increases version" do
             expect do
               skin.upload
-            end.to change { skin.version }.by(1)
+            end.to change { skin.send(:remote_version) }.by(1)
+          end
+
+          it "updates skin data" do
+            skin.should_receive(:update)
+
+            skin.upload
           end
         end
       end
 
-      describe "#version" do
+      describe "#remote_version" do
         let(:skin) { Skin.new(:code => "Kx9axnRf", :name => "demo") }
+        let(:version) { 15 }
 
         it "returns uploaded value" do
-          skin.version.should == 14
+          skin.send(:remote_version).should == version
         end
 
         it "returns test value" do
-          skin.version(:test).should == 14
+          skin.send(:remote_version, :test).should == version
         end
 
         it "returns live value" do
-          skin.version(:live).should == 0
+          skin.send(:remote_version, :live).should == 0
         end
       end
 

data/spec/fixtures/cassettes/Adyen_Admin_Client/_get/raises_authenticated_error_when_not_logged_in.yml

@@ -29,13 +29,13 @@ http_interactions:
       message: Moved Temporarily
     headers: 
       Date: 
-      - Thu, 12 Apr 2012 15:59:55 GMT
+      - Thu, 19 Apr 2012 17:35:02 GMT
       Server: 
       - Apache
       Set-Cookie: 
-      - JSESSIONID=84F73E1B4FA287BC6827EC39280ADAF8.test5e; Path=/ca/; Secure; HttpOnly
+      - JSESSIONID=E9721CF1DF5254FC2788EDBE60AD5D5C.test5e; Path=/ca/; Secure; HttpOnly
       Location: 
-      - https://ca-test.adyen.com/ca/ca/login.shtml;jsessionid=84F73E1B4FA287BC6827EC39280ADAF8.test5e
+      - https://ca-test.adyen.com/ca/ca/login.shtml;jsessionid=E9721CF1DF5254FC2788EDBE60AD5D5C.test5e
       Content-Length: 
       - "0"
       Keep-Alive: 
@@ -48,10 +48,10 @@ http_interactions:
       encoding: US-ASCII
       string: ""
     http_version: 
-  recorded_at: Thu, 12 Apr 2012 15:59:55 GMT
+  recorded_at: Thu, 19 Apr 2012 17:35:02 GMT
 - request: 
     method: get
-    uri: https://ca-test.adyen.com/ca/ca/login.shtml;jsessionid=84F73E1B4FA287BC6827EC39280ADAF8.test5e
+    uri: https://ca-test.adyen.com/ca/ca/login.shtml;jsessionid=E9721CF1DF5254FC2788EDBE60AD5D5C.test5e
     body: 
       encoding: US-ASCII
       string: ""
@@ -67,7 +67,7 @@ http_interactions:
       Accept-Language: 
       - en-us,en;q=0.5
       Cookie: 
-      - JSESSIONID=84F73E1B4FA287BC6827EC39280ADAF8.test5e
+      - JSESSIONID=E9721CF1DF5254FC2788EDBE60AD5D5C.test5e
       Host: 
       - ca-test.adyen.com
       Connection: 
@@ -80,7 +80,7 @@ http_interactions:
       message: OK
     headers: 
       Date: 
-      - Thu, 12 Apr 2012 15:59:56 GMT
+      - Thu, 19 Apr 2012 17:35:02 GMT
       Server: 
       - Apache
       Cache-Control: 
@@ -242,7 +242,7 @@ http_interactions:
         		 
         		  <tr>
         		    <td colspan="2"><br />
-        				<input type="hidden" name="j_formHash" value="994jn5V6LNqMGPZwB9TZTQnwIKRgsw=" />
+        				<input type="hidden" name="j_formHash" value="964GlK7lxwq1iYLRIK2WHfvux9CXBM=" />
         				<input type="submit" class="button" value="Submit" /></td>
         		  </tr>
         		</table>
@@ -267,5 +267,5 @@ http_interactions:
         </html>
 
     http_version: 
-  recorded_at: Thu, 12 Apr 2012 15:59:55 GMT
+  recorded_at: Thu, 19 Apr 2012 17:35:02 GMT
 recorded_with: VCR 2.0.1