bitcoin2graphdb 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7248f3cef0dff2462fb9a7126612d8045941733
-  data.tar.gz: c572be8943e1a8cc3b894cb49d1687a14c246aaa
+  metadata.gz: 3abd39596fb30ef8f52ff0387fbcc0adcd18efc1
+  data.tar.gz: 73c24c9bf6fbfd0821fa1916709cafba35487118
 SHA512:
-  metadata.gz: 6ced644afd085b7eedaaeada3c6043c8b880b6cf63de6a68187923d5d015de6a5aedb31b782af5bc6b9e70c722651f0e62db494508719622fa87b3c3f08c668a
-  data.tar.gz: a39f314a88a2c61ded9f8eed92d4ef4392df35341b8f418af9ce6b308c852f98f129bde2c4092e8d33691b98769893b51834ccb95b19533c7b6259a27bedc1ea
+  metadata.gz: f5bb775614cc38d5984bd180bb752fc4de6f7eb3605bccff9d95674792e2b3d02999be1ff3a80357a00f2476ce05951e921e8ef5865b9a37db36b17cb91c761a
+  data.tar.gz: 771e9ee594c438532fd41ff59b3e43ad6534c8ec16316d96c919a1ae0a14e8ce749393bc96212edf4ef1715a4cffb76eb73743292b2a4f06626586df1fd481a1

data/Rakefile

@@ -11,8 +11,40 @@ task :default => :spec
 namespace :b2g do
   desc 'Import specified block to neo4j database.'
   task :import_block, [:block_height,:config_path] do |task, args|
-    config = YAML.load(File.read(args.config_path)).deep_symbolize_keys
     puts "import #{args.block_height} block."
-    Bitcoin2Graphdb::Migration.new(config[:bitcoin2graphdb]).run_with_height(args.block_height.to_i)
+    Bitcoin2Graphdb::Migration.new(load_config(args.config_path)).run_with_height(args.block_height.to_i)
+  end
+
+  desc 'Remove specified block from neo4j database.'
+  task :remove_block, [:block_height,:config_path] do |task, args|
+    load_neo4j_session(args.config_path)
+    block = Graphdb::Model::Block.with_height(args.block_height.to_i).first
+    if block.nil?
+      puts "block height #{args.block_height} does not exist."
+    else
+      block.destroy
+      puts "block height #{args.block_height} is deleted."
+    end
+  end
+
+  desc 'Remove specified transaction from neo4j database.'
+  task :remove_tx, [:txid,:config_path] do |task, args|
+    load_neo4j_session(args.config_path)
+    tx = Graphdb::Model::Transaction.with_txid(args.txid).first
+    if tx.nil?
+      puts "txid #{args.txid} does not exist."
+    else
+      tx.destroy
+      puts "tixd #{args.txid} is deleted."
+    end
+  end
+
+  def load_neo4j_session(config_path)
+    config = load_config(config_path)
+    Neo4j::Session.open(:server_db, config[:neo4j][:server], {basic_auth: config[:neo4j][:basic_auth]})
+  end
+
+  def load_config(config_path)
+    YAML.load(File.read(config_path)).deep_symbolize_keys[:bitcoin2graphdb]
   end
 end

data/bitcoin2graphdb.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "openassets-ruby", ">= 0.3.9"
+  spec.add_runtime_dependency "openassets-ruby", ">= 0.4.1"
   spec.add_runtime_dependency "daemon-spawn"
   spec.add_runtime_dependency 'neo4j', '~> 5.0.0'
   spec.add_runtime_dependency "activesupport", ">= 4.0.2"

data/lib/bitcoin2graphdb/migration.rb

@@ -19,7 +19,7 @@ module Bitcoin2Graphdb
 
     def run_with_height(block_height)
       puts "start migration for block height = #{block_height}. #{Time.now}"
-      # Neo4j::Transaction.run do |tx|
+      Neo4j::Transaction.run do |tx|
         begin
           Graphdb::Model::Block.create_from_block_height(block_height)
           @block_height = block_height
@@ -28,18 +28,18 @@ module Bitcoin2Graphdb
             puts "Block height out of range. sleep 10 min."
             sleep 600
           else
-            # tx.failure
+            tx.failure
             raise e
           end
         end
-      # end
+      end
       puts "end migration for block height #{block_height}. #{Time.now}"
     end
 
     private
     def current_block_height
       return @block_height if @block_height
-      block = Graphdb::Model::Block.latest
+      block = Graphdb::Model::Block.latest.first
       @block_height = block.nil? ? -1 : block.height
     end
 

data/lib/bitcoin2graphdb/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin2Graphdb
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/graphdb/model/address.rb

@@ -3,12 +3,14 @@ module Graphdb
     class Address < ActiveNodeBase
       property :address, index: :exact, constraint: :unique
 
+      has_many :in, :outputs, origin: :addresses, model_class: TxOut
+
       validates :address, presence: true
 
-      scope :with_address, -> (address){where(address: address).first}
+      scope :with_address, -> (address){where(address: address)}
 
       def self.find_or_create(address)
-        a = with_address(address)
+        a = with_address(address).first
         unless a
           a = new
           a.address = address

data/lib/graphdb/model/block.rb

@@ -18,7 +18,7 @@ module Graphdb
       property :created_at
       property :updated_at
 
-      has_many :in, :transactions, origin: :block, model_class: Transaction
+      has_many :in, :transactions, origin: :block, model_class: Transaction, dependent: :destroy
       has_one :out, :previous_block, type: :previous_block, model_class: Block
 
       validates :block_hash, :presence => true
@@ -31,8 +31,9 @@ module Graphdb
 
       after_create :chain_previous_block
 
-      scope :latest, -> {order(height: 'DESC').first}
+      scope :latest, -> {order(height: 'DESC')}
       scope :with_block_hash, -> (block_hash){where(block_hash: block_hash)}
+      scope :with_height, -> (height){where(height: height)}
 
       def self.create_from_block_height(block_height)
         block = new

data/lib/graphdb/model/transaction.rb

@@ -12,8 +12,8 @@ module Graphdb
       property :confirmations, type: Integer
 
       has_one :out, :block, type: :block
-      has_many :in, :inputs, origin: :transaction, model_class: TxIn
-      has_many :in, :outputs, origin: :transaction, model_class: TxOut
+      has_many :in, :inputs, origin: :transaction, model_class: TxIn, dependent: :destroy
+      has_many :in, :outputs, origin: :transaction, model_class: TxOut, dependent: :destroy
 
       validates :hex, :presence => true
       validates :txid, :presence => true
@@ -23,6 +23,7 @@ module Graphdb
       scope :with_txid, ->(txid){where(txid: txid)}
 
       def self.create_from_txid(txid)
+        puts "create tx #{txid}"
         tx = new
         hash = load_tx(txid)
         tx.hex = hash['hex']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoin2graphdb
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openassets-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: daemon-spawn
   requirement: !ruby/object:Gem::Requirement