From 955739e2a7be70e6abf7e95710ffe0f4a9c64481 Mon Sep 17 00:00:00 2001 From: mms Date: Tue, 12 Nov 2024 21:26:10 +0100 Subject: feat: rename modules --- lib/osugiru.rb | 39 ++++++++++++++++++ lib/osugiru/config.rb | 7 ++++ lib/osugiru/database.rb | 19 +++++++++ lib/osugiru/helpers.rb | 13 ++++++ lib/osugiru/message.rb | 23 +++++++++++ lib/osugiru/messages.rb | 103 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/osugiru/ruleset.rb | 11 ++++++ lib/some.rb | 47 ---------------------- lib/some/config.rb | 5 --- lib/some/database.rb | 19 --------- lib/some/helpers.rb | 13 ------ lib/some/message.rb | 23 ----------- lib/some/messages.rb | 103 ------------------------------------------------ lib/some/ruleset.rb | 11 ------ 14 files changed, 215 insertions(+), 221 deletions(-) create mode 100644 lib/osugiru.rb create mode 100644 lib/osugiru/config.rb create mode 100644 lib/osugiru/database.rb create mode 100644 lib/osugiru/helpers.rb create mode 100644 lib/osugiru/message.rb create mode 100644 lib/osugiru/messages.rb create mode 100644 lib/osugiru/ruleset.rb delete mode 100644 lib/some.rb delete mode 100644 lib/some/config.rb delete mode 100644 lib/some/database.rb delete mode 100644 lib/some/helpers.rb delete mode 100644 lib/some/message.rb delete mode 100644 lib/some/messages.rb delete mode 100644 lib/some/ruleset.rb (limited to 'lib') diff --git a/lib/osugiru.rb b/lib/osugiru.rb new file mode 100644 index 0000000..91a2c06 --- /dev/null +++ b/lib/osugiru.rb @@ -0,0 +1,39 @@ +# frozen_string_literal: true + +require 'notmuch' +require 'pry' + +require_relative 'osugiru/database' +require_relative 'osugiru/config' +require_relative 'osugiru/message' +require_relative 'osugiru/messages' +require_relative 'osugiru/helpers' +require_relative 'osugiru/ruleset' + +module Osugiru + class << self + attr_accessor :config + attr_reader :db, :rule_sets + + def configure(&block) + @config ||= Config.new + @rule_sets = [] + + instance_eval(&block) + + @db = Database.new(path: config.database_path) + end + + def rule_set(name, &block) + @rule_sets << RuleSet.new(name, block) + end + end +end + +def eval_rules + Osugiru.rule_sets.each do |rule_set| + rule_set.run + end +end + + diff --git a/lib/osugiru/config.rb b/lib/osugiru/config.rb new file mode 100644 index 0000000..033d501 --- /dev/null +++ b/lib/osugiru/config.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +module Osugiru + class Config + attr_accessor :database_path + end +end diff --git a/lib/osugiru/database.rb b/lib/osugiru/database.rb new file mode 100644 index 0000000..d014c94 --- /dev/null +++ b/lib/osugiru/database.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +module Osugiru + class Database + attr_reader :db + + def initialize(path:) + @db = ::Notmuch::Database.new(path) + end + + def query(query) + db.query(query) + end + + def search_messages(query) + query(query).search_messages + end + end +end diff --git a/lib/osugiru/helpers.rb b/lib/osugiru/helpers.rb new file mode 100644 index 0000000..c493bbd --- /dev/null +++ b/lib/osugiru/helpers.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module Osugiru + module Helpers + def self.header_name_from_dsl(method_name) + method_name + .to_s + .split('_') + .map(&:capitalize) + .join('-') + end + end +end diff --git a/lib/osugiru/message.rb b/lib/osugiru/message.rb new file mode 100644 index 0000000..3446f17 --- /dev/null +++ b/lib/osugiru/message.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +module Osugiru + class Message + attr_reader :message + + def initialize(msg:) + @message = msg + end + + def method_missing(method_name, *_args) + handle_get(Osugiru::Helpers.header_name_from_dsl(method_name)) + end + + def handle_get(header_name) + message.header(header_name) if message.header(header_name) + end + + def tags + @message.tags + end + end +end diff --git a/lib/osugiru/messages.rb b/lib/osugiru/messages.rb new file mode 100644 index 0000000..4af19b6 --- /dev/null +++ b/lib/osugiru/messages.rb @@ -0,0 +1,103 @@ +# frozen_string_literal: true + +require 'pry' +module Osugiru + class Messages + AND_CONJUCTION = :and + OR_CONJUCTION = :or + DEFAULT_CONJUCTION = AND_CONJUCTION + + Token = Struct.new(:conjuction, :field, :value, :messages) do + def to_query + conjuction_to_use = messages.next_token_id > 1 ? conjuction : '' + return "#{conjuction_to_use} (#{value})" if field == :direct + + "#{conjuction_to_use} (#{field}:#{value})" + end + end + + TokenGroup = Struct.new(:conjuction, :tokens, :messages) do + def initialize(*) + super + end + + def to_query + tokens.flat_map(&:to_query).join(' ').to_s + end + + def push_token(field, value) + if value.is_a? String + tokens.push(Token.new(conjuction, field, value, messages)) + elsif value.is_a? Array + group = TokenGroup.new(OR_CONJUCTION, [], messages) + value.each do |val| + group.push_token(field, val) + end + tokens.push group + + end + end + + def next_token_id + @token_count += 1 + end + end + + attr_accessor :query, :current_conjuction, :token_count + attr_reader :db + + def initialize(db:) + @db = db + @query = [] + @current_conjuction = AND_CONJUCTION + @token_count = 0 + end + + def or + @current_conjuction = OR_CONJUCTION + self + end + + def and + @current_conjuction = AND_CONJUCTION + self + end + + def filter(params) + case params + when String + add_filter_from_string(params) + when Hash + add_filter_from_hash(params) + end + + self + end + + def each + db.search_messages(query_string).each do |msg| + yield(Message.new(msg: msg)) + end + end + + def add_filter_from_string(string) + @query << Token.new(current_conjuction, :direct, string, self) + end + + def add_filter_from_hash(hash) + group = TokenGroup.new(current_conjuction, [], self) + hash.each do |key, value| + group.push_token(key, value) + end + @query << group + end + + def query_string + query.map(&:to_query).join(' ') + end + + def next_token_id + @token_count += 1 + end + end +end diff --git a/lib/osugiru/ruleset.rb b/lib/osugiru/ruleset.rb new file mode 100644 index 0000000..a9bac16 --- /dev/null +++ b/lib/osugiru/ruleset.rb @@ -0,0 +1,11 @@ +module Osugiru + RuleSet = Struct.new(:name, :rule) do + def messages + Messages.new(db: Osugiru.db) + end + + def run + instance_eval(&rule) + end + end +end diff --git a/lib/some.rb b/lib/some.rb deleted file mode 100644 index 446fba2..0000000 --- a/lib/some.rb +++ /dev/null @@ -1,47 +0,0 @@ -# frozen_string_literal: true - -require 'notmuch' -require 'pry' - -require_relative 'some/database' -require_relative 'some/config' -require_relative 'some/message' -require_relative 'some/messages' -require_relative 'some/helpers' -require_relative 'some/ruleset' - -module Some - class << self - attr_accessor :config - attr_reader :db, :rule_sets - - def configure(&block) - @config ||= Config.new - @rule_sets = [] - - instance_eval(&block) - - @db = Database.new(path: config.database_path) - end - - def rule_set(name, &block) - @rule_sets << RuleSet.new(name, block) - end - end -end - -def eval_rules - Some.rule_sets.each do |rule_set| - rule_set.run - end -end - -CONFIG_FILEPATH = 'some/config.rb' -XDG_HOME = ENV.fetch('XDG_CONFIG_HOME', "#{Dir.home}/.config") -def start_some - config_file = File.read("#{XDG_HOME}/#{CONFIG_FILEPATH}") - instance_eval(config_file) - eval_rules -end - -start_some diff --git a/lib/some/config.rb b/lib/some/config.rb deleted file mode 100644 index 916db0c..0000000 --- a/lib/some/config.rb +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -class Config - attr_accessor :database_path -end diff --git a/lib/some/database.rb b/lib/some/database.rb deleted file mode 100644 index d481dd5..0000000 --- a/lib/some/database.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Some - class Database - attr_reader :db - - def initialize(path:) - @db = ::Notmuch::Database.new(path) - end - - def query(query) - db.query(query) - end - - def search_messages(query) - query(query).search_messages - end - end -end diff --git a/lib/some/helpers.rb b/lib/some/helpers.rb deleted file mode 100644 index 36dcdef..0000000 --- a/lib/some/helpers.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true - -module Some - module Helpers - def self.header_name_from_dsl(method_name) - method_name - .to_s - .split('_') - .map(&:capitalize) - .join('-') - end - end -end diff --git a/lib/some/message.rb b/lib/some/message.rb deleted file mode 100644 index cd352f1..0000000 --- a/lib/some/message.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -module Some - class Message - attr_reader :message - - def initialize(msg:) - @message = msg - end - - def method_missing(method_name, *_args) - handle_get(Some::Helpers.header_name_from_dsl(method_name)) - end - - def handle_get(header_name) - message.header(header_name) if message.header(header_name) - end - - def tags - @message.tags - end - end -end diff --git a/lib/some/messages.rb b/lib/some/messages.rb deleted file mode 100644 index 9f2520b..0000000 --- a/lib/some/messages.rb +++ /dev/null @@ -1,103 +0,0 @@ -# frozen_string_literal: true - -require 'pry' -module Some - class Messages - AND_CONJUCTION = :and - OR_CONJUCTION = :or - DEFAULT_CONJUCTION = AND_CONJUCTION - - Token = Struct.new(:conjuction, :field, :value, :messages) do - def to_query - conjuction_to_use = messages.next_token_id > 1 ? conjuction : '' - return "#{conjuction_to_use} (#{value})" if field == :direct - - "#{conjuction_to_use} (#{field}:#{value})" - end - end - - TokenGroup = Struct.new(:conjuction, :tokens, :messages) do - def initialize(*) - super - end - - def to_query - tokens.flat_map(&:to_query).join(' ').to_s - end - - def push_token(field, value) - if value.is_a? String - tokens.push(Token.new(conjuction, field, value, messages)) - elsif value.is_a? Array - group = TokenGroup.new(OR_CONJUCTION, [], messages) - value.each do |val| - group.push_token(field, val) - end - tokens.push group - - end - end - - def next_token_id - @token_count += 1 - end - end - - attr_accessor :query, :current_conjuction, :token_count - attr_reader :db - - def initialize(db:) - @db = db - @query = [] - @current_conjuction = AND_CONJUCTION - @token_count = 0 - end - - def or - @current_conjuction = OR_CONJUCTION - self - end - - def and - @current_conjuction = AND_CONJUCTION - self - end - - def filter(params) - case params - when String - add_filter_from_string(params) - when Hash - add_filter_from_hash(params) - end - - self - end - - def each - db.search_messages(query_string).each do |msg| - yield(Message.new(msg: msg)) - end - end - - def add_filter_from_string(string) - @query << Token.new(current_conjuction, :direct, string, self) - end - - def add_filter_from_hash(hash) - group = TokenGroup.new(current_conjuction, [], self) - hash.each do |key, value| - group.push_token(key, value) - end - @query << group - end - - def query_string - query.map(&:to_query).join(' ') - end - - def next_token_id - @token_count += 1 - end - end -end diff --git a/lib/some/ruleset.rb b/lib/some/ruleset.rb deleted file mode 100644 index 6df1eff..0000000 --- a/lib/some/ruleset.rb +++ /dev/null @@ -1,11 +0,0 @@ -module Some - RuleSet = Struct.new(:name, :rule) do - def messages - Messages.new(db: Some.db) - end - - def run - instance_eval(&rule) - end - end -end -- cgit v1.2.3