exel 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bb6f49bf87e5bdf9dab0634d6ba7ea975335aed
-  data.tar.gz: 661b46455bab58722f422f341f2470ded9519853
+  metadata.gz: ddd9afec5ea8298052cc0ee3aee03dedb9c1e085
+  data.tar.gz: 51c89e0ccad9b2be2dbc8961c52d0c80fad5fe24
 SHA512:
-  metadata.gz: 359c314ec2a54d8e229738a44e0a243636c644fb451e82a013a26f04317bd3964ddefbe982781ae76abb40a3550ce34c457b1663a70f371b57e0a5183e01d195
-  data.tar.gz: c3a4b9799e38d4b4d8f2af6ab62141001b71377faaea6eac83caed5cbe647755f5cbd5c8a1322b1a576f4ab688ced6972c8cfbfe57bff3c39dfed8326d4c2c76
+  metadata.gz: 81c0b0b05b1d5fbd01de78c75e342e7a4beb557d9c4bc70ff5aed5835e50c108e6f3326b6fc095e15375fc38a0872decaa6df63d2f627cbcaa26a6852a12c144
+  data.tar.gz: 3628008c5f8479ef6dab87a5229bc024117b49a3ba668a16e451f1dbdf0b216b323bd8ac80a4154eda090ac0db1c322e805ef6861a07f21c881224577e068979

data/lib/exel.rb

@@ -47,5 +47,5 @@ module EXEL
   end
 
   root = File.expand_path('../..', __FILE__)
-  Dir[File.join(root, 'lib/exel/**/*.rb')].reject { |file| file.include?('old_context') }.each { |file| require file }
+  Dir[File.join(root, 'lib/exel/**/*.rb')].each { |file| require file }
 end

data/lib/exel/context.rb

@@ -28,31 +28,17 @@ module EXEL
     # Given a string representing the URI to a serialized context, downloads and returns the deserialized context
     #
     # @return [Context]
-    # rubocop:disable Metrics/MethodLength
     def self.deserialize(uri)
       file = EXEL::Value.localize(uri)
 
       begin
         context = Marshal.load(file.read)
-      rescue
-        # temporarily in place for backwards compatibility
-
-        dir = File.expand_path('..', __FILE__)
-
-        EXEL.send(:remove_const, :Context)
-        load File.join(dir, 'old_context.rb')
-
-        context = Context.deserialize(uri)
-
-        EXEL.send(:remove_const, :Context)
-        load File.join(dir, 'context.rb')
       ensure
         file.close
       end
 
       context
     end
-    # rubocop:enable Metrics/MethodLength
 
     # Returns the value referenced by the given key. If it is a remote value, it will be converted to a local value and
     # the local value will be returned.

data/lib/exel/version.rb

@@ -1,3 +1,3 @@
 module EXEL
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ CodeClimate::TestReporter.start
 
 require 'pry'
 
-Dir[File.expand_path('../../lib/**/*.rb', __FILE__)].reject { |f| f.include?('old_context') }.each { |f| require f }
+Dir[File.expand_path('../../lib/**/*.rb', __FILE__)].each { |f| require f }
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exel
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - yroo
@@ -208,7 +208,6 @@ files:
 - lib/exel/listen_instruction.rb
 - lib/exel/logging.rb
 - lib/exel/null_instruction.rb
-- lib/exel/old_context.rb
 - lib/exel/processor_helper.rb
 - lib/exel/processors/async_processor.rb
 - lib/exel/processors/run_processor.rb

data/lib/exel/old_context.rb

@@ -1,109 +0,0 @@
-require 'tempfile'
-
-module EXEL
-  # This is here for one version for backwards compatibility with already serialized contexts, which can't
-  # be deserialized with the new +Context+ class
-  class Context
-    # Internal hash of keys/values in the context. Use {#[]} and {#[]=} to get and set values instead of this.
-    attr_reader :table
-
-    # Accepts an optional hash of keys and values to initialize the context with.
-    def initialize(initial_context = {})
-      @table = initial_context
-    end
-
-    # Returns a deep copy of this context. The copy and the original will have no shared object references.
-    #
-    # @return [Context]
-    def deep_dup
-      Context.deserialize(serialize)
-    end
-
-    # Serializes this instance to a local file and uses the remote provider to upload it. Returns a URI indicating where
-    # the serialized context can be downloaded.
-    #
-    # @return [String] A URI such as +s3://bucket/file+, +file:///path/to/file+, etc.
-    def serialize
-      EXEL::Value.remotize(serialized_context)
-    end
-
-    # Given a string representing the URI to a serialized context, downloads and returns the deserialized context
-    #
-    # @return [Context]
-    def self.deserialize(uri)
-      file = EXEL::Value.localize(uri)
-      context = Marshal.load(file.read)
-      file.close
-      context
-    end
-
-    def foobar
-      puts 'hi'
-    end
-
-    # Returns the value referenced by the given key
-    def [](key)
-      value = EXEL::Value.localize(@table[key])
-      value = get_deferred(value)
-      @table[key] = value
-      value
-    end
-
-    # Stores the given key/value pair
-    def []=(key, value)
-      @table[key] = value
-    end
-
-    # Adds the given key/value pairs to the context, overriding any keys that are already present.
-    #
-    # @return [Context]
-    def merge!(hash)
-      @table.merge!(hash)
-      self
-    end
-
-    # Removes the value referenced by +key+ from the context
-    def delete(key)
-      @table.delete(key)
-    end
-
-    # Two Contexts are equal if they contain the same key/value pairs
-    def ==(other)
-      other.is_a?(EXEL::Context) && table == other.table
-    end
-
-    # Returns true if this instance contains all of the given key/value pairs
-    def include?(hash)
-      @table.merge(hash) == @table
-    end
-
-    private
-
-    def serialized_context
-      file = Tempfile.new(SecureRandom.uuid, encoding: 'ascii-8bit')
-      file.write(Marshal.dump(Context.new(remotized_table)))
-      file.rewind
-      file
-    end
-
-    def remotized_table
-      @table.each_with_object({}) { |(key, value), acc| acc[key] = EXEL::Value.remotize(value) }
-    end
-
-    def get_deferred(value)
-      if deferred?(value)
-        value = value.get(self)
-      elsif value.is_a?(Array)
-        value.map! { |v| get_deferred(v) }
-      elsif value.is_a?(Hash)
-        value.each { |k, v| value[k] = get_deferred(v) }
-      end
-
-      value
-    end
-
-    def deferred?(value)
-      value.is_a?(DeferredContextValue)
-    end
-  end
-end