swd 0.0.0 → 0.0.1

data/.gitignore

@@ -1,4 +1,21 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC

data/Gemfile.lock

@@ -0,0 +1,44 @@
+PATH
+  remote: .
+  specs:
+    swd (0.0.1)
+      activesupport (>= 3)
+      attr_required (>= 0.0.3)
+      httpclient (>= 2.2.1)
+      i18n
+      json (>= 1.4.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.10)
+    addressable (2.2.6)
+    attr_required (0.0.3)
+    crack (0.1.8)
+    diff-lcs (1.1.2)
+    httpclient (2.2.1)
+    i18n (0.6.0)
+    json (1.5.3)
+    rake (0.9.2)
+    rcov (0.9.10)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    webmock (1.7.4)
+      addressable (> 2.2.5, ~> 2.2)
+      crack (>= 0.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake (>= 0.8)
+  rcov (>= 0.9)
+  rspec (>= 2)
+  swd!
+  webmock (>= 1.6.2)

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/lib/swd/resource.rb

@@ -9,7 +9,7 @@ module SWD
     include AttrRequired
     attr_required :principal, :service, :host, :path
 
-    class ContentExpired < Exception; end
+    class Expired < Exception; end
 
     def initialize(attributes = {})
       required_attributes.each do |key|
@@ -23,7 +23,7 @@ module SWD
     def discover!
       SWD.cache.fetch(cache_key, @cache_options) do
         handle_response do
-          HTTPClient.get endpoint.to_s
+          HTTPClient.get_content endpoint.to_s
         end
       end
     end
@@ -33,37 +33,42 @@ module SWD
         :principal => principal,
         :service => service
       }.to_query, nil]
+    rescue URI::Error => e
+      raise Exception.new(e.message)
     end
 
     private
 
     def handle_response
-      res = yield
-      case res.status
-      when 200
-        res = JSON.parse(res.body).with_indifferent_access
-        if redirect = res[:SWD_service_redirect]
-          redirect_to redirect[:location], redirect[:expires]
-        else
-          Response.new res
-        end
+      res = JSON.parse(yield).with_indifferent_access
+      if redirect = res[:SWD_service_redirect]
+        redirect_to redirect[:location], redirect[:expires]
+      else
+        Response.new res
+      end
+    rescue HTTPClient::BadResponseError => e
+      case e.res.try(:status)
+      when nil
+        raise Exception.new(e.message)
       when 400
-        raise BadRequest.new(res)
+        raise BadRequest.new('Bad Request', res)
       when 401
-        raise Unauthorized.new(res)
+        raise Unauthorized.new('Unauthorized', res)
       when 403
-        raise Forbidden.new(res)
+        raise Forbidden.new('Forbidden', res)
       when 404
-        raise NotFound.new(res)
+        raise NotFound.new('Not Found', res)
       else
-        raise HttpError.new(res.code, res)
+        raise HttpError.new(e.res.status, e.res.reason, res)
       end
+    rescue JSON::ParserError, OpenSSL::SSL::SSLError, SocketError => e
+      raise Exception.new(e.message)
     end
 
     def redirect_to(location, expires)
       uri = URI.parse(location)
       @host, @path = uri.host, uri.path
-      raise ContentExpired if expires && expires.to_i < Time.now.utc.to_i
+      raise Expired if expires && expires.to_i < Time.now.utc.to_i
       discover!
     end
 

data/spec/swd/resource_spec.rb

@@ -49,7 +49,7 @@ describe SWD::Resource do
       context 'when expired' do
         it 'should return SWD::Response' do
           mock_json resource.endpoint, 'redirect_expired' do
-            expect { res = resource.discover! }.should raise_error SWD::Resource::ContentExpired
+            expect { res = resource.discover! }.should raise_error SWD::Resource::Expired
           end
         end
       end
@@ -69,42 +69,73 @@ describe SWD::Resource do
       end
     end
 
-    context 'when bad request' do
-      it 'should raise SWD::BadRequest' do
-        mock_json resource.endpoint, 'blank', :status => 400 do
-          expect { res = resource.discover! }.should raise_error SWD::BadRequest
+    describe 'error handling' do
+
+      context 'when invalid SSL cert' do
+        it do
+          HTTPClient.should_receive(:get_content).and_raise(OpenSSL::SSL::SSLError)
+          expect { res = resource.discover! }.should raise_error SWD::Exception
         end
       end
-    end
 
-    context 'when unauthorized' do
-      it 'should raise SWD::Unauthorized' do
-        mock_json resource.endpoint, 'blank', :status => 401 do
-          expect { res = resource.discover! }.should raise_error SWD::Unauthorized
+      context 'when invalid JSON' do
+        it do
+          HTTPClient.should_receive(:get_content).and_raise(JSON::ParserError)
+          expect { res = resource.discover! }.should raise_error SWD::Exception
         end
       end
-    end
 
-    context 'when forbidden' do
-      it 'should raise SWD::Forbidden' do
-        mock_json resource.endpoint, 'blank', :status => 403 do
-          expect { res = resource.discover! }.should raise_error SWD::Forbidden
+      context 'when SocketError' do
+        it do
+          HTTPClient.should_receive(:get_content).and_raise(SocketError)
+          expect { res = resource.discover! }.should raise_error SWD::Exception
         end
       end
-    end
 
-    context 'when not found' do
-      it 'should raise SWD::NotFound' do
-        mock_json resource.endpoint, 'blank', :status => 404 do
-          expect { res = resource.discover! }.should raise_error SWD::NotFound
+      context 'when BadResponseError without response' do
+        it do
+          HTTPClient.should_receive(:get_content).and_raise(HTTPClient::BadResponseError.new(''))
+          expect { res = resource.discover! }.should raise_error SWD::Exception
+        end
+      end
+
+      context 'when bad request' do
+        it 'should raise SWD::BadRequest' do
+          mock_json resource.endpoint, 'blank', :status => 400 do
+            expect { res = resource.discover! }.should raise_error SWD::BadRequest
+          end
+        end
+      end
+
+      context 'when unauthorized' do
+        it 'should raise SWD::Unauthorized' do
+          mock_json resource.endpoint, 'blank', :status => 401 do
+            expect { res = resource.discover! }.should raise_error SWD::Unauthorized
+          end
+        end
+      end
+
+      context 'when forbidden' do
+        it 'should raise SWD::Forbidden' do
+          mock_json resource.endpoint, 'blank', :status => 403 do
+            expect { res = resource.discover! }.should raise_error SWD::Forbidden
+          end
         end
       end
-    end
 
-    context 'when other error happened' do
-      it 'should raise SWD::HttpError' do
-        mock_json resource.endpoint, 'blank', :status => 500 do
-          expect { res = resource.discover! }.should raise_error SWD::HttpError
+      context 'when not found' do
+        it 'should raise SWD::NotFound' do
+          mock_json resource.endpoint, 'blank', :status => 404 do
+            expect { res = resource.discover! }.should raise_error SWD::NotFound
+          end
+        end
+      end
+
+      context 'when other error happened' do
+        it 'should raise SWD::HttpError' do
+          mock_json resource.endpoint, 'blank', :status => 500 do
+            expect { res = resource.discover! }.should raise_error SWD::HttpError
+          end
         end
       end
     end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: swd
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 0
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - nov matake
@@ -25,11 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 4
-        - 3
         version: 1.4.3
   type: :runtime
   version_requirements: *id001
@@ -41,11 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 2
-        - 1
         version: 2.2.1
   type: :runtime
   version_requirements: *id002
@@ -57,9 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
         version: "3"
   type: :runtime
   version_requirements: *id003
@@ -71,9 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -85,11 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 0
-        - 3
         version: 0.0.3
   type: :runtime
   version_requirements: *id005
@@ -101,10 +75,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
         version: "0.8"
   type: :development
   version_requirements: *id006
@@ -116,10 +86,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
         version: "0.9"
   type: :development
   version_requirements: *id007
@@ -131,9 +97,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
         version: "2"
   type: :development
   version_requirements: *id008
@@ -145,11 +108,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 6
-        - 2
         version: 1.6.2
   type: :development
   version_requirements: *id009
@@ -165,19 +123,9 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - Rakefile
 - VERSION
-- coverage/index.html
-- coverage/jquery-1.3.2.min.js
-- coverage/jquery.tablesorter.min.js
-- coverage/lib-swd-cache_rb.html
-- coverage/lib-swd-exception_rb.html
-- coverage/lib-swd-resource_rb.html
-- coverage/lib-swd-response_rb.html
-- coverage/lib-swd_rb.html
-- coverage/print.css
-- coverage/rcov.js
-- coverage/screen.css
 - lib/swd.rb
 - lib/swd/cache.rb
 - lib/swd/exception.rb
@@ -206,18 +154,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 

data/coverage/index.html

@@ -1,170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang='en' xml:lang='en' xmlns='http://www.w3.org/1999/xhtml'>
-  <head>
-    <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
-    <title>Swd C0 Coverage Information - RCov</title>
-    <link href="screen.css" media="all" rel="stylesheet" type="text/css" />
-    <link href="print.css" media="print" rel="stylesheet" type="text/css" />
-    
-    <script type="text/javascript" src="jquery-1.3.2.min.js"></script>
-    <script type="text/javascript" src="jquery.tablesorter.min.js"></script>
-    <script type="text/javascript" src="rcov.js"></script>
-  </head>
-  <body>
-    <h1>Swd C0 Coverage Information - RCov</h1>
-    
-
-    <noscript><style type="text/css">.if_js { display:none; }</style></noscript>
-
-    <div class="filters if_js">
-      <fieldset>
-        <label>File Filter:</label>
-        <select id="file_filter" class="filter">
-          <option value="all_files">Show All</option>
-          <option value="lib">lib/</option><option value="swd">swd/</option>
-        </select>
-      </fieldset>
-      <fieldset>
-        <label>Code Coverage Threshold:</label>
-        <select id="coverage_filter" class="filter">
-          <option value="all_coverage">Show All</option>
-          <option value="10">&lt; 10% Coverage</option><option value="20">&lt; 20% Coverage</option><option value="30">&lt; 30% Coverage</option><option value="40">&lt; 40% Coverage</option><option value="50">&lt; 50% Coverage</option><option value="60">&lt; 60% Coverage</option><option value="70">&lt; 70% Coverage</option><option value="80">&lt; 80% Coverage</option><option value="90">&lt; 90% Coverage</option><option value="100">&lt; 100% Coverage</option>
-          <option value="110">= 100% Coverage</option>
-        </select>
-      </fieldset>
-    </div>
-    
-    <div class="report_table_wrapper">
-      <table class='report' id='report_table'>
-        <thead>
-          <tr>
-            <th class="left_align">Name</th>
-            <th class="right_align">Total Lines</th>
-            <th class="right_align">Lines of Code</th>
-            <th class="left_align">Total Coverage</th>
-            <th class="left_align">Code Coverage</th>
-          </tr>
-        </thead>
-        <tfoot>
-          <tr>
-            <td class="left_align">TOTAL</td>
-            <td class='right_align'><tt>150</tt></td>
-            <td class='right_align'><tt>134</tt></td>
-            <td class="left_align"><div class="percent_graph_legend"><tt class=''>99.33%</tt></div>
-          <div class="percent_graph">
-            <div class="covered" style="width:99px"></div>
-            <div class="uncovered" style="width:1px"></div>
-          </div></td>
-            <td class="left_align"><div class="percent_graph_legend"><tt class='coverage_total'>99.25%</tt></div>
-          <div class="percent_graph">
-            <div class="covered" style="width:99px"></div>
-            <div class="uncovered" style="width:1px"></div>
-          </div></td>
-          </tr>
-        </tfoot>
-        <tbody>
-          
-            <tr class="all_files all_coverage 110 lib even">
-              <td class="left_align"><a href="lib-swd_rb.html">lib/swd.rb</a></td>
-              <td class='right_align'><tt>16</tt></td>
-              <td class='right_align'><tt>15</tt></td>
-              <td class="left_align"><div class="percent_graph_legend"><tt class=''>100.00%</tt></div>
-          <div class="percent_graph">
-            <div class="covered" style="width:100px"></div>
-            <div class="uncovered" style="width:0px"></div>
-          </div></td>
-              <td class="left_align"><div class="percent_graph_legend"><tt class=''>100.00%</tt></div>
-          <div class="percent_graph">
-            <div class="covered" style="width:100px"></div>
-            <div class="uncovered" style="width:0px"></div>
-          </div></td>
-            </tr>
-          
-            <tr class="all_files all_coverage 110 lib swd odd">
-              <td class="left_align"><a href="lib-swd-cache_rb.html">lib/swd/cache.rb</a></td>
-              <td class='right_align'><tt>8</tt></td>
-              <td class='right_align'><tt>8</tt></td>
-              <td class="left_align"><div class="percent_graph_legend"><tt class=''>100.00%</tt></div>
-          <div class="percent_graph">
-            <div class="covered" style="width:100px"></div>
-            <div class="uncovered" style="width:0px"></div>
-          </div></td>
-              <td class="left_align"><div class="percent_graph_legend"><tt class=''>100.00%</tt></div>
-          <div class="percent_graph">
-            <div class="covered" style="width:100px"></div>
-            <div class="uncovered" style="width:0px"></div>
-          </div></td>
-            </tr>
-          
-            <tr class="all_files all_coverage 110 lib swd even">
-              <td class="left_align"><a href="lib-swd-exception_rb.html">lib/swd/exception.rb</a></td>
-              <td class='right_align'><tt>36</tt></td>
-              <td class='right_align'><tt>31</tt></td>
-              <td class="left_align"><div class="percent_graph_legend"><tt class=''>100.00%</tt></div>
-          <div class="percent_graph">
-            <div class="covered" style="width:100px"></div>
-            <div class="uncovered" style="width:0px"></div>
-          </div></td>
-              <td class="left_align"><div class="percent_graph_legend"><tt class=''>100.00%</tt></div>
-          <div class="percent_graph">
-            <div class="covered" style="width:100px"></div>
-            <div class="uncovered" style="width:0px"></div>
-          </div></td>
-            </tr>
-          
-            <tr class="all_files all_coverage 100 lib swd odd">
-              <td class="left_align"><a href="lib-swd-resource_rb.html">lib/swd/resource.rb</a></td>
-              <td class='right_align'><tt>79</tt></td>
-              <td class='right_align'><tt>70</tt></td>
-              <td class="left_align"><div class="percent_graph_legend"><tt class=''>98.73%</tt></div>
-          <div class="percent_graph">
-            <div class="covered" style="width:99px"></div>
-            <div class="uncovered" style="width:1px"></div>
-          </div></td>
-              <td class="left_align"><div class="percent_graph_legend"><tt class=''>98.57%</tt></div>
-          <div class="percent_graph">
-            <div class="covered" style="width:99px"></div>
-            <div class="uncovered" style="width:1px"></div>
-          </div></td>
-            </tr>
-          
-            <tr class="all_files all_coverage 110 lib swd even">
-              <td class="left_align"><a href="lib-swd-response_rb.html">lib/swd/response.rb</a></td>
-              <td class='right_align'><tt>11</tt></td>
-              <td class='right_align'><tt>10</tt></td>
-              <td class="left_align"><div class="percent_graph_legend"><tt class=''>100.00%</tt></div>
-          <div class="percent_graph">
-            <div class="covered" style="width:100px"></div>
-            <div class="uncovered" style="width:0px"></div>
-          </div></td>
-              <td class="left_align"><div class="percent_graph_legend"><tt class=''>100.00%</tt></div>
-          <div class="percent_graph">
-            <div class="covered" style="width:100px"></div>
-            <div class="uncovered" style="width:0px"></div>
-          </div></td>
-            </tr>
-          
-        </tbody>
-      </table>
-    </div>
-    
-    <p>Generated on Fri Aug 19 16:24:16 +0900 2011 with <a href="http://github.com/relevance/rcov">rcov 0.9.10</a></p>
-
-    <script type="text/javascript">
-      $(document).ready(function(){$("#report_table").tablesorter({widgets: ['zebra'], textExtraction: 'complex'});});
-      $('.filter').change(function(){
-        ff = $('#file_filter').val();
-        cf = $('#coverage_filter').val();
-        $('table#report_table tbody tr').each(function(i){ 
-          if ((this.className.split(" ").indexOf(ff) > -1) && (this.className.split(" ").indexOf(cf) > -1)) {
-            this.style.display = "";
-          } else {
-            this.style.display = "none";
-          };
-          restripe();
-        })
-      })
-    </script>
-
-  </body>
-</html>