piotr_majewski_magic 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 501de2d0b9fd09066c8e4adc35a4fd690ff74e8e
-  data.tar.gz: 32250955f24b4476b04aad15e63c690ccad9cf2c
+SHA256:
+  metadata.gz: 625277973f304598447198105e250e744f87280393b445b47314e1bf40be8684
+  data.tar.gz: f5371be4205526ac1e12cacf8022e9cd7971c6dab715c4175696b388fa5a98b5
 SHA512:
-  metadata.gz: b6e77141adff2298a2788db314a88f38a9c90319777ef90ab270ad3d5e904970103c4dc89098aafec31147350998b0fdb3d9b5efe40b1819a45d6d2236b4afe5
-  data.tar.gz: a0ee9174bff5d8ae56709ef7ebd4145b9789fe84be2a91141466cb792c16d6362d83472f889df420cc7af75f6791614a853ea4d897555222571ac5a5c8e5e326
+  metadata.gz: 306ae43b9ff7ffa373865a013e78f6a8fdbcca3a90bc24ad298d5547b5029a227560de4ffc6f7b910ab8ed4b9eeeb8d177310c4fe7b1f1adb4d10d67df87132a
+  data.tar.gz: 2b3b58bcaa0d1dd094fb7db68d43bb3dbfc60a171af26026bfeb670e82d188e60a96bf3ef2e9686b7b7ee105a23245ecac5fc69bcdb5e901b62647b99aaa4cda

data/cache/cards.json

@@ -0,0 +1 @@
+{}

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

@@ -3,13 +3,13 @@
 require 'json'
 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
@@ -20,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
@@ -31,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,14 +3,13 @@
 require 'json'
 require_relative 'cards_manager'
 require_relative 'query'
-require_relative 'cards_source'
+require_relative 'cards'
 
 class QueryMtg
   def self.call(argv)
     new(argv).call
   end
 
-  # NOTE: puts to output to CLI
   def call
     puts requested_cards
   rescue Query::RepeatedFilter, CardsManager::InvalidValue, CardsManager::UnknownAttribute => e
@@ -35,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.6
+  version: 0.0.7
 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
@@ -73,8 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.12
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: CLI for querying MTG.io