remoji 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ae3aea0a8f9827bddb9c49ed0d859624e4103f3632e210c7836127abc610074
-  data.tar.gz: 63f467ac5b178839e00d096658da9d5351cc0d20e8ccbe3a158c07ac57a35ff4
+  metadata.gz: d8726b1419bb4466309d2cba91ebed4da62334560a09690d091e5136cd5b2b8c
+  data.tar.gz: e582403321f9c4d462f541d924d021c4d8760b82a91c3fe903bfbc6ce6ced7f4
 SHA512:
-  metadata.gz: 8521de7667461162c1b29a37aca3f3d474f382ac19aff9abd3109255ade26222bfd5868d70dbae6b88d807cdb9932184dd540df6afd97da1e9aea50d8dab760e
-  data.tar.gz: 0d449ec0292aff89802512fa8edcfd3ba7c3aa0829d291ec0d41690f15e4ee2e8f76c803e0dd3bbc7f204d3936f9647b211aa571a6bf866e7f2660a80937f45e
+  metadata.gz: 47cc546e38e03e79bd45460562a2dde345461886f0df52e6de4d07bd771cd483d1e98932eb968aa8992bd84a3150dc28c435036d244396170207c2de253039db
+  data.tar.gz: 5486e83886f85ba783c013937764ab91c26d077ece40e4e88840bfa2f96e999f3bf8a5fa147965f6234dded6e3bacf452b8328dcc259d9b6d620ff4266b9bd30

data/README.adoc

@@ -39,12 +39,12 @@ must have internet access for this
 ----
 % emj --help
 
-emj [options] EMOJI ANOTHER_EMOJI ...
+emj [options] <EMOJI ANOTHER_EMOJI ... | String With :substitutions: (with -n)>
 
 Where EMOJI is an emoji name to search for
     -c, --cat CAT                    Find matches in a category
     -s, --subcat CAT                 Find matches in a subcategory
-    -n, --no-details                 Just print the emojis
+    -n, --no-details                 Treat arguments as a string and subsitute :emoji: blocks
         --subs, --subcategories      List subcategories
         --cats, --categories         List Categories
     -v, --verbose                    Increase verbosity
@@ -63,18 +63,18 @@ cat face: 🐱
 cat: 🐈
 ----
 
-Same search without any metadata (-n)
+Same search using string substitition
 
 ----
-% emj -n -c Animal cat
+% emj -n -c Animal :cat:
 🐱 🐈
 ----
 
 Using strings inline with emoji with -n
 
 ----
-% emj -n S:The blue S:Cow cow
-The 💙 📘 🔵 🟦 🔷 🔹 Cow 🤠 🐮 🐄
+% emj -n The :cow: jumped over the :moon:
+The 🐄 jumped over the 🎑
 ----
 
 Show all categories / subcategories

data/lib/remoji.rb

@@ -14,7 +14,7 @@ class Remoji # rubocop:disable Metrics/ClassLength
   EMOJI_TABLE = 'http://unicode.org/emoji/charts/full-emoji-list.html'.freeze
 
   def self.run!(args)
-    new.execute! args
+    new(args).execute!
   end
 
   def categories
@@ -64,7 +64,9 @@ class Remoji # rubocop:disable Metrics/ClassLength
     emoji_file.open('w+') { |f| f.puts JSON.pretty_generate(hash) }
   end
 
-  def initialize
+  attr_reader :args
+  def initialize(args)
+    @args = args
     @options = OpenStruct.new verbose: 0
     verify_cache!
   end
@@ -107,24 +109,48 @@ class Remoji # rubocop:disable Metrics/ClassLength
                    end
   end
 
-  def execute!(args)
+  def execute!
     parse_opts! args
-
     if args.empty?
-      output filter_array
+      puts output(filter_array)
       exit
     end
 
-    found = []
-    args.each do |arg|
-      found << if arg.match?(/^S:/)
-                 arg
-               else
-                 find_in_filter_array(arg)
-               end
+    puts output
+  end
+
+  def formatted(name, attrs)
+    return attrs[:sym] if @options.no
+    return "#{name}: #{attrs}" if @options.verbose.positive?
+
+    [attrs[:sym], name].join(' : ')
+  end
+
+  def output(arr = nil)
+    if arr
+      strings = arr.map { |name, attrs| formatted name, attrs }
+      sep = @options.no ? ' ' : "\n"
+      return strings.join(sep)
     end
+    return replace_emojis args.join(' ') if @options.no
+
+    args.each_with_object([]) do |q, s|
+      s << string_for(q)
+    end.join.squeeze(' ')
+  end
+
+  def string_for(emoji)
+    found = find_in_filter_array(emoji).each_with_object([]) { |f, arr| arr << f }
+    sep = @options.no ? ' ' : "\n"
+    found.each_with_object([]) do |f, s|
+      s << formatted(*f)
+    end.join sep
+  end
 
-    output found.compact.flatten 1
+  def replace_emojis(string)
+    string.gsub(/:[^:]+:/) do |r|
+      string_for r[1..-2]
+    end
   end
 
   def find_in_filter_array(arg)
@@ -146,8 +172,9 @@ class Remoji # rubocop:disable Metrics/ClassLength
 
   def parse_opts!(args)
     OptionParser.new do |o|
-      o.banner = "#{$PROGRAM_NAME} [options] EMOJI ANOTHER_EMOJI ..."
+      o.banner = "#{$PROGRAM_NAME} [options] <EMOJI ANOTHER_EMOJI ... | String With :substitutions: (with -n)>"
       o.separator 'Where EMOJI is an emoji name to search for'
+      o.separator 'With -n, all arguments are treated as a string and :emoji: blocks are replaced with matches, if any'
       %i[cat subcat details cats subcats verbose exact regex].each do |sym|
         send "#{sym}_opt".to_sym, o
       end
@@ -193,33 +220,13 @@ class Remoji # rubocop:disable Metrics/ClassLength
   end
 
   def details_opt(opt)
-    opt.on('-n', '--no-details', 'Just print the emojis') { |_| @options.no = true }
+    opt.on('-n', '--no-details', 'Just print the string with :emojis: substituded') { |_| @options.no = true }
   end
 
   def die!(msg, code = 1)
     warn msg
     exit code
   end
-
-  def output(them)
-    puts display(them)
-  end
-
-  def display(them) # rubocop:disab
-    die! 'No matching emojis found', 2 if them.empty?
-
-    join_char = @options.no ? ' ' : "\n"
-    them.map do |name, attrs|
-      attrs ||= { sym: name.split('S:').last, type: 'Raw String' }
-      if @options.no
-        attrs[:sym]
-      elsif @options.verbose.positive?
-        "#{name}: #{attrs}"
-      else
-        [attrs[:sym], name].join(' : ')
-      end
-    end.join(join_char).squeeze(join_char)
-  end
 end
 
 Remoji.run! ARGV if $PROGRAM_NAME == __FILE__

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remoji
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - tj@rubyists.com