tiqav 0.0.1 → 0.0.2

data/Manifest.txt

@@ -14,4 +14,5 @@ script/destroy
 script/generate
 test/test_alpha_num.rb
 test/test_helper.rb
-test/test_tiqav.rb
+test/test_tiqav_search.rb
+test/test_tiqav_random.rb

data/README.rdoc

@@ -2,6 +2,10 @@
 
 * http://github.com/shokai/ruby-tiqav
 
+== INSTALL:
+
+* gem install tiqav
+
 == DESCRIPTION:
 
 Search Images on Tiqav.com
@@ -25,10 +29,6 @@ Search Images on Tiqav.com
 
 * Ruby 1.8.7+ or 1.9.3+
 
-== INSTALL:
-
-* gem install tiqav
-
 == LICENSE:
 
 (The MIT License)

data/Rakefile

@@ -14,7 +14,7 @@ $hoe = Hoe.spec 'tiqav' do
   self.developer 'Sho Hashimoto', 'hashimoto@shokai.org'
   # self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   self.rubyforge_name       = self.name # TODO this is default value
-  self.extra_deps         = [['nokogiri','>= 1.5.2']]
+  self.extra_deps         = [['json','>= 1.5.4']]
 
 end
 

data/lib/tiqav/image.rb

@@ -2,12 +2,13 @@
 module Tiqav
 
   class Image
-    attr_reader :id, :url, :permalink, :filename
+    attr_reader :id, :url, :permalink, :filename, :ext
 
-    def initialize(id)
+    def initialize(id, ext = 'jpg')
       @id = id
-      @filename = "#{@id}.jpg"
-      @url = URI.parse "http://tiqav.com/#{@filename}"
+      @ext = ext
+      @filename = "#{@id}.#{@ext}"
+      @url = URI.parse "http://img.tiqav.com/#{@filename}"
       @permalink = URI.parse "http://tiqav.com/#{@id}"
     end
 

data/lib/tiqav/search.rb

@@ -1,16 +1,11 @@
 
 module Tiqav
   def self.search(word)
-    uri = URI.parse "http://tiqav.com/search/#{URI.encode word}"
-    res = Net::HTTP.start(uri.host, uri.port).request(Net::HTTP::Get.new uri.path)
+    uri = URI.parse "http://api.tiqav.com/search.json?q=#{URI.encode word}"
+    res = Net::HTTP.start(uri.host, uri.port).request(Net::HTTP::Get.new uri.request_uri)
     raise Error, "HTTP Status #{res.code} at #{uri}" unless res.code.to_i == 200
-    doc = Nokogiri::HTML res.body
-    doc.xpath('//a').map{|a|
-      a['href']
-    }.reject{|a|
-      !(a =~ /^\/[a-zA-Z0-9]+$/)
-    }.map{|a|
-      Tiqav::Image.new a.scan(/([a-zA-Z0-9]+)/)[0][0]
+    JSON.parse(res.body).map{|img|
+      Tiqav::Image.new img['id'], img['ext']
     }
   end
 

data/lib/tiqav/tiqav.rb

@@ -1,6 +1,6 @@
 require 'net/http'
 require 'uri'
-require 'nokogiri'
+require 'json'
 
 module Tiqav
   class Error < StandardError

data/lib/tiqav.rb

@@ -7,5 +7,5 @@ require 'tiqav/search'
 require 'tiqav/alpha_num'
 
 module Tiqav
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/test/test_tiqav_random.rb

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+require 'tmpdir'
+
+class TestTiqavRandom < Test::Unit::TestCase
+
+  def setup
+    @img = Tiqav.random
+  end
+
+  def test_image_class
+    assert @img.class == Tiqav::Image
+  end
+
+end

data/test/{test_tiqav.rb → test_tiqav_search.rb}

@@ -2,14 +2,15 @@
 require File.expand_path 'test_helper', File.dirname(__FILE__)
 require 'tmpdir'
 
-class TestTiqav < Test::Unit::TestCase
+class TestTiqavSearch < Test::Unit::TestCase
 
   def setup
-    @img = Tiqav.random
+    @imgs = Tiqav.search('ちくわ')
+    @img = @imgs[0]
   end
-  
+
   def test_search
-    assert Tiqav.search('ちくわ').size > 0
+    assert @imgs.size > 0
   end
 
   def test_image_class
@@ -17,7 +18,7 @@ class TestTiqav < Test::Unit::TestCase
   end
 
   def test_image_exists?
-    assert @img.exists? == true
+    assert @img.exists?
   end
 
   def test_image_url
@@ -29,14 +30,15 @@ class TestTiqav < Test::Unit::TestCase
   end
 
   def test_image_filename
-    assert @img.filename =~ /.+\.jpe?g/i
+    assert @img.filename =~ /^.+\.#{@img.ext}$/
   end
 
   def test_image_save
     Dir.mktmpdir do |dir|
       fpath = File.expand_path @img.filename, dir
       @img.save(fpath)
-      assert File.exists?(fpath) and File.stat(fpath).size > 0
+      assert File.exists?(fpath)
+      assert File.stat(fpath).size > 0
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tiqav
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Sho Hashimoto
@@ -15,22 +15,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-09 00:00:00 Z
+date: 2012-06-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 11
         segments: 
         - 1
         - 5
-        - 2
-        version: 1.5.2
+        - 4
+        version: 1.5.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -107,7 +107,8 @@ files:
 - script/generate
 - test/test_alpha_num.rb
 - test/test_helper.rb
-- test/test_tiqav.rb
+- test/test_tiqav_search.rb
+- test/test_tiqav_random.rb
 - .gemtest
 homepage: http://github.com/shokai/ruby-tiqav
 licenses: []
@@ -146,4 +147,5 @@ summary: Search Images on Tiqav.com
 test_files: 
 - test/test_alpha_num.rb
 - test/test_helper.rb
-- test/test_tiqav.rb
+- test/test_tiqav_random.rb
+- test/test_tiqav_search.rb