urbit-api 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a3c9e5915684d444baa066c316ebeafd2cddc0aa731d323b15fec95be932b05
-  data.tar.gz: 951ddb43e002c92c0490b549de64a2311b42124c09cb499833d58d7c717b088d
+  metadata.gz: d45d05923c175955a85dfb0676a63eafc0eed277b656b7d045f8675f586cee7e
+  data.tar.gz: e2bc0d8d71d02629b9b3f335ff1672f20686c178e1584540ff1724943d82158c
 SHA512:
-  metadata.gz: a677021940189cf5e52a969b01d4f77b418dc544d823b47d1dfaf83832c44f00dbe926692d9957f3a01809a8fdda15ba65177b5a57ecb01f310ec800e09d6e75
-  data.tar.gz: d10188333e23d83a6abee0a44250bdce9641694264fc81970b5de285a973156f00b7b5a342b88e3b4d476d8a363e350012aabcf727cc940b9a2f0fc50ce59918
+  metadata.gz: 86e48b8bae4f5cedfbe9ca0fcb4ac327185973ce73e29c8a26f7644fadb2e8f78850b9f1cca9d62802d22c45afdeb025b8d495e14d54bf642f123f66f986a1c5
+  data.tar.gz: 20968fc224c1e4fd6105922a4ddc30b16f45f25a12f2c5e4294eaec33f7d379db8180720b062a3d274755853468c7e61af823401ec2a4f5b3e800be3f1de497f

data/lib/urbit/bucket.rb

@@ -0,0 +1,45 @@
+
+module Urbit
+  class Bucket
+    attr_accessor :entries, :name, :setting
+
+    def initialize(setting:, name:, entries:)
+      @setting = setting
+      @name = name
+      @entries = Hash.new.replace(entries)
+    end
+
+    def [](key:)
+      self.entries[key]
+    end
+
+    def []=(key, val)
+      msg = {"put-entry": {"desk": "#{@setting.desk}", "bucket-key": "#{self.name}", "entry-key": "#{key[:key]}", "value": val}}
+      self.ship.poke(app: 'settings-store', mark: 'settings-event', message: msg)
+      nil
+    end
+
+    def remove_entry(key:)
+      msg = {"del-entry": {"desk": "#{@setting.desk}", "bucket-key": "#{self.name}", "entry-key": "#{key}"}}
+      self.ship.poke(app: 'settings-store', mark: 'settings-event', message: msg)
+      nil
+    end
+
+    def ship
+      self.setting.ship
+    end
+
+    def to_h
+      {name: @name, entries: @entries}
+    end
+
+    def to_s
+      "a Bucket(#{self.to_h})"
+    end
+
+    def to_string
+      "#{self.name}: #{self.entries.count} entries"
+    end
+
+  end
+end

data/lib/urbit/channel.rb

@@ -21,7 +21,6 @@ module Urbit
     end
 
     def close
-      # puts "closing #{name}"
       m = Urbit::CloseMessage.new(channel: self)
       @is_open = !self.send(message: m)
     end
@@ -35,11 +34,11 @@ module Urbit
     end
 
     #
-    # One way to open a channel by "poking" an urbit app with a mark and a (json) message.
-    # A typical example of this is poking the 'hood' app using the mark 'helm-hi' to start a DM chat.
+    # Poke an app with a message using a mark.
+    # The message must be a Ruby Hash, not a String.
     #
     def poke(app:, mark:, message:)
-      @is_open = self.send(message: (Urbit::PokeMessage.new(channel: self, app: app, mark: mark, a_string: message)))
+      @is_open = self.send(message: (Urbit::PokeMessage.new(channel: self, app: app, mark: mark, a_message_hash: message)))
       @receiver = Urbit::Receiver.new(channel: self)
       self
     end
@@ -84,7 +83,7 @@ module Urbit
     end
 
     def url
-      "http://localhost:8080/~/channel/#{self.key}"
+      "#{self.ship.url}/~/channel/#{self.key}"
     end
   end
 end

data/lib/urbit/fact/base_fact.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+module Urbit
+  module Fact
+    class BaseFact
+      attr_reader :ack, :channel, :data, :type
+
+      def initialize(channel:, event:)
+        @channel = channel
+        @data = event.data
+        @type = event.type
+        # TODO: Remove this debugging once Facts are finalized. DJR 2/3/2022
+        # puts "Received a #{self.class.name.split('::').last} for [#{channel}] -- [#{@type}] -- [#{@data}]"
+      end
+
+      def add_ack(ack:)
+        @ack = :ack
+      end
+
+      def contents
+        JSON.parse(@data)
+      end
+
+      def create_parser
+        nil
+      end
+
+      def for_this_ship?
+        self.ship == @channel.ship
+      end
+
+      def graph_update?
+        false
+      end
+
+      def is_acknowledged?
+        !@ack.nil?
+      end
+
+      def raw_json
+        nil
+      end
+
+      def ship
+        @channel.ship
+      end
+
+      def to_h
+        {
+          ship:            self.ship.to_h,
+          acknowleged:     self.is_acknowledged?,
+          is_graph_update: self.graph_update?
+        }
+      end
+
+      def to_s
+        "a #{self.class.name}(#{self.to_h})"
+      end
+    end
+
+    class EmptyFact < BaseFact
+    end
+
+    class ErrorFact < BaseFact
+      def error
+        self.contents["err"]
+      end
+
+      def response
+        self.contents["response"]
+      end
+
+      def to_h
+        super.merge!({
+          error:    self.error,
+          response: self.response,
+        })
+      end
+    end
+
+    class SuccessFact < BaseFact
+      def code
+        self.contents["ok"]
+      end
+
+      def response
+        self.contents["response"]
+      end
+
+      def to_h
+        super.merge!({
+          code:     self.code,
+          response: self.response,
+        })
+      end
+
+    end
+  end
+end

data/lib/urbit/fact/graph_fact.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module Urbit
+  module Fact
+    class GraphUpdateFact < BaseFact
+      def initialize(channel:, event:)
+        super channel: channel, event: event
+      end
+
+      #
+      # Attach this new fact as a node to its Graph.
+      #
+      def attach_parser
+        # puts "Received a graph update for [#{self.ship.graph(resource: self.resource)}]"
+        if self.incoming_graph
+          # puts "Received an add_graph event: #{self.raw_json} on #{self.resource}"
+          self.create_parser
+        end
+      end
+
+      def graph_update?
+        true
+      end
+
+      def incoming_graph
+        self.ship.graph(resource: self.resource)
+      end
+
+      def resource
+        return "~#{self.resource_h["ship"]}/#{self.resource_h["name"]}" unless self.resource_h.nil?
+      end
+
+      def resource_h
+        self.raw_json["resource"]
+      end
+
+      def root_h
+        self.contents["json"]["graph-update"]
+      end
+
+      def to_h
+        super.merge!(resource: self.resource)
+      end
+    end
+
+    class AddGraphFact < GraphUpdateFact
+      def initialize(channel:, event:)
+        super channel: channel, event: event
+      end
+
+      def create_parser
+        Urbit::AddGraphParser.new(for_graph: incoming_graph,  with_json: self.raw_json).add_nodes
+      end
+
+      def raw_json
+        self.root_h["add-graph"]
+      end
+    end
+
+    class AddNodesFact < GraphUpdateFact
+      def initialize(channel:, event:)
+        super channel: channel, event: event
+      end
+
+      def create_parser
+        Urbit::AddNodesParser.new(for_graph: incoming_graph,  with_json: self.raw_json).add_nodes
+      end
+
+      def raw_json
+        self.root_h["add-nodes"]
+      end
+    end
+
+    class RemoveGraphFact < GraphUpdateFact
+      def initialize(channel:, event:)
+        super channel: channel, event: event
+      end
+
+      def create_parser
+        Urbit::RemoveGraphParser.new(for_graph: incoming_graph,  with_json: self.raw_json)
+      end
+
+      def raw_json
+        self.root_h["remove-graph"]
+      end
+
+      def resource_h
+        self.raw_json
+      end
+    end
+  end
+end

data/lib/urbit/fact/group_fact.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+require 'urbit/group'
+require 'urbit/group_parser'
+
+module Urbit
+  module Fact
+    class GroupUpdateFact < BaseFact
+      def initialize(channel:, event:)
+        super channel: channel, event: event
+      end
+
+      def root_h
+        self.contents["json"]["groupUpdate"]
+      end
+    end
+
+    class AddGroupFact < GroupUpdateFact
+      def initialize(channel:, event:)
+        super channel: channel, event: event
+        self.channel.ship.groups.add(self.parser.group)
+      end
+
+      def parser
+        Urbit::AddGroupParser.new(with_json: self.raw_json)
+      end
+
+      def raw_json
+        self.root_h["addGroup"]
+      end
+    end
+
+    class AddGroupMemberFact < GroupUpdateFact
+      def initialize(channel:, event:)
+        super channel: channel, event: event
+        self.channel.ship.groups.add_members group_path: self.parser.resource, ships: self.parser.ships
+      end
+
+      def parser
+        Urbit::ChangeMemberParser.new(with_json: self.raw_json)
+      end
+
+      def raw_json
+        self.root_h["addMembers"]
+      end
+    end
+
+    class AddTagFact < GroupUpdateFact
+      def initialize(channel:, event:)
+        super channel: channel, event: event
+        self.channel.ship.groups.add_tag group_path: self.parser.resource, ships: self.parser.ships, tag: self.parser.tag
+      end
+
+      def parser
+        Urbit::ChangeTagParser.new(with_json: self.raw_json)
+      end
+
+      def raw_json
+        self.root_h["addTag"]
+      end
+    end
+
+    class InitialGroupFact < GroupUpdateFact
+      def initialize(channel:, event:)
+        super channel: channel, event: event
+        self.parser.groups.each {|g| self.channel.ship.groups.add(g)}
+      end
+
+      def parser
+        Urbit::InitialGroupParser.new(with_json: self.raw_json)
+      end
+
+      def raw_json
+        self.root_h["initial"]
+      end
+    end
+
+    class InitialGroupGroupFact < GroupUpdateFact
+      def initialize(channel:, event:)
+        super channel: channel, event: event
+        self.channel.ship.groups.add(self.parser.group)
+      end
+
+      def parser
+        Urbit::InitialGroupGroupParser.new(with_json: self.raw_json)
+      end
+
+      def raw_json
+        self.root_h["initialGroup"]
+      end
+    end
+
+    class RemoveGroupMemberFact < GroupUpdateFact
+      def initialize(channel:, event:)
+        super channel: channel, event: event
+        self.channel.ship.groups.remove_members group_path: self.parser.resource, ships: self.parser.ships
+      end
+
+      def parser
+        Urbit::ChangeMemberParser.new(with_json: self.raw_json)
+      end
+
+      def raw_json
+        self.root_h["removeMembers"]
+      end
+    end
+
+    class RemoveTagFact < GroupUpdateFact
+      def initialize(channel:, event:)
+        super channel: channel, event: event
+        self.channel.ship.groups.remove_tag group_path: self.parser.resource, ships: self.parser.ships, tag: self.parser.tag
+      end
+
+      def parser
+        Urbit::ChangeTagParser.new(with_json: self.raw_json)
+      end
+
+      def raw_json
+        self.root_h["removeTag"]
+      end
+    end
+
+  end # Module Fact
+end # Module Urbit

data/lib/urbit/fact/settings_fact.rb

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+module Urbit
+  module Fact
+
+    class SettingsEventFact < BaseFact
+      def initialize(channel:, event:)
+        super channel: channel, event: event
+        self.accept if self.for_this_ship?
+      end
+
+      def accept
+        nil
+      end
+
+      def base_contents
+        JSON.parse(@data)["json"]["settings-event"]
+      end
+
+      def bucket
+        self.desk[bucket: self.bucket_key]
+      end
+
+      def bucket_key
+        self.contents["bucket-key"]
+      end
+
+      def desk
+        self.ship.settings[desk: self.desk_name]
+      end
+
+      def desk_name
+        self.contents["desk"]
+      end
+
+      def to_h
+        super.merge!({
+          bucket: self.bucket_key,
+          desk:   self.desk_name,
+        })
+      end
+    end
+
+    class SettingsEventDelBucketFact < SettingsEventFact
+      def accept
+        self.desk.buckets.delete(self.bucket)
+      end
+
+      def contents
+        self.base_contents["del-bucket"]
+      end
+    end
+
+    class SettingsEventDelEntryFact < SettingsEventFact
+      def accept
+        self.bucket.entries.delete(self.entry)
+      end
+
+      def contents
+        self.base_contents["del-entry"]
+      end
+
+      def entry
+        self.contents["entry-key"]
+      end
+    end
+
+    class SettingsEventPutBucketFact < SettingsEventFact
+      def accept
+        # This is a new bucket, add it.
+        s = channel.ship.settings[desk: self.desk_name]
+        s.buckets << Bucket.new(setting: s, name: self.bucket_key, entries: self.entries)
+        nil
+      end
+
+      def contents
+        self.base_contents["put-bucket"]
+      end
+
+      def entries
+        self.contents["bucket"]
+      end
+
+      def to_h
+        super.merge!({
+          entries: self.entries
+        })
+      end
+    end
+
+    class SettingsEventPutEntryFact < SettingsEventFact
+      def accept
+        # See if we already have this setting, if no add it, if yes update it.
+        if (entries = channel.ship.settings[desk: self.desk_name].entries(bucket: self.bucket_key))
+          entries[self.entry] = self.value
+        end
+      end
+
+      def contents
+        self.base_contents["put-entry"]
+      end
+
+      def entry
+        self.contents["entry-key"]
+      end
+
+      def to_h
+        super.merge!({
+          entry:  self.entry,
+          value:  self.value
+        })
+      end
+
+      def value
+        self.contents["value"]
+      end
+    end
+
+  end
+end

data/lib/urbit/fact.rb

@@ -1,66 +1,50 @@
-require 'urbit/graph'
-require 'urbit/node'
-require 'urbit/parser'
+# frozen_string_literal: true
 
-module Urbit
-  class Fact
-    attr_reader :ack
-
-    def initialize(channel:, event:)
-      @channel = channel
-      @data = event.data
-      @type = event.type
+require_relative 'fact/base_fact'
+require_relative 'fact/graph_fact'
+require_relative 'fact/group_fact'
+require_relative 'fact/settings_fact'
 
-      # Attach this new fact as a node to its Graph.
-      if self.graph_update?
-        puts self.add_nodes_json
-        Urbit::AddNodesParser.new(for_graph: (self.ship.graph(resource: self.resource)),  with_json: self.add_nodes_json).add_nodes
+module Urbit
+  module Fact
+    class << self
+      #
+      # This is a Factory method to make the proper Fact subclass from a Channel Event.
+      #
+      def collect(channel:, event:)
+        contents = JSON.parse(event.data)
+
+        if contents["json"].nil?
+          return SuccessFact.new(channel: channel, event: event) if contents["ok"]
+          return ErrorFact.new(channel: channel, event: event)   if contents["err"]
+          return EmptyFact.new(channel: channel, event: event)
+        end
+
+        if contents["json"]["graph-update"]
+          return AddGraphFact.new(channel: channel, event: event)      if contents["json"]["graph-update"]["add-graph"]
+          return AddNodesFact.new(channel: channel, event: event)      if contents["json"]["graph-update"]["add-nodes"]
+          return RemoveGraphFact.new(channel: channel, event: event)   if contents["json"]["graph-update"]["remove-graph"]
+        end
+
+        if (c = contents["json"]["groupUpdate"])
+          return AddGroupFact.new(channel: channel, event: event)          if c["addGroup"]
+          return AddGroupMemberFact.new(channel: channel, event: event)    if c["addMembers"]
+          return AddTagFact.new(channel: channel, event: event)            if c["addTag"]
+          return InitialGroupFact.new(channel: channel, event: event)      if c["initial"]
+          return InitialGroupGroupFact.new(channel: channel, event: event) if c["initialGroup"]
+          return RemoveGroupMemberFact.new(channel: channel, event: event) if c["removeMembers"]
+          return RemoveTagFact.new(channel: channel, event: event)         if c["removeTag"]
+        end
+
+        if (c = contents["json"]["settings-event"])
+          return SettingsEventDelBucketFact.new(channel: channel, event: event) if c["del-bucket"]
+          return SettingsEventDelEntryFact.new(channel: channel, event: event)  if c["del-entry"]
+          return SettingsEventPutBucketFact.new(channel: channel, event: event) if c["put-bucket"]
+          return SettingsEventPutEntryFact.new(channel: channel, event: event)  if c["put-entry"]
+        end
+
+        return BaseFact.new(channel: channel, event: event)
       end
     end
-
-    def add_ack(ack:)
-      @ack = :ack
-    end
-
-    def add_nodes_json
-      return nil unless self.graph_update?
-      self.contents["json"]["graph-update"]["add-nodes"]
-    end
-
-    def contents
-      JSON.parse(@data)
-    end
-
-    def graph_update?
-      !self.contents["json"].nil? && !self.contents["json"]["graph-update"].nil?
-    end
-
-    def is_acknowledged?
-      !@ack.nil?
-    end
-
-    def resource
-      return nil unless self.graph_update?
-      r = self.contents["json"]["graph-update"]["add-nodes"]["resource"]
-      "~#{r["ship"]}/#{r["name"]}"
-    end
-
-    def ship
-      @channel.ship
-    end
-
-    def to_h
-      {
-        ship:            self.ship.to_h,
-        resource:        self.resource,
-        acknowleged:     self.is_acknowledged?,
-        is_graph_update: self.graph_update?
-        # contents:        self.contents
-      }
-    end
-
-    def to_s
-      "a Fact(#{self.to_h})"
-    end
   end
 end

data/lib/urbit/graph.rb

@@ -14,7 +14,7 @@ module Urbit
     end
 
     def add_node(node:)
-      @nodes << node
+      @nodes << node unless node.deleted?
     end
 
     def host_ship
@@ -56,7 +56,8 @@ module Urbit
     def newest_nodes(count: 10)
       count = 1 if count < 1
       return self.fetch_newest_nodes(count) if @nodes.empty? || @nodes.count < count
-      self.nodes.reverse[0..(count - 1)]
+      last_node = self.nodes.count - 1
+      self.nodes[(last_node - count)..last_node]
     end
 
     def oldest_nodes(count: 10)