second_curtain 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e612882eec9966ea91629702a511c41c9db33784
-  data.tar.gz: 2ef83f8df3be270dbff87915d65898c21cec9d13
+  metadata.gz: f5fabcd6cadb0d6ce87051406d8f56f7e2aa01e2
+  data.tar.gz: 6b5fb2e39c035d03252f292517abafcd7b182a66
 SHA512:
-  metadata.gz: 2d0a7d83618a988ddd46f9ae412423b8174ec7c299a101be7434724b63b353a8dc94f9a6cb08c294723c42276f68cd8a6041b8a63196994d96490d0d339c2829
-  data.tar.gz: d0aca83c9f9d206c15a8b8245b70ce85831f851e2785be388b3028ddb360e0b1cf9c554b2795ffdd555adb84af92635b2e9675ebd232535c41bfb5b9b993e9e2
+  metadata.gz: 8d44d903cb8be3f133d2dcea9db5de598b7d78127d1ead3a8bc9bbf6ec7c4e6fecbc53a249ac543c0cb672f39276aec4d8c38010fb973ee4d448a2dc5bab0338
+  data.tar.gz: e8e2d625cd39dbdac828e689c9ff4f78da7adb236cfab89d54743e91e39603972eb1baf516563e91f826fd15a217eb3023b2f10e6007b541e889665756620133

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 0.6.0
+
+- Relative URLs for images - [@larslockefeer](https://github.com/larslockefeer)
+
 ## 0.5.0
 
 - Improved parsing – @orta

data/lib/second_curtain/path_utils.rb

@@ -0,0 +1,21 @@
+class PathUtils
+
+  # Returns a path  composed of components, without leading and trailing slashes
+  def self.pathWithComponents(components)
+    path = ""
+
+    for component in components do
+      path = self.sanitizePathComponent(path + "/" + self.sanitizePathComponent(component))
+    end
+
+    return path
+  end
+
+  :private
+
+  # Takes a path component and strips leading and trailing slashes
+  def self.sanitizePathComponent(component)
+    # Remove leading and trailing slash
+    component.gsub(/^\//, "").chomp("/")
+  end
+end

data/lib/second_curtain/upload.rb

@@ -2,6 +2,7 @@ require 'aws-sdk-v1'
 require 'date'
 require 'pathname'
 require 'uri'
+require 'second_curtain/path_utils'
 
 class Upload
   attr_reader :expected_path
@@ -19,13 +20,13 @@ class Upload
     abort unless path
 
     expected_filename = Pathname.new(@expected_path).basename.to_s
-    expected_object = bucket.objects[path + "/" + expected_filename]
+    expected_object = bucket.objects[PathUtils.pathWithComponents([path, expected_filename])]
     expected_object.write(:file => @expected_path)
-    @uploaded_expected_url = expected_object.public_url
+    @uploaded_expected_url = expected_filename
 
     actual_filename = Pathname.new(@actual_path).basename.to_s
-    actual_object = bucket.objects[path + "/" + actual_filename]
+    actual_object = bucket.objects[PathUtils.pathWithComponents([path, actual_filename])]
     actual_object.write(:file => @actual_path)
-    @uploaded_actual_url = actual_object.public_url
+    @uploaded_actual_url = actual_filename
   end
-end
+end

data/lib/second_curtain/upload_manager.rb

@@ -1,6 +1,7 @@
 require 'aws-sdk-v1'
 require 'second_curtain/upload'
 require 'second_curtain/web_preview'
+require 'second_curtain/path_utils'
 
 class UploadManager
   def initialize (bucket, path_prefix)
@@ -20,11 +21,11 @@ class UploadManager
     return nil unless @uploads.count > 0
 
     @uploads.each do |upload|
-      upload.upload(@bucket, @path_prefix)
+      upload.upload(@bucket, PathUtils.pathWithComponents([@path_prefix, folder_name]))
     end
 
     preview = WebPreview.new(@uploads)
-    index_object = @bucket.objects[@path_prefix + folder_name + "/index.html"]
+    index_object = @bucket.objects[PathUtils.pathWithComponents([@path_prefix, folder_name, "index.html"])]
     index_object.write(preview.generate_html)
     index_object.public_url.to_s
   end

data/second_curtain.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'second_curtain'
-  s.version     = '0.5.0'
+  s.version     = '0.6.0'
   s.licenses    = ['MIT']
   s.summary     = "Upload failing iOS snapshot tests cases to S3."
   s.description	=

data/spec/second_shutter/path_utils_spec.rb

@@ -0,0 +1,32 @@
+require './lib/second_curtain/path_utils.rb'
+
+describe PathUtils do
+  before(:each) do
+  end
+
+  describe "composing a path" do
+    it "yields a concatenation of these components without leading and trailing slashes" do
+      expect(PathUtils.pathWithComponents(["component1", "component2"])).to eq("component1/component2")
+    end
+
+    it "yields a concatenation of these components without leading and trailing slashes" do
+      expect(PathUtils.pathWithComponents(["/component1/component1b/", "/component2/"])).to eq("component1/component1b/component2")
+    end
+
+    it "yields an empty string when called without components" do
+      expect(PathUtils.pathWithComponents([])).to eq("")
+    end
+
+    it "yields a string without leading slash when called with an empty first component" do
+      expect(PathUtils.pathWithComponents(["", "/component2"])).to eq("component2")
+    end
+
+    it "yields a string without trailing slash when called with an empty last component" do
+      expect(PathUtils.pathWithComponents(["component1", ""])).to eq("component1")
+    end
+
+    it "yields an empty string when called with a single slash" do
+      expect(PathUtils.pathWithComponents(["/"])).to eq("")
+    end
+  end
+end

data/spec/second_shutter/upload_spec.rb

@@ -21,14 +21,12 @@ describe Upload do
     expect(bucket).to receive(:objects).twice.and_return(doubles)
 
     expect(expected_double).to receive(:write).with(anything)
-    expect(expected_double).to receive(:public_url).and_return("http://exmaple.com/1.png")
     expect(actual_double).to receive(:write).with(anything)
-    expect(actual_double).to receive(:public_url).and_return("http://exmaple.com/2.png")
 
     upload = Upload.new('/path/to/expected.png', '/path/to/actual.png')
     upload.upload(bucket, path)
 
-    expect(upload.uploaded_expected_url).to eq("http://exmaple.com/1.png")
-    expect(upload.uploaded_actual_url).to eq("http://exmaple.com/2.png")
+    expect(upload.uploaded_expected_url).to eq("expected.png")
+    expect(upload.uploaded_actual_url).to eq("actual.png")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: second_curtain
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ash Furrow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -360,6 +360,7 @@ files:
 - lib/second_curtain.rb
 - lib/second_curtain/kaleidoscope_command.rb
 - lib/second_curtain/parser.rb
+- lib/second_curtain/path_utils.rb
 - lib/second_curtain/template.mustache.html
 - lib/second_curtain/test_suite.rb
 - lib/second_curtain/upload.rb
@@ -370,6 +371,7 @@ files:
 - spec/sample_output.txt
 - spec/second_shutter/kaleidoscope_command_spec.rb
 - spec/second_shutter/parser_spec.rb
+- spec/second_shutter/path_utils_spec.rb
 - spec/second_shutter/test_suite_spec.rb
 - spec/second_shutter/upload_manager_spec.rb
 - spec/second_shutter/upload_spec.rb