image_searcher 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc294a4d85ccfa2fa6b2e8350b22e4f63563a41e
-  data.tar.gz: 7d7aed9c8d22231db92ec1ef03496b64f71cea21
+  metadata.gz: 093042c5007de3e38b446c9411769f78d17e3674
+  data.tar.gz: e8a24e871ec2a4a54ab6ab305cfb312f3f95d781
 SHA512:
-  metadata.gz: ddfdee7ef492714ba94a17f9250a5081dd8fa2fe9d7455ab11b02f371f26a884f3ffc6b010add9b321835909da0cccf8036991a6362e343b920e1072e2fc3fb5
-  data.tar.gz: 9a690f4defc62814870587d47e309832633a9b62403f61ab330c4162faff7eb4db1df9ce6219736e9fb38f2c6b09e1f687b4620d1d9e0ad084c18d78e9021829
+  metadata.gz: c4da65fa188fac36cc448e187d47f19ea64c57766b24042850ae64b9a51b7e5db0378bf301d3de2c806da0d636c87ab51545c951ddeea8c67f3a25f7ea5eb4f2
+  data.tar.gz: 9565e7c7fc49bba02f81a7be70f1522d4aec3bfcf00ae5775055486095cc1ba0c1f4e233081f0b22abe6719bd62ebae50191f80cf2632a9d4e151c44e38e525e

data/README.md

@@ -7,7 +7,7 @@ A ruby wrapper for the [Ababeen](http://api.ababeen.com) Image Search API v1.0 -
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'image_searcher', '~> 0.1.3'
+gem 'image_searcher', '~> 0.1.4'
 ```
 
 And then execute:
@@ -24,16 +24,23 @@ Or install it yourself as:
 images = ImageSearcher.search(query: "New York")
 ```
 
-And you've got an array of objects. By default the result has `10` nested arrays(objects). 
+And you've got an array of objects. By default the result has `100` nested arrays. 
 
 **Available options**:
 ```
 query(String)
 count(Integer) - maximum 100(10 by default)
+format(String) - if you need a certain format of images(jpg, png, etc.)
+formats(Array) - array of allow formats
 ```
-For example: `ImageSearcher.search(query: "New York", count: 66)`
+Examples:
 
-Also you can see a nice preview of a result http://api.ababeen.com/api/images.php?q=tiger&preview=true&count=100
+`ImageSearcher.search(query: 'New York', count: 66)`
+`ImageSearcher.search(query: 'New York', format: 'jpg')`
+`ImageSearcher.search(query: 'New York', formats: ['jpg', 'png'])`
+
+Also you can see a nice preview of a result: 
+http://api.ababeen.com/api/images.php?q=New%York&preview=true&count=100
 
 ## Contributing
 

data/image_searcher.gemspec

@@ -5,7 +5,7 @@ require 'image_searcher/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "image_searcher"
-  spec.version       = ImageSearcher::VERSION
+  spec.version       = '0.1.4'
   spec.authors       = ["Vitaliy"]
   spec.email         = ["vitaliy.fry@gmail.com"]
 

data/lib/image_searcher.rb

@@ -3,6 +3,4 @@ require 'httparty'
 require 'image_searcher/api'
 require 'image_searcher/search'
 
-module ImageSearcher
-  # Your code goes here...
-end
+module ImageSearcher; end

data/lib/image_searcher/filter.rb

@@ -0,0 +1,14 @@
+module ImageSearcher::Filter
+
+  def filter_by_format(result, format)
+    result.keep_if { |h| h["url"].match(/.#{format}/i) }
+  end
+
+  def filter_by_formats(result, formats)
+    formats.each do |f|
+      result = result.keep_if { |h| h['url'].match(/.#{f}/i) }
+    end
+
+    result
+  end
+end

data/lib/image_searcher/search.rb

@@ -1,11 +1,35 @@
 module ImageSearcher
+
+  require_relative 'filter'
+  extend Filter
+
   def self.search(options = {})
-    raise "Missing query" unless options[:query]
+    raise_errors(options)
+    url = build_json_url(options)
+    result = ImageSearcher::API.get_json(url)
+    perform_filter_params(result, options)
+    result
+  end
 
+  def self.raise_errors(options)
+    raise "Missing params" if options[:query].nil?
+    raise "Missing query" if options[:query].empty?
+  end
+
+  def self.build_json_url(options)
     base_uri = ImageSearcher::API::BASE_URI
     url = "#{base_uri}?q=#{options[:query]}"
     url += "&count=#{options[:count]}" if options[:count]
+    url
+  end
+
+  def self.perform_filter_params(result, options)
+    if options[:format]
+      result = filter_by_format(result, options[:format])
+    end
 
-    ImageSearcher::API.get_json(url)
+    if options[:formats]
+      result = filter_by_formats(result, options[:formats])
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_searcher
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Vitaliy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -84,6 +85,7 @@ files:
 - image_searcher.gemspec
 - lib/image_searcher.rb
 - lib/image_searcher/api.rb
+- lib/image_searcher/filter.rb
 - lib/image_searcher/search.rb
 - lib/image_searcher/version.rb
 homepage: https://github.com/Frylock13/image_searcher
@@ -106,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A ruby wrapper for the Ababeen images search API