openassets-ruby 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d8052b1dcdf76bb4c36271aa86d543135b110b6
-  data.tar.gz: 0300e7f511a0365192bcc3138dea33510d0dcdf1
+  metadata.gz: 162e453da0e910ff8ed1b9a6b18236b8ceb06c34
+  data.tar.gz: 2c6da11a79ce5a7bacf9818f6698bbe76423588d
 SHA512:
-  metadata.gz: 1eb24f346b31042c16065aaed4224bc548cc3b5da06b73e7b4bda240783a772fbfd13ae8383cc096d2324e5c927f2b365813286a6225d7d1e7a29aca1dfa6bfc
-  data.tar.gz: cc4c9597c8b4d0b70108334ada063ac3142a91e9ea29d3ccb7f723fb4273f07844d667f1d54534e9a8218af2222bb0bfef87d5a155624fd3716be33693382e19
+  metadata.gz: 09400c1d32f9349b61f5b682c7af2f39c82af361fe8aa549be3600f7e6a46bf29da7bd6117cf458560c8e9a6fcdc529403314e8eb4c40f1ce1642580ed506239
+  data.tar.gz: e09e86b7d3ab64d94b09d0b3d956ad65d364ba1344a870824318b659b143b26c270e39143d7f195780e277468495baac0742f0821e5f3f2c70022871acdd7772

data/README.md

@@ -11,6 +11,7 @@ gem install openassets-ruby
 
 Initialize the connection information to the Bitcoin Core server.
 
+* **use mainnet**  
 ```ruby
 require 'openassets'
 
@@ -20,6 +21,17 @@ api = OpenAssets::Api.new({:network => 'mainnet',
                      :rpc => {:user => 'xxx', :password => 'xxx', :schema => 'http', :port => 8332, :host => 'localhost'}})                      
 ```
 
+* **use testnet**  
+change :network and :port(depends on your server setting).
+```ruby
+require 'openassets'
+
+api = OpenAssets::Api.new({:network => 'testnet',
+                     :provider => 'bitcoind',
+                     :dust_limit => 600,
+                     :rpc => {:user => 'xxx', :password => 'xxx', :schema => 'http', :port => 18332, :host => 'localhost'}})                      
+```
+
 ## API
 
 Currently openassets-ruby support the following API.   

data/lib/openassets.rb

@@ -5,7 +5,9 @@ module OpenAssets
   autoload :Transaction, 'openassets/transaction'
   autoload :VERSION, 'openassets/version'
   autoload :Util, 'openassets/util'
+  autoload :MethodFilter, 'openassets/medhod_filter'
   autoload :Api, 'openassets/api'
   autoload :Provider, 'openassets/provider'
   autoload :Error, 'openassets/error'
+
 end

data/lib/openassets/api.rb

@@ -4,7 +4,10 @@ module OpenAssets
 
   class Api
 
-    include OpenAssets::Util
+    include Util
+    include MethodFilter
+
+    before_filter :change_network, {:include => [:list_unspent, :get_balance, :issue_asset, :send_asset]}
 
     attr_reader :config
     attr_reader :provider
@@ -283,6 +286,14 @@ module OpenAssets
       end
     end
 
+    def change_network
+      if is_testnet?
+        Bitcoin.network = :testnet
+      else
+        Bitcoin.network = :bitcoin
+      end
+    end
+
   end
 
 end

data/lib/openassets/medhod_filter.rb

@@ -0,0 +1,55 @@
+module OpenAssets
+  module MethodFilter
+
+    module Filters
+
+      def before_filter(method, options = {})
+        @before_filters ||= {}
+        @before_filters[method] = options
+      end
+
+      def filtered_method?(method, options)
+        if options.has_key? :include
+          return true if options[:include].include? method.intern
+          false
+        elsif options.has_key? :exclude
+          return false if options[:exclude].include? method.intern
+          true
+        else
+          true
+        end
+      end
+
+      private
+      def method_added(name)
+        @before_filters ||= {}
+        @modified_methods ||= []
+        return if @modified_methods.include?(name)
+        return if @before_filters.include?(name)
+        return if /with_filters$/ =~ name.to_s
+        return if  /without_filters$/ =~ name.to_s
+        @modified_methods << name
+
+        name = name.to_s
+        alias_method( "#{name}_without_filters", name)
+        before_filters = @before_filters
+
+        define_method("#{name}_with_filters") do |*args|
+          before_filters.each do |filter_name, options|
+            method(filter_name).call if self.class.filtered_method?(name, options)
+          end
+          result = method("#{name}_without_filters").call(*args)
+          result
+        end
+
+        alias_method(name, "#{name}_with_filters")
+        @modified_methods.delete_if { |x| name == x }
+      end
+    end
+
+    def self.included(receiver)
+      receiver.extend(Filters)
+    end
+
+  end
+end

data/lib/openassets/util.rb

@@ -8,6 +8,7 @@ module OpenAssets
 
     # version byte for Open Assets Address
     OA_VERSION_BYTE = 23
+    OA_VERSION_BYTE_TESTNET = 115
 
     # convert bitcoin address to open assets address
     # @param [String] btc_address The Bitcoin address.
@@ -41,7 +42,7 @@ module OpenAssets
       # P2PKH script = OP_DUP OP_HASH160 <PubKeyHash> OP_EQUALVERIFY OP_CHECKSIG
       # （76=OP_DUP, a9=OP_HASH160, 14=Bytes to push, 88=OP_EQUALVERIFY, ac=OP_CHECKSIG）
       script = hash160(["76", "a9", "14", hash, "88", "ac"].join)
-      script = OA_VERSION_BYTE.to_s(16) + script # add version byte to script hash
+      script = oa_version_byte.to_s(16) + script # add version byte to script hash
       encode_base58(script + checksum(script)) # add checksum & encode
     end
 
@@ -89,5 +90,10 @@ module OpenAssets
         raise ArgumentError, "#{a} is invalid bitcoin address. " unless valid_address?(a)
       }
     end
+
+    private
+    def oa_version_byte
+      Bitcoin.network[:address_version] == "6f" ? OA_VERSION_BYTE_TESTNET : OA_VERSION_BYTE
+    end
   end
 end

data/lib/openassets/version.rb

@@ -1,3 +1,3 @@
 module OpenAssets
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openassets-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-07 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby
@@ -116,6 +116,7 @@ files:
 - lib/openassets.rb
 - lib/openassets/api.rb
 - lib/openassets/error.rb
+- lib/openassets/medhod_filter.rb
 - lib/openassets/protocol.rb
 - lib/openassets/protocol/asset_definition.rb
 - lib/openassets/protocol/marker_output.rb