adyen-skinbuilder 0.3.2 → 0.4.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    adyen-skinbuilder (0.3.1)
+    adyen-skinbuilder (0.4.1)
       adyen-admin
       sinatra
       sinatra-contrib
@@ -10,20 +10,24 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    adyen-admin (0.0.13)
+    adyen-admin (0.0.16)
       mechanize
       rubyzip
-    backports (2.5.3)
+    backports (2.6.1)
     diff-lcs (1.1.3)
     domain_name (0.5.3)
       unf (~> 0.0.3)
     eventmachine (0.12.10)
     ffi (1.0.11)
-    guard (1.0.3)
-      ffi (>= 0.5.0)
+    guard (1.1.1)
+      listen (>= 0.4.2)
       thor (>= 0.14.6)
-    guard-rspec (0.7.2)
-      guard (>= 0.10.0)
+    guard-rspec (1.1.0)
+      guard (>= 1.1)
+    listen (0.4.5)
+      rb-fchange (~> 0.0.5)
+      rb-fsevent (~> 0.9.1)
+      rb-inotify (~> 0.8.8)
     mechanize (2.5.1)
       domain_name (~> 0.5, >= 0.5.1)
       mime-types (~> 1.17, >= 1.17.2)
@@ -33,9 +37,9 @@ GEM
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (~> 0.0, >= 0.0.9)
     mime-types (1.18)
-    net-http-digest_auth (1.2)
-    net-http-persistent (2.6)
-    nokogiri (1.5.2)
+    net-http-digest_auth (1.2.1)
+    net-http-persistent (2.7)
+    nokogiri (1.5.4)
     ntlm-http (0.1.1)
     rack (1.4.1)
     rack-protection (1.2.0)
@@ -43,15 +47,20 @@ GEM
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2.2)
+    rb-fchange (0.0.5)
+      ffi
+    rb-fsevent (0.9.1)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
       rspec-expectations (~> 2.10.0)
       rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.0)
+    rspec-core (2.10.1)
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.10.1)
-    rubyzip (0.9.8)
+    rubyzip (0.9.9)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
@@ -63,11 +72,11 @@ GEM
       rack-test
       sinatra (~> 1.3.0)
       tilt (~> 1.3)
-    thor (0.15.2)
+    thor (0.15.3)
     tilt (1.3.3)
     unf (0.0.5)
       unf_ext
-    unf_ext (0.0.4)
+    unf_ext (0.0.5)
     vegas (0.1.11)
       rack (>= 1.0.0)
     webrobots (0.0.13)

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

@@ -23,8 +23,20 @@ module Adyen
 
          # render an erb partial inline
         def render_partial(file, locals = {})
-          views = locals.delete(:views) || @skin.path
-          erb "_#{file}.html".to_sym, :layout => false, :views => views, :locals => locals
+          file = partialize(file)
+          file = if views = locals.delete(:views)
+            File.join(views, file)
+          else
+            @skin.get_file(file)
+          end
+          erb File.basename(file).gsub(".erb", "").to_sym, :layout => false, :views => File.dirname(file), :locals => locals
+        end
+
+        private
+        def partialize(path)
+          path.to_s.split('/').tap do |path|
+            path[-1] = "_#{path.last}.html.erb"
+          end.join("/")
         end
       end
     end

data/lib/adyen-skinbuilder/server.rb

@@ -33,14 +33,20 @@ module Adyen
         end
       end
 
-      def skin_file(skin, filename = "skin.html")
-        File.join(skin.path, filename).tap do |file|
-          if !File.exists?("#{file}.erb")
+      def skin_file(skin, filename)
+        skin.get_file(filename).tap do |file|
+          if !File.exists?(file)
             return File.join(settings.views, filename)
           end
         end
       end
 
+      def skin_erb_file(skin, filename = "skin.html")
+        if file = skin_file(skin, "#{filename}.erb")
+          return file.gsub(".erb", "")
+        end
+      end
+
       def adyen_login
         if (cfg = settings.adyen_admin_cfg) && !Adyen::Admin.authenticated?
           Adyen::Admin.login(cfg[:accountname], cfg[:username], cfg[:password])
@@ -48,7 +54,7 @@ module Adyen
       end
 
       def render_skin(skin)
-        erb(skin_file(skin).to_sym, {
+        erb(skin_erb_file(skin).to_sym, {
           :views => '/',
           :layout => File.join(settings.views, "layout.html").to_sym
         })
@@ -57,7 +63,7 @@ module Adyen
       helpers Helper::Render, Helper::Adyen
 
       get '/sf/:skin_code/*' do |skin_code, path|
-        if (skin = Adyen::Admin::Skin.find(skin_code)) && (file = File.join(skin.path, path)) && File.exists?(file)
+        if (skin = Adyen::Admin::Skin.find(skin_code)) && (file = skin.get_file(path)) && File.exists?(file)
           send_file file
         elsif (file = File.join(skins_directory, "base", path)) && File.exists?(file)
           send_file file
@@ -89,7 +95,7 @@ module Adyen
         if @skin = Adyen::Admin::Skin.find(skin_code)
           @skin.download.tap do |zip_file|
             @skin.decompile(zip_file)
-            `cp #{skin_file(@skin)}.erb #{@skin.path}`
+            `cp #{skin_erb_file(@skin)}.erb #{@skin.path}`
             `rm -f #{zip_file}`
           end
         end

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

@@ -98,10 +98,10 @@
                   <% if Adyen::Admin.authenticated? && !skin.frozen? %>
                     <% if skin.path %>
                       <a href="/<%= skin.code %>/upload">upload</a>
+                      <a href="/<%= skin.code %>/update">update</a>
                     <% else %>
                       <a href="/<%= skin.code %>/download">download</a>
                     <% end %>
-                      <a href="/<%= skin.code %>/update">update</a>
                   <% else %>
                     <a href="/<%= skin.code %>/compile">compile</a>
                   <% end %>

data/lib/adyen-skinbuilder/version.rb

@@ -1,5 +1,5 @@
 module Adyen
   module Skinbuilder
-    VERSION = '0.3.2'
+    VERSION = '0.4.1'
   end
 end

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

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Adyen::SkinBuilder::Helper::Render do
+
+  before do
+    extend Adyen::SkinBuilder::Helper::Render
+  end
+
+  describe "#partialize" do
+    it { partialize("file").should == "_file.html.erb" }
+    it { partialize("path1/file").should == "path1/_file.html.erb" }
+    it { partialize("/path1/file").should == "/path1/_file.html.erb" }
+    it { partialize("/path1/path2/file").should == "/path1/path2/_file.html.erb" }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adyen-skinbuilder
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 13
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Priit Haamer
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-01 00:00:00 +02:00
+date: 2012-06-20 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -212,6 +212,7 @@ files:
 - spec/fixtures/skins/base/res/resources.properties
 - spec/fixtures/skins/test/skin.html.erb
 - spec/fixtures/skins/test/skin.yml
+- spec/lib/adyen-skinbuilder/helper/render_spec.rb
 - spec/lib/adyen-skinbuilder/server_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -272,5 +273,6 @@ test_files:
 - spec/fixtures/skins/base/res/resources.properties
 - spec/fixtures/skins/test/skin.html.erb
 - spec/fixtures/skins/test/skin.yml
+- spec/lib/adyen-skinbuilder/helper/render_spec.rb
 - spec/lib/adyen-skinbuilder/server_spec.rb
 - spec/spec_helper.rb