Merge pull request #18 from rngtng/enhancements

Upload fix, default_data support

.gitignore

@@ -1,3 +1,4 @@
 pkg
 .adyenrc
 .rvmrc
+*.zip

.rspec

@@ -0,0 +1 @@
+--colour

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
+bundler_args: --deployment --without development
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0

CHANGELOG.md

@@ -11,7 +11,12 @@
   * auto concatinate multiple .js files
   * auto concatinate multiple .css files
   * auto build example PaymentMethod skeleton
-  * support new CSS selectors
+
+## v0.4.2
+  * lastes adyen-admin which fixes upload
+  * compress includes the skincode in filename
+  * pass default_data to skin
+  * support new CSS selectors by @jigfox (https://github.com/priithaamer/adyen-skinbuilder/pull/17)
 
 ## v0.3.1
   * feature: see remote version

Gemfile

@@ -1,3 +1,13 @@
 source "http://rubygems.org"
 
 gemspec
+
+group :development do
+  gem 'guard-rspec'
+end
+
+group :development, :test do
+  gem 'rake'
+  gem 'rspec'
+  gem 'rack-test'
+end

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    adyen-skinbuilder (0.4.1)
+    adyen-skinbuilder (0.4.2)
       adyen-admin
       i18n
       sinatra
@@ -11,77 +11,96 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    adyen-admin (0.0.16)
+    adyen-admin (0.0.18)
       mechanize
       rubyzip
-    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.1.1)
-      listen (>= 0.4.2)
-      thor (>= 0.14.6)
-    guard-rspec (1.1.0)
-      guard (>= 1.1)
-    i18n (0.6.4)
-    listen (0.4.5)
-      rb-fchange (~> 0.0.5)
-      rb-fsevent (~> 0.9.1)
-      rb-inotify (~> 0.8.8)
-    mechanize (2.5.1)
+    backports (3.3.5)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    domain_name (0.5.15)
+      unf (>= 0.0.5, < 1.0.0)
+    ffi (1.9.3)
+    formatador (0.2.4)
+    guard (2.2.4)
+      formatador (>= 0.2.4)
+      listen (~> 2.1)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rspec (4.0.4)
+      guard (>= 2.1.1)
+      rspec (~> 2.14)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    i18n (0.6.5)
+    listen (2.2.0)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.4)
+    mechanize (2.7.3)
       domain_name (~> 0.5, >= 0.5.1)
-      mime-types (~> 1.17, >= 1.17.2)
+      http-cookie (~> 1.0)
+      mime-types (~> 2.0)
       net-http-digest_auth (~> 1.1, >= 1.1.1)
       net-http-persistent (~> 2.5, >= 2.5.2)
       nokogiri (~> 1.4)
       ntlm-http (~> 0.1, >= 0.1.1)
-      webrobots (~> 0.0, >= 0.0.9)
-    mime-types (1.22)
-    net-http-digest_auth (1.2.1)
-    net-http-persistent (2.7)
-    nokogiri (1.5.9)
+      webrobots (>= 0.0.9, < 0.2)
+    method_source (0.8.2)
+    mime-types (2.0)
+    mini_portile (0.5.2)
+    multi_json (1.8.2)
+    net-http-digest_auth (1.4)
+    net-http-persistent (2.9)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     ntlm-http (0.1.1)
-    rack (1.4.1)
-    rack-protection (1.2.0)
+    pry (0.9.12.3)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rack-protection (1.5.1)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rake (0.9.2.2)
-    rb-fchange (0.0.5)
-      ffi
-    rb-fsevent (0.9.1)
-    rb-inotify (0.8.8)
+    rake (10.1.0)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.2)
       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.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rubyzip (0.9.9)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    sinatra-contrib (1.3.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    rubyzip (1.1.0)
+    sinatra (1.4.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    sinatra-contrib (1.4.1)
       backports (>= 2.0)
-      eventmachine
+      multi_json
       rack-protection
       rack-test
-      sinatra (~> 1.3.0)
+      sinatra (~> 1.4.0)
       tilt (~> 1.3)
-    thor (0.15.3)
-    tilt (1.3.7)
-    unf (0.0.5)
+    slop (3.4.7)
+    thor (0.18.1)
+    tilt (1.4.1)
+    timers (1.1.0)
+    unf (0.1.3)
       unf_ext
-    unf_ext (0.0.5)
+    unf_ext (0.0.6)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    webrobots (0.0.13)
+    webrobots (0.1.1)
 
 PLATFORMS
   ruby

adyen-skinbuilder.gemspec

@@ -19,8 +19,4 @@ Gem::Specification.new do |s|
   %w(sinatra sinatra-contrib vegas i18n adyen-admin).each do |gem|
     s.add_runtime_dependency *gem.split(' ')
   end
-
-  %w(rake rspec guard-rspec rack-test).each do |gem|
-    s.add_development_dependency *gem.split(' ')
-  end
 end

lib/adyen-skinbuilder/server.rb

@@ -15,6 +15,7 @@ class Server < Sinatra::Base
       dir = File.dirname(File.expand_path(__FILE__))
 
       set :views, "#{dir}/server/views"
+      set :server, 'webrick'
 
       # method will be overwritten by _vegas_ if skin directory given
       def self.skins_directory
@@ -59,10 +60,11 @@ def adyen_login
         end
       end
 
-      def render_skin(skin)
+      def render_skin(skin, locals = {})
         erb(skin_erb_file(skin).to_sym, {
           :views => '/',
-          :layout => File.join(settings.views, "layout.html").to_sym
+          :layout => File.join(settings.views, "layout.html").to_sym,
+          :locals => locals,
         })
       end
 
@@ -82,10 +84,12 @@ def render_skin(skin)
       end
 
       get '/sf/:skin_code/*' do |skin_code, path|
-        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
+        if skin = Adyen::Admin::Skin.find(skin_code)
+          if (file = skin.get_file(path)) && File.exists?(file)
+            send_file file
+          elsif (file = File.join(skins_directory, skin.parent_skin, path)) && File.exists?(file)
+            send_file file
+          end
         end
       end
 
@@ -137,7 +141,7 @@ def render_skin(skin)
             @locale_suffix = "_#{locale}"
             @skin.compile(render_skin(@skin))
           end
-          send_file(@skin.compress)
+          send_file(@skin.compress, :filename => "#{skin_code}.zip")
         else
           redirect '/'
         end
@@ -153,7 +157,7 @@ def render_skin(skin)
       # skin page
       get '/:skin_code' do |skin_code|
         if @skin = Adyen::Admin::Skin.find(skin_code)
-          render_skin @skin
+          render_skin @skin, { :default_data => @skin.default_data }
         else
           redirect '/'
         end

lib/adyen-skinbuilder/version.rb

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

spec/fixtures/skins/test/skin.html.erb

@@ -1,2 +1,4 @@
 
 <% adyen_form_tag %>
+
+<%= default_data  %>

spec/fixtures/skins/test/skin.yml

@@ -5,3 +5,4 @@
 :version: 32
 :version_live: 0
 :version_test: 31
+:default_data: dummy_default_data

spec/lib/adyen-skinbuilder/server_spec.rb

@@ -110,6 +110,10 @@ def app
         it 'responds with 200 status' do
           last_response.status.should == 200
         end
+
+        it "includes default_data" do
+          last_response.body.include?("dummy_default_data")
+        end
       end
     end