hot_or_not 0.1.6 → 0.1.8

data/Gemfile

@@ -14,7 +14,7 @@ group :development do
 end
 
 gem 'rest-client', '~> 1.6.1'
-gem 'diffy', '~> 2.0.1'
+gem 'diffy', '~> 2.0.3'
 gem 'facets', '~> 2.9.1'
 gem 'json', '~> 1.5.2'
 gem 'hpricot', '~> 0.8.4'

data/Gemfile.lock

@@ -1,10 +1,11 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diffy (2.0.1)
+    diffy (2.0.3)
     facets (2.9.1)
     git (1.2.5)
     hpricot (0.8.4)
+    hpricot (0.8.4-java)
     jeweler (1.6.0)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
@@ -26,7 +27,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  diffy (~> 2.0.1)
+  diffy (~> 2.0.3)
   facets (~> 2.9.1)
   hpricot (~> 0.8.4)
   jeweler (~> 1.6.0)

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.8

data/lib/hot_or_not/compare_url.rb

@@ -25,14 +25,15 @@ module HotOrNot
     end
 
     def self.load_from(filename)
-      contents = YAML.load run_erb filename
-      side_a, side_b, comparisons = contents['side_a'], contents['side_b'], contents['comparisons']
+      contents = YAML.load(run_erb(filename)).symbolize_keys!
+      side_a, side_b, comparisons = contents.delete(:side_a), contents.delete(:side_b), contents.delete(:comparisons)
       raise "You're file is not of the proper format" unless side_a && side_b && comparisons
       comparisons.map do |h|
         h.symbolize_keys!
         name = h.delete :name
         url = h.delete :url
-        CompareUrl.new name, url, side_a, side_b, h
+        options = contents.merge h
+        CompareUrl.new name, url, side_a, side_b, options
       end
     end
 

data/lib/hot_or_not/comparison_result.rb

@@ -41,7 +41,7 @@ module HotOrNot
 
     def different?
       return side_a_body != side_b_body if @diff.nil?
-      @diff.count > side_a_body.lines.count || @diff.count > side_b_body.lines.count
+      @diff.diff != side_a_body.gsub(/^/, ' ')
     end
 
     def output_to_files_in(directory)
@@ -58,8 +58,8 @@ module HotOrNot
                    message += "#{$/}  #{@compare_url.base_b} => #{@side_b_results.error_message}" if @side_b_results.error?
                    message
                  else
-                   diff_options = '-U 3'
-                   diff_options += ' ' + @compare_url.options[:diff] if @compare_url.options[:diff]
+                   diff_options = ['-U 3']
+                   diff_options << @compare_url.options[:diff] if @compare_url.options[:diff]
                    @diff = Diffy::Diff.new(side_a_body, side_b_body, :diff => diff_options)
                    "#{@compare_url.full_name}: #{@compare_url.url}: Body from #{@compare_url.base_a} did not match body from #{@compare_url.base_b}"
                  end

data/test/compare_url_test.rb

@@ -17,7 +17,12 @@ module HotOrNot
       end
 
       should "load options from file" do
-        expected_options = { :headers => { 'authorization' => 'foo123bar' } }
+        expected_headers = { 'authorization' => 'foo123bar' }
+        assert_equal expected_headers, @urls[1].options[:headers]
+      end
+
+      should "merge global options in" do
+        expected_options = { :diff => '-w', :headers => { 'authorization' => 'foo123bar' } }
         assert_equal expected_options, @urls[1].options
       end
     end

data/test/comparison_result_test.rb

@@ -106,6 +106,23 @@ module HotOrNot
           should "provide a diff" do
             assert_present @result.diff
           end
+
+          context "ignoring whitespace" do
+            setup do
+              compare_url = CompareUrl.new 'Test People', '/api/people', 'http://side_a', 'http://side_b', :diff => '-w'
+              body_a = "foo\nbar"
+              body_b = " foo\nbaz"
+              response_a = FakeResponse.new body_a, 200
+              response_b = FakeResponse.new body_b, 200
+              side_a_results = UrlResult.new compare_url.side_a, response_a, nil
+              side_b_results = UrlResult.new compare_url.side_b, response_b, nil
+              @result = ComparisonResult.new compare_url, side_a_results, side_b_results
+            end
+
+            should "return failure" do
+              assert_not @result.success?
+            end
+          end
         end
 
         context "when one result has an error" do

data/test/data/simple_urls.yml

@@ -1,5 +1,6 @@
 side_a: 'http://side_a'
 side_b: 'http://side_b'
+diff: -w
 comparisons:
   - name: People Test
     url: /api/people

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hot_or_not
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.6
+  hash: 11
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Joel Friedman
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 -05:00
+date: 2011-07-20 00:00:00 -05:00
 default_executable: hot_or_not
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,6 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 6
+        - 1
         version: 1.6.1
   type: :runtime
   prerelease: false
@@ -31,7 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.1
+        hash: 9
+        segments: 
+        - 2
+        - 0
+        - 3
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -42,6 +57,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 2
+        - 9
+        - 1
         version: 2.9.1
   type: :runtime
   prerelease: false
@@ -53,6 +73,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
   type: :runtime
   prerelease: false
@@ -64,6 +89,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 8
+        - 4
         version: 0.8.4
   type: :runtime
   prerelease: false
@@ -75,6 +105,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -86,6 +119,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
   prerelease: false
@@ -97,6 +135,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
         version: 1.6.0
   type: :development
   prerelease: false
@@ -108,6 +151,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -119,6 +165,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -171,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4115142112659835342
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -180,11 +229,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A tool for side-by-side comparsion of web apis