scene7ize 0.2.4 → 0.2.6

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+scene7ize.sublime-project
+scene7ize.sublime-workspace

data/README.md

@@ -10,9 +10,10 @@ Automatically assumes JPGs have been optimized, default quality is set to 100.
 
 ## Usage
 
-The first argument is the Scene7 URL prefix.
-The second argument is an input file.
-Third argument (optional) is an output file.
+- The first argument is the Scene7 URL prefix.
+- The second argument is an input file.
+- Third argument (optional) is an output file.
+- Fourth argument (optional) is a base path.  If provided, images will be reference from it - otherwise they will be referenced relative to the input file.
 
 To run in "safe mode", specify an output file:
 

data/lib/scene7ize/cli.rb

@@ -27,9 +27,14 @@ module Scene7ize
                   :type => :string,
                   :aliases => '-o',
                   :banner => 'write to an output file instead of overwriting the input file'
+
+    method_option :base_path,
+                  :type => :string,
+                  :aliases => '-b',
+                  :banner => 'sets a base path to reference the image, otherwise references relative to input file'
     def parse
 
-      Scene7ize.parse_file(options[:url_prefix], options[:input_file], options[:output_file])
+      Scene7ize.parse_file(options[:url_prefix], options[:input_file], options[:output_file], options[:base_path])
 
     end
 

data/lib/scene7ize/version.rb

@@ -1,3 +1,3 @@
 module Scene7ize
-  VERSION = "0.2.4"
+  VERSION = "0.2.6"
 end

data/lib/scene7ize.rb

@@ -3,12 +3,18 @@ require 'mini_magick'
 require 'uri'
 
 module Scene7ize
-  DEFAULT_REGEX = /(?<=['"\())])(?<dir_and_basename>((?!['"\)]).)*)\.(?<ext>gif|jpg|jpeg|png)(?=['"\)])/i
+  DEFAULT_REGEX = /(?<=[\('"])(?<dir_and_basename>((?!['"\)]).)*)\.(?<ext>gif|jpg|jpeg|png)(?=['"\)])/i
 
   class << self; attr_accessor :scene7prefix; end
 
   def self.scene7url_from(image_filename)
     # TODO: error handling
+
+    if !File.exists?(image_filename)
+      puts "ERROR: Could not open #{image_filename}.  Leaving unchanged."
+      return false
+    end
+
     image = MiniMagick::Image.open(image_filename)
 
     suffix = case image[:format].downcase
@@ -31,20 +37,24 @@ module Scene7ize
 
   def self.replace(content)
     replacement = content.gsub(DEFAULT_REGEX) do |match|
-      image_filename = "#{$~[:dir_and_basename]}.#{$~[:ext]}"
+      original_filename = "#{$~[:dir_and_basename]}.#{$~[:ext]}"
+
+      puts "matching #{original_filename}"
 
       # reconstruct image path relative to input file and open
-      image_filename = File.join(@input_file_path, image_filename)
-      self.scene7url_from(image_filename)
+      image_filename = File.join(@base_path || @input_file_path, original_filename)
+
+      self.scene7url_from(image_filename) || original_filename
     end
   end
 
 
-  def self.parse_file(scene7prefix, input_file, output_file = nil)
+  def self.parse_file(scene7prefix, input_file, output_file = nil, base_path = nil)
     @scene7prefix = scene7prefix
 
     file_content = File.read(input_file)
     @input_file_path = File.dirname(input_file)
+    @base_path = File.path(base_path) if base_path
 
     replacement = replace(file_content)
 

data/scene7ize.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["brad@pixelwavedesign.com"]
   gem.description   = %q{...}
   gem.summary       = %q{Converts local image paths in an HTML or CSS file to Scene7 paths containing dimensions and format data}
-  gem.homepage      = "https://github.com/codercarson/scene7ize"
+  gem.homepage      = "https://github.com/codecarson/scene7ize"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/spec/scene7ize_spec.rb

@@ -22,6 +22,8 @@ describe Scene7ize do
       @output_data = <<-CONTENTS
         <p id="jpg"><a href="#{@s7_url}"><img src="#{@s7_url}" alt="Test jpg"></a></p>
       CONTENTS
+
+      File.stub(:exists?)
     end
 
     it "should write to an output file when one is given" do
@@ -44,6 +46,17 @@ describe Scene7ize do
       expect { Scene7ize.parse_file('file-that-doesnt-exist.ext') }.to raise_error
     end
 
+    it "should parse files relative to a base bath, if one is given" do
+      base_path = "/code/my_project_root"
+
+      File.stub(:read).with(@input_filename) { @input_data }
+      File.stub(:open) #.with(@output_filename, 'w').and_return(@output_data)
+
+      Scene7ize.should_receive(:scene7url_from).with(File.join(base_path, "test-image.jpg")).any_number_of_times
+
+      Scene7ize.parse_file(@s7_url_prefix, @input_filename, @output_filename, base_path)
+    end
+
   end
 
 
@@ -73,9 +86,11 @@ describe Scene7ize do
         @image_filename = 'test.jpg'
         @image = { :width => 10, :height => 15, :format => 'jpg' }
 
+        File.stub(:exists?).and_return(true)
         MiniMagick::Image.should_receive(:open).and_return(@image)
         Scene7ize.should_receive(:scene7prefix).and_return("http://s7.example.com/")
         @scene7url = Scene7ize.scene7url_from(@image_filename)
+
       end
 
       it "should contain a specified prefix"
@@ -105,6 +120,7 @@ describe Scene7ize do
       @image_filename = 'test.png'
       @image = { :width => 10, :height => 15, :format => 'png' }
 
+      File.stub(:exists?).and_return(true)
       MiniMagick::Image.should_receive(:open).and_return(@image)
       Scene7ize.should_receive(:scene7prefix).and_return("http://s7.example.com/")
       @scene7url = Scene7ize.scene7url_from(@image_filename)
@@ -118,6 +134,7 @@ describe Scene7ize do
       @image_filename = 'test.gif'
       @image = { :width => 10, :height => 15, :format => 'gif' }
 
+      File.stub(:exists?).and_return(true)
       MiniMagick::Image.should_receive(:open).and_return(@image)
       Scene7ize.should_receive(:scene7prefix).and_return("http://s7.example.com/")
       @scene7url = Scene7ize.scene7url_from(@image_filename)
@@ -127,11 +144,12 @@ describe Scene7ize do
       @scene7url.should_not match /qlt=\d{1,}/
     end
 
-    it "should throw an error if not a valid image file" do
+    it "should return false if not a valid image file" do
       @image_filename = 'test.png'
       Scene7ize.stub(:scene7prefix).and_return("http://s7.example.com/")
 
-      expect { Scene7ize.scene7url_from(@image_filename) }.to raise_error
+      scene7url = Scene7ize.scene7url_from(@image_filename)
+      scene7url.should == false
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scene7ize
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -95,7 +95,7 @@ files:
 - scene7ize.gemspec
 - spec/scene7ize_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/codercarson/scene7ize
+homepage: https://github.com/codecarson/scene7ize
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Converts local image paths in an HTML or CSS file to Scene7 paths containing