smooster 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b10f0a4f5608b08c92b1c3a604c47106fe035db5
-  data.tar.gz: d84635953f0c111cde9a1d1c4838b21b7d96a255
+  metadata.gz: 8a20fe62a1bbfd74278fa7d59b3039ad468453ce
+  data.tar.gz: aa5e06e14aebc6b643ca085d97a26a08fa8b988c
 SHA512:
-  metadata.gz: 82fd0268f1ce3d1d00fc8f1ee52f257e2827516cad8f13df5e6c43de4a15ac731315ccd01fd75c914594c937ef300c7a2d42c017e63665c4e0d4ad9803700d15
-  data.tar.gz: 35920f7fa2949e2500d5d45293be8e5b2a038efcb4b1a9075fe29e148f1a80b08309ee65436eedc63d51d5a160fba995ca8593762af2d07a8886032b0c478757
+  metadata.gz: 1ff1e2b8cfa6b70d1315184e27c15516f65ea8b6900b7ba3fd42a49f4632f17d661de1829c58a99b5f379817bdbcc8fea252ffa94191c8baec2dcb0452ac0b9f
+  data.tar.gz: f05da62d75ce563341fb3f7573f1da9a807f050317587bd02cc6e6721077402b7817e29de7aa915f4c18f917427d94779d2eacf159e319e77fc89bc873863729

data/README.md

@@ -74,6 +74,10 @@ This is a ruby gem
 
 ## Changelog
 
+###0.4.2
+* Bugfix: Checking folder names for unsupported characters before upload
+* Bugfix: Checking page titles for unsupported characters before upload
+
 ###0.4.1
 * Feature: Setting the hosting for the website
 

data/lib/smooster/cli/executable.rb

@@ -9,6 +9,7 @@ module Smooster
 
       desc "test", "Returns test data"
       def test
+        puts "smooster Gem Version: #{Gem.loaded_specs["smooster"].version}"
         puts Smooster::Application.instance.api_key()
         puts Dir.pwd
       end
@@ -91,12 +92,19 @@ module Smooster
             urls << p.url
             puts "#{p.filename} #{status}"
           end
+          puts "Starting validation of #{urls.count} pages"
+          return if urls.count == 0
           urls.each do |url|
-            puts "#{url}"
-            url_encoded = CGI.escape(url)
-            if options[:validator]
-              Launchy.open("http://validator.w3.org/check?uri=#{url_encoded}&charset=%28detect+automatically%29&doctype=Inline&group=0")
-              sleep 1
+            begin
+              puts "#{url}"
+              url_encoded = CGI.escape(url)
+              if options[:validator]
+                Launchy.open("http://validator.w3.org/check?uri=#{url_encoded}&charset=%28detect+automatically%29&doctype=Inline&group=0")
+                sleep 1
+              end
+            rescue => e
+              Smooster::Application.instance.logger.error "Error in page validation for #{url}!: #{e} / #{e.backtrace.inspect}"
+              puts "This url failed to be validated: #{url}".colorize(:red)
             end
           end
         end

data/lib/smooster/deploy/media_asset.rb

@@ -53,6 +53,11 @@ module Smooster
       def upload
         return false if self.checksum.to_s == self.load_checksum.to_s
 
+        unless /^[a-zA-Z0-9\/\-]+$/.match(self.folder_path)
+          puts "The folder names must contain ONLY letters, numbers and hyphens (-): #{self.folder_path}".colorize(:red)
+          return false
+        end
+
         if self.smo_id.present?
           begin
             response = RestClient.put "#{Smooster::Application.instance.api_url()}/#{Smooster::Application.instance.site_id()}/media_assets/#{self.smo_id}", {:media_asset => {:file => File.new(self.file_path, 'rb'), :folder_path => self.folder_path}}, {"Authorization" => 'Token token="'+ Smooster::Application.instance.api_key() +'"', "Accept" => 'application/vnd.smoosterid.v2'}

data/lib/smooster/deploy/pages.rb

@@ -9,8 +9,12 @@ module Smooster
           template = SiteTemplate.new({:body => body, :path => file, :checksum => Digest::MD5.hexdigest(body)})
           template.smo_id = template.load_smo_id if template.load_smo_id.present?
           source = Nokogiri::HTML(body)
-          template.title = source.css('title').first.inner_html
-          collection << template
+          if /^[a-z0-9\/\-]+$/.match(source.css('title').first)
+            template.title = source.css('title').first.inner_html
+            collection << template
+          else
+            puts "Couldn't create page, because the templates title-tag name must contain ONLY lower case letters, numbers and hyphens (-): #{source.css('title').first}".colorize(:red)
+          end
         end
         collection
       end

data/lib/smooster/deploy/site_templates.rb

@@ -10,8 +10,12 @@ module Smooster
           template.smo_id = template.load_smo_id if template.load_smo_id.present?
           source = Nokogiri::HTML(body)
           if source.css('title').first
-            template.title = source.css('title').first.inner_html
-            collection << template
+            if /^[a-z0-9\/\-]+$/.match(source.css('title').first)
+              template.title = source.css('title').first.inner_html
+              collection << template
+            else
+              puts "Couldn't create template, because the templates title-tag name must contain ONLY lower case letters, numbers and hyphens (-): #{source.css('title').first}".colorize(:red)
+            end
           else
             puts "The file #{file} is not a valid HTMl-Document. Also be sure to add a title-tag".colorize(:red)
           end

data/lib/smooster/version.rb

@@ -1,3 +1,3 @@
 module Smooster
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smooster
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Sebastian Maier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor