sumhash 0.0.2 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6821cbf43c71f33fb60986e6673e5a5b04f006f4
+  data.tar.gz: e550b4a42a77731938b66faacc91eca6cb487ab5
+SHA512:
+  metadata.gz: 9dffd044887b13b9dc554fe45218bc8194c2c105fe62bd6684f8dd5db55240c347b8e93461b888b6d20d4ddf2e8608c1b0e8600119e8d18ff062a4c41daed36c
+  data.tar.gz: 86e4a7d2c1477d4cf12718cacbb0cebde19f3fcd25c9616e94e957c3f7888c41085e3020a6641cb545b12374f7467d82c439058a5906b80d803864a92c9f19bb

data/lib/sumhash.rb

@@ -1,6 +1,12 @@
-$:.unshift File.dirname(__FILE__) # for use/testing when no gem is installed
-
-require 'ostruct'
+require 'sumhash/version'
 require 'sumhash/hash'
 require 'sumhash/ostruct'
+require 'ostruct'
+
+class Hash
+  include Sumhash::Hash
+end
 
+class OpenStruct
+  include Sumhash::OpenStruct
+end

data/lib/sumhash/hash.rb

@@ -1,21 +1,15 @@
-class Hash
+module Sumhash::Hash
   NUMBER_CLASSES = [Integer, Fixnum, Bignum, Float, Rational]
   SUPPORTED_CLASSES = NUMBER_CLASSES + [Hash, OpenStruct]
 
   # Plus
   def +(hash)
-    (self.keys + hash.keys).inject({}) do |sum, k|
-      sum[k] = sum(self[k], hash[k])
-      sum
-    end
+    self.merge(hash) { |_, v1, v2| sum(v1, v2) }
   end
 
   # Minus
   def -(hash)
-    (self.keys + hash.keys).inject({}) do |sum, k|
-      sum[k] = sum(self[k], hash[k], :-)
-      sum
-    end
+    self.merge(hash) { |_, v1, v2| sum(v1, v2, :-) }
   end
 
   # Unary minus
@@ -35,7 +29,7 @@ class Hash
   def /(num)
     raise TypeError, "#{num.class} can't be coerced into Float"  unless NUMBER_CLASSES.include? num.class
     self.inject({}) do |res, (k, v)|
-      res[k] = SUPPORTED_CLASSES.include?(v.class) ? v/num : v
+      res[k] = SUPPORTED_CLASSES.include?(v.class) ? v / num : v
       res
     end
   end
@@ -44,19 +38,18 @@ class Hash
   def *(num)
     raise TypeError, "#{num.class} can't be coerced into Float"  unless NUMBER_CLASSES.include? num.class
     self.inject({}) do |res, (k, v)|
-      res[k] = SUPPORTED_CLASSES.include?(v.class) ? v*num : v
+      res[k] = SUPPORTED_CLASSES.include?(v.class) ? v * num : v
       res
     end
   end
 
-  private
+private
   # Can sum Objects if: 1) both numbers; 2) both Hashes; 3) both OpenStructs.
   def sum(n, m, sign=:+)
-    if (NUMBER_CLASSES.include?(n.class) && NUMBER_CLASSES.include?(m.class)) || (n.class == Hash && m.class == Hash) || (n.class == OpenStruct && m.class == OpenStruct)
-      n.send(sign, m)
+    if (NUMBER_CLASSES.include?(n.class) && NUMBER_CLASSES.include?(m.class)) || (n.is_a?(Hash) && m.is_a?(Hash)) || (n.is_a?(OpenStruct) && m.is_a?(OpenStruct))
+      n.__send__(sign, m)
     else
       n || m
     end
   end
 end
-

data/lib/sumhash/ostruct.rb

@@ -1,32 +1,32 @@
-class OpenStruct
+module Sumhash::OpenStruct
   NUMBER_CLASSES = [Integer, Fixnum, Bignum, Float, Rational]
   SUPPORTED_CLASSES = NUMBER_CLASSES + [Hash, OpenStruct]
 
   def _fields
-    @table.keys.map{|k| k.to_sym }
+    @table.keys.map(&:to_sym)
   end
 
   # Plus
   def +(os)
-    (self._fields + os._fields).inject(OpenStruct.new()) do |sum, f|
-      sum.send(:"#{f}=", sum(self.send(f), os.send(f)))
+    (self._fields + os._fields).inject(OpenStruct.new) do |sum, f|
+      sum.__send__(:"#{f}=", sum(self.__send__(f), os.__send__(f)))
       sum
     end
   end
 
   # Minus
   def -(os)
-    (self._fields + os._fields).inject(OpenStruct.new()) do |sum, f|
-      sum.send(:"#{f}=", sum(self.send(f), os.send(f), :-))
+    (self._fields + os._fields).inject(OpenStruct.new) do |sum, f|
+      sum.__send__(:"#{f}=", sum(self.__send__(f), os.__send__(f), :-))
       sum
     end
   end
 
   # Unary minus
   def -@
-    self._fields.inject(OpenStruct.new()) do |res, f|
-      v = self.send(f)
-      res.send(:"#{f}=", SUPPORTED_CLASSES.include?(v.class) ? -v : v)
+    self._fields.inject(OpenStruct.new) do |res, f|
+      v = self.__send__(f)
+      res.__send__(:"#{f}=", SUPPORTED_CLASSES.include?(v.class) ? -v : v)
       res
     end
   end
@@ -38,32 +38,31 @@ class OpenStruct
 
   # Division
   def /(num)
-    raise TypeError, "#{num.class} can't be coerced into Float"  unless NUMBER_CLASSES.include? num.class
-    self._fields.inject(OpenStruct.new()) do |res, f|
-      v = self.send(f)
-      res.send(:"#{f}=", SUPPORTED_CLASSES.include?(v.class) ? v/num.to_f : v)
+    raise TypeError, "#{num.class} can't be coerced into Float" unless NUMBER_CLASSES.include? num.class
+    self._fields.inject(OpenStruct.new) do |res, f|
+      v = self.__send__(f)
+      res.__send__(:"#{f}=", SUPPORTED_CLASSES.include?(v.class) ? v / num.to_f : v)
       res
     end
   end
 
   # Multiplication
   def *(num)
-    raise TypeError, "#{num.class} can't be coerced into Float"  unless NUMBER_CLASSES.include? num.class
-    self._fields.inject(OpenStruct.new()) do |res, f|
-      v = self.send(f)
-      res.send(:"#{f}=", SUPPORTED_CLASSES.include?(v.class) && !v.kind_of?(String) ? v*num.to_f : v)
+    raise TypeError, "#{num.class} can't be coerced into Float" unless NUMBER_CLASSES.include? num.class
+    self._fields.inject(OpenStruct.new) do |res, f|
+      v = self.__send__(f)
+      res.__send__(:"#{f}=", SUPPORTED_CLASSES.include?(v.class) && !v.kind_of?(String) ? v * num.to_f : v)
       res
     end
   end
 
-  private
+private
   # Can sum Objects if: 1) both numbers; 2) both Hashes; 3) both OpenStructs.
   def sum(n, m, sign=:+)
-    if (NUMBER_CLASSES.include?(n.class) && NUMBER_CLASSES.include?(m.class)) || (n.class == Hash && m.class == Hash) || (n.class == OpenStruct && m.class == OpenStruct)
-      n.send(sign, m)
+    if (NUMBER_CLASSES.include?(n.class) && NUMBER_CLASSES.include?(m.class)) || (n.is_a?(Hash) && m.is_a?(Hash)) || (n.is_a?(OpenStruct) && m.is_a?(OpenStruct))
+      n.__send__(sign, m)
     else
       n || m
     end
   end
 end
-

data/lib/sumhash/version.rb

@@ -1,4 +1,3 @@
 module Sumhash
-  VERSION = "0.0.2"
+  VERSION = '0.0.4'
 end
-

data/sumhash.gemspec

@@ -6,26 +6,24 @@ Gem::Specification.new do |s|
   s.name = "sumhash"
   s.version = Sumhash::VERSION
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Alex Avoyants"]
+  s.authors = ["Oleksandr Avoiants", "Andrii Dmytrenko", "Alexey Grachov"]
   s.email = ["shhavel@gmail.com"]
   s.homepage = "https://github.com/shhavel/sumhash"
-  s.summary = %q{Sum operations for Hash & OpenStruct classes}
-  s.description = %q{This gem provides summing operations to Hashes and OpenStructs. Works with nested structures. If you need a feature added, send me a message on Github!}
+  s.summary = %q{Summation operation for Hash and OpenStruct}
+  s.description = %q{Provides summation operation to Hash and OpenStruct. Works with nested structures.}
   s.rubyforge_project = "sumhash"
   s.files = [
     "sumhash.gemspec",
     "lib/sumhash.rb",
     "lib/sumhash/hash.rb",
     "lib/sumhash/ostruct.rb",
-    "lib/sumhash/version.rb", 
-    "test/suite.rb",
+    "lib/sumhash/version.rb",
     "test/test_division.rb",
     "test/test_multiplication.rb",
     "test/test_plus.rb",
     "test/test_unary_minus.rb",
   ]
   s.test_files = [
-    "test/suite.rb",
     "test/test_division.rb",
     "test/test_multiplication.rb",
     "test/test_plus.rb",
@@ -33,4 +31,3 @@ Gem::Specification.new do |s|
   ]
   s.require_paths = ["lib"]
 end
-

data/test/test_division.rb

@@ -1,5 +1,4 @@
-require "ostruct"
-require "#{File.expand_path('../')}/lib/sumhash.rb"
+require "sumhash"
 require "test/unit"
 
 class TestDivision < Test::Unit::TestCase
@@ -11,4 +10,3 @@ class TestDivision < Test::Unit::TestCase
     assert_raise(TypeError) { OpenStruct.new({ n: 10, m: 14 })/"2" }
   end
 end
-

data/test/test_multiplication.rb

@@ -1,5 +1,4 @@
-require "ostruct"
-require "#{File.expand_path('../')}/lib/sumhash.rb"
+require "sumhash"
 require "test/unit"
 
 class TestMultiplication < Test::Unit::TestCase
@@ -11,4 +10,3 @@ class TestMultiplication < Test::Unit::TestCase
     assert_raise(TypeError) { OpenStruct.new({ n: 5, m: 7 }) * "2" }
   end
 end
-

data/test/test_plus.rb

@@ -1,5 +1,4 @@
-require "ostruct"
-require "#{File.expand_path('../')}/lib/sumhash.rb"
+require "sumhash"
 require "test/unit"
 
 class TestPlus < Test::Unit::TestCase
@@ -58,4 +57,3 @@ class TestPlus < Test::Unit::TestCase
                   { n: 2.1, m: 3.2, os: OpenStruct.new(x: 1.1, y: 2.1), s: 'str' } * 2)
   end
 end
-

data/test/test_unary_minus.rb

@@ -1,5 +1,4 @@
-require "ostruct"
-require "#{File.expand_path('../')}/lib/sumhash.rb"
+require "sumhash"
 require "test/unit"
 
 class TestUnaryMinus < Test::Unit::TestCase
@@ -8,4 +7,3 @@ class TestUnaryMinus < Test::Unit::TestCase
                  -{ n: 4.2, m: 3.3, os: OpenStruct.new(x: 2.2, y: -4.2), s: 'str' })
   end
 end
-

metadata

@@ -1,60 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: sumhash
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
-- Alex Avoyants
+- Oleksandr Avoiants
+- Andrii Dmytrenko
+- Alexey Grachov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-23 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies: []
-description: This gem provides summing operations to Hashes and OpenStructs. Works
-  with nested structures. If you need a feature added, send me a message on Github!
+description: Provides summation operation to Hash and OpenStruct. Works with nested
+  structures.
 email:
 - shhavel@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- sumhash.gemspec
 - lib/sumhash.rb
 - lib/sumhash/hash.rb
 - lib/sumhash/ostruct.rb
 - lib/sumhash/version.rb
-- test/suite.rb
+- sumhash.gemspec
 - test/test_division.rb
 - test/test_multiplication.rb
 - test/test_plus.rb
 - test/test_unary_minus.rb
 homepage: https://github.com/shhavel/sumhash
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sumhash
-rubygems_version: 1.8.24
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
-summary: Sum operations for Hash & OpenStruct classes
+specification_version: 4
+summary: Summation operation for Hash and OpenStruct
 test_files:
-- test/suite.rb
 - test/test_division.rb
 - test/test_multiplication.rb
 - test/test_plus.rb

data/test/suite.rb

@@ -1,5 +0,0 @@
-tests = Dir["#{File.dirname(__FILE__)}/test_*.rb"]
-tests.each do |file|
-  require file
-end
-