cosgrove 0.0.3.5 → 0.0.4.0pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bac465f9c2b8fa574b8c2eacb612a88c7ea82cae
-  data.tar.gz: 64e6e6994059bd030276924844d3e129a690121e
+SHA256:
+  metadata.gz: 30ef938779ca56743ce5f8a4fa9612e251dc98d92fd0b7f92d30cf6fcbb9cc13
+  data.tar.gz: 31e31742772dc409ca264638289b13eab63952686d5d4eb10e7d0a87b318d16e
 SHA512:
-  metadata.gz: 777b4dc3e3d5bf5d339b7a8dc6203ad43e39e4722e55c0b7ff40a7dfcfa4ac1690dbe358275e4d83d4cdfdfeba439fdd8339ef3f97d092d9b8b3a631a6de607b
-  data.tar.gz: cd909b21d15bdaef5a9d4961f51c971e277accea8d146b790eb8ad4c0cc3f94721cca82d4f010501c222e55a8a89f50f9685c7420427500a53431b88fd619e7a
+  metadata.gz: a39ed8012f5c4baa02be75eafdd19def80d4f27d55f924a1b0214592843a0f33bc2db5ebf2620e57e6c5fc5ba21df5ed8fe6d73dfc97943d5dd3764217fb51cb
+  data.tar.gz: 0a0d21235b281c8085e90e65f675c6300f7825a78594e4aa475f60e593889284d3a8237915d15d0104f149da0b8ca5ef08e4a2a6ed5ed9e882f466f0e0824374

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'mechanize', git: 'https://github.com/sparklemotion/mechanize.git', branch: 'upgrade_net-http-persistent'
+gem 'mechanize'
+gem 'pry'
 
 gemspec

data/Gemfile.lock

@@ -1,67 +1,50 @@
-GIT
-  remote: https://github.com/sparklemotion/mechanize.git
-  revision: f68b1a0bdeee9ec7c9a8b7854f8e6b81d62c43b2
-  branch: upgrade_net-http-persistent
-  specs:
-    mechanize (2.7.5)
-      domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0)
-      mime-types (>= 1.17.2)
-      net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (>= 2.5.2)
-      nokogiri (~> 1.6)
-      ntlm-http (~> 0.1, >= 0.1.1)
-      webrobots (>= 0.0.9, < 0.2)
-
 PATH
   remote: .
   specs:
-    cosgrove (0.0.3.5)
+    cosgrove (0.0.4.0pre1)
       activesupport (~> 5.1, >= 5.1.1)
       ai4r (~> 1.13, >= 1.13)
       awesome_print (~> 1.7, >= 1.7.0)
       discordrb (~> 3.2, >= 3.2.1)
       golos_cloud (~> 1.1, >= 1.1.1rc1)
       mechanize (~> 2.7, >= 2.7.5)
-      mongoid (~> 6.1, >= 6.1.0)
       phantomjs (~> 2.1, >= 2.1.1.0)
-      radiator (~> 0.3, >= 0.3.15)
+      radiator (~> 0.4, >= 0.4.3)
       railties (~> 5.1, >= 5.1.1)
       rdiscount (~> 2.2, >= 2.2.0.1)
       rmagick (~> 2.16, >= 2.16.0)
       steem-slap (~> 0.0, >= 0.0.2)
       steem_api (~> 1.1, >= 1.1.1rc1)
-      steem_data (~> 0.0, >= 0.0.3)
       wolfram-alpha (~> 0.3, >= 0.3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.1.4)
-      actionview (= 5.1.4)
-      activesupport (= 5.1.4)
+    actionpack (5.1.6)
+      actionview (= 5.1.6)
+      activesupport (= 5.1.6)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.4)
-      activesupport (= 5.1.4)
+    actionview (5.1.6)
+      activesupport (= 5.1.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activerecord (5.1.4)
-      activemodel (= 5.1.4)
-      activesupport (= 5.1.4)
+    activemodel (5.1.6)
+      activesupport (= 5.1.6)
+    activerecord (5.1.6)
+      activemodel (= 5.1.6)
+      activesupport (= 5.1.6)
       arel (~> 8.0)
     activerecord-sqlserver-adapter (5.1.6)
       activerecord (~> 5.1.0)
       tiny_tds
-    activesupport (5.1.4)
+    activesupport (5.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
@@ -69,63 +52,69 @@ GEM
     ai4r (1.13)
     arel (8.0.0)
     awesome_print (1.8.0)
-    bitcoin-ruby (0.0.15)
-    bson (4.3.0)
+    bitcoin-ruby (0.0.18)
     builder (3.2.3)
-    concurrent-ruby (1.0.5)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.3)
     connection_pool (2.2.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.3)
-    discordrb (3.2.1)
-      discordrb-webhooks (~> 3.2.0.1)
+    crass (1.0.4)
+    discordrb (3.3.0)
+      discordrb-webhooks (~> 3.3.0)
+      ffi (>= 1.9.24)
       opus-ruby
       rbnacl (~> 3.4.0)
-      rest-client
+      rest-client (>= 2.1.0.rc1)
       websocket-client-simple (>= 0.3.0)
-    discordrb-webhooks (3.2.0.1)
-      rest-client
-    docile (1.1.5)
-    domain_name (0.5.20170404)
+    discordrb-webhooks (3.3.0)
+      rest-client (>= 2.1.0.rc1)
+    docile (1.3.0)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    erubi (1.7.0)
+    erubi (1.7.1)
     event_emitter (0.2.6)
-    ffi (1.9.18)
-    golos_cloud (1.1.1rc1)
+    ffi (1.9.25)
+    golos_cloud (1.1.1)
       activerecord (>= 4, < 6)
       activerecord-sqlserver-adapter (>= 4, < 6)
       nokogiri (~> 1.8)
       rest-client (~> 2.0)
       tiny_tds (~> 1.3)
     hashdiff (0.3.7)
-    hashie (3.5.7)
+    hashie (3.6.0)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (0.9.3)
+    i18n (1.1.1)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    loofah (2.1.1)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    mechanize (2.7.6)
+      domain_name (~> 0.5, >= 0.5.1)
+      http-cookie (~> 1.0)
+      mime-types (>= 1.17.2)
+      net-http-digest_auth (~> 1.1, >= 1.1.1)
+      net-http-persistent (>= 2.5.2)
+      nokogiri (~> 1.6)
+      ntlm-http (~> 0.1, >= 0.1.1)
+      webrobots (>= 0.0.9, < 0.2)
     method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    minitest-line (0.6.4)
+    minitest-line (0.6.5)
       minitest (~> 5.0)
     minitest-proveit (1.0.0)
       minitest (> 5, < 7)
-    mongo (2.5.0)
-      bson (>= 4.3.0, < 5.0.0)
-    mongoid (6.3.0)
-      activemodel (~> 5.1)
-      mongo (>= 2.5.0, < 3.0.0)
     multi_json (1.13.1)
     net-http-digest_auth (1.4.1)
     net-http-persistent (3.0.0)
@@ -137,11 +126,14 @@ GEM
     opus-ruby (1.0.1)
       ffi
     phantomjs (2.1.1.0)
-    public_suffix (3.0.1)
-    rack (2.0.4)
-    rack-test (0.8.2)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.2)
+    rack (2.0.6)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    radiator (0.3.15)
+    radiator (0.4.3)
       awesome_print (~> 1.7, >= 1.7.0)
       bitcoin-ruby (~> 0.0, >= 0.0.11)
       ffi (~> 1.9, >= 1.9.18)
@@ -152,40 +144,39 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.4)
-      actionpack (= 5.1.4)
-      activesupport (= 5.1.4)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.1.6)
+      actionpack (= 5.1.6)
+      activesupport (= 5.1.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
+    rake (12.3.1)
     rbnacl (3.4.0)
       ffi
     rdiscount (2.2.0.1)
-    rest-client (2.0.2)
+    rest-client (2.1.0.rc1)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     rmagick (2.16.0)
     safe_yaml (1.0.4)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     steem-slap (0.0.4)
-    steem_api (1.1.1rc1)
+    steem_api (1.1.1)
       activerecord (>= 4, < 6)
       activerecord-sqlserver-adapter (>= 4, < 6)
       awesome_print (~> 1.7, >= 1.7.0)
       nokogiri (~> 1.8)
       rest-client (~> 2.0)
       tiny_tds (~> 1.3)
-    steem_data (0.0.3)
-      mongoid (~> 6.1, >= 6.1.0)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tiny_tds (1.3.0)
       mini_portile2 (~> 2.0)
@@ -193,20 +184,20 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
+    unf_ext (0.0.7.5)
     vcr (3.0.3)
-    webmock (3.3.0)
+    webmock (3.4.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
     webrobots (0.1.2)
-    websocket (1.2.5)
+    websocket (1.2.8)
     websocket-client-simple (0.3.0)
       event_emitter
       websocket
     wolfram-alpha (0.3.1)
       nokogiri
-    yard (0.9.12)
+    yard (0.9.16)
 
 PLATFORMS
   ruby
@@ -214,15 +205,16 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.15, >= 1.15.4)
   cosgrove!
-  mechanize!
-  minitest (~> 5.9, >= 5.9.0)
-  minitest-line (~> 0.6, >= 0.6.3)
+  mechanize
+  minitest (~> 5.10, >= 5.10.3)
+  minitest-line (~> 0.6, >= 0.6.4)
   minitest-proveit (~> 1.0, >= 1.0.0)
+  pry
   rake (~> 12.1, >= 12.1.0)
   simplecov (~> 0.11, >= 0.11.2)
   vcr (~> 3.0, >= 3.0.3)
   webmock (~> 3.0, >= 3.0.1)
-  yard (~> 0.9, >= 0.9.11)
+  yard (~> 0.9, >= 0.9.16)
 
 BUNDLED WITH
-   1.16.1
+   1.16.5

data/cosgrove.gemspec

@@ -20,21 +20,18 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.15', '>= 1.15.4'
   spec.add_development_dependency 'rake', '~> 12.1', '>= 12.1.0'
   spec.add_development_dependency 'minitest-proveit', '~> 1.0', '>= 1.0.0'
-  spec.add_development_dependency 'minitest', '~> 5.9', '>= 5.9.0'
-  spec.add_development_dependency 'minitest-line', '~> 0.6', '>= 0.6.3'
+  spec.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.3'
+  spec.add_development_dependency 'minitest-line', '~> 0.6', '>= 0.6.4'
   spec.add_development_dependency 'webmock', '~> 3.0', '>= 3.0.1'
   spec.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.3'
   spec.add_development_dependency 'simplecov', '~> 0.11', '>= 0.11.2'
-  spec.add_development_dependency 'yard', '~> 0.9', '>= 0.9.11'
-  # spec.add_development_dependency 'pry', '~> 0.10', '>= 0.10.3'
+  spec.add_development_dependency 'yard', '~> 0.9', '>= 0.9.16'
 
-  spec.add_dependency 'radiator', '~> 0.3', '>= 0.3.15'
-  spec.add_dependency 'steem_data', '~> 0.0', '>= 0.0.3'
+  spec.add_dependency 'radiator', '~> 0.4', '>= 0.4.3'
   spec.add_dependency 'steem_api', '~> 1.1', '>= 1.1.1rc1'
   spec.add_dependency 'golos_cloud', '~> 1.1', '>= 1.1.1rc1'
   spec.add_dependency 'discordrb', '~> 3.2', '>= 3.2.1'
   spec.add_dependency 'ai4r', '~> 1.13', '>= 1.13'
-  spec.add_dependency 'mongoid', '~> 6.1', '>= 6.1.0'
   spec.add_dependency 'steem-slap', '~> 0.0', '>= 0.0.2'
   spec.add_dependency 'activesupport', '~> 5.1', '>= 5.1.1'
   spec.add_dependency 'railties', '~> 5.1', '>= 5.1.1'

data/lib/cosgrove.rb

@@ -4,25 +4,17 @@ require 'yaml'
 require 'action_view'
 require 'radiator'
 require 'awesome_print'
-require 'steem_data'
 require 'steem_api'
 require 'golos_cloud'
-# require 'irb' # for binding.irb
 # require 'pry' # for binding.pry
 
 Bundler.require
 
 defined? Thread.report_on_exception and Thread.report_on_exception = true
 
-SteemData.load
-
-# This will cause a nil to be returned instead of raising an error, allowing us
-# to fall back to SteemApi and/or RPC.
-Mongoid.raise_not_found_error = false
-
 module Cosgrove
   PWD = Dir.pwd.freeze
-  KNOWN_CHAINS = [:steem, :golos, :test]
+  KNOWN_CHAINS = [:steem, :test]
   
   require 'cosgrove/version'
   require 'cosgrove/phantomjs'

data/lib/cosgrove/bot.rb

@@ -60,7 +60,6 @@ module Cosgrove
         return if event.channel.pm? && !cosgrove_allow_pm_commands
         cb_account = nil
         
-        mongo_behind_warning(event)
         if key.nil?
           event.respond "To create an account: https://steemit.com/enter_email?r=#{steem_account}"
           return
@@ -97,7 +96,6 @@ module Cosgrove
       self.command :register do |event, account_name, chain = :steem|
         return if event.channel.pm? && !cosgrove_allow_pm_commands
         
-        mongo_behind_warning(event)
         discord_id = event.author.id
         
         if discord_id.to_i == 0

data/lib/cosgrove/market.rb

@@ -2,18 +2,25 @@ module Cosgrove
   module Market
     include Support
     include ActionView::Helpers::NumberHelper
-
+    
+    def base_per_mvest(chain = :steem)
+      api(chain).get_dynamic_global_properties do |properties|
+        total_vesting_fund_steem = properties.total_vesting_fund_steem.to_f
+        total_vesting_shares_mvest = properties.total_vesting_shares.to_f / 1e6
+      
+        total_vesting_fund_steem / total_vesting_shares_mvest
+      end
+    end
+    
     def price_feed(chain = :steem)
       api(chain).get_feed_history do |feed_history|
-        base_per_mvest = api(chain).steem_per_mvest
-        
         current_median_history = feed_history.current_median_history
         base = current_median_history.base
         base = base.split(' ').first.to_f
         quote = current_median_history.quote
         quote = quote.split(' ').first.to_f
         
-        base_per_debt = (base / quote) * base_per_mvest
+        base_per_debt = (base / quote) * base_per_mvest(chain)
         
         [base_per_mvest, base_per_debt]
       end
@@ -125,24 +132,13 @@ module Cosgrove
         end
         
         account_names = account_names.map(&:downcase).uniq
-        accounts = SteemData::Account.where(:name.in => account_names)
-        account = accounts.last
-        
-        if accounts.size == 0
-          accounts = SteemApi::Account.where(name: account_names)
-          account = accounts.limit(1).last
-        end
+        accounts = SteemApi::Account.where(name: account_names)
+        account = accounts.limit(1).first
         
         if accounts.count == account_names.size
-          if accounts.kind_of? Mongoid::Criteria
-            vests = accounts.sum('vesting_shares.amount')
-            delegated_vests = accounts.sum('delegated_vesting_shares.amount')
-            received_vests = accounts.sum('received_vesting_shares.amount')
-          else
-            vests = accounts.pluck(:vesting_shares).map(&:to_f).sum
-            delegated_vests = accounts.pluck(:delegated_vesting_shares).map(&:to_f).sum
-            received_vests = accounts.pluck(:received_vesting_shares).map(&:to_f).sum
-          end
+          vests = accounts.pluck(:vesting_shares).map(&:to_f).sum
+          delegated_vests = accounts.pluck(:delegated_vesting_shares).map(&:to_f).sum
+          received_vests = accounts.pluck(:received_vesting_shares).map(&:to_f).sum
         elsif !wildcards
           valid_names = accounts.distinct(:name)
           unknown_names = account_names - valid_names
@@ -209,7 +205,7 @@ module Cosgrove
         usd = number_to_currency(usd, precision: 3)
         
         "**#{account.name}:** `#{mgests} MGESTS = #{golos} GOLOS = #{gbg} GBG = #{usd}`"
-      when :test then "Query not supported.  No Mongo for Testnet."
+      when :test then "Query not supported.  No database for Testnet."
       end
     end
     
@@ -267,11 +263,11 @@ module Cosgrove
     end
     
     def promoted(chain = :steem, period = :today)
-      return "Query not supported.  No Mongo for #{chain.to_s.capitalize}." unless chain == :steem
+      return "Query not supported.  No database for #{chain.to_s.capitalize}." unless chain == :steem
       
-      promoted = SteemData::AccountOperation.type('transfer').where(account: 'null', to: 'null', 'amount.asset' => 'SBD').send(period)
+      promoted = SteemApi::Tx::Transfer.where(to: 'null', amount_symbol: 'SBD').send(period)
       count_promoted = promoted.count
-      sum_promoted = promoted.sum('amount.amount')
+      sum_promoted = promoted.sum(:amount)
       
       base_per_mvest, base_per_debt = price_feed(chain)
       total = api(chain).get_reward_fund('post') do |reward_fund|
@@ -362,9 +358,9 @@ module Cosgrove
       chain = options[:chain] || :steem
       account_names = options[:account_names]
       case chain
-      when :steem then SteemData::Account.where(:name.in => account_names).sum('vesting_shares.amount')
-      when :golos then "Query not supported.  No Mongo for Golos."
-      when :test then "Query not supported.  No Mongo for Testnet."
+      when :steem then SteemApi::Account.where(name: account_names).sum("TRY_PARSE(REPLACE(vesting_shares, ' VESTS', '') AS float)")
+      when :golos then "Query not supported.  No database for Golos."
+      when :test then "Query not supported.  No database for Testnet."
       end
     end
     

data/lib/cosgrove/support.rb

@@ -5,8 +5,8 @@ module Cosgrove
     include ActionView::Helpers::DateHelper
     
     def suggest_account_name(account_name)
-      regex = /.*#{account_name.chars.each.map { |c| c }.join('.*')}.*/
-      guesses = SteemData::Account.where(name: regex).distinct(:name)
+      pattern = account_name.chars.each.map{ |c| c }.join('%')
+      guesses = SteemApi::Account.where("name LIKE '%#{pattern}%'").pluck(:name)
       
       if guesses.any?
         guesses.sample
@@ -28,41 +28,9 @@ module Cosgrove
       help.join
     end
     
-    def mongo_behind_warning(event)
-      elapse = -1
-      
-      begin
-        message = []
-        
-        if (blocks = head_block_number(:steem) - steem_data_head_block_number) > 1200
-          elapse = blocks * 3
-          message << "Mongo is behind by #{time_ago_in_words(elapse.seconds.ago)}."
-        else
-          0
-        end
-        
-        if message.size > 0
-          event.respond message.join(' ')
-        end
-      rescue => e
-        event.respond "Mongo might be behind, but the API is also acting up.  Please try again later.\n\n```#{e.inspect}\n```"
-        sleep 15
-        event.respond Cosgrove::SnarkCommands::WITTY.sample
-      end
-      
-      elapse
-    end
-    
     def cannot_find_input(event, message_prefix = "Unable to find that.")
       message = [message_prefix]
       
-      message << if (blocks = head_block_number(:steem) - steem_data_head_block_number) > 86400
-        elapse = blocks * 3
-        "  Mongo is behind by #{time_ago_in_words(elapse.seconds.ago)}.  Try again later."
-      else
-        "  Mongo might be behind or this is not a valid input."
-      end
-        
       event.respond message.join(' ')
     end
     
@@ -82,7 +50,7 @@ module Cosgrove
       end
       
       post = case chain
-      when :steem then SteemData::Post.where(author: author_name, permlink: permlink).last
+      when :steem then SteemApi::Comment.where(author: author_name, permlink: permlink).last
       when :golos then GolosCloud::Comment.where(author: author_name, permlink: permlink).last
       end
       
@@ -111,16 +79,18 @@ module Cosgrove
         "**#{age}** old"
       end
       
-      if post.active_votes.any?
-        upvotes = post.active_votes.map{ |v| v if v['percent'] > 0 }.compact.count
-        downvotes = post.active_votes.map{ |v| v if v['percent'] < 0 }.compact.count
+      active_votes = SteemApi::Tx::Vote.where(author: post.author, permlink: post.permlink)
+      
+      if active_votes.any?
+        upvotes = active_votes.map{ |v| v if v.weight > 0 }.compact.count
+        downvotes = active_votes.map{ |v| v if v.weight < 0 }.compact.count
         netvotes = upvotes - downvotes
         details << "Net votes: #{netvotes}"
         
         # Only append this detail of the post less than an hour old.
         if created > 1.hour.ago
           votes = case chain
-          when :steem then SteemData::AccountOperation.type('vote').starting(post.created)
+          when :steem then SteemApi::Tx::Vote.where('timestamp > ?', post.created)
           when :golos then GolosCloud::Vote.where('timestamp > ?', post.created)
           end
           total_votes = votes.count
@@ -134,8 +104,8 @@ module Cosgrove
       
       details << "Comments: #{post.children.to_i}"
       
-      page_views = page_views("/#{post.parent_permlink}/@#{post.author}/#{post.permlink}")
-      details << "Views: #{page_views}" if !!page_views
+      # page_views = page_views("/#{post.parent_permlink}/@#{post.author}/#{post.permlink}")
+      # details << "Views: #{page_views}" if !!page_views
       
       begin
         event.respond details.join('; ')
@@ -153,7 +123,7 @@ module Cosgrove
       raise "Required argument: chain" if chain.nil?
       
       if chain == :steem
-        account = if (accounts = SteemData::Account.where(name: key)).any?
+        account = if (accounts = SteemApi::Account.where(name: key)).any?
           accounts.first
         end
       end
@@ -206,7 +176,7 @@ module Cosgrove
           'Origin' => 'https://steemit.com'
         })
         
-        csrf = page.parser.to_html.split(',"csrf":"').last.split('","new_visit":').first
+        csrf = page.parser.to_html.split(':{"csrf":"').last.split('","new_visit":').first
         # Uncomment in case views stop showing.
         # puts "DEBUG: #{csrf}"
         return unless csrf.size == 36

data/lib/cosgrove/upvote_job.rb

@@ -29,7 +29,7 @@ module Cosgrove
         return
       end
       
-      votes_today = SteemData::AccountOperation.type('vote').where(voter: steem_account).today
+      votes_today = SteemApi::Tx::Vote.where(voter: steem_account).today
       today_count = votes_today.count
       author_count = votes_today.where(author: author_name).count
       vote_ratio = if today_count == 0

data/lib/cosgrove/utils.rb

@@ -89,14 +89,6 @@ module Cosgrove
       end
     end
     
-    def steem_data_head_block_number
-      begin
-        SteemData::AccountOperation.order(timestamp: -1).limit(1).first.block
-      rescue
-        -1
-      end
-    end
-    
     def properties(chain)
       api(chain).get_dynamic_global_properties.result
     end
@@ -149,9 +141,9 @@ module Cosgrove
       offset = offset.to_i
       
       posts = if op == 'latest'
-        SteemData::Post.root_posts.where(author: author.name).order(created: :desc)
+        SteemApi::Comment.where(depth: 0, author: author.name).order(created: :desc)
       elsif op == 'first'
-        SteemData::Post.root_posts.where(author: author.name).order(created: :asc)
+        SteemApi::Comment.where(depth: 0, author: author.name).order(created: :asc)
       else
         []
       end
@@ -175,7 +167,7 @@ module Cosgrove
       parent_permlink = options[:parent_permlink]
       
       post = if chain == :steem
-        posts = SteemData::Post.root_posts.where(author: author_name)
+        posts = SteemApi::Comment.where(depth: 0, author: author_name)
         posts = posts.where(permlink: permlink) if !!permlink
         posts = posts.where(parent_permlink: parent_permlink) if !!parent_permlink
         
@@ -215,19 +207,11 @@ module Cosgrove
       chain = options[:chain]
       author_name = options[:author_name]
       
-      author = SteemData::Account.where(name: author_name).last
-      
-      if author.nil?
-        author = begin
-          SteemApi::Account.where(name: author_name).last
-        rescue => e
-          puts e
-        end
-      end
+      author = SteemApi::Account.where(name: author_name).first
       
       if author.nil?
         author = api(chain).get_accounts([author_name]) do |accounts, errors|
-          accounts.last
+          accounts.first
         end
       end
       
@@ -242,8 +226,9 @@ module Cosgrove
       
       op = case chain
       when :steem
-        transfers = SteemData::AccountOperation.type('transfer').
-          where(account: steem_account, from: from, to: steem_account, memo: {'$regex' => ".*#{memo_key}.*"})
+        transfers = SteemApi::Tx::Transfer.
+          where(from: from, to: steem_account).
+          where("memo LIKE ?", "%#{memo_key}%")
       
         if transfers.any?
           transfers.last
@@ -261,8 +246,8 @@ module Cosgrove
       end
       
       if op.nil?
-        # Fall back to RPC.  The transaction is so new, SteemData hasn't seen it
-        # yet, SteemData is behind, or there is no such transfer.
+        # Fall back to RPC.  The transaction is so new, SteemApi hasn't seen it
+        # yet, SteemApi is behind, or there is no such transfer.
         
         api(chain).get_account_history(steem_account, -1, 10000) do |history, error|
           if !!error

data/lib/cosgrove/version.rb

@@ -1,4 +1,4 @@
 module Cosgrove
-  VERSION = '0.0.3.5'
+  VERSION = '0.0.4.0pre1'
   AGENT_ID = "cosgrove/#{VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cosgrove
 version: !ruby/object:Gem::Version
-  version: 0.0.3.5
+  version: 0.0.4.0pre1
 platform: ruby
 authors:
 - Anthony Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,20 +76,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.9.0
+        version: 5.10.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.9.0
+        version: 5.10.3
 - !ruby/object:Gem::Dependency
   name: minitest-line
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.11
+        version: 0.9.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -189,47 +189,27 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.11
+        version: 0.9.16
 - !ruby/object:Gem::Dependency
   name: radiator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.15
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.15
-- !ruby/object:Gem::Dependency
-  name: steem_data
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: steem_api
   requirement: !ruby/object:Gem::Requirement
@@ -310,26 +290,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: steem-slap
   requirement: !ruby/object:Gem::Requirement
@@ -537,7 +497,6 @@ files:
 - lib/cosgrove/upvote_job.rb
 - lib/cosgrove/utils.rb
 - lib/cosgrove/version.rb
-- mongoid.yml
 - support/js/screencap.js
 homepage: https://github.com/steem-third-party/cosgrove
 licenses:
@@ -554,12 +513,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Cosgrove Discord Bo t

data/mongoid.yml

@@ -1,9 +0,0 @@
-development:
-  clients:
-    default:
-      database: SteemData
-      hosts:
-        - mongo1.steemdata.com:27017
-      options:
-        user: 'steemit'
-        password: 'steemit'