adyen-skinbuilder 0.3.0 → 0.3.1

data/.gitignore

@@ -1,3 +1,3 @@
 pkg
+.adyenrc
 .rvmrc
-.adyenrc

data/CHANGELOG.md

@@ -4,10 +4,21 @@
   * multiple user, assets upload, hosted system
 
 ## Todo
-  * beautify index page, add 'new', 'edit', 'download'
+  * beautify index page, add 'new', 'edit'
   * add locale support
   * add more functions to binary to get a proper CLI tool (or move to adyen-admin??)
   * more helper e.g. cutom fields
+  * auto concatinate multiple .js files
+  * auto concatinate multiple .css files
+  * auto build example PaymentMethod skeleton
+  * support new CSS selectors
+
+## v0.3.1
+  * feature: see remote version
+  * feature: read skin code from skin.yaml file
+  * fix skincode name
+  * fix relative skin path
+  * fix non existing link to setup remote admin
   * auto re-login when session timed out
 
 ## v0.3.0
@@ -15,6 +26,7 @@
   * show local / remote skins, option to sync
   * add skin upload -> 'adyen-admin'
   * add skin export
+  * added action 'download'
   * gemify
   * add custom skin path
   * add order_data

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    adyen-skinbuilder (0.3.0.rc2)
+    adyen-skinbuilder (0.3.1)
       adyen-admin
       sinatra
       sinatra-contrib
@@ -10,7 +10,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    adyen-admin (0.0.7)
+    adyen-admin (0.0.12)
       mechanize
       rubyzip
     backports (2.5.1)
@@ -24,7 +24,7 @@ GEM
       thor (~> 0.14.6)
     guard-rspec (0.7.0)
       guard (>= 0.10.0)
-    mechanize (2.3)
+    mechanize (2.4)
       domain_name (~> 0.5, >= 0.5.1)
       mime-types (~> 1.17, >= 1.17.2)
       net-http-digest_auth (~> 1.1, >= 1.1.1)

data/bin/adyen-skinbuilder

@@ -8,7 +8,7 @@ opts = {}
 
 
 if (skins = ARGV.last) && File.directory?(skins)
-  opts[:skins_directory] = skins
+  opts[:skins_directory] = File.expand_path(skins)
 
   begin
     skin = Adyen::Admin::Skin.new(:path => skins) #auto launch skin

data/lib/adyen-skinbuilder/helper/adyen.rb

@@ -23,6 +23,9 @@ module Adyen
         #
         # def adyen_custom_hidden_tag
         # end
+
+        ## autofill cc
+        ## autofill avs
       end
     end
   end

data/lib/adyen-skinbuilder/helper/render.rb

@@ -17,13 +17,13 @@ module Adyen
 
         # renders a file from the inc folder of the skin
         def render_file(file)
-          file = skin_path @skin_code, "/inc/#{file}.txt"
+          file = File.join(@skin.path, "inc/#{file}.txt")
           File.read(file) if File.exists?(file)
         end
 
          # render an erb partial inline
         def render_partial(file, locals = {})
-          views = locals.delete(:views) || skin_path(@skin_code)
+          views = locals.delete(:views) || @skin.path
           erb "_#{file}.html".to_sym, :layout => false, :views => views, :locals => locals
         end
       end

data/lib/adyen-skinbuilder/server.rb

@@ -25,6 +25,7 @@ module Adyen
 
       def skins_directory
         @@skins_directory ||= begin
+          # check if it's a skin, if so use dirname
           Adyen::Admin::Skin.new(:path => settings.skins_directory)
           File.dirname(settings.skins_directory)
         rescue ArgumentError
@@ -32,41 +33,33 @@ module Adyen
         end
       end
 
-      def skin_path(*path)
-        File.join(skins_directory, *path)
-      end
-
-      def skin_file(skin_code)
-        skin_path(skin_code, "skin.html").tap do |file|
+      def skin_file(skin, filename = "skin.html")
+        File.join(skin.path, filename).tap do |file|
           if !File.exists?("#{file}.erb")
-            file.replace File.join(settings.views, "skin.html")
-          end
-        end
-      end
-
-      def store(output)
-        output.scan(/<!-- ### inc\/([a-z]+) -->(.+?)<!-- ### -->/m) do |name, content|
-          file = skin_path @skin_code, "/inc/#{name}.txt"
-          `mkdir -p #{File.dirname(file)}`
-          File.open(file, "w") do |f|
-            f.write content.strip
+            return File.join(settings.views, filename)
           end
         end
       end
 
       def adyen_login
-        if settings.adyen_admin_cfg && !Adyen::Admin.authenticated?
-          cfg = settings.adyen_admin_cfg
+        if (cfg = settings.adyen_admin_cfg) && !Adyen::Admin.authenticated?
           Adyen::Admin.login(cfg[:accountname], cfg[:username], cfg[:password])
         end
       end
 
+      def render_skin(skin)
+        erb(skin_file(skin).to_sym, {
+          :views => '/',
+          :layout => File.join(settings.views, "layout.html").to_sym
+        })
+      end
+
       helpers Helper::Render, Helper::Adyen
 
       get '/sf/:skin_code/*' do |skin_code, path|
-        if (file = skin_path(skin_code, path)) && File.exists?(file)
+        if (skin = Adyen::Admin::Skin.find(skin_code)) && (file = File.join(skin.path, path)) && File.exists?(file)
           send_file file
-        elsif (file = skin_path("base", path)) && File.exists?(file)
+        elsif (file = File.join(skins_directory, "base", path)) && File.exists?(file)
           send_file file
         end
       end
@@ -83,46 +76,63 @@ module Adyen
       get '/favicon.ico' do
       end
 
-      # skin page
-      get '/:skin_code' do |skin_code|
-        @skin_code = skin_code
-
-        erb(skin_file(@skin_code).to_sym, {
-          :views => '/',
-          :layout => File.join(settings.views, "layout.html").to_sym
-        }).tap do |output|
-          if @skin = Adyen::Admin::Skin.new(:path => skin_path(skin_code))
-            if params[:compile]
-              store(output)
-              send_file(@skin.compile) && return
-            elsif params[:upload]
-              store(output)
-              adyen_login
-              @skin.upload
-            end
-          end
+      get '/:skin_code/upload' do |skin_code|
+        if @skin = Adyen::Admin::Skin.find(skin_code)
+          output = render_skin @skin
+          @skin.compile(output)
+          @skin.upload
         end
+        redirect '/sync'
       end
 
-      # cache remote skins
-      @@skin_cache = nil
-
-      # index page
-      get '/' do
-        Adyen::Admin::Skin.default_path = skin_path
-        if params[:sync]
-          Adyen::Admin::Skin.purge_cache
-          adyen_login
-          @@skin_cache = Adyen::Admin::Skin.all
-        end
-        if params[:download] && (@skin = Adyen::Admin::Skin.find(params[:download]))
+      get '/:skin_code/download' do |skin_code|
+        if @skin = Adyen::Admin::Skin.find(skin_code)
           @skin.download.tap do |zip_file|
             @skin.decompile(zip_file)
-            `cp #{skin_file(@skin.code)}.erb #{@skin.path}`
+            `cp #{skin_file(@skin)}.erb #{@skin.path}`
             `rm -f #{zip_file}`
           end
         end
-        @skins = @@skin_cache || Adyen::Admin::Skin.all_local
+        redirect '/'
+      end
+
+      get '/:skin_code/update' do |skin_code|
+        if @skin = Adyen::Admin::Skin.find(skin_code)
+          @skin.update
+        end
+        redirect '/sync'
+      end
+
+      get '/:skin_code/compile' do |skin_code|
+        if @skin = Adyen::Admin::Skin.find(skin_code)
+          output = render_skin @skin
+          @skin.compile(output)
+          send_file(@skin.compress)
+        else
+          redirect '/'
+        end
+      end
+
+      get '/sync' do
+        Adyen::Admin::Skin.default_path = skins_directory
+        Adyen::Admin::Skin.purge_cache
+        adyen_login
+        redirect '/'
+      end
+
+      # skin page
+      get '/:skin_code' do |skin_code|
+        if @skin = Adyen::Admin::Skin.find(skin_code)
+          render_skin @skin
+        else
+          redirect '/'
+        end
+      end
+
+      # index page
+      get '/' do
+        Adyen::Admin::Skin.default_path = skins_directory
+        @skins = Adyen::Admin::Skin.all
         @adyen_admin_cfg = settings.adyen_admin_cfg
 
         erb 'index.html'.to_sym, :layout => false

data/lib/adyen-skinbuilder/server/views/index.html.erb

@@ -63,17 +63,17 @@
         <h1>Adyen Skins</h1>
 
         <% unless @adyen_admin_cfg %>
-          <div class="warning">No Adyen Admin config found. Please create a <i>.adyenrc</i> with credentials, see <a href="">more details see here</a></div>
+          <div class="warning">No Adyen Admin config found. Please create a <i>.adyenrc</i> with credentials, see <a href="https://github.com/priithaamer/adyen-skinbuilder#interacting-with-remote-adyen-admin">more details see here</a></div>
         <% end %>
 
-        Skins found in <i><%= skin_path %></i>
+        Skins found in <i><%= skins_directory %></i>
         <br>
 
         <table>
           <tr>
              <th>Status</th>
              <th>Name</th>
-             <th>Code</th>
+             <th>Versions</th>
              <th>Action</th>
              <th>Remote</th>
           </tr>
@@ -84,17 +84,26 @@
                   <%= "R" unless skin.frozen? %>
                   <%= "L" if skin.path %>
                 </td>
-                <td><img src="https://ca-test.adyen.com/ca/img/icons/layout_content.png"><a href="/<%= File.basename(skin.path.to_s) %>"><%= skin.name || skin.code %></a></td>
-                <td><%= skin.code %></td>
+                <td><a href="/<%= skin.code %>"><img src="https://ca-test.adyen.com/ca/img/icons/layout_content.png" border="0"><%= skin.name || skin.code %></a></td>
                 <td>
-                  <% if @adyen_admin_cfg && !skin.frozen? %>
+                  <% if !skin.frozen? %>
+                    <%= skin.version %>
+                    -
+                    <%= skin.version_test %>
+                    -
+                    <%= skin.version_live %>
+                  <% end %>
+                </td>
+                <td>
+                  <% if Adyen::Admin.authenticated? && !skin.frozen? %>
                     <% if skin.path %>
-                      <a href="/<%= File.basename(skin.path.to_s) %>?upload=true">upload</a>
+                      <a href="/<%= skin.code %>/upload">upload</a>
                     <% else %>
-                      <a href="/?download=<%= skin.code %>">download</a>
+                      <a href="/<%= skin.code %>/download">download</a>
                     <% end %>
+                      <a href="/<%= skin.code %>/update">update</a>
                   <% else %>
-                    <a href="/<%= File.basename(skin.path.to_s) %>?compile=true">compile</a>
+                    <a href="/<%= skin.code %>/compile">compile</a>
                   <% end %>
                 </td>
                 <td>
@@ -109,7 +118,7 @@
         </table>
 
         <% if @adyen_admin_cfg %>
-          <a href="?sync=true">Sync with remote Adyen Admin<a>
+          <a href="/sync">Sync with remote Adyen Admin<a>
         <% end %>
       </div>
     </div>

data/lib/adyen-skinbuilder/server/views/layout.html.erb

@@ -1,17 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>Page Title</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title><%= @skin.code %> - Adyen-Skinbuilder</title>
 
     <link rel="stylesheet" media="screen" type="text/css" href="/hpp/css/reset.css" />
 
-    <link rel="stylesheet" media="screen" type="text/css" href="/sf/<%= @skin_code %>/css/screen.css" />
-    <link rel="stylesheet" media="print" type="text/css" href="/sf/<%= @skin_code %>/css/print.css" />
+    <link rel="stylesheet" media="screen" type="text/css" href="/sf/<%= @skin.code %>/css/screen.css" />
+    <link rel="stylesheet" media="print" type="text/css" href="/sf/<%= @skin.code %>/css/print.css" />
 
     <script type="text/javascript" src="/hpp/js/default.js"></script>
-    <script type="text/javascript" src="/sf/<%= @skin_code %>/js/custom.js"></script>
+    <script type="text/javascript" src="/sf/<%= @skin.code %>/js/custom.js"></script>
     <!--[if lt IE 7]>
-      <link rel="stylesheet" type="text/css" href="/sf/<%= @skin_code %>/css/screen_ie6.css" />
+      <link rel="stylesheet" type="text/css" href="/sf/<%= @skin.code %>/css/screen_ie6.css" />
     <![endif]-->
   </head>
   <body>

data/lib/adyen-skinbuilder/version.rb

@@ -1,5 +1,5 @@
 module Adyen
   module Skinbuilder
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/spec/lib/adyen-skinbuilder/server_spec.rb

@@ -6,7 +6,7 @@ describe 'SkinBuilder server' do
   include Rack::Test::Methods
 
   let(:skins_directory) { File.expand_path(File.join(File.dirname(__FILE__), '../../fixtures/skins')) }
-  let(:skin_code) { "/DV3tf95f" }
+  let(:skin_code) { "DV3tf95f" }
 
   def app
     Adyen::SkinBuilder::Server.tap do |app|
@@ -16,13 +16,15 @@ describe 'SkinBuilder server' do
 
   before do
     Adyen::Admin.stub(:login)
+    Adyen::Admin::Skin.purge_cache
+    Adyen::Admin::Skin.default_path = skins_directory
   end
 
   describe 'assets' do
     let(:file) { '/css/screen.css' }
 
     before(:each) do
-      get "/sf" + skin_code + file
+      get File.join( "/sf", skin_code, file)
     end
 
     it 'responds with 200 status' do
@@ -34,7 +36,7 @@ describe 'SkinBuilder server' do
     end
 
     it 'returns file content' do
-      last_response.body.should == File.read(skins_directory + skin_code + file)
+      last_response.body.should == File.read(File.join(skins_directory, skin_code, file))
     end
 
     context 'file not available, falls back to base' do
@@ -54,130 +56,132 @@ describe 'SkinBuilder server' do
     end
   end
 
-  describe 'GET /' do
-    context "split files skin" do
+  describe 'GET' do
+    describe '/' do
+      let(:path) { '/' }
+
       before(:each) do
         get path
       end
 
-      describe "index" do
-        let(:path) { '/' }
-
-        it 'responds with 200 status' do
-          last_response.status.should == 200
-        end
+      it 'responds with 200 status' do
+        last_response.status.should == 200
+      end
 
-        it 'returns adyen skeleton in HTML format' do
-          last_response.headers.fetch('Content-Type').should == 'text/html;charset=utf-8'
-        end
+      it 'returns adyen skeleton in HTML format' do
+        last_response.headers.fetch('Content-Type').should == 'text/html;charset=utf-8'
+      end
 
-        it 'returns skins_directory' do
-          last_response.body.should include(skins_directory)
-        end
+      it 'returns skins_directory' do
+        last_response.body.should include(skins_directory)
+      end
 
-        it 'returns avilable skins' do
-          last_response.body.should include(skin_code)
-        end
+      it 'returns avilable skins' do
+        last_response.body.should include(skin_code)
       end
+    end
 
-      describe "skin" do
-        let(:path) { skin_code }
+    describe "/:skin_code" do
+      let(:path) { "/#{skin_code}" }
 
-        it 'responds with 200 status' do
-          last_response.status.should == 200
-        end
+      before(:each) do
+        get path
+      end
+
+      it 'responds with 200 status' do
+        last_response.status.should == 200
+      end
 
-        it 'returns adyen skeleton in HTML format' do
-          last_response.headers.fetch('Content-Type').should == 'text/html;charset=utf-8'
-        end
+      it 'returns adyen skeleton in HTML format' do
+        last_response.headers.fetch('Content-Type').should == 'text/html;charset=utf-8'
+      end
 
-        it 'returns adyen form' do
-          last_response.body.should include('<form id="pageform" action="" method="post" onsubmit="return formValidate(this);">')
-        end
+      it 'returns adyen form' do
+        last_response.body.should include('<form id="pageform" action="" method="post" onsubmit="return formValidate(this);">')
+      end
 
-        it 'returns order data' do
-          last_response.body.should include(File.read(skins_directory + skin_code + '/inc/order_data.txt'))
-        end
+      it 'returns order data' do
+        last_response.body.should include(File.read(File.join(skins_directory, skin_code, 'inc/order_data.txt')))
       end
     end
 
-    context "one file skin" do
-      describe "compile" do
-        let(:skin_code) { "/JH0815" }
-        let(:path) { skin_code + "?compile=true" }
+    describe "/compile" do
+      let(:skin_code) { "JH0815" }
+      let(:path) { "/#{skin_code}/compile" }
+      let(:skin_dir) { File.join(skins_directory, skin_code) }
 
-        before(:each) do
-          get path
-        end
+      before do
+        get path
+      end
 
-        after do
-          FileUtils.rm_rf(skins_directory + skin_code + '/inc')
-          `rm JH0815.zip`
-        end
+      after do
+        FileUtils.rm_rf( skin_dir + '/inc')
+        `rm #{skin_code}.zip`
+      end
 
-        it 'writes cheader' do
-          File.read(skins_directory + skin_code + '/inc/cheader.txt').should == "<!-- ### inc/cheader_[locale].txt or inc/cheader.txt (fallback) ### -->"
-        end
+      it 'writes cheader' do
+        File.read( skin_dir + '/inc/cheader.txt').should == "<!-- ### inc/cheader_[locale].txt or inc/cheader.txt (fallback) ### -->"
+      end
 
-        it 'writes pmheader' do
-          File.read(skins_directory + skin_code + '/inc/pmheader.txt').should == "<!-- ### inc/pmheader_[locale].txt or inc/pmheader.txt (fallback) ### -->"
-        end
+      it 'writes pmheader' do
+        File.read( skin_dir + '/inc/pmheader.txt').should == "<!-- ### inc/pmheader_[locale].txt or inc/pmheader.txt (fallback) ### -->"
+      end
 
-        it 'writes pmfooter' do
-          File.read(skins_directory + skin_code + '/inc/pmfooter.txt').should == "<!-- ### inc/pmfooter_[locale].txt or inc/pmfooter.txt (fallback) ### -->\n\n  <!-- ### inc/customfields_[locale].txt or inc/customfields.txt (fallback) ### -->"
-        end
+      it 'writes pmfooter' do
+        File.read( skin_dir + '/inc/pmfooter.txt').should == "<!-- ### inc/pmfooter_[locale].txt or inc/pmfooter.txt (fallback) ### -->\n\n  <!-- ### inc/customfields_[locale].txt or inc/customfields.txt (fallback) ### -->"
+      end
 
-        it 'writes cfooter' do
-          File.read(skins_directory + skin_code + '/inc/cfooter.txt').should == "<!-- ### inc/cfooter_[locale].txt or inc/cfooter.txt (fallback) ### -->"
-        end
+      it 'writes cfooter' do
+        File.read( skin_dir + '/inc/cfooter.txt').should == "<!-- ### inc/cfooter_[locale].txt or inc/cfooter.txt (fallback) ### -->"
+      end
 
-        it "returns zip file" do
-          last_response.headers["Content-Type"].should == "application/zip"
-        end
+      it "returns zip file" do
+        last_response.headers["Content-Type"].should == "application/zip"
       end
+    end
 
-      describe "upload" do
-        let(:path) { skin_code + "?upload=true" }
-        let!(:skin) { Adyen::Admin::Skin.new(:path => skins_directory + skin_code) }
+    describe "/upload" do
+      let(:path) { "/#{skin_code}/upload" }
+      let!(:skin) { Adyen::Admin::Skin.new(:path => File.join(skins_directory, skin_code)) }
+      let(:skin_dir) { File.join(skins_directory, skin_code) }
 
-        after do
-          `rm -rf #{skins_directory + skin_code}/inc/*er.txt`
-        end
+      after do
+        `rm -rf #{skin_dir}/inc/*er.txt`
+      end
 
-        it "calls upload on skin" do
-          Adyen::Admin::Skin.should_receive(:new).and_return(skin)
-          skin.should_receive(:upload)
-          get path
-        end
+      it "calls upload on skin" do
+        Adyen::Admin::Skin.should_receive(:find).and_return(skin)
+        skin.should_receive(:upload)
+        get path
       end
+    end
 
-      describe "download" do
-        let(:skin_code) { "vQW0fEo8" }
-        let(:path) { "/?download=vQW0fEo8" }
-        let(:skin) { Adyen::Admin::Skin.new(:code => skin_code) }
+    describe "/download" do
+      let(:skin_code) { "vQW0fEo8" }
+      let(:path) { "/#{skin_code}/download" }
+      let(:skin) { Adyen::Admin::Skin.new(:code => skin_code) }
 
-        before do
-          `cp spec/fixtures/example.zip spec/fixtures/#{skin_code}.zip`
-        end
+      before do
+        `cp spec/fixtures/example.zip spec/fixtures/#{skin_code}.zip`
+      end
 
-        after do
-          `rm -rf #{skin.path}`
-        end
+      after do
+        `rm -rf #{skin.path}`
+      end
 
-        it "call download on skin" do
-          Adyen::Admin::Skin.should_receive(:find).and_return(skin)
-          skin.should_receive(:download).and_return("spec/fixtures/#{skin_code}.zip")
-          get path
-          File.should be_exists("spec/fixtures/skins/#{skin_code}/skin.html.erb")
-        end
+      it "call download on skin" do
+        Adyen::Admin::Skin.should_receive(:find).and_return(skin)
+        skin.should_receive(:download).and_return("spec/fixtures/#{skin_code}.zip")
+        get path
+        File.should be_exists("spec/fixtures/skins/#{skin_code}/skin.html.erb")
+      end
 
-        # it "copies skin template" do
-        #   Adyen::Admin::Skin.should_receive(:find).and_return(skin)
-        #   skin.should_receive(:download).and_return("spec/fixtures/#{skin_code}.zip")
-        #   get path
+      # it "copies skin template" do
+      #   Adyen::Admin::Skin.should_receive(:find).and_return(skin)
+      #   skin.should_receive(:download).and_return("spec/fixtures/#{skin_code}.zip")
+      #   get path
 
-        # end
-      end
+      # end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adyen-skinbuilder
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Priit Haamer
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-13 00:00:00 +03:00
+date: 2012-04-27 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency