scene7ize 0.2.0 → 0.2.4

data/README.md

@@ -16,11 +16,11 @@ Third argument (optional) is an output file.
 
 To run in "safe mode", specify an output file:
 
-    $ scene7ize http://s7.example.com index.html output.html
+    $ scene7ize parse -u http://s7.example.com -i index.html -o output.html
 
 Or, omit the output file to replace contents of an input file.
 
-    $ scene7ize http://s7.example.com index.html
+    $ scene7ize parse -u http://s7.example.com -i index.html
 
 ## TODO
 

data/lib/scene7ize/version.rb

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

data/lib/scene7ize.rb

@@ -3,10 +3,11 @@ require 'mini_magick'
 require 'uri'
 
 module Scene7ize
-  DEFAULT_REGEX = /(?<=['"])(?<dir_and_basename>((?!['"]).)*)\.(?<ext>gif|jpg|jpeg|png)(?=['"])/im
+  DEFAULT_REGEX = /(?<=['"\())])(?<dir_and_basename>((?!['"\)]).)*)\.(?<ext>gif|jpg|jpeg|png)(?=['"\)])/i
 
+  class << self; attr_accessor :scene7prefix; end
 
-  def self.scene7url_from(scene7prefix, image_filename)
+  def self.scene7url_from(image_filename)
     # TODO: error handling
     image = MiniMagick::Image.open(image_filename)
 
@@ -24,25 +25,31 @@ module Scene7ize
     basename = File.basename(image_filename, File.extname(image_filename))
 
     # TODO: error handle  URI::InvalidURIError
-    URI.join(scene7prefix, "#{basename}?wid=#{image[:width]}&hei=#{image[:height]}#{suffix}").to_s
+    URI.join(self.scene7prefix, "#{basename}?wid=#{image[:width]}&hei=#{image[:height]}#{suffix}").to_s
   end
 
 
-  def self.parse_file(scene7prefix, input_file, output_file = nil)
-    file_content = File.read(input_file)
-    input_file_path = File.dirname(input_file)
-
-    replacement = file_content.gsub!(DEFAULT_REGEX) do |match|
+  def self.replace(content)
+    replacement = content.gsub(DEFAULT_REGEX) do |match|
       image_filename = "#{$~[:dir_and_basename]}.#{$~[:ext]}"
 
       # reconstruct image path relative to input file and open
-      image_filename = File.join(input_file_path, image_filename)
-      self.scene7url_from(scene7prefix, image_filename)
+      image_filename = File.join(@input_file_path, image_filename)
+      self.scene7url_from(image_filename)
     end
+  end
+
+
+  def self.parse_file(scene7prefix, input_file, output_file = nil)
+    @scene7prefix = scene7prefix
+
+    file_content = File.read(input_file)
+    @input_file_path = File.dirname(input_file)
+
+    replacement = replace(file_content)
 
     output_file = input_file if output_file.nil?
     File.open(output_file, "w") { |file| file.puts replacement }
 
   end
-
 end

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      = ""
+  gem.homepage      = "https://github.com/codercarson/scene7ize"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/spec/scene7ize_spec.rb

@@ -41,7 +41,25 @@ describe Scene7ize do
     end
 
     it "should display an error given an invalid input file" do
-      expect { Scene7ize.parse_file(@s7_url_prefix, 'file-that-doesnt-exist.ext') }.to raise_error
+      expect { Scene7ize.parse_file('file-that-doesnt-exist.ext') }.to raise_error
+    end
+
+  end
+
+
+  context "#replace" do
+
+    it "should parse a CSS url string with no quotes" do
+      @scene7url = "http://s7.example.com/dancing-happy-face.gif?wid=10&hei=10&fmt=gif-alpha"
+      @input_data = <<-CONTENTS
+        background: url(../../../../images/dancing-happy-face.gif) top left no-repeat;
+      CONTENTS
+      @expected_output = <<-CONTENTS
+        background: url(#{@scene7url}) top left no-repeat;
+      CONTENTS
+
+      Scene7ize.stub(:scene7url_from).and_return(@scene7url)
+      Scene7ize.replace(@input_data).should == @expected_output
     end
 
   end
@@ -56,13 +74,14 @@ describe Scene7ize do
         @image = { :width => 10, :height => 15, :format => 'jpg' }
 
         MiniMagick::Image.should_receive(:open).and_return(@image)
-        @scene7url = Scene7ize.scene7url_from("http://example.com/scene7/", @image_filename)
+        Scene7ize.should_receive(:scene7prefix).and_return("http://s7.example.com/")
+        @scene7url = Scene7ize.scene7url_from(@image_filename)
       end
 
       it "should contain a specified prefix"
 
       it "should create a valid scene7 url" do
-        @scene7url.should == "http://example.com/scene7/test?wid=10&hei=15&qlt=100"
+        @scene7url.should == "http://s7.example.com/test?wid=10&hei=15&qlt=100"
       end
 
       it "should contain a valid width parameter" do
@@ -87,7 +106,8 @@ describe Scene7ize do
       @image = { :width => 10, :height => 15, :format => 'png' }
 
       MiniMagick::Image.should_receive(:open).and_return(@image)
-      @scene7url = Scene7ize.scene7url_from("http://example.com/scene7/", @image_filename)
+      Scene7ize.should_receive(:scene7prefix).and_return("http://s7.example.com/")
+      @scene7url = Scene7ize.scene7url_from(@image_filename)
 
       @scene7url.should match /fmt=png-alpha/
       @scene7url.should_not match /fmt=gif-alpha/
@@ -99,7 +119,8 @@ describe Scene7ize do
       @image = { :width => 10, :height => 15, :format => 'gif' }
 
       MiniMagick::Image.should_receive(:open).and_return(@image)
-      @scene7url = Scene7ize.scene7url_from("http://example.com/scene7/", @image_filename)
+      Scene7ize.should_receive(:scene7prefix).and_return("http://s7.example.com/")
+      @scene7url = Scene7ize.scene7url_from(@image_filename)
 
       @scene7url.should match /fmt=gif-alpha/
       @scene7url.should_not match /fmt=png-alpha/
@@ -108,8 +129,9 @@ describe Scene7ize do
 
     it "should throw an error if not a valid image file" do
       @image_filename = 'test.png'
+      Scene7ize.stub(:scene7prefix).and_return("http://s7.example.com/")
 
-      expect { Scene7ize.scene7url_from("http://example.com/scene7/", @image_filename) }.to raise_error
+      expect { Scene7ize.scene7url_from(@image_filename) }.to raise_error
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scene7ize
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-11-21 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: ''
+homepage: https://github.com/codercarson/scene7ize
 licenses: []
 post_install_message: 
 rdoc_options: []