glib-web 0.4.61 → 0.4.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 187ee3620edc45227fa9735cf7fa76dcc3222e2f
-  data.tar.gz: 8186ad4c2983ff890edf11ec300be961d9c8687a
+  metadata.gz: 05f8e86292395e22c1ee9ef711abdf5fbd9b9115
+  data.tar.gz: 3181f098ac9d09879b8ee8fa84dfe2f173317d90
 SHA512:
-  metadata.gz: 99ad724fbafa89f6401c08477abe1d64f3d0b0fd3c8732fa84efcef6fd24eac5a4f6e411f914b65666e25c423560d1a3dafba4ab59ffd11ab0ccf20fe020292f
-  data.tar.gz: 881746e07bfea3b4d200fbbed451bb6ffa8dcec1f3d530318417cf9859a9e87f2bc681f1cd7a3ee6d6fa1e461f87204f7bd2d32c2844ebe429776fdb464f751a
+  metadata.gz: 6138e1485e762613e802890ab940a6bf82078f074909bd1fc6af4b50c4602b4a5918f8fde84162d4dfb525c166bf7945cb5c0adb7fc3b6a2277c74aeb3f50acf
+  data.tar.gz: e3757f1d6da865c8d4b3dfdfc962b5e04d5d52b3d0acc7a8fc4cedefb211490d9d8101eca06f62018c52c0a32451319657d21f8704feecfda88fd7507785e96f

data/lib/glib/json_crawler/http.rb

@@ -49,6 +49,14 @@ module Glib
       end
 
       private
+        Response = Struct.new :code, :headers, :media_type, :body do
+          def initialize(*)
+            super
+            self.headers ||= {}
+            self.media_type ||= 'text/plain'
+          end
+        end
+
         def fetch(method, url, action, params = {}, inspect_result = true)
           return nil if url.blank?
 
@@ -70,17 +78,29 @@ module Glib
             params[name] = '' if value.is_a?(Array) && value.size == 0
           end
 
+          response = nil
           begin
             @context.send(method, url, params: params, headers: http_header)
-          rescue
-            puts "Crashed on #{url}"
-            raise
+            raw_response = @context.response
+            response = Response.new(raw_response.code.to_i, raw_response.headers, raw_response.media_type, raw_response.body)
+          rescue => ex
+            if !inspect_result
+              case ex
+              when ActionController::RoutingError, ActiveRecord::RecordNotFound
+                response = Response.new(404)
+              end
+            end
+
+            if !response
+              puts "Crashed on #{url}"
+              raise
+            end
           end
-          response = @context.response
+
           @router.log(action, url, response)
 
           if inspect_result
-            if (code = response.code.to_i) == 302
+            if (code = response.code) == 302
               redirect_uri = URI(response.headers['Location'])
               redirect_uri.query = [redirect_uri.query, 'format=json'].compact.join('&')
               get redirect_uri.to_s, action

data/lib/glib/json_crawler/router.rb

@@ -41,10 +41,10 @@ module Glib
               JsonCrawler::NavInitiate.new(http, params, action)
             when 'windows/open-v1', 'dialogs/open-v1', 'windows/reload-v1'
               # TODO: Shouldn't dialog be crawled as well?
-              unless action == 'dialogs/open-v1'
+              # unless action == 'dialogs/open-v1'
                 # @@crawler_actions.add([action, params['url']]) if @@store_action
                 @read_only_actions.add([action, params['url']])
-              end
+              # end
               JsonCrawler::WindowsOpen.new(http, params, action)
             when 'http/post-v1'
               JsonCrawler::ActionHttp.new(:post, http, params, action)
@@ -83,3 +83,4 @@ module Glib
     end
   end
 end
+  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.4.61
+  version: 0.4.62
 platform: ruby
 authors:
 - ''