cb_nitride 0.1.41 → 0.1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 723359bc440d2f8aceae994d3b97469518ebc8c7
-  data.tar.gz: b871f31d9699ce67f2e233438492795b32358b03
+  metadata.gz: 802e587affbe9f50bd597c55ae1e7cabdc806a6c
+  data.tar.gz: c199b4958ef85e82aa4bfc974c0e118d2b343935
 SHA512:
-  metadata.gz: 7af938ac8431f2c102fe1d0cbca697e92a462b981415fb76de89ce1c04af52a07f83a8c5751eb6dee6d49f5346e1edf9cbcc05118ef8316677e32f3fda39b6fe
-  data.tar.gz: 5ec776da91d0cc4c9c8080a64aaa87f5116012c504cb15fa2b027bdc61ed2ff85b1a8da5f55eba8de6c6d4d7e855542e4610c88b11317d45e26567a01a2188c0
+  metadata.gz: b4af2cbb519619f1f9ed41e2deaf5f1be49bc1b5cea9c471095d9ffb614c889900e4786f09ef4c737f692891eedc3e47a47df54430a87813b8ad5d91838cd336
+  data.tar.gz: 52fa620cb30c0553e3c1035de475f2c5208e10a67dbe32f92757aff1d7a98def294ecc478e5a249b487a64afb2a4c902b5dc2f6f964597b3506cc9eedce2e767

data/lib/cb_nitride/diamond_item.rb

@@ -3,11 +3,11 @@ module CbNitride
 
     SHORT_PAREN_OF_PATTERN = /\s*[O][f][(]/
 
-    attr_reader :state, :diamond_number, :stock_number, :image_url, :publisher, :creators, :description, :release_date, :price, :category_code, :errors, :raw_title, :image
+    attr_accessor :state, :diamond_number, :stock_number, :image_url, :publisher, :creators, :description, :release_date, :price, :category_code, :errors, :raw_title, :image
 
     def initialize(options = {})
       @state = options[:state]
-      @raw_title = options[:title]
+      @raw_title = options[:title].sub(SHORT_PAREN_OF_PATTERN, ' (Of ')
       @diamond_number = options[:diamond_number]
       @stock_number = options[:stock_number]
       @image = options[:image]
@@ -20,115 +20,5 @@ module CbNitride
       @category_code = options[:category_code]
       @errors = options[:errors]
     end
-
-    def release_year
-      if release_date.nil?
-        return nil
-      else
-        return release_date.year.to_i
-      end
-    end
-    def raw_title
-      @_raw_title ||= @raw_title.sub(SHORT_PAREN_OF_PATTERN, ' (Of ')
-    end
-
-    def author
-      @_author ||= creators_hash["W"]
-    end
-
-    def artist
-      @_artist ||= creators_hash["A"]
-    end
-
-    def cover_artist
-      @_cover_artist ||= creators_hash["CA"]
-    end
-
-    def series_title
-      @_series_title ||= title_formatter.series_title || title
-    end
-
-    def title
-      @_title ||= title_formatter.clean_title
-    end
-
-    def special_number
-      @_special_number ||= title_formatter.special_number
-    end
-
-    def issue_number
-      @issue_number ||= title_formatter.issue_number
-    end
-
-    def limited_series_max_issue
-      @_limited_series_max_issue ||= title_formatter.limited_series_max_issue
-    end
-
-    def variant_description
-      @_variant_description ||= title_formatter.variant_description
-    end
-
-    def product_type?
-      return :issue if is_issue?
-      return :variant if is_variant?
-      return :collection if is_collection?
-      return :merchandise if is_merch?
-    end
-
-    private
-
-    def creators_hash
-      return @_creators_hash if @_creators_hash
-      array = creators.split('(').map {|x| x.split(')')}.flatten.map {|x| x.strip}
-      hash ={}
-      array.each_with_index do |val, i|
-        if i.even? || i == 0
-          if val.include? '/'
-            val.split('/').each_with_index do |key, index|
-              instance_variable_set("@key#{index + 1}".to_sym, key)
-            end
-          else
-            @key = val
-          end
-        elsif i.odd?
-          @value = val
-          hash.merge! @key => @value if @key
-          hash.merge! @key1 => @value if @key1
-          hash.merge! @key2 => @value if @key2
-          hash.merge! @key3 => @value if @key3
-          @value = nil
-          @key = nil
-          @key1= nil
-          @key2 = nil
-          @key3 = nil
-        end
-      end
-      @_creators_hash = hash
-    end
-
-    def title_formatter
-      @_formatted_title ||= TitleFormatter.new(raw_title)
-    end
-
-    def is_collection?
-      @_is_collection ||= CategorySorter::COLLECTION_CODE  == category_code
-    end
-
-    def is_merch?
-      @_is_merch ||= CategorySorter::MERCHANDISE_CODES.include? category_code
-    end
-
-    def is_issue?
-      @_is_issue ||=
-        category_code == CategorySorter::ISSUE_CODE && category_sorter.is_issue?
-    end
-
-    def category_sorter
-      @_category_sorter ||= CategorySorter.new({title: title, category_code: category_code  })
-    end
-
-    def is_variant?
-      @_is_variant ||= category_code == CategorySorter::ISSUE_CODE && category_sorter.is_variant?
-    end
   end
 end

data/lib/cb_nitride/public_hasher.rb

@@ -26,7 +26,7 @@ module CbNitride
       if item.valid_diamond_number?
         item.spawn_item
       else
-        return nil
+        return NullItem.new(diamond_number)
       end
     end
 
@@ -53,8 +53,8 @@ module CbNitride
       item_page.css("a.FancyPopupImage").children[1]["alt"].gsub(" Image", "")
     end
 
-    def uncategorized_hash
-      @_uncategorized_hash ||= {
+    def branded_hash
+      @_branded_hash ||= {
         title: find_text_with(TITLE_CLASS),
         diamond_number: diamond_number,
         stock_number: get_stock_number,
@@ -73,13 +73,6 @@ module CbNitride
       MechanizeClip.get get_image_url(BASE_URL, IMAGE_CLASS), agent
     end
 
-    def branded_hash
-      @_branded_hash ||=
-        uncategorized_hash.merge!(
-          category_code: CategorySorter.new(uncategorized_hash).sort
-        )
-    end
-
     def item_page
       @item_page ||= Nokogiri::HTML(agent.get(SEARCH_URL + diamond_number).content)
     end

data/lib/cb_nitride/version.rb

@@ -1,3 +1,3 @@
 module CbNitride
-  VERSION = "0.1.41"
+  VERSION = "0.1.43"
 end

data/lib/cb_nitride.rb

@@ -6,11 +6,9 @@ require "cb_nitride/configuration"
 require "cb_nitride/diamond_login"
 require "cb_nitride/public_hasher"
 require "cb_nitride/private_hasher"
-require "cb_nitride/category_sorter"
 require "cb_nitride/diamond_item"
 require "cb_nitride/diamond_number_set"
 require "cb_nitride/diamond_number_formatter"
-require "cb_nitride/title_formatter"
 require "cb_nitride/null_item"
 
 module CbNitride

data/test/test_helper.rb

@@ -48,6 +48,7 @@ module HasherTests
   VARIANT_CODE = "APR130183"
   MERCH_CODE = "MAR131699"
   COLLECTION_CODE = "FEB130068"
+  BAD_CODE = "FEB1099999"
 
 end
 

data/test/unit/private_hasher_test.rb

@@ -27,7 +27,6 @@ class PrivateHasherTest < MiniTest::Unit::TestCase
 
   def test_that_the_private_diamond_item_contains_the_right_fields
     setup_object(ISSUE_CODE)
-    refute_equal @item.title, "Pug Party Parade"
     assert_equal @item.stock_number, "STK611169"
     assert_equal @item.diamond_number, ISSUE_CODE
     assert_equal @item.image.class, MechanizeClip::PageTmpFile
@@ -40,28 +39,9 @@ class PrivateHasherTest < MiniTest::Unit::TestCase
     assert_equal @item.category_code, "1"
   end
 
-  def test_that_the_private_hash_identifies_issues
-    setup_object(ISSUE_CODE)
-    assert_equal @item.category_code, ISSUE_CATEGORY_CODE
-  end
-
-  def test_that_the_private_hash_identifies_variants
-    setup_object(VARIANT_CODE)
-    assert_equal @item.category_code, ISSUE_CATEGORY_CODE
-  end
-
-  def test_that_the_private_hash_identifies_merchandise
-    setup_object(MERCH_CODE)
-    assert_includes MERCHANDISE_CATEGORY_CODES, @item.category_code
-  end
-
-  def test_that_the_private_hash_identifies_collection
-    setup_object(COLLECTION_CODE)
-    assert_equal @item.category_code, COLLECTION_CATEGORY_CODE
-  end
-
   def test_that_the_private_hash_identifies_invalid_diamond_codes
-    setup_object("FEB1099999")
-    assert_equal @item, nil
+    setup_object(BAD_CODE)
+    assert_equal @item.class, CbNitride::NullItem
+    assert_equal @item.diamond_number, BAD_CODE
   end
 end

data/test/unit/public_hasher_test.rb

@@ -18,7 +18,6 @@ class PublicHasherTest < MiniTest::Unit::TestCase
 
   def test_that_the_public_diamond_item_contains_the_right_fields
     setup_object(ISSUE_CODE)
-    refute_equal @item.title, "Pug Party Parade"
     assert_equal @item.stock_number, "STK611169"
     assert_equal @item.diamond_number, ISSUE_CODE
     assert_equal @item.image.class, MechanizeClip::PageTmpFile
@@ -28,32 +27,12 @@ class PublicHasherTest < MiniTest::Unit::TestCase
     assert_equal @item.release_date.to_s, "2013-06-05"
     assert_equal @item.price, 2.99
     assert_equal @item.state, :public
-    assert_equal @item.category_code, "1"
-  end
-
-  def test_that_the_public_hash_identifies_issues
-    setup_object(ISSUE_CODE)
-    assert_equal @item.category_code, ISSUE_CATEGORY_CODE
-  end
-
-  def test_that_the_public_hash_identifies_variants
-    setup_object(VARIANT_CODE)
-    assert_equal @item.category_code, ISSUE_CATEGORY_CODE
-  end
-
-  def test_that_the_public_hash_identifies_merchandise
-    setup_object(MERCH_CODE)
-    assert_includes MERCHANDISE_CATEGORY_CODES, @item.category_code
-  end
-
-  def test_that_the_public_hash_identifies_collection
-    setup_object(COLLECTION_CODE)
-    assert_equal @item.category_code, COLLECTION_CATEGORY_CODE
   end
 
   def test_that_the_public_hash_identifies_invalid_diamond_codes
-    setup_object("FEB1099999")
-    assert_equal @item, nil
+    setup_object(BAD_CODE)
+    assert_equal @item.class, CbNitride::NullItem
+    assert_equal @item.diamond_number, BAD_CODE
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cb_nitride
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.43
 platform: ruby
 authors:
 - Alex Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,7 +94,6 @@ files:
 - Rakefile
 - cb_nitride.gemspec
 - lib/cb_nitride.rb
-- lib/cb_nitride/category_sorter.rb
 - lib/cb_nitride/configuration.rb
 - lib/cb_nitride/diamond_item.rb
 - lib/cb_nitride/diamond_login.rb
@@ -106,7 +105,6 @@ files:
 - lib/cb_nitride/null_item.rb
 - lib/cb_nitride/private_hasher.rb
 - lib/cb_nitride/public_hasher.rb
-- lib/cb_nitride/title_formatter.rb
 - lib/cb_nitride/version.rb
 - test/cassettes/test_that_it_can_log_in_cassette.yml
 - test/cassettes/test_that_it_fails_with_bad_information_cassette.yml
@@ -129,7 +127,6 @@ files:
 - test/cassettes/test_that_the_public_hash_produces_a_diamond_item_cassette.yml
 - test/test_helper.rb
 - test/unit/configuration_test.rb
-- test/unit/diamond_item_test.rb
 - test/unit/diamond_login_test.rb
 - test/unit/diamond_number_formatter_test.rb
 - test/unit/private_hasher_test.rb
@@ -182,7 +179,6 @@ test_files:
 - test/cassettes/test_that_the_public_hash_produces_a_diamond_item_cassette.yml
 - test/test_helper.rb
 - test/unit/configuration_test.rb
-- test/unit/diamond_item_test.rb
 - test/unit/diamond_login_test.rb
 - test/unit/diamond_number_formatter_test.rb
 - test/unit/private_hasher_test.rb

data/lib/cb_nitride/category_sorter.rb

@@ -1,95 +0,0 @@
-module CbNitride
-  class CategorySorter
-
-    ISSUE_CODE = "1"
-    COLLECTION_CODE = "3"
-    MERCHANDISE_CODES = ["2", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"]
-
-    attr_reader :hash
-
-    def initialize(hash)
-      @hash = hash
-    end
-
-    def sort
-      return hash[:category_code] unless hash[:category_code].nil?
-      return ISSUE_CODE if is_variant?
-      return COLLECTION_CODE if is_collection?
-      return "16" if is_merch?
-      return ISSUE_CODE if is_issue?
-    end
-
-    def is_variant?
-      return @is_variant unless @is_variant.nil?
-      @is_variant = true if hash[:title].include? "VAR ED"
-      @is_variant = true if hash[:title].include? "COMBO PACK"
-      @is_variant = true if hash[:title].include? "STANDARD ED"
-      @is_variant = true if hash[:title].match(/(CVR)\s[B-Z]/)
-      @is_variant = true if specific_issue_patterns(hash[:title])
-      @is_variant = false if @is_variant.nil?
-      return @is_variant
-    end
-
-    def is_issue?
-      return @is_issue unless @is_issue.nil?
-      if specific_issue_patterns(hash[:title])
-        @is_issue = true
-      elsif is_variant?
-        @is_issue = false
-      elsif is_collection?
-        @is_issue = false
-      elsif is_merch?
-        @is_issue = false
-      else
-        @is_issue = true
-      end
-      return @is_issue
-    end
-
-    def is_collection?
-      return @is_collection unless @is_collection.nil?
-      @is_collection = true if hash[:title].include?(" GN ")
-      @is_collection = true if hash[:title].include?(" TP ")
-      @is_collection = true if hash[:title].match(/\s(VOL)\s\d+/)
-      @is_collection = false if hash[:title].match(/\s[#]\d+/)
-      @is_collection = false if @is_collection.nil?
-      return @is_collection
-    end
-
-    def is_merch?
-      return @is_merch unless @is_merch.nil?
-      case hash[:creators]
-      when ""
-        @is_merch = true
-      else
-        @is_merch = false
-      end
-      return @is_merch
-    end
-
-    private
-
-    def strict_issue_title_matcher(title)
-      /^(#{title})\s[#]/
-    end
-
-    def specific_issue_patterns(title)
-      title.match(/(CVR)\s[A]/) ||
-        title.match(strict_issue_title_matcher("RED SONJA")) ||
-        title.match(strict_issue_title_matcher("VAMPIRELLA")) ||
-        title.match(strict_issue_title_matcher("ARMY OF DARKNESS VS HACK SLASH")) ||
-        split_issue_patterns(title)
-    end
-
-    def split_issue_patterns(title)
-      return nil unless title.split("#")[1]
-      title.split("#")[1].match(/\d\D+(PTG)/) ||
-      title.split('#')[1].match(/(REORDER ED)/) ||
-      title.split('#')[1].match(/(SKETCH ED)/) ||
-      title.split('#')[1].match(/(FOIL CVR)/) ||
-      title.split("#")[1].include?("VAR INCENTIVE CVR") ||
-      title.split("#")[1].include?("DIRECT MARKET CVR") ||
-      title.split("#")[1].include?("MAIN CVRS")
-    end
-  end
-end

data/lib/cb_nitride/title_formatter.rb

@@ -1,68 +0,0 @@
-module CbNitride
-  class TitleFormatter
-
-    attr_accessor :raw_title
-
-    #TODO: This really only works for variants and issues.
-
-    def initialize(raw_title)
-      @raw_title = raw_title
-    end
-
-    LONG_PAREN_OF_PATTERN = /[(].*[Oo][fF].*\d+.*[)]/
-
-    def series_title
-      @_series_title ||=
-        if clean_title.include? "#"
-          clean_title.split("#").first.strip
-        end
-    end
-
-    def special_number
-      @_special_number ||=
-        match = clean_title.match(/#\S+/).to_s.gsub('#', '').strip
-        if match.nil? || match.empty?
-          nil
-        else
-          match
-        end
-    end
-
-    def issue_number
-      @_issue_number ||=
-        match = clean_title.match(/#\d+/).to_s.gsub('#', '').strip
-        if match.nil? || match.empty?
-          nil
-        else
-          match.to_i
-        end
-    end
-
-    def limited_series_max_issue
-      @_limited_series_max_issue ||=
-        if clean_title.match(LONG_PAREN_OF_PATTERN)
-          clean_long_paren_of_text
-        else
-          nil
-        end
-    end
-
-    def variant_description
-      @_variant_description ||=
-        array = clean_title.split(/#\S+/)
-        return nil if array.size == 1
-        string = array.last.gsub(LONG_PAREN_OF_PATTERN, '').strip
-        string.empty? ? nil : string
-    end
-
-    def clean_long_paren_of_text
-      clean_title.match(LONG_PAREN_OF_PATTERN).to_s.match(/\d+/).to_s.strip.to_i
-    end
-
-    def clean_title
-      @_clean_title ||=
-        raw_title.gsub(/[(][C].*[)]?/, '').gsub('(MR)', '').gsub('(NET)', '').strip
-    end
-
-  end
-end

data/test/unit/diamond_item_test.rb

@@ -1,61 +0,0 @@
-require_relative '../test_helper'
-
-class DiamondItemTest < MiniTest::Unit::TestCase
-  def specific_issue
-    @_type ||= CbNitride::DiamondItem.new(
-      {
-        category_code: "1",
-        title: "RED SONJA #12 SECOND CVR"
-      }).product_type?
-  end
-
-  def main_cvrs_check
-    @_type ||= CbNitride::DiamondItem.new(
-      {
-        category_code: "1",
-        title: "SOMETHING SOMETHING #20 MAIN CVRS"
-      }).product_type?
-  end
-
-  def ideal_collection
-    @_ideal_collection ||= CbNitride::DiamondItem.new(
-      {
-        category_code: "3",
-        title: "BATTLING BOY HC GN"
-      }).product_type?
-  end
-
-  def ideal_merchandise
-    @_ideal_merchandise ||= CbNitride::DiamondItem.new(
-      {
-        category_code: "16",
-        title: "ADV TIME MARCELINE NAME ONLY PX JRS RAGLAN LG (C: 0-1-0)"
-      }).product_type?
-  end
-
-  def ideal_variant
-    @_ideal_variant ||= CbNitride::DiamondItem.new(
-      {
-        category_code: "1",
-        title: "SANDMAN OVERTURE #1 (OF 6) CVR B (MR)"
-      }).product_type?
-  end
-
-  def ideal_issue
-    @_ideal_issue ||= CbNitride::DiamondItem.new(
-      {
-        category_code: "1",
-        title: "SANDMAN OVERTURE #1 (OF 6) CVR A (MR)"
-      }).product_type?
-  end
-
-  def test_that_they_are_the_right_items
-    assert_equal :issue, specific_issue
-    assert_equal :issue, main_cvrs_check
-    assert_equal :issue, ideal_issue
-    assert_equal :variant, ideal_variant
-    assert_equal :collection, ideal_collection
-    assert_equal :merchandise, ideal_merchandise
-  end
-
-end