ex_ua 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b80529d1a796a452c402596e0911c611cd09544
-  data.tar.gz: d576cc7c09db8586703340fce9e73bc9e2eca226
+  metadata.gz: 776595958f2a09a7ecb567195f192810b4727ba4
+  data.tar.gz: 04987baa71a95522a1f932902ceb5c9c33ddfb1c
 SHA512:
-  metadata.gz: 75a02afae964de65c138426ec6d792e1c18d8234353d796c8153d3d66c5d802eda8870c8ee0bb15126a07059b07d8462e6f06ad44a44a8cca9dc8b26a794fe1c
-  data.tar.gz: b276646a9b6d09b7505bc7f5f268cb4bfa82a73efe4ad8fa469e2e2c765abc0aa79614c893a6cfd7e81edd6110467b36e240c8b94bb92bc06ed568f00148d169
+  metadata.gz: 05ec9b4ed174096081e6e57f787a2893760110f04ffec7513ef961451ca141d1310a0e90ef2d3db1375cdf706474de0aa4b1b448391161aa148384b97dceead3
+  data.tar.gz: 6890c56b7a8907d83e14e6a174d9acd3dde93c4421b067e06c49f544c66b714832fca901f9ec6cdec5adb0549a43a38173f850f6a7ac153188a6945768456ba7

data/LICENCE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Andrii Dmytrenko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -15,8 +15,7 @@ Example usage
 
 
     require 'ex_ua'
-    client = ExUA::Client.new
-    base_categories = client.base_categories('ru') # Gives you array of all base categories for a given language
+    base_categories = ExUA::Client.base_categories('ru') # Gives you array of all base categories for a given language
     category = base_categories.first # Select first category (usually video)
     sub_categories = category.categories # Select sub-categories of a category
     example_video_category = sub_categories.first.categories.first

data/Rakefile

@@ -1,8 +1,9 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+Dir.glob('tasks/*.rake').each { |r| import r }
 
 desc 'Default: run specs.'
-task :default => :spec
+task :default => :spec#[:update_spec_data, :spec]
 
 desc "Run specs"
 RSpec::Core::RakeTask.new

data/ex_ua.gemspec

@@ -17,10 +17,12 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.license = 'MIT'
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec", '>= 2.10.0'
   s.add_development_dependency "rake", '>= 0.9.0'
   s.add_runtime_dependency "httparty", '>= 0.10.0'
   s.add_runtime_dependency "nokogiri", '>= 1.5.0'
+  s.add_runtime_dependency "addressable", '>= 2.3.0'
 end

data/lib/ex_ua/category.rb

@@ -1,24 +1,23 @@
 # @author Andrii Dmytrenko
-require 'cgi'
+require 'addressable/uri'
 module ExUA
   # Represents a category
   # @example Usage
   #   #You usually get categories thru ExUA::Client object
-  #   client = ExUA::Client.new
-  #   categories = client.base_categories('ru')
+  #   categories = ExUA::Client.base_categories('ru')
   #   sub_categories = categories.first.categories
   #   items = sub_categories.first.categories.first.items
   class Category
     class NotFound < StandardError; end
-    attr_reader :id,:parent, :url
+    attr_reader :id,:parent, :uri
 
     # @param[ExUA::Client] ex_ua client
     # @param[Fixnum] id Category id
     # @param[Hash] options
-    def initialize(ex_ua, options={})
-      @ex_ua = ex_ua
+    def initialize(options={})
       @id = options[:id]
-      @url = strip_url(options[:url]) || url_from_id(id)
+      @uri = Addressable::URI.parse(options[:url] || url_from_id(id))
+      @uri.site = ExUA::BASE_URL
       @name = options.delete(:name)
       @parent = options.delete(:parent)
     end
@@ -27,10 +26,6 @@ module ExUA
       "id:#{id} name:'#{name}' page: #{page}"
     end
 
-    def inspect
-      "#<#{self.class}: #{to_s}>"
-    end
-
     # Canonical url
     # @return [String]
     def canonical_url
@@ -62,8 +57,8 @@ module ExUA
     # @return [Array<ExUA::Category>]
     def categories
       page_content.search('table.include_0 a b').map do |link|
-        if match = link.parent.attributes["href"].value.match(%r{/(?<url>\d+)\?r=(?<r>\d+)})
-          Category.new(@ex_ua, parent: self, url: match['url'], name: link.text)
+        if match = link.parent.attributes["href"].value.match(%r{(?<url>[^?]+)\?r=(?<r>\d+)})
+          Category.new(parent: self, url: match['url'], name: link.text)
         end
       end.compact
     end
@@ -82,20 +77,24 @@ module ExUA
     # @return [ExUA::Category]
     def next
       raise NotFound, "No link to a next category found" unless next?
-      Category.new(@ex_ua, id: self.id, url: next_url)
+      Category.new(id: self.id, url: next_url)
     end
 
     # Previous category
     # @return [ExUA::Category]
     def prev
       raise NotFound, "No link to a previous category found" unless prev?
-      Category.new(@ex_ua, id: self.id, url: prev_url)
+      Category.new(id: self.id, url: prev_url)
     end
 
     # Current page number
     # @return [Fixnum]
     def page
-      CGI.parse(URI.parse(@url).query||"")["p"].first.to_i || 0
+      uri.query_values["p"].to_i
+    end
+
+    def path
+      uri.path
     end
 
     # Download items
@@ -111,13 +110,8 @@ module ExUA
 
     protected
 
-    def strip_url(url)
-      return unless url
-      url.sub(ExUA::BASE_URL, '')
-    end
-
     def page_content
-      @page_content||=@ex_ua.get(url)
+      @page_content||=ExUA::Client.instance.get(uri.request_uri)
     end
 
     def url_from_id(id)

data/lib/ex_ua/client.rb

@@ -1,5 +1,7 @@
 require 'httparty'
 require 'nokogiri'
+require 'singleton'
+require 'addressable/uri'
 
 module ExUA
   # Client for ExUA
@@ -7,11 +9,29 @@ module ExUA
   #   client = ExUA::Client.new
   #   categories = client.base_categories('ru')
   #
+  class ExUAFetcher
+    include HTTParty
+    no_follow true
+    def self.get_redirect(uri)
+      get Addressable::URI.parse(uri).normalize.to_s
+    rescue HTTParty::RedirectionTooDeep => e
+      e.response["location"]
+    end
+  end
   class Client
+    include Singleton
+    KNOWN_BASE_CATEGORIES = %w[video audio images texts games software]
+    class<<self
+      [:available_languages, :base_categories, :search].each do |met|
+        define_method(met) do |*args| #delegate to instance
+          instance.public_send(met, *args)
+        end
+      end
+    end
     # List of available languages
     # @return [Array<String>]
     def available_languages
-      @available_langauges||=get('/').search('select[name=lang] option').inject({}){|acc,el| acc[el.attributes["value"].value]=el.text;acc}
+      @available_langauges ||= get('/').search('select[name=lang] option').inject({}){|acc,el| acc[el.attributes["value"].value]=el.text;acc}
     end
 
     # List of base categories for a given language
@@ -20,11 +40,26 @@ module ExUA
     #   client.base_categories('ru')
     # @return [Array<ExUA::Category>]
     def base_categories(lang)
-      ExUA::KNOWN_BASE_CATEGORIES.map{|cat| Category.new(self, url: "/#{lang}/#{cat}")}
+      KNOWN_BASE_CATEGORIES.map{|cat| Category.new(url: "/#{lang}/#{cat}")}
+    end
+
+    def search(text, page=0, per=20)
+      uri = Addressable::URI.parse("/search?#{Addressable::URI.form_encode(s: text, p: page, per: per)}")
+      page = get(uri)
+      page.search('table.panel tr td').map do |s|
+        s.search('a')[1]
+      end.compact.map do |link|
+        ExUA::Category.new(url: link.attributes['href'], name: link.text)
+      end
+    end
+
+    def get(request_uri)
+      Nokogiri.parse(HTTParty.get(Addressable::URI.join(ExUA::BASE_URL,request_uri).to_s).body)
     end
 
-    def get(url)
-      Nokogiri.parse(HTTParty.get("#{ExUA::BASE_URL}#{url}").body)
+    private
+    def base_categories_names
+      KNOWN_BASE_CATEGORIES
     end
   end
 end

data/lib/ex_ua/item.rb

@@ -1,3 +1,4 @@
+require 'addressable/uri'
 # @author Andrii Dmytrenko
 module ExUA
   # Download item
@@ -16,15 +17,31 @@ module ExUA
         }
       end
     end
-    # Actual download url.
+
+    # Queries ex.ua to get a real url to fetch data from (follows redirect)
+    def retrieve_real_load_url
+      retrieve_real_url(download_uri)
+    end
+
+    def retrieve_real_get_url
+      retrieve_real_url(get_uri)
+    end
+
+    # Actual download url with ex.ua included
     # You can add ?fs_id=server_id  param to download form #additional_servers
-    # @return[String] download_url
-    def download_url
-      "#{ExUA::BASE_URL}#{url}"
+    # @return[Addressable::URI]
+
+    def get_uri
+      @get_url ||= Addressable::URI.join(ExUA::BASE_URL,"/get/#{self.id}")
+    end
+
+    def download_uri
+      @downoadload_url ||= Addressable::URI.join(ExUA::BASE_URL, "/load/#{self.id}")
     end
 
-    def url
-      @url ||= "/load/#{self.id}"
+    private
+    def retrieve_real_url(uri)
+      ExUA::ExUAFetcher.get_redirect(uri)
     end
   end
 end

data/lib/ex_ua/version.rb

@@ -1,3 +1,3 @@
 module ExUa
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/ex_ua.rb

@@ -6,5 +6,4 @@ require "ex_ua/category"
 
 module ExUA
   BASE_URL='http://www.ex.ua'
-  KNOWN_BASE_CATEGORIES = %w[video audio images texts games software]
 end

data/spec/category_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 describe ExUA::Category do
+  before { stub_client }
   context "general 1 page category" do
-    subject{ExUA::Category.new(client, url: 'ru_video.html')}
+    subject{ExUA::Category.new(url: '/ru_video.html')}
     describe '#categories' do
       it 'returns list of child categories' do
         subject.categories.should be_kind_of(Array)
@@ -11,23 +12,24 @@ describe ExUA::Category do
       end
     end
     its(:items){should_not be_nil}
-    its(:name){should eq("\u0412\u0438\u0434\u0435\u043E [RU - \u0440\u0443\u0441\u0441\u043A\u0438\u0439]")}
+    its(:name){should_not be_nil}
     its(:description){should_not be_nil}
     its(:canonical_url){should_not be_nil}
     its(:next?){should be_false}
     its(:prev?){should be_false}
+    its(:uri){should eq(Addressable::URI.parse('http://www.ex.ua/ru_video.html'))}
   end
   context "general few pages category" do
-    subject{ExUA::Category.new(client, url: 'foreign_video_russia.html')}
+    subject{ExUA::Category.new(url: '/foreign_video_russia.html')}
     describe '#next' do
       it 'returns a category with same url, but different page number' do
-        subject.next.url.should eq('/ru/video/foreign?r=23775&p=1')
+        subject.next.uri.request_uri.should eq('/ru/video/foreign?r=23775&p=1')
       end
     end
     describe '#prev' do
       it 'returns a category with same url, but different page number' do
         pending 'find a page with prev'
-        expect(subject.prev.url).to eq('')
+        expect(subject.prev.uri).to eq('')
       end
       it 'raises error when no prev url found' do
         expect{subject.prev}.to raise_error(ExUA::Category::NotFound)
@@ -35,7 +37,7 @@ describe ExUA::Category do
     end
   end
   context "item category" do
-    subject{ExUA::Category.new(client, url: 'video_test.html')}
+    subject{ExUA::Category.new(url: '/video_test.html')}
     its(:picture){should_not be_nil}
   end
 end

data/spec/client_spec.rb

@@ -1,17 +1,28 @@
 require 'spec_helper'
 describe ExUA::Client do
+  subject{ described_class }
+  before { stub_client }
   describe '#available_languages' do
     it 'returns list of available languages' do
-      client.available_languages.should be_kind_of(Hash)
+      subject.available_languages.should be_kind_of(Hash)
     end
     it 'includes known languages' do
       known_languages = ["en", "ru", "uk"]
-      (client.available_languages.keys & known_languages).sort.should eq(known_languages)
+      (subject.available_languages.keys & known_languages).sort.should eq(known_languages)
     end
   end
   describe '#base_categories' do
     it 'lists base categories for a language' do
-      client.base_categories("uk").should be_kind_of(Array)
+      subject.base_categories("uk").should be_kind_of(Array)
+    end
+  end
+  describe '#search' do
+    it 'returns list of categories' do
+      subject.search('futurama').should be_kind_of(Array)
+      subject.search('futurama').all?{|cat| cat.kind_of? ExUA::Category}
+    end
+    it 'returns 20 results by default' do
+      subject.search('futurama').size.should eq(20)
     end
   end
 end