smeargle 1.0.0 → 1.0.1

data/CHANGELOG

@@ -15,3 +15,6 @@
 ## v1.0.0
 * Added a license to gemspec
 * Stable release
+
+## v1.0.1
+* Cleaned up code

data/lib/smeargle/image.rb

@@ -14,22 +14,18 @@ module Smeargle
     end
 
     def formatted_images
-      formatted_images ||=
+      @formatted_images ||=
         image_collection.reject{ |i| corrupt? i }.
           map { |i| format_image_url i }
     end
 
     def detailed_images
-      detailed_images ||=
+      @detailed_images ||=
         formatted_images.map { |i| image_details i }
     end
 
     def format_image_url img
-      if URI(img).relative?
-        self.clean_url + img
-      else
-        img
-      end
+      URI(img).relative? ? "#{clean_url}#{img}" : img
     end
 
     def image_details img
@@ -49,13 +45,11 @@ module Smeargle
       images
     end
 
-    def simple_images
-      @simple_images ||= formatted_images
-    end
-
     def corrupt? img
       img =~ /\;/
     end
 
+    alias_method :simple_images, :formatted_images
+
   end
 end

data/lib/smeargle/sketch.rb

@@ -13,12 +13,8 @@ module Smeargle
     end
 
     def safe_url
-      parsed_url = URI.parse url
-      if !parsed_url.scheme
-        @safe_url ||= 'http://' + url
-      else
-        @safe_url ||= url
-      end
+      @safe_url ||=
+        !URI.parse(url).scheme ? "http://#{url}" : url
     end
 
     def response_body

data/lib/smeargle/version.rb

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

data/spec/smeargle/image_spec.rb

@@ -14,58 +14,58 @@ describe Smeargle::Image do
   end
 
   describe 'images' do
-    it 'should return an array' do
+    it 'returns an array' do
       smeargle.images.should be_a Array
     end
 
-    it 'should contain the sample image' do
+    it 'contains the sample image' do
       smeargle.images.first[:url].should =~ /test\.png/i
     end
 
-    it 'should contain hashes' do
+    it 'contains hashes' do
       smeargle.images.first.should be_a Hash
     end
   end
 
   describe 'format_image_url' do
-    it 'should format relative paths' do
+    it 'formats relative paths' do
       e = smeargle.format_image_url '/test.png'
       e.should == 'http://google.com/test.png'
     end
 
-    it 'should not format absolute paths' do
+    it 'does not format absolute paths' do
       e = smeargle.format_image_url 'http://google.com/test.png'
       e.should == 'http://google.com/test.png'
     end
   end
 
   describe 'formatted images' do
-    it 'should return an array of formatted urls' do
+    it 'returns an array of formatted urls' do
       e = smeargle.formatted_images
       e.first.should == 'http://google.com/test.png'
     end
 
-    it 'should exclude corrupted images' do
+    it 'excludes corrupted images' do
       e = smeargle.formatted_images
       e.count.should == 1
     end
   end
 
   describe 'detailed_images' do
-    it 'should return an array of hashes' do
+    it 'returns an array of hashes' do
       e = smeargle.detailed_images
       e.first.should be_a Hash
     end
   end
 
   describe 'image_collection' do
-    it 'should not contain duplicates' do
+    it 'does not contain duplicates' do
       smeargle.image_collection.count.should == 2
     end
   end
 
   describe 'filtered_images' do
-    it 'should filter images on height' do
+    it 'filters images on height' do
       s = Smeargle::Sketch.new 'google.com', min_width: 20
       s.stub!(:image_details).and_return(
         { url: 'test.png', height: 10, width: 10 })
@@ -74,14 +74,14 @@ describe Smeargle::Image do
   end
 
   describe 'simple_images' do
-    it 'should contain an array of urls' do
+    it 'contains an array of urls' do
       s = Smeargle::Sketch.new 'google.com'
       s.simple_images.first.should =~ /test\.png/
     end
   end
 
   describe 'corrupt?' do
-    it 'should return true for corrupt url' do
+    it 'returns true for corrupt url' do
       e = smeargle.corrupt? 'http:/google.com/test;test.png'
       e.should be_true
     end

data/spec/smeargle/sketch_spec.rb

@@ -10,12 +10,12 @@ describe Smeargle::Sketch do
   end
 
   describe 'new' do
-    it 'should initialize url' do
+    it 'initializes url' do
       s = Smeargle::Sketch.new 'http://google.com'
       s.url.should == 'http://google.com'
     end
 
-    it 'should set min width/height' do
+    it 'sets min width/height' do
       s = Smeargle::Sketch.new 'http://google.com',
         min_width: 200, min_height: 250
       s.min_width.should == 200
@@ -24,11 +24,11 @@ describe Smeargle::Sketch do
   end
 
   describe 'safe_url' do
-    it 'should format the url' do
+    it 'formats the url' do
       smeargle.safe_url.should == 'http://google.com'
     end
 
-    it 'should leave the url alone' do
+    it 'does not format safe urls' do
       s = Smeargle::Sketch.new 'http://google.com'
       s.safe_url.should == 'http://google.com'
       s.safe_url.should == s.url
@@ -36,14 +36,14 @@ describe Smeargle::Sketch do
   end
 
   describe 'response' do
-    it 'should have the correct body' do
+    it 'generates the correct body' do
       smeargle.response_body.css('body').text.
         should =~ /google/i
     end
   end
 
   describe 'clean_url' do
-    it 'should clean up paramaters' do
+    it 'cleans up paramaters' do
       s = Smeargle::Sketch.new 'google.com/test/clean?go=now'
       s.clean_url.should == 'http://google.com'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smeargle
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2203931265859465904
+      hash: -1948350418827169577
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2203931265859465904
+      hash: -1948350418827169577
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23