hoodie 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 426eabc32be60c299ca43f6543ba20a03df847cc
-  data.tar.gz: b3951228007594470384a5063e805a81e935a3da
+  metadata.gz: 3f049115fb6e28197cf8fc99f90a93b47dfc6d36
+  data.tar.gz: 11356e662f4b076be57c3b42f5e0f0f37ceba367
 SHA512:
-  metadata.gz: 7e49a845d9aa835d222cb7ebb8fe2993d8e9bb26cf7f737f203ad54b504d56f822dd574c2077fe83b0be67bf05acf7c3f081bd6cd115af97e2fc4c99ab3b26f7
-  data.tar.gz: ed1b3f56e2afdd79fb9556d13d79398b0ed2cb16c5f0dd117ed95d46df96783d33dd821225208d07c09f05dc4661464a301d16988c9db74000d00174ebe20e1a
+  metadata.gz: b7655a46f873e0a0bcaa29b190086e05782816696cbf8d59d013547c32a98d99486fc85d3a773da46655315a26e4cab78a2f4eb22a570f3cb6897d9f8a2bab65
+  data.tar.gz: f4d66b616e2e3f5a73adb2f1dd22b201be54f49c9d8bc43126bb9498333e018f4a75795c6cb25fe739c15bdc853deb5b1757610b9340594eaaa832ebec485c1e

data/lib/hoodie/identity_map.rb

@@ -17,78 +17,80 @@
 # permissions and limitations under the License.
 #
 
-module Hoodie::IdentityMap
-  def self.enabled=(flag)
-    Thread.current[:identity_map_enabled] = flag
-  end
-
-  def self.enabled
-    Thread.current[:identity_map_enabled]
-  end
-
-  def self.enabled?
-    enabled == true
-  end
+module Hoodie
+  module IdentityMap
+    def self.enabled=(flag)
+      Thread.current[:identity_map_enabled] = flag
+    end
 
-  def self.repository
-    Thread.current[:identity_map] ||= {}
-  end
+    def self.enabled
+      Thread.current[:identity_map_enabled]
+    end
 
-  def self.clear
-    repository.clear
-  end
+    def self.enabled?
+      enabled == true
+    end
 
-  def self.include?(object)
-    repository.keys.include?(object.id)
-  end
+    def self.repository
+      Thread.current[:identity_map] ||= {}
+    end
 
-  def self.use
-    old, self.enabled = enabled, true
-    yield if block_given?
-  ensure
-    self.enabled = old
-    clear
-  end
+    def self.clear
+      repository.clear
+    end
 
-  def self.without
-    old, self.enabled = enabled, false
-    yield if block_given?
-  ensure
-    self.enabled = old
-  end
+    def self.include?(object)
+      repository.keys.include?(object.id)
+    end
 
-  module ClassMethods
-    def get(id, options = nil)
-      get_from_identity_map(id) || super
+    def self.use
+      old, self.enabled = enabled, true
+      yield if block_given?
+    ensure
+      self.enabled = old
+      clear
     end
 
-    def get_from_identity_map(id)
-      IdentityMap.repository[id] if IdentityMap.enabled?
+    def self.without
+      old, self.enabled = enabled, false
+      yield if block_given?
+    ensure
+      self.enabled = old
     end
-    private :get_from_identity_map
 
-    def load(id, attrs)
-      if IdentityMap.enabled? && instance = IdentityMap.repository[id]
-        instance
-      else
-        super.tap { |doc| doc.add_to_identity_map }
+    module ClassMethods
+      def get(id, options = nil)
+        get_from_identity_map(id) || super
+      end
+
+      def get_from_identity_map(id)
+        IdentityMap.repository[id] if IdentityMap.enabled?
+      end
+      private :get_from_identity_map
+
+      def load(id, attrs)
+        if IdentityMap.enabled? && instance = IdentityMap.repository[id]
+          instance
+        else
+          super.tap { |doc| doc.add_to_identity_map }
+        end
       end
     end
-  end
 
-  def save(options={})
-    super.tap { |result| add_to_identity_map if result }
-  end
+    def save(options={})
+      super.tap { |result| add_to_identity_map if result }
+    end
 
-  def delete
-    super.tap { remove_from_identity_map }
-  end
+    def delete
+      super.tap { remove_from_identity_map }
+    end
 
-  def add_to_identity_map
-    IdentityMap.repository[id] = self if IdentityMap.enabled?
-  end
+    def add_to_identity_map
+      IdentityMap.repository[id] = self if IdentityMap.enabled?
+    end
 
-  def remove_from_identity_map
-    IdentityMap.repository.delete(id) if IdentityMap.enabled?
+    def remove_from_identity_map
+      IdentityMap.repository.delete(id) if IdentityMap.enabled?
+    end
   end
 end

data/lib/hoodie/utils.rb

@@ -21,13 +21,84 @@
 require 'securerandom'
 require 'time'
 
-module Hoodie::Utils
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-  private_class_method :included
+module Hoodie
+  module Utils
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+    private_class_method :included
+
+    module ClassMethods
+      def callable(call_her)
+        call_her.respond_to?(:call) ? call_her : lambda { call_her }
+      end
+
+      def camelize(underscored_word)
+        underscored_word.to_s.gsub(/(?:^|_)(.)/) { $1.upcase }
+      end
+
+      def classify(table_name)
+        camelize singularize(table_name.to_s.sub(/.*\./, ''))
+      end
+
+      def class_name
+        demodulize(self.class)
+      end
+
+      def caller_name
+        caller_locations(2, 1).first.label
+      end
+
+      def demodulize(class_name_in_module)
+        class_name_in_module.to_s.sub(/^.*::/, '')
+      end
+
+      def pluralize(word)
+        word.to_s.sub(/([^s])$/, '\1s')
+      end
+
+      def singularize(word)
+        word.to_s.sub(/s$/, '').sub(/ie$/, 'y')
+      end
+
+      def underscore(camel_cased_word)
+        word = camel_cased_word.to_s.dup
+        word.gsub!(/::/, '/')
+        word.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+        word.tr! '-', '_'
+        word.downcase!
+        word
+      end
+
+      # Return the date and time in "HTTP-date" format as defined by RFC 7231.
+      #
+      # @return [Date,Time] in "HTTP-date" format
+      def utc_httpdate
+        Time.now.utc.httpdate
+      end
+
+      def request_id
+        SecureRandom.uuid
+      end
+
+      def twenty_four_hours_ago
+        Time.now - ( 60 * 60 * 24)
+      end
+
+      def verify_options(accepted, actual) # @private
+        return unless debug || $DEBUG
+        unless (act=Set[*actual.keys]).subset?(acc=Set[*accepted])
+          raise Croesus::Errors::UnknownOption,
+            "\nDetected unknown option(s): #{(act - acc).to_a.inspect}\n" <<
+            "Accepted options are: #{accepted.inspect}"
+        end
+        yield if block_given?
+      end
+    end # module ClassMethods
+
+    # ============================================================================
 
-  module ClassMethods
     def callable(call_her)
       call_her.respond_to?(:call) ? call_her : lambda { call_her }
     end
@@ -94,172 +165,103 @@ module Hoodie::Utils
       end
       yield if block_given?
     end
-  end # module ClassMethods
-
-  # ============================================================================
-
-  def callable(call_her)
-    call_her.respond_to?(:call) ? call_her : lambda { call_her }
-  end
-
-  def camelize(underscored_word)
-    underscored_word.to_s.gsub(/(?:^|_)(.)/) { $1.upcase }
-  end
-
-  def classify(table_name)
-    camelize singularize(table_name.to_s.sub(/.*\./, ''))
-  end
 
-  def class_name
-    demodulize(self.class)
-  end
-
-  def caller_name
-    caller_locations(2, 1).first.label
-  end
-
-  def demodulize(class_name_in_module)
-    class_name_in_module.to_s.sub(/^.*::/, '')
-  end
-
-  def pluralize(word)
-    word.to_s.sub(/([^s])$/, '\1s')
-  end
-
-  def singularize(word)
-    word.to_s.sub(/s$/, '').sub(/ie$/, 'y')
-  end
-
-  def underscore(camel_cased_word)
-    word = camel_cased_word.to_s.dup
-    word.gsub!(/::/, '/')
-    word.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-    word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
-    word.tr! '-', '_'
-    word.downcase!
-    word
-  end
-
-  # Return the date and time in "HTTP-date" format as defined by RFC 7231.
-  #
-  # @return [Date,Time] in "HTTP-date" format
-  def utc_httpdate
-    Time.now.utc.httpdate
-  end
+    # Returns the columns and lines of the current tty.
+    #
+    # @return [Integer]
+    #   number of columns and lines of tty, returns [0, 0] if no tty is present.
+    #
+    # @api public
+    def terminal_dimensions
+      [0, 0] unless  STDOUT.tty?
+      [80, 40] if OS.windows?
+
+      if ENV['COLUMNS'] && ENV['LINES']
+        [ENV['COLUMNS'].to_i, ENV['LINES'].to_i]
+      elsif ENV['TERM'] && command_in_path?('tput')
+        [`tput cols`.to_i, `tput lines`.to_i]
+      elsif command_in_path?('stty')
+        `stty size`.scan(/\d+/).map {|s| s.to_i }
+      else
+        [0, 0]
+      end
+    rescue
+      [0, 0]
+    end
 
-  def request_id
-    SecureRandom.uuid
-  end
+    # Checks in PATH returns true if the command is found
+    def command_in_path?(command)
+      found = ENV['PATH'].split(File::PATH_SEPARATOR).map do |p|
+        File.exist?(File.join(p, command))
+      end
+      found.include?(true)
+    end
 
-  def twenty_four_hours_ago
-    Time.now - ( 60 * 60 * 24)
-  end
+    # Runs a code block, and retries it when an exception occurs. Should the
+    # number of retries be reached without success, the last exception will be
+    # raised.
+    #
+    # @param opts [Hash{Symbol => Value}]
+    # @option opts [Fixnum] :tries
+    #   number of attempts to retry before raising the last exception
+    # @option opts [Fixnum] :sleep
+    #   number of seconds to wait between retries, use lambda to exponentially
+    #   increasing delay between retries
+    # @option opts [Array(Exception)] :on
+    #   the type of exception(s) to catch and retry on
+    # @option opts [Regex] :matching
+    #   match based on the exception message
+    # @option opts [Block] :ensure
+    #   ensure a block of code is executed, regardless of whether an exception
+    #   is raised
+    #
+    # @return [Block]
+    #
+    def retrier(opts = {}, &block)
+      defaults = {
+        tries:    2,
+        sleep:    1,
+        on:       StandardError,
+        matching: /.*/,
+        :ensure => Proc.new {}
+      }
 
-  def verify_options(accepted, actual) # @private
-    return unless debug || $DEBUG
-    unless (act=Set[*actual.keys]).subset?(acc=Set[*accepted])
-      raise Croesus::Errors::UnknownOption,
-        "\nDetected unknown option(s): #{(act - acc).to_a.inspect}\n" <<
-        "Accepted options are: #{accepted.inspect}"
-    end
-    yield if block_given?
-  end
+      check_for_invalid_options(opts, defaults)
+      defaults.merge!(opts)
 
-  # Returns the columns and lines of the current tty.
-  #
-  # @return [Integer]
-  #   number of columns and lines of tty, returns [0, 0] if no tty is present.
-  #
-  # @api public
-  def terminal_dimensions
-    [0, 0] unless  STDOUT.tty?
-    [80, 40] if OS.windows?
-
-    if ENV['COLUMNS'] && ENV['LINES']
-      [ENV['COLUMNS'].to_i, ENV['LINES'].to_i]
-    elsif ENV['TERM'] && command_in_path?('tput')
-      [`tput cols`.to_i, `tput lines`.to_i]
-    elsif command_in_path?('stty')
-      `stty size`.scan(/\d+/).map {|s| s.to_i }
-    else
-      [0, 0]
-    end
-  rescue
-    [0, 0]
-  end
+      return if defaults[:tries] == 0
 
-  # Checks in PATH returns true if the command is found
-  def command_in_path?(command)
-    found = ENV['PATH'].split(File::PATH_SEPARATOR).map do |p|
-      File.exist?(File.join(p, command))
-    end
-    found.include?(true)
-  end
+      on_exception, tries = [defaults[:on]].flatten, defaults[:tries]
+      retries = 0
+      retry_exception = nil
 
-  # Runs a code block, and retries it when an exception occurs. Should the
-  # number of retries be reached without success, the last exception will be
-  # raised.
-  #
-  # @param opts [Hash{Symbol => Value}]
-  # @option opts [Fixnum] :tries
-  #   number of attempts to retry before raising the last exception
-  # @option opts [Fixnum] :sleep
-  #   number of seconds to wait between retries, use lambda to exponentially
-  #   increasing delay between retries
-  # @option opts [Array(Exception)] :on
-  #   the type of exception(s) to catch and retry on
-  # @option opts [Regex] :matching
-  #   match based on the exception message
-  # @option opts [Block] :ensure
-  #   ensure a block of code is executed, regardless of whether an exception
-  #   is raised
-  #
-  # @return [Block]
-  #
-  def retrier(opts = {}, &block)
-    defaults = {
-      tries:    2,
-      sleep:    1,
-      on:       StandardError,
-      matching: /.*/,
-      :ensure => Proc.new {}
-    }
-
-    check_for_invalid_options(opts, defaults)
-    defaults.merge!(opts)
-
-    return if defaults[:tries] == 0
-
-    on_exception, tries = [defaults[:on]].flatten, defaults[:tries]
-    retries = 0
-    retry_exception = nil
-
-    begin
-      yield retries, retry_exception
-    rescue *on_exception => exception
-      raise unless exception.message =~ defaults[:matching]
-      raise if retries+1 >= defaults[:tries]
-
-      # Interrupt Exception could be raised while sleeping
       begin
-        sleep defaults[:sleep].respond_to?(:call) ?
-          defaults[:sleep].call(retries) : defaults[:sleep]
-      rescue *on_exception
+        yield retries, retry_exception
+      rescue *on_exception => exception
+        raise unless exception.message =~ defaults[:matching]
+        raise if retries+1 >= defaults[:tries]
+
+        # Interrupt Exception could be raised while sleeping
+        begin
+          sleep defaults[:sleep].respond_to?(:call) ?
+            defaults[:sleep].call(retries) : defaults[:sleep]
+        rescue *on_exception
+        end
+
+        retries += 1
+        retry_exception = exception
+        retry
+      ensure
+        defaults[:ensure].call(retries)
       end
-
-      retries += 1
-      retry_exception = exception
-      retry
-    ensure
-      defaults[:ensure].call(retries)
     end
-  end
 
-  private #   P R O P R I E T À   P R I V A T A   Vietato L'accesso
+    private #   P R O P R I E T À   P R I V A T A   Vietato L'accesso
 
-  def check_for_invalid_options(custom_options, defaults)
-    invalid_options = defaults.merge(custom_options).keys - defaults.keys
-    raise ArgumentError.new('[Retrier] Invalid options: ' \
-      "#{invalid_options.join(", ")}") unless invalid_options.empty?
+    def check_for_invalid_options(custom_options, defaults)
+      invalid_options = defaults.merge(custom_options).keys - defaults.keys
+      raise ArgumentError.new('[Retrier] Invalid options: ' \
+        "#{invalid_options.join(", ")}") unless invalid_options.empty?
+    end
   end
 end

data/lib/hoodie/version.rb

@@ -18,5 +18,5 @@
 #
 
 module Hoodie
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoodie
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Stefano Harding