smeargle 0.1.2 → 1.0.0

data/CHANGELOG

@@ -11,3 +11,7 @@
 ## v0.1.2
 * Added error handling to image_details
 * Added better image link support
+
+## v1.0.0
+* Added a license to gemspec
+* Stable release

data/README.md

@@ -1,4 +1,4 @@
-# Smeargle [![BuildStatus](https://secure.travis-ci.org/mockra/smeargle.png)](http://travis-ci.org/mockra/smeargle)
+# Smeargle [![BuildStatus](https://secure.travis-ci.org/mockra/smeargle.png)](http://travis-ci.org/mockra/smeargle) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/mockra/smeargle)
 
 Smeargle is an image collection tool that will return an object
 containing images from a given URL. Smeargle was designed to be
@@ -54,7 +54,7 @@ to run. You may want to have it run in the background.
 
   # returns an array filtered by provided options
   s.images
-  
+
   s.images.each do |img|
     img[:url]
     img[:width]

data/lib/smeargle/image.rb

@@ -14,22 +14,17 @@ module Smeargle
     end
 
     def formatted_images
-      formatted_images = []
-      image_collection.each do |img|
-        formatted_images << image_format(img)
-      end
-      formatted_images
+      formatted_images ||=
+        image_collection.reject{ |i| corrupt? i }.
+          map { |i| format_image_url i }
     end
 
     def detailed_images
-      detailed_images = []
-      formatted_images.each do |img|
-        detailed_images << image_details(img)
-      end
-      detailed_images
+      detailed_images ||=
+        formatted_images.map { |i| image_details i }
     end
 
-    def image_format img
+    def format_image_url img
       if URI(img).relative?
         self.clean_url + img
       else
@@ -58,5 +53,9 @@ module Smeargle
       @simple_images ||= formatted_images
     end
 
+    def corrupt? img
+      img =~ /\;/
+    end
+
   end
 end

data/lib/smeargle/sketch.rb

@@ -16,8 +16,9 @@ module Smeargle
       parsed_url = URI.parse url
       if !parsed_url.scheme
         @safe_url ||= 'http://' + url
+      else
+        @safe_url ||= url
       end
-      @safe_url ||= url
     end
 
     def response_body

data/lib/smeargle/version.rb

@@ -1,3 +1,3 @@
 module Smeargle
-  VERSION = "0.1.2"
+  VERSION = "1.0.0"
 end

data/smeargle.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Smeargle::VERSION
 
+  gem.license = 'MIT'
+
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'fakeweb'

data/spec/smeargle/image_spec.rb

@@ -9,7 +9,8 @@ describe Smeargle::Image do
       { url: 'test.png', height: 10, width: 10 })
 
     FakeWeb.register_uri :get, 'http://google.com',
-      body: "Google <img src='/test.png' /> <img src='/test.png' />"
+      body: "Google <img src='/test.png' /> <img src='/test.png' />
+      <img src='/test.png;script' />"
   end
 
   describe 'images' do
@@ -26,14 +27,14 @@ describe Smeargle::Image do
     end
   end
 
-  describe 'image_format' do
+  describe 'format_image_url' do
     it 'should format relative paths' do
-      e = smeargle.image_format '/test.png'
+      e = smeargle.format_image_url '/test.png'
       e.should == 'http://google.com/test.png'
     end
 
     it 'should not format absolute paths' do
-      e = smeargle.image_format 'http://google.com/test.png'
+      e = smeargle.format_image_url 'http://google.com/test.png'
       e.should == 'http://google.com/test.png'
     end
   end
@@ -43,6 +44,11 @@ describe Smeargle::Image do
       e = smeargle.formatted_images
       e.first.should == 'http://google.com/test.png'
     end
+
+    it 'should exclude corrupted images' do
+      e = smeargle.formatted_images
+      e.count.should == 1
+    end
   end
 
   describe 'detailed_images' do
@@ -54,7 +60,7 @@ describe Smeargle::Image do
 
   describe 'image_collection' do
     it 'should not contain duplicates' do
-      smeargle.image_collection.count.should == 1
+      smeargle.image_collection.count.should == 2
     end
   end
 
@@ -74,4 +80,11 @@ describe Smeargle::Image do
     end
   end
 
+  describe 'corrupt?' do
+    it 'should return true for corrupt url' do
+      e = smeargle.corrupt? 'http:/google.com/test;test.png'
+      e.should be_true
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smeargle
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -115,7 +115,8 @@ files:
 - spec/smeargle_spec.rb
 - spec/spec_helper.rb
 homepage: http://mockra.com
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -128,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3610093232473006616
+      hash: 2203931265859465904
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -137,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3610093232473006616
+      hash: 2203931265859465904
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23