cb_nitride 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 927f221545d3f6f7b9672f6df48e4a72b0eace45
-  data.tar.gz: 51223a4207e9f7ca245aea639deba2da030c2cce
+  metadata.gz: 485039a035ee821e6d0935fe16e97860f7928734
+  data.tar.gz: 0472b21da446f2cabfd1476f90130a5244b5d38f
 SHA512:
-  metadata.gz: 8adb9951857add021386eeb4b67e5cf0600897f9812fd9affb9bb7db1f0a5da633876df7b4543609fb5bfe3890c93446d403a7d6603a6bdf6f6e1ad7d82b3e54
-  data.tar.gz: 4b40e1825f723443ec74c85440d28e6a8a2808c11f5cbea9b102cde2e9f43a992137c5ee8028d978d918f6387918b675b0ebeb6d8f3554b6180b18a8e7435b2a
+  metadata.gz: 9be05051ffe43e028c28b671adbe453658b3f97840077dc49aca05ab4f11a70fb86ee6b5e5a136685e7a46299c4fd3e76ac0ef75cd20d1931b3d0daf9dc25661
+  data.tar.gz: 27cc04e88b6f0437dda82224ffec749deadf114c93d66b5e4fb47dfab1319a9bbe2dcb95c153e818bb1c4296b32a9e97230540b5ed7b6e76d1fc44851ab34f2c

data/Gemfile

@@ -7,6 +7,7 @@ gem 'mechanize'
 gem 'nokogiri'
 gem 'pry'
 gem 'stamp'
+gem "mechanize_clip"
 
 group :test do
   gem 'vcr'

data/cb_nitride.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_runtime_dependency "mechanize", "~> 2.7"
+  spec.add_runtime_dependency "mechanize_clip", "~> 0.1"
   spec.add_runtime_dependency "nokogiri", "~> 1.5"
 end

data/lib/cb_nitride/diamond_item.rb

@@ -1,13 +1,14 @@
 module CbNitride
   class DiamondItem
 
-    attr_reader :state, :diamond_number, :stock_number, :image_url, :publisher, :creators, :description, :release_date, :price, :category_code, :errors, :raw_title
+    attr_reader :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]
       @diamond_number = options[:diamond_number]
       @stock_number = options[:stock_number]
+      @image = options[:image]
       @image_url = options[:image_url]
       @publisher = options[:publisher]
       @creators = options[:creators]
@@ -18,8 +19,8 @@ module CbNitride
       @errors = options[:errors]
     end
 
-    def writer
-      @_writer ||= creators_hash["W"]
+    def author
+      @_author ||= creators_hash["W"]
     end
 
     def artist

data/lib/cb_nitride/private_hasher.rb

@@ -1,3 +1,4 @@
+require 'mechanize_clip'
 module CbNitride
   class PrivateHasher
     include HasherMethods
@@ -54,7 +55,7 @@ module CbNitride
         title: find_text_with(TITLE_CLASS),
         diamond_number: diamond_number,
         stock_number: native_hash["Stock #"],
-        image_url: get_image_url(BASE_URL, IMAGE_CLASS),
+        image: get_image,
         publisher: find_text_with(PUBLISHER_CLASS),
         creators: find_text_with(CREATOR_CLASS),
         description: find_text_with(DESCRIPTION_CLASS),
@@ -66,6 +67,10 @@ module CbNitride
       }
     end
 
+    def get_image
+      MechanizeClip.get get_image_url(BASE_URL, IMAGE_CLASS), agent
+    end
+
     def item_page
       @item_page ||= Nokogiri::HTML(agent.get(SEARCH_URL + diamond_number).content)
     end

data/lib/cb_nitride/public_hasher.rb

@@ -1,4 +1,5 @@
 require 'mechanize'
+require 'mechanize_clip'
 require 'nokogiri'
 
 module CbNitride
@@ -29,9 +30,9 @@ module CbNitride
       end
     end
 
-    def initialize(diamond_number)
+    def initialize(diamond_number, agent = Mechanize.new)
       @diamond_number = diamond_number
-      @agent = Mechanize.new
+      @agent = agent
     end
 
     def spawn_item
@@ -57,7 +58,7 @@ module CbNitride
         title: find_text_with(TITLE_CLASS),
         diamond_number: diamond_number,
         stock_number: get_stock_number,
-        image_url: get_image_url(BASE_URL, IMAGE_CLASS),
+        image: get_image,
         publisher: find_text_with(PUBLISHER_CLASS).gsub(/Publisher:\W*/, ""),
         creators: find_text_with(CREATOR_CLASS),
         description: find_text_with(DESCRIPTION_CLASS),
@@ -68,6 +69,10 @@ module CbNitride
       }
     end
 
+    def get_image
+      MechanizeClip.get get_image_url(BASE_URL, IMAGE_CLASS), agent
+    end
+
     def branded_hash
       @_branded_hash ||=
         uncategorized_hash.merge!(

data/lib/cb_nitride/version.rb

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

data/lib/cb_nitride.rb

@@ -15,9 +15,9 @@ require "cb_nitride/title_formatter"
 module CbNitride
   def self.item(diamond_number, options = {})
     if qualified?
-      PrivateHasher.item(diamond_number, options[:agent] || DiamondLogin.agent)
+      PrivateHasher.item(diamond_number, options[:agent])
     else
-      PublicHasher.item(diamond_number)
+      PublicHasher.item(diamond_number, options[:agent])
     end
   end
 end

data/test/cassettes/test_that_the_private_diamond_item_contains_the_right_fields_cassette.yml

@@ -657,4 +657,188 @@ http_interactions:
         /w9qL+oIo0cAAA==
     http_version: 
   recorded_at: Wed, 24 Jul 2013 01:53:00 GMT
+- request:
+    method: get
+    uri: https://retailerservices.diamondcomics.com/Image/Display?pd=webdata/catalogimages/STK_IMAGES_THUMBNAIL/STK600001-620000&pf=STK611169_TN.jpg
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip,deflate,identity
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/534.51.22 (KHTML,
+        like Gecko) Version/5.1.1 Safari/534.51.22
+      Accept-Charset:
+      - ISO-8859-1,utf-8;q=0.7,*;q=0.7
+      Accept-Language:
+      - en-us,en;q=0.5
+      Cookie:
+      - .ASPXAUTH=38A5E4EE84999FFCF5A0BDD034414562970109B622490504E6D6A87242305C4CD68F80F661835C488365104DBF2128361D14E4858FFF469D1906B9565A54385E5B472CA68F416966DDF2929A7DE27593FACEB308AAC33E2FA9F377A94F4EE5DD62CE61E22592BE9F5A299283C4B0E74E74B3318B9A41E8BE74A292062F81230B2B6DF882599D891A2A2CB4BFE15F8BA278D6990A86B8F8713F18B02FC8A6343E7F666D98423915532C667ABE6E8E809BBFE6975F6219DCB75116A98551E3CCA4;
+        ASP.NET_SessionId=1hdfv0hwsjn1zrwwdeict5vo
+      Host:
+      - retailerservices.diamondcomics.com
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - 300
+  response:
+    status:
+      code: 302
+      message: Found
+    headers:
+      Cache-Control:
+      - private
+      Content-Type:
+      - text/html; charset=utf-8
+      Location:
+      - /Login/Login?ReturnUrl=%2fImage%2fDisplay%3fpd%3dwebdata%2fcatalogimages%2fSTK_IMAGES_THUMBNAIL%2fSTK600001-620000%26pf%3dSTK611169_TN.jpg&pd=webdata/catalogimages/STK_IMAGES_THUMBNAIL/STK600001-620000&pf=STK611169_TN.jpg
+      Server:
+      - Microsoft-IIS/7.5
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Powered-By:
+      - ASP.NET
+      Date:
+      - Wed, 31 Jul 2013 05:52:05 GMT
+      Content-Length:
+      - '346'
+    body:
+      encoding: UTF-8
+      string: "<html><head><title>Object moved</title></head><body>\r\n<h2>Object
+        moved to <a href=\"/Login/Login?ReturnUrl=%2fImage%2fDisplay%3fpd%3dwebdata%2fcatalogimages%2fSTK_IMAGES_THUMBNAIL%2fSTK600001-620000%26pf%3dSTK611169_TN.jpg&amp;pd=webdata/catalogimages/STK_IMAGES_THUMBNAIL/STK600001-620000&amp;pf=STK611169_TN.jpg\">here</a>.</h2>\r\n</body></html>\r\n"
+    http_version: 
+  recorded_at: Wed, 31 Jul 2013 05:51:51 GMT
+- request:
+    method: get
+    uri: https://retailerservices.diamondcomics.com/Login/Login?ReturnUrl=/Image/Display?pd=webdata/catalogimages/STK_IMAGES_THUMBNAIL/STK600001-620000%26pf=STK611169_TN.jpg&pd=webdata/catalogimages/STK_IMAGES_THUMBNAIL/STK600001-620000&pf=STK611169_TN.jpg
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip,deflate,identity
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/534.51.22 (KHTML,
+        like Gecko) Version/5.1.1 Safari/534.51.22
+      Accept-Charset:
+      - ISO-8859-1,utf-8;q=0.7,*;q=0.7
+      Accept-Language:
+      - en-us,en;q=0.5
+      Cookie:
+      - .ASPXAUTH=38A5E4EE84999FFCF5A0BDD034414562970109B622490504E6D6A87242305C4CD68F80F661835C488365104DBF2128361D14E4858FFF469D1906B9565A54385E5B472CA68F416966DDF2929A7DE27593FACEB308AAC33E2FA9F377A94F4EE5DD62CE61E22592BE9F5A299283C4B0E74E74B3318B9A41E8BE74A292062F81230B2B6DF882599D891A2A2CB4BFE15F8BA278D6990A86B8F8713F18B02FC8A6343E7F666D98423915532C667ABE6E8E809BBFE6975F6219DCB75116A98551E3CCA4;
+        ASP.NET_SessionId=1hdfv0hwsjn1zrwwdeict5vo
+      Host:
+      - retailerservices.diamondcomics.com
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - 300
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - private
+      Content-Type:
+      - text/html; charset=utf-8
+      Content-Encoding:
+      - gzip
+      Vary:
+      - Accept-Encoding
+      Server:
+      - Microsoft-IIS/7.5
+      X-Aspnetmvc-Version:
+      - '3.0'
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Powered-By:
+      - ASP.NET
+      Date:
+      - Wed, 31 Jul 2013 05:52:05 GMT
+      Content-Length:
+      - '3250'
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAEAO29B2AcSZYlJi9tynt/SvVK1+B0oQiAYBMk2JBAEOzBiM3m
+        kuwdaUcjKasqgcplVmVdZhZAzO2dvPfee++999577733ujudTif33/8/XGZk
+        AWz2zkrayZ4hgKrIHz9+fB8/Ih7/rk+/PHnz+7w8Teftojz6jZPH9meezehn
+        Ss/jRd5m1KBdbee/aF1cfvbR77391fH2SbVYZW0xKfOP0mm1bPNl+9lHZ6ef
+        PTxM6d8D/vcB/3v69PPTj9K7BlxbtGV+9PTkafqKABdlXqev8/qymOZNup0+
+        ry6K5eO70kjfKIvl23Re5+effXT3RLq6+3qe1flsPG2a3+Ny/6O0zsvPPmra
+        6zJv5nnefpS216v8s4/a/F17l9p43ceAfZEVy+fZdbVuBeCnHwqwneeLvLk7
+        yZr87nm2nF5Pqnd3f/oXrfP6emz+3t4d3xvvo8MP7W26btpqsc2dai/b64Lg
+        H4x3D8by7fv200zrYtWmTT2ljl7zH42BvTt+MN4dL4rl+KfpFQ/ET2eXmbz4
+        0dHju/LbLQCO59VlXmfTaVXPimr5TULuEHuVTd9+OOimWu59OBRB8KeXVVuc
+        X3+TY6bvqrJ8U9GY98d7298E5ObqvJr8dD5tPxiS4Nhnz/fDUv59/Ltub3+v
+        OCcdk376ffrmx0Q6bmTyjvgU+aciHZuZH81uh+Hj3/V7+XJWnH9/e5v+IoA+
+        pg8+CNMHt8P0wdfHlBHr9PuyLpasGm+hQRb5rMg++2iFVz4CngpX+uxgqlr8
+        p0nn3gtADeBLgMzcy2dD75hu8Vxmdfr7X2S/KP1MfvzMz6Tf+/6h+x4fjlfr
+        Zr71vY9//yZvj0kRrZftx6P0Y7Jzew8f7N3/9NP7259+/P07G956Wi3IirzI
+        FjleJBosquVsWi2KaTOmHxtebkn1vX2ZXeSXRX4l7VzLrfP1ctqSVky37qS/
+        2H2OBwO7yGhYs2q6XtBEjad1nrX5aUmGYNlufSzU+PjOITUbg1LU9uMOrT7m
+        L7Pmejmlb9t6nVP/BNw+9C1NGn239TGcgObRx+lnXpdlNSU3gLT2qq7aalqV
+        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
+        /wE+8SYbGSMAAA==
+    http_version: 
+  recorded_at: Wed, 31 Jul 2013 05:51:51 GMT
 recorded_with: VCR 2.5.0