alluc 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 13e51dcd43e1278c5307cba11719f7af4a84a029
-  data.tar.gz: ec85e3c5f08d6e24390e33202c6782dd313e95e5
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmI5ZDVjNDJjMzY0N2ViZTZmZTlmZGNiZDk3NDM0MzM5Y2YwNjk4YQ==
+  data.tar.gz: !binary |-
+    ODUyNjRjMzk1OWMyYWYyMDAwYjA0NzEyODcwOGQyYjM4YzdkMGU2Mg==
 SHA512:
-  metadata.gz: 3cce7d26f02ecabb6ade847a3a3b4b7553533da7100e9c97a685b354f4f015ac0946b7cf469ed47f1a343faf03f65ec67adf33191ae9559c7866f393ea253182
-  data.tar.gz: b54c7c5527ae955e5e313762d64612e1530198b386b59ca654b00df0b8f8dac4e95ad421dfd0ed14e666621326d39012f1e947c0582886f71407c3698d4a62fe
+  metadata.gz: !binary |-
+    OGRmNzdiYjgyYzE4YzAyM2NjZTczMjgxMDQzMmJhMzlkYmRlYjgxMzY0MjY4
+    MDVjZDJmY2E5NjBhMDdkN2I4ODVhYWQ3ZTRiYjQ5ZjM5ZWE2OWFjNmI2OTk3
+    NTM3ZjhhYzBlNjUzNDkxYjZlNGNhZDQwZmIzYzhiMzRjZGFmNTM=
+  data.tar.gz: !binary |-
+    ODEyZTE1ZGJmZmE5MzM1MzUwYjBmNDM1M2QyYTFhMDM0NTMzZThiZDdhZWYx
+    NDg0YThjYzljMzllMDNjNDk1ZGVjMzJmMjMwZWUwYzk1Y2Q4NTU2OWQ2NGM1
+    ZTI0MTJiOWU0YWE4NWEwYzkxYWJhMmE3NWI3ZWFiMTVkN2NjMTk=

data/README.md

@@ -1,8 +1,12 @@
 # Alluc
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/alluc`. To experiment with that code, run `bin/console` for an interactive prompt.
+alluc.com API
 
-TODO: Delete this and the text above, and describe your gem
+With this early version, beta-testers can access allucs database of 21 million streaming and 24m download links and execute full text search queries to find video-hoster or cyberlocker links related to any topic. Beta access is free and allows queries retrieving up to 10,000 links per day.
+
+To [sign up](http://api.alluc.com/products/api-10000-calls-month), choose the beta plan and complete checkout (no payment required) and you will receive your API key within the next 24 hours.
+
+The API is also available on [Mashape](https://www.mashape.com/alluc/video-and-download-link-search/) (with slightly higher latencies).
 
 ## Installation
 
@@ -22,11 +26,19 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
+Connect to normal alluc api
+```ruby
+Alluc.connect('api_key')
+```
+Connect to mashape api
+```ruby
+Alluc.connect('api_key', :mashape)
+```
+Methods
+```ruby
+Alluc.download_links('batman')
+Alluc.streaming_links('batman')
+```
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/lib/alluc.rb

@@ -9,30 +9,23 @@ require 'alluc/requester'
 
 module Alluc
 
-  def self.connect(api_key)
+  def self.connect(api_key, type = :alluc)
+    Excon.defaults[:ssl_verify_peer] = false
     Alluc::Api.instance.tap do |api|
-      api.connect(api_key)
+      api.connect(api_key, type)
     end
   end
 
-  def self.streaming_links(query, opts={})
-    params = Hash.new.tap do |hash|
-      hash['query'] = CGI.escape(query)
-      hash['count'] = opts[:count] if opts[:count] # count - max-amount of returned results. Can be between 1 - 100
-      hash['from'] = opts[:from] if opts[:from] # from - where to start. For example if you want result 20-30, you will set count=10 and from=20
-      hash['getmeta'] = opts[:getmeta] if opts[:getmeta] # getmeta - If you want additional info on hosterlinks and source, set this to 1. Only use if you really need it as it might make for slower queries.
+  ['stream', 'download'].each do |action|
+    define_singleton_method("#{action}_links") do |query, opts = {}|
+      params = Hash.new.tap do |hash|
+        hash['query'] = CGI.escape(query)
+        hash['count'] = opts[:count] if opts[:count] # count - max-amount of returned results. Can be between 1 - 100
+        hash['from'] = opts[:from] if opts[:from] # from - where to start. For example if you want result 20-30, you will set count=10 and from=20
+        hash['getmeta'] = opts[:getmeta] if opts[:getmeta] # getmeta - If you want additional info on hosterlinks and source, set this to 1. Only use if you really need it as it might make for slower queries.
+      end
+      Alluc::Requester.get("search/#{action}", params)
     end
-    Alluc::Requester.get('search/stream', params)
-  end
-
-  def self.download_links(query, opts={})
-    params = Hash.new.tap do |hash|
-      hash['query'] = CGI.escape(query)
-      hash['count'] = opts[:count] if opts[:count] # count - max-amount of returned results. Can be between 1 - 100
-      hash['from'] = opts[:from] if opts[:from] # from - where to start. For example if you want result 20-30, you will set count=10 and from=20
-      hash['getmeta'] = opts[:getmeta] if opts[:getmeta] # getmeta - If you want additional info on hosterlinks and source, set this to 1. Only use if you really need it as it might make for slower queries.
-    end
-    Alluc::Requester.get('search/download', params)
   end
 
 end

data/lib/alluc/api.rb

@@ -4,7 +4,7 @@ module Alluc
   class Api
     include Singleton
 
-    attr_reader :base_url, :mashape_url, :version, :api_key
+    attr_reader :base_url, :mashape_url, :version, :api_key, :api_type
 
     def initialize
       self.base_url = 'https://www.alluc.com/api/'.freeze
@@ -12,18 +12,28 @@ module Alluc
       self.version = '0.1'.freeze
     end
 
-    def connect(api_key)
+    def connect(api_key, api_type)
       self.api_key = api_key
+      self.api_type = api_type
+    end
+
+    def actual_url
+      if api_type == :mashape
+        mashape_url
+      else
+        base_url
+      end
     end
 
     def url_for(action, params={})
-      url = URI.join(mashape_url, action) # Need some base_url / mashape_url logic here
+      params[:apikey] = api_key if api_type == :alluc
+      url = URI.join(actual_url, action) # Need some base_url / mashape_url logic here
       url.query = URI.encode_www_form(params) unless params.empty?
       url.to_s
     end
 
     private
-      attr_writer :base_url, :mashape_url, :version, :api_key
+      attr_writer :base_url, :mashape_url, :version, :api_key, :api_type
 
   end
 end

data/lib/alluc/requester.rb

@@ -16,21 +16,23 @@ class Alluc::Requester
         Hash.new.tap do |headers|
           headers['Accept'] = 'application/json'
           headers['Content-Type'] = 'application/json'
-          headers['X-Mashape-Key'] = api.api_key
+          headers['X-Mashape-Key'] = api.api_key if api.api_type == :mashape
         end
       end
 
       def perform_request(&block)
         begin
           block.call
-        rescue
+        rescue Exception => e
+          puts e.message
         end
       end
 
       def parse_response(response)
         begin
-          JSON.parse(response.body, object_class: OpenStruct)
+          JSON.parse(response.body)
         rescue JSON::ParserError => e
+          puts e.message
         end
       end
 

data/lib/alluc/version.rb

@@ -1,3 +1,3 @@
 module Alluc
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,58 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: alluc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ahmet Abdi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.44.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.44.4
-description: "'ALluc API'"
+description: ! '''ALluc API'''
 email:
 - ahmetabdi@gmail.com
 executables: []
@@ -71,7 +71,6 @@ files:
 - lib/alluc.rb
 - lib/alluc/api.rb
 - lib/alluc/requester.rb
-- lib/alluc/search.rb
 - lib/alluc/version.rb
 homepage: https://github.com/ahmetabdi/alluc
 licenses:
@@ -83,12 +82,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -96,5 +95,5 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: "'Alluc API'"
+summary: ! '''Alluc API'''
 test_files: []

data/lib/alluc/search.rb

@@ -1,32 +0,0 @@
-module Alluc
-  class Search
-    # PARAMS: searchtype:string count:number from:number getmeta:number queryL:string (url encoded)
-    # query - the search string. All alluc search operators can be used (https://www.alluc.com/about/). Make sure to urlencode this.
-    # count - max-amount of returned results. Can be between 1 - 100.
-    # from - where to start. For example if you want result 20-30, you will set count=10 and from=20
-    # apikey - your apikey
-    # getmeta - If you want additional info on hosterlinks and source, set this to 1. Only use if you really need it as it might make for slower queries.
-
-    # "status": "success", 	// Status, success or error
-    # "message": "",		// What went wrong? empty if success
-    # "result":[ ]		// result of your query. Array when using /api/search/ and object in all other cases.
-    # "fetchedtoday": 174	// Amount of links retrieved with your apikey so far today
-    # "resultcount": 1	// Amount of results for the current query
-
-    def file_data
-      # https://www.alluc.com/api/filedata/{filedataid}
-      # Request more information about a hoster-link. {filedataid} is returned in /api/search/.
-    end
-
-    def source_data
-      # https://www.alluc.com/api/sourcedata/{md5-of-source-URL}
-      # Request more information about a source-url (URL where a hoster link was found)
-    end
-
-    def thumbnail
-      # https://www.alluc.com/api/thumbnail/{imageid}
-      # Fetch a thumbnail. {imageid} is returned in /api/search/.
-    end
-
-  end
-end