btcruby 1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69203af0ce59eee2b3131a2df44cae9a7ca517be
-  data.tar.gz: f5fc80c6a9fed850298d7eb9b5812af45474e0d6
+  metadata.gz: 16766d44b49b6e361fcd92e76421a0ba4f815fa6
+  data.tar.gz: 92aaedfe9cda6fcfc87ce9f6b158adbb3237e847
 SHA512:
-  metadata.gz: 82f4dcc9b9114d38049baddc9675bbbde98ced25699cf4c03f9ff01c83217e265c06d096b6d945e967424ddad6b2975b755d821d5bfaecb1e9553b97c52d9bb3
-  data.tar.gz: 4818136ee80be83560ed4432889eb80de6b14973f1f8448cadebfc35cd47103f6ede63753656fc3b9ffcb32bdf814381abce98fd8dcd4d240f182182075bd497
+  metadata.gz: 5cab2a47cbb54f031fe4a8f57360657a9790cd1f56843b53d613e40c840612fd35f3910822e2a1f46e9a5f33eb3b84c60635c842d71ec0c1963e19e107cadbfc
+  data.tar.gz: bd806cad97401ba874414b63f0c35cd095e7dae9e28f9ac3e16cc4bcb7caf123a88713d24a05bc2f0f0619dd0ed965e8a000171f47a47a2b55ac1ea4f39def04

data/RELEASE_NOTES.md

@@ -2,6 +2,18 @@
 BTCRuby Release Notes
 =====================
 
+1.2.1 (September 8, 2015)
+-----------------------
+
+* Added more arithmetic operators to `BTC::ScriptNumber`.
+
+
+1.2 (September 8, 2015)
+-----------------------
+
+* Renamed Script Plugin to Script Extension.
+
+
 1.1.6 (August 26, 2015)
 -----------------------
 

data/lib/btcruby/script/script_number.rb

@@ -10,7 +10,7 @@ module BTC
 
   class ScriptNumber
     DEFAULT_MAX_SIZE = 4
-    
+
     INT64_MAX = 0x7fffffffffffffff
     INT64_MIN = -INT64_MAX - 1
 
@@ -57,10 +57,10 @@ module BTC
     def  <(other); @integer  < other.to_i; end
     def >=(other); @integer >= other.to_i; end
     def  >(other); @integer  > other.to_i; end
-    
+
     def +(other); self.class.new(integer: @integer + other.to_i); end
     def -(other); self.class.new(integer: @integer - other.to_i); end
-    
+
     def +@
       self
     end
@@ -69,7 +69,38 @@ module BTC
       assert(@integer > INT64_MIN && @integer <= INT64_MAX, "Integer will not be within int64 range after negation")
       self.class.new(integer: -@integer)
     end
-    
+
+    def *(other)
+      # TODO: add asserts to check that result fits within int64 limits
+      self.class.new(integer: @integer * other.to_i)
+    end
+
+    def /(other)
+      # TODO: add asserts to check that result fits within int64 limits
+      self.class.new(integer: @integer / other.to_i)
+    end
+
+    def <<(other)
+      # TODO: add asserts to check that result fits within int64 limits
+      assert(other >= 0, "Shift amount must not be negative")
+      a = @integer.abs
+      r = a << other.to_i
+      if a != @integer
+        r = -r
+      end
+      self.class.new(integer: r)
+    end
+
+    def >>(other)
+      # TODO: add asserts to check that result fits within int64 limits
+      assert(other >= 0, "Shift amount must not be negative")
+      a = @integer.abs
+      r = a >> other.to_i
+      if a != @integer
+        r = -r
+      end
+      self.class.new(integer: r)
+    end
 
 
     # Conversion Methods
@@ -138,7 +169,7 @@ module BTC
 
       BTC.data_from_bytes(result)
     end
-    
+
     def assert(condition, message)
       raise message if !condition
     end

data/lib/btcruby/version.rb

@@ -1,3 +1,3 @@
 module BTC
-  VERSION = "1.2".freeze
+  VERSION = "1.2.1".freeze
 end

data/spec/script_number_spec.rb

@@ -7,7 +7,7 @@ describe BTC::ScriptNumber do
       BTC::ScriptNumber.new(integer: i).to_i.must_equal i
     end
   end
-  
+
   it "should validate a range of back-and-forth conversions" do
     (-100000..10000).each do |i|
       BTC::ScriptNumber.new(integer: i).to_i.must_equal i
@@ -45,7 +45,7 @@ describe BTC::ScriptNumber do
   it "should decode -255." do
     BTC::ScriptNumber.new(data: "\xff\x80").to_i.must_equal -255
   end
-  
+
   it "should raise exception for non-minimally-encoded data" do
     should_raise('non-minimally encoded script number') { BTC::ScriptNumber.new(data: "\x00") }
     should_raise('non-minimally encoded script number') { BTC::ScriptNumber.new(data: "\x80") }
@@ -55,23 +55,23 @@ describe BTC::ScriptNumber do
     should_raise('non-minimally encoded script number') { BTC::ScriptNumber.new(data: "\x00\x10\x80") }
     should_raise('non-minimally encoded script number') { BTC::ScriptNumber.new(data: "\x10\x00\x80") }
   end
-  
+
   it "should raise exception for invalid encoding" do
-    should_raise('script number overflow (3 > 2)')      { BTC::ScriptNumber.new(data: "\x00\x00\x80", max_size: 2) }    
+    should_raise('script number overflow (3 > 2)')      { BTC::ScriptNumber.new(data: "\x00\x00\x80", max_size: 2) }
   end
-  
+
   it "should encode booleans" do
     BTC::ScriptNumber.new(boolean: true).must_equal 1
     BTC::ScriptNumber.new(boolean: true).data.must_equal "\x01"
     BTC::ScriptNumber.new(boolean: false).must_equal 0
     BTC::ScriptNumber.new(boolean: false).data.must_equal ""
   end
-  
+
   it "should check equality checks" do
     (BTC::ScriptNumber.new(integer: 0) == 0).must_equal true
     (BTC::ScriptNumber.new(integer: 1) == 1).must_equal true
     (BTC::ScriptNumber.new(integer: -1) == -1).must_equal true
-    
+
     (BTC::ScriptNumber.new(integer: 0) == BTC::ScriptNumber.new(integer: 0)).must_equal true
     (BTC::ScriptNumber.new(integer: 1) == BTC::ScriptNumber.new(integer: 1)).must_equal true
     (BTC::ScriptNumber.new(integer: -1) == BTC::ScriptNumber.new(integer: -1)).must_equal true
@@ -83,7 +83,7 @@ describe BTC::ScriptNumber do
     (BTC::ScriptNumber.new(integer: 1) != BTC::ScriptNumber.new(integer: 1)).must_equal false
     (BTC::ScriptNumber.new(integer: -1) != BTC::ScriptNumber.new(integer: -1)).must_equal false
   end
-  
+
   it "should support #-" do
     sn = BTC::ScriptNumber.new(integer: 123)
     sn = sn - 20
@@ -97,19 +97,87 @@ describe BTC::ScriptNumber do
     sn += 7
     sn.must_equal 150
   end
-  
+
   it "should support unary minus operator" do
     sn = BTC::ScriptNumber.new(integer: 123)
     sn = -sn
     sn.must_equal -123
   end
-  
+
   it "should support unary plus operator" do
     sn = BTC::ScriptNumber.new(integer: 123)
     sn = +sn
     sn.must_equal 123
   end
 
+  it "should support #*" do
+    sn = BTC::ScriptNumber.new(integer: 123)
+    sn = sn * 10
+    sn.must_equal 1230
+
+    sn = BTC::ScriptNumber.new(integer: 123)
+    sn = sn * -10
+    sn.must_equal -1230
+
+    sn = BTC::ScriptNumber.new(integer: -123)
+    sn = sn * 10
+    sn.must_equal -1230
+
+    sn = BTC::ScriptNumber.new(integer: -123)
+    sn = sn * -10
+    sn.must_equal 1230
+  end
+
+  it "should support integer #/ rounding to a lower value" do
+    sn = BTC::ScriptNumber.new(integer: 123)
+    sn = sn / 10
+    sn.must_equal 12
+
+    sn = BTC::ScriptNumber.new(integer: 123)
+    sn = sn / -10
+    sn.must_equal -13
+
+    sn = BTC::ScriptNumber.new(integer: -123)
+    sn = sn / -10
+    sn.must_equal 12
+
+    sn = BTC::ScriptNumber.new(integer: -123)
+    sn = sn / 10
+    sn.must_equal -13
+  end
+
+  it "should support << (LSHIFT)" do
+    sn = BTC::ScriptNumber.new(integer: 123)
+    sn = sn << 0
+    sn.must_equal 123
+
+    sn = BTC::ScriptNumber.new(integer: 123)
+    sn = sn << 2
+    sn.must_equal 492
+  end
+
+  it "should support >> (RSHIFT) with overflow" do
+    sn = BTC::ScriptNumber.new(integer: 123)
+    sn = sn >> 0
+    sn.must_equal 123
+
+    sn = BTC::ScriptNumber.new(integer: 123)
+    sn = sn >> 1
+    sn.must_equal 61
+
+    sn = BTC::ScriptNumber.new(integer: -123)
+    sn = sn >> 1
+    sn.must_equal -61
+
+    sn = BTC::ScriptNumber.new(integer: 123)
+    sn = sn >> 7
+    sn.must_equal 0
+
+    sn = BTC::ScriptNumber.new(integer: -123)
+    sn = sn >> 7
+    sn.must_equal 0
+  end
+
   def should_raise(message)
     raised = false
     begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: btcruby
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: 1.2.1
 platform: ruby
 authors:
 - Oleg Andreev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi