ocean-rails 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac295d46c01283272dcf2bfd02bdc86170b4bf87
-  data.tar.gz: 99d4f7e4b7cdf86738dd7991945b0365cc4574d0
+  metadata.gz: 695bf42c433ee293191b3c856bdea9659fa6026b
+  data.tar.gz: 2472561dd035df00ca8ee24d923d6576ba3bc79f
 SHA512:
-  metadata.gz: 88d08d9514b4b7946a066f5e3150ec13219dd4d77ba400bda3ed28389e982ea7fd59a170d9f2c657c332ff8252f17ca9cdaf13693eb44290f37ee8780b48f6e8
-  data.tar.gz: 9eaef29359bd7593ade30e260e7fd2819de2e15da1375d92ab2b300d35ca8965dd5ce45bb9ed4924752b29683847637cc4da21fe37698b1c844aa39a7d938e5a
+  metadata.gz: c32548ba8c61a9b8348f8f710e97864ac26a58f2dd18dce8f2ceb2d872472630d2d30f3780e756e14d4336ab3fffcdcf818c56784d7e420e4293f69082a52c6a
+  data.tar.gz: 722dc5edec98fcf8a921fcc5f3b9372804eaedb4e33f6206b0090c48d4bf8a2e82f1add6e81bacc98dd9f768bb1c7861a1584aec8d3f42f9117f5de359acc74c

data/lib/ocean/api.rb

@@ -11,7 +11,6 @@ class Api
   # etc.
   #
   def self.internalize_uri(uri, chef_env=CHEF_ENV)
-    return uri if chef_env == 'prod'
     uri.sub(OCEAN_API_URL, INTERNAL_OCEAN_API_URL)
   end
 
@@ -188,6 +187,8 @@ class Api
     request = nil   # For clarity
     response = nil
 
+    url = url.first == "/" ? "#{INTERNAL_OCEAN_API_URL}#{url}" : Api.internalize_uri(url)
+
     # This is a Proc when run queues the request and schedules retries
     enqueue_request = lambda do
       # First construct a request. It will not be sent yet.
@@ -422,9 +423,6 @@ class Api
   #
   def self.permitted?(token, args={})
     raise unless token
-    #response = Api.get(:auth, "/authentications/#{token}", args)
-
-    #response
     Api.request "#{INTERNAL_OCEAN_API_URL}/v1/authentications/#{token}", :get, 
                 args: args
   end  

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "4.0.2"
+  VERSION = "4.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Peter Bengtson
@@ -252,7 +252,6 @@ files:
 - lib/ocean/api.rb
 - lib/ocean/api_remote_resource.rb
 - lib/ocean/api_resource.rb
-- lib/ocean/continuation_experiments.rb
 - lib/ocean/engine.rb
 - lib/ocean/flooding.rb
 - lib/ocean/ocean_application_controller.rb

data/lib/ocean/continuation_experiments.rb

@@ -1,139 +0,0 @@
-require 'continuation'
-
-  # Api.simultaneously takes a block. It executes the block straight away. 
-  #
-  # When executing inside an Api.simultaneously block, Api.request only enqueues its request,
-  # but doesn't run it. They register on_complete handlers that will be run asynchronously
-  # when Api.simultaneously fires hydra to run after the block.
-  #
-  # When Api.request runs outside Api.simultaneously, it simply returns an Api::Response.
-  # When running inside Api.simultaneously, however, Api.request creates a continuation
-  # and registers it with Api.simultaneously. After the block has run, Api.simultaneously
-  # invokes each continuation in turn with another continuation to allow the next 
-  # continuation to be called. When there are no more continuations to process, 
-  # Api.simultaneously returns normally. In this way, all continuations are executed serially 
-  # to process the Api.request results, no matter who called them or from where.
-
-class Quux
-
-  require 'continuation'
-
-
-  def self.simultaneously?
-    !!@continuations
-  end
-
-  def self.accumulating?
-    @accumulating
-  end
-
-
-  def self.simultaneously
-    raise "Api.simultaneously may not be nested" if simultaneously?
-    @continuations = []
-    # Execute the block
-    begin
-      puts "--------------------------- ACCUMULATING ------------------------"
-      @accumulating = true
-      yield @continuations
-    ensure
-      @accumulating = false
-    end
-
-    # The continuations array should now have entries. Create a continuation
-    # to return to this point.
-    begin
-      puts '', "--------------------------- EXECUTING ------------------------"
-    cc, results, result = callcc { |cc, results, result| [cc, [], :init] }
-    # '-BACK AT TOP LEVEL-----', [cc, results, result].inspect
-    raise "must be a continuation" unless cc.is_a? Continuation
-    results << result if result && result != :init
-    # Call the first accumulated continuation (if any) with it. When they call
-    # here, the next continuation will be called (if any). This is a loop,
-    # continuation style.
-      if @continuations.size > 0
-        @continuations.shift.call(cc, results)
-      end
-      ensure
-    # No longer nested
-    @continuations = nil
-    end
-    results
-  end
-
-
-  def self.doubler (arg, k: nil)
-    raise "K is not a continuation: #{k.inspect}" if k && !k.is_a?(Continuation)
-    cc, acc = callcc { |cc, acc| [cc, acc] }
-    puts '', '-CONTINUATION CALL TO DOUBLER-----', [cc, acc].inspect
-    return cc if accumulating?
-
-    # Execution phase
-
-    # Calculate a result
-    result = arg * 2                # Calculate the result
-
-    # Transfer back
-    k.call(k, result) if k          # Go elsewhere if k is there (e.g. to a nested caller)
-    cc.call(cc, acc, result)        # Return to caller
-  end
-
-
-  def self.nested(arg, k: nil)
-    raise "K is not a continuation: #{k.inspect}" if k && !k.is_a?(Continuation)
-    cc, acc = callcc { |cc, acc| [cc, acc] }
-    puts '', '-CONTINUATION CALL TO NESTED-----', [cc, acc].inspect
-    return cc if accumulating?
-
-    # Execution phase
-    # Set up the overriding continuation for the callee
-    callee_k, result = callcc { |callee_k, result| [callee_k, result] }
-    # The callee returns to the following statement
-    result = doubler(arg, k: callee_k) unless result   # Can't be nil or false (fix later)
-
-    # Calculate a result
-    result = "#{result} processed"
-
-    # Transfer back
-    k.call(k, result) if k          # Go elsewhere if k is there (e.g. to a nested caller)
-    cc.call(cc, acc, result)        # Return to caller
-  end
-
-
-  def self.deeply_nested(arg, k: nil)
-    raise "K is not a continuation: #{k.inspect}" if k && !k.is_a?(Continuation)
-    cc, acc = callcc { |cc, acc| [cc, acc] }
-    puts '', '-CONTINUATION CALL TO DEEPLY_NESTED-----', [cc, acc].inspect
-    return cc if accumulating?
-
-    # Execution phase
-    # Set up the overriding continuation for the callee
-    callee_k, result = callcc { |callee_k, result| [callee_k, result] }
-    # The callee returns to the following statement
-    result = nested(arg, k: callee_k) unless result   # Can't be nil or false (fix later)
-
-    # Calculate a result
-    result = "#{result} more deeply"
-
-    # Transfer back
-    k.call(k, result) if k          # Go elsewhere if k is there (e.g. to a nested caller)
-    cc.call(cc, acc, result)        # Return to caller
-  end
-
-end
-
-
-
-# This accumulates stuff
-res = Quux.simultaneously do |r|
-  r << Quux.doubler(24)
-  r << Quux.nested("hej")
-  r << Quux.doubler(100)
-  r << Quux.deeply_nested("woo")
-  r << Quux.doubler(1)
-end
-
-puts
-puts res.inspect
-puts
-