piotr_majewski_magic 0.0.4 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37fba04ac22e2007245847c0efbbf9f901cdca23
-  data.tar.gz: a6ae35e338aa2eed0313731ad74124cdd6238287
+  metadata.gz: 6341b23896c241c1b9d67ef5e9c43753f32e0504
+  data.tar.gz: a2214c807495e4f63e77e253663fb4ef4f66defd
 SHA512:
-  metadata.gz: e9c0f0f0d972eaa4e23440d6761ef88febd41acd43a35dfeebaf34e822c1ee19f731acfab5fef914ec74d3152006ca086b66ff2731d857d30de263db0e94e5a0
-  data.tar.gz: d0fbaad67bc6a79daef218fd4247104b0caae0d8b54440a852ef850e8738c1e4d03fab544b204f87dea2fbff1b2399b04104336150b56176bf5bb21c09fbf7eb
+  metadata.gz: b2bbebe1218d2f3a13ed3a953eb9bdc68465ebb49acaf37fa94f5f401f486080ce3ec71a05ab9f3a71c551a40f597f1c557b9eea8396f6a4d864faed0079263f
+  data.tar.gz: bc546c26f24e818ef56812c9fee1a1e732abeada4af0e7507920394de1aaaf38d121254ae3550b412a39a0633744da5bf4e974774148f12fd1db33e15794a198

data/lib/{cards_source.rb → cards.rb}

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'pry'
 require_relative 'mtg_api_response'
 
-class CardsSource
+class Cards
   def self.get(no_cache = nil)
     new(no_cache).get
   end
 
   def get
-    JSON.parse(cards_source)
+    JSON.parse(cards)
   end
 
   private
@@ -21,8 +20,8 @@ class CardsSource
     @no_cache = no_cache
   end
 
-  def cards_source
-    fetch_cards_from_api if no_cache || cache_empty?
+  def cards
+    fetch_and_save_cards_from_api if no_cache || cache_empty?
 
     read_cache
   end
@@ -32,10 +31,10 @@ class CardsSource
   end
 
   def cache_empty?
-     File.size(cache_file_path).zero?
+    File.size(cache_file_path).zero?
   end
 
-  def fetch_cards_from_api
+  def fetch_and_save_cards_from_api
     File.open(cache_file_path, 'w') do |file|
       file.write(MtgApiResponse.results)
     end

data/lib/cards_manager.rb

@@ -22,15 +22,16 @@ class CardsManager
   private
 
   def group_and_select(query, cards)
-    raise UnknownAttribute unless cards.first.key?(query[0][:attribute])
+    attribute = query[0][:attribute]
+    unknown_attribute(attribute) unless cards.first.key?(attribute)
 
     selected_cards = matching_cards(query[0], cards)
     new_query = query[1..]
 
     return selected_cards if new_query.empty?
 
-    selected_cards.map.with_object({}) do |(attribute_value, cards), hash|
-      hash[attribute_value] = group_and_select(new_query, cards)
+    selected_cards.map.with_object({}) do |(attribute_value, card_set), hash|
+      hash[attribute_value] = group_and_select(new_query, card_set)
     end
   end
 
@@ -46,6 +47,14 @@ class CardsManager
 
     cli_value.tally == source_value&.tally
   rescue NoMethodError
+    invalid_value(cli_value)
+  end
+
+  def unknown_attribute(attribute)
+    raise UnknownAttribute, "`#{attribute}`: Is not an MTG card attribute"
+  end
+
+  def invalid_value(cli_value)
     message = "`#{cli_value}`: Type of provided value doesn't match type of card attribute"
     raise InvalidValue, message
   end

data/lib/mtg_api_request.rb

@@ -30,10 +30,10 @@ class MtgApiRequest
   private
 
   def unfetched_pages
-    @unfetched_pages ||= (1..total_count).to_a
+    @unfetched_pages ||= (1..total_page_count).to_a
   end
 
-  def total_count
+  def total_page_count
     response = Faraday.get(URL)
     (response.headers['total-count'].to_f / 100).ceil
   end

data/lib/query.rb

@@ -5,6 +5,9 @@ require 'forwardable'
 class Query
   extend Forwardable
 
+  ATTRIBUTE_AND_VALUE_DIVIDERS = /(?<!~)=/.freeze
+  VALUE_TO_LIST_DIVIDERS = /(?<!~)&/.freeze
+
   RepeatedFilter = Class.new(StandardError)
   Group = Class.new
 
@@ -16,11 +19,10 @@ class Query
 
   def build
     @build ||= argv.map.with_object([]) do |argument, query_options|
-      query_element = parse_argument(argument)
+      query_element = query_element(argument)
 
       if query_options.find { |el| el[:attribute] == query_element[:attribute] }
-        message = "#{query_element[:attribute]}: Every filter can be passed only once"
-        raise RepeatedFilter, message
+        repeated_filter(query_element[:attribute])
       end
 
       query_options << query_element
@@ -31,15 +33,35 @@ class Query
 
   private
 
-  # TODO: pick a divider (something that is unlikely to show up)
-  # potential problem with imageUrl values
-  # NOTE: should allow escaping `#`
-  def parse_argument(argument)
-    return { attribute: argument, value: Group } unless argument.match?('=')
+  def query_element(argument)
+    return { attribute: argument, value: Group } unless argument.match?(ATTRIBUTE_AND_VALUE_DIVIDERS)
+
+    attribute, value = argument.split(ATTRIBUTE_AND_VALUE_DIVIDERS)
+
+    {
+      attribute: sanitize(attribute),
+      value: sanitize(parse_value(value))
+    }
+  end
+
+  def parse_value(value)
+    return value unless value&.match?(VALUE_TO_LIST_DIVIDERS)
 
-    attribute, value = argument.split('=')
-    value = value&.match?('#') ? value.split('#') : value
+    value.split(VALUE_TO_LIST_DIVIDERS)
+  end
+
+  def sanitize(query_part)
+    return unless query_part
+
+    if query_part.is_a?(String)
+      query_part.gsub(/~=/, '=').gsub(/~&/, '&')
+    else
+      query_part.map { |part| sanitize(part) }
+    end
+  end
 
-    { attribute: attribute, value: value }
+  def repeated_filter(attribute)
+    message = "#{attribute}: Every filter can be passed only once"
+    raise RepeatedFilter, message
   end
 end

data/lib/query_mtg.rb

@@ -3,7 +3,7 @@
 require 'json'
 require_relative 'cards_manager'
 require_relative 'query'
-require_relative 'cards_source'
+require_relative 'cards'
 
 class QueryMtg
   def self.call(argv)
@@ -34,6 +34,6 @@ class QueryMtg
   end
 
   def cards_source
-    CardsSource.get(no_cache)
+    Cards.get(no_cache)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piotr_majewski_magic
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: '0.1'
 platform: ruby
 authors:
 - Piotr Majewski
@@ -48,8 +48,8 @@ extra_rdoc_files: []
 files:
 - bin/query_mtg
 - cache/cards.json
+- lib/cards.rb
 - lib/cards_manager.rb
-- lib/cards_source.rb
 - lib/mtg_api_request.rb
 - lib/mtg_api_response.rb
 - lib/query.rb