goodguide-gibbon 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6149450d065a995f3529ce090e46660c767b3528
-  data.tar.gz: dc185cb13befd7689de9ab2529e87d4c76ef0a55
+  metadata.gz: c8b34db5c0525825c475f7d18109f8ffc5518e53
+  data.tar.gz: 9db9f664a974da99e90ad45855d9d42b91656a1d
 SHA512:
-  metadata.gz: 35a60f8887b78d4b9c17991671e7c75b5fc312ba525357baf56ffaec5429a40ada1fe8534d4d119429366e813a32f77170a134464167f95fce7149c25e6e0b1c
-  data.tar.gz: 111d9117a247e4961f1b0e4904454ecc4023162a89c54340f62a99b8e07e580279d16bd0bd5aaf091895ce8d083de726917434aaf1408ce256c95ba0bb7821e0
+  metadata.gz: 271a7ede66936d1e02e5eaf6852f8c78948fc4b989d6c4bc377ee1c34bde960ccbb16253db765e8e51595c1434639d0c1392181df31a137f05d6ca6ee55ef683
+  data.tar.gz: bf95e7975d0abec0c15131733ec04a38471f7c05d505d2aac0631081f774c65601d9efee3dd8de2f6d4caa26c87252c0033ce482e1ae4f332f0849f63d1533a0

data/lib/goodguide/gibbon.rb

@@ -173,6 +173,17 @@ module GoodGuide
       end
     end
 
+    class ParseError < SemanticError
+      attr_reader :message
+      def initialize(message)
+        @message = message.to_s
+      end
+
+      def messages
+        [message]
+      end
+    end
+
     class GibbonError < StandardError
       def to_js(gibbon)
         raise "abstract"
@@ -351,7 +362,17 @@ module GoodGuide
       end
 
       def to_js(gibbon)
-        { :analyzeQuery => proc_for(gibbon, :analyze_query) }
+        analyze_proc = proc do |*args|
+          args.shift unless defined?(JRUBY_VERSION)
+
+          begin
+            { :success => true, :analysis => analyze_query(*args) }
+          rescue GibbonError => e
+            { :success => false, :error => e.to_js(gibbon) }
+          end
+        end
+
+        { :analyzeQuery => analyze_proc }
       end
     end
 
@@ -450,10 +471,6 @@ module GoodGuide
       def add_dependency!(key, dep)
         (@dependencies[key] ||= []) << dep
       end
-
-      def to_js(gibbon)
-        { :performQuery => proc_for(gibbon, :perform_query) }
-      end
     end
 
     class Context
@@ -478,7 +495,7 @@ module GoodGuide
       def parse(str)
         obj_to_ruby self.gibbon.parse(str)
       rescue JSError => e
-        raise SemanticError.new([{'_tag' => 'parse', 'message' => e.value}], self)
+        raise ParseError.new(e.value)
       end
 
       def compile(semantics)
@@ -489,39 +506,26 @@ module GoodGuide
         obj_to_ruby(gibbon.compileRuby(obj_to_js(semantics)))
       end
 
-      def analyze(syntax, global_table, static_client)
-        syntax = obj_to_js(syntax)
+      if defined?(JRUBY_VERSION)
+        def unwrap_error(e)
+          return e unless e.respond_to?(:value) and e.value.is_a? Rhino::Ruby::Object
 
-        out = capture do |&callback|
-          gibbon.analyze(syntax, global_table, static_client, callback)
+          e.value.unwrap
+        end
+      else
+        def unwrap_error(e)
+          e
         end
-
-        obj_to_ruby(out)
       end
 
-    private
-      def capture(&b)
-        callback_args = nil
-        call_count = 0
-
-        b.call do |*args|
-          # Rhino doesn't get "this", but V8 does.
-          args.shift unless defined?(JRUBY_VERSION)
-
-          call_count += 1
-
-          if call_count >= 2
-            first = callback_args.inspect
-            second = args.inspect
-            raise "gibbon: callback called twice with #{first} and #{second}"
-          end
-
-          callback_args = args
-        end
+      def analyze(syntax, global_table, static_client)
+        syntax = obj_to_js(syntax)
 
-        raise "gibbon: callback never called" unless call_count >= 1
+        result = gibbon.analyze(syntax, global_table, static_client)
 
-        callback_args
+        [ obj_to_ruby(result[:errors]), obj_to_ruby(result[:semantics]) ]
+      rescue => e
+        raise unwrap_error(e)
       end
     end