cb_nitride 0.0.16 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12973fe1a33d9c54223ba2b7d87cd35603d9f4b2
-  data.tar.gz: 215c085a8fbc26a068e0ca59f3068b5b7a3edd19
+  metadata.gz: 927f221545d3f6f7b9672f6df48e4a72b0eace45
+  data.tar.gz: 51223a4207e9f7ca245aea639deba2da030c2cce
 SHA512:
-  metadata.gz: 19688eb3a9fa80ff2214ab3225264b0411ecb9722aa8103d4c624d40058cc8dd1e1c50f9919667e85740c404851d1c3e27d19d7272a62ecb4f0861ebd37b0482
-  data.tar.gz: 4ff6384a19643717c5cec0f75ed3cb5f4d8de796962e8fd1433713d5fe29f517168b5bc3553f2fa753b25e6d473c8dc87dd480980bb918adf7e6d59e4128dea8
+  metadata.gz: 8adb9951857add021386eeb4b67e5cf0600897f9812fd9affb9bb7db1f0a5da633876df7b4543609fb5bfe3890c93446d403a7d6603a6bdf6f6e1ad7d82b3e54
+  data.tar.gz: 4b40e1825f723443ec74c85440d28e6a8a2808c11f5cbea9b102cde2e9f43a992137c5ee8028d978d918f6387918b675b0ebeb6d8f3554b6180b18a8e7435b2a

data/lib/cb_nitride/diamond_number_formatter.rb

@@ -0,0 +1,25 @@
+module CbNitride
+  class DiamondNumberFormatter
+    attr_reader :month, :year, :num
+
+    def self.format(year: year, month: month, num: num)
+      new(year: year, month: month, num: num).format
+    end
+
+    def initialize(year: year, month: month, num: num)
+      @year = year
+      @month = month
+      @num = num
+    end
+
+    def format
+      month + year + calculate_zeroes
+    end
+
+    private
+
+    def calculate_zeroes
+      ("0" * (4 - num.to_s.size)) + num.to_s
+    end
+  end
+end

data/lib/cb_nitride/{diamond_number_generator.rb → diamond_number_set.rb}

@@ -1,36 +1,30 @@
 module CbNitride
-  class DiamondNumberGenerator
-
-    #TODO: Refactor into DiamondNumberSet with sorting capabilities instead of array of array of array.
-
+  class DiamondNumberSet
     NEW_RELEASES_URL = "http://www.previewsworld.com/Home/1/1/71/952"
     UPCOMING_RELEASES_URL = "http://www.previewsworld.com/Home/1/1/71/954"
-
-    attr_reader :month, :year
-
     MONTH_CODES = ['JAN', 'FEB', 'MAR', 'APR', 'JUN', 'MAY', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC']
-    YEAR_CODES = ['06','07','08','09','10','11','12','13']
+    YEAR_CODES = ['96', '97', '98', '99', '00', '01', '02', '03', '04', '05' '06','07','08','09','10','11','12','13']
+    POSSIBLE_DIAMOND_NUMBERS = (1...9999)
 
-    def self.generate_all!
-      new.brute_force_formatted_numbers
+    def self.generate_imminent_diamond_numbers
+      new.imminent_numbers
     end
 
-    def self.generate_imminent!
-      new.imminent_releases
+    def self.generate_all_diamond_numbers
+      new.brute_force_formatted_numbers
     end
 
-    def initialize(year_range = nil, month_range = nil, options = {})
-      @year_range = year_range || YEAR_CODES
-      @month_range = month_range || MONTH_CODES
+    def self.generate_for(years: years, months: months)
+      new.brute_force_formatted_numbers(year_range: years, month_range: months)
     end
 
-    def imminent_releases
+    def imminent_numbers
       [new_releases_page, upcoming_releases_page].map do |page|
         extract_diamond_numbers(page)
       end.flatten
     end
 
-    def brute_force_formatted_numbers
+    def brute_force_formatted_numbers(year_range: year_range || YEAR_CODES, month_range: month_range || MONTH_CODES)
       year_range.map do |year|
         month_range.map do |month|
           generate_numbers(year, month)
@@ -38,30 +32,30 @@ module CbNitride
       end
     end
 
+    private
+
     def all_for_year
-      month_codes.map do |month|
+      MONTH_CODES.map do |month|
         generate_numbers(year, month)
       end.flatten
     end
 
-    private
-
     def generate_numbers(year, month)
-      (1...3000).map do |num|
-        format_number(year, month, num)
+      POSSIBLE_DIAMOND_NUMBERS.map do |num|
+        DiamondNumberFormatter.format(year: year, month: month, num: num)
       end.flatten.compact
     end
 
-    def format_number(year, month, num)
-      month + year + calculate_zeroes(num)
+    def item_page(url)
+      Nokogiri::HTML(Mechanize.new.get(url).content)
     end
 
-    def calculate_zeroes(num)
-      ("0" * (4 - num.to_s.size)) + num.to_s
+    def new_releases_page
+      @_new_releases_page ||= item_page(NEW_RELEASES_URL)
     end
 
-    def item_page(url)
-      Nokogiri::HTML(Mechanize.new.get(url).content)
+    def upcoming_releases_page
+      @_upcoming_releases_page ||= item_page(UPCOMING_RELEASES_URL)
     end
 
     def extract_diamond_numbers(page)
@@ -73,13 +67,5 @@ module CbNitride
         end
       end.compact
     end
-
-    def new_releases_page
-      @_new_releases_page ||= item_page(NEW_RELEASES_URL)
-    end
-
-    def upcoming_releases_page
-      @_upcoming_releases_page ||= item_page(UPCOMING_RELEASES_URL)
-    end
   end
 end

data/lib/cb_nitride/title_formatter.rb

@@ -10,6 +10,7 @@ module CbNitride
     end
 
     OF_PATTERN = /[(].*[Oo][fF].*\d+.*[)]/
+
     def series_title
       @_series_title ||=
         if clean_title.include? "#"

data/lib/cb_nitride/version.rb

@@ -1,3 +1,3 @@
 module CbNitride
-  VERSION = "0.0.16"
+  VERSION = "0.1.0"
 end

data/lib/cb_nitride.rb

@@ -8,7 +8,8 @@ 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_generator"
+require "cb_nitride/diamond_number_set"
+require "cb_nitride/diamond_number_formatter"
 require "cb_nitride/title_formatter"
 
 module CbNitride
@@ -19,41 +20,4 @@ module CbNitride
       PublicHasher.item(diamond_number)
     end
   end
-
-  def self.generate_diamond_numbers
-    @_generate_diamond_numbers ||= DiamondNumberGenerator.generate_all!
-  end
-
-  def self.scrape_imminent!
-    agent = DiamondLogin.agent if qualified?
-    DiamondNumberGenerator.generate_imminent!.map do |diamond_number|
-      puts "Looking for #{diamond_number}"
-      if qualified?
-        diamond_item = item(diamond_number, agent: agent)
-      else
-        diamond_item = item (diamond_number)
-      end
-      if diamond_item.nil?
-        puts 'Invalid diamond item'
-        next
-      else
-        puts "Recorded #{diamond_item.title} (#{diamond_number})"
-        diamond_item
-      end
-    end
-  end
-
-  def self.scrape_all!
-    generate_diamond_numbers.flatten.map do |diamond_number|
-      diamond_item = item(diamond_number)
-      if diamond_item.nil?
-        puts "invalid diamond Item"
-        next
-      else
-        puts "Recorded #{diamond_item.title} (#{diamond_number})"
-        diamond_item
-      end
-    end.flatten
-  end
-
 end

data/test/unit/diamond_number_formatter_test.rb

@@ -0,0 +1,9 @@
+require_relative '../test_helper'
+
+class DiamondNumberFormatterTest < MiniTest::Unit::TestCase
+  def test_that_it_produces_the_right_string
+    number = CbNitride::DiamondNumberFormatter.format(month: "AUG", num:'0831', year: '88')
+
+    assert_equal "AUG880831", number
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cb_nitride
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.1.0
 platform: ruby
 authors:
 - Alex Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,8 @@ files:
 - lib/cb_nitride/configuration.rb
 - lib/cb_nitride/diamond_item.rb
 - lib/cb_nitride/diamond_login.rb
-- lib/cb_nitride/diamond_number_generator.rb
+- lib/cb_nitride/diamond_number_formatter.rb
+- lib/cb_nitride/diamond_number_set.rb
 - lib/cb_nitride/exceptions.rb
 - lib/cb_nitride/hasher_methods.rb
 - lib/cb_nitride/module_methods.rb
@@ -115,6 +116,7 @@ files:
 - 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
 - test/unit/public_hasher_test.rb
 - test/unit/pull_test.rb
@@ -167,6 +169,7 @@ test_files:
 - 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
 - test/unit/public_hasher_test.rb
 - test/unit/pull_test.rb