image_searcher 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 093042c5007de3e38b446c9411769f78d17e3674
-  data.tar.gz: e8a24e871ec2a4a54ab6ab305cfb312f3f95d781
+  metadata.gz: b0fbd835cba4e16b93ff11774c9fc7070bd7fe94
+  data.tar.gz: 13ac2936185dd3407597a4b6f69338cc5e874c5c
 SHA512:
-  metadata.gz: c4da65fa188fac36cc448e187d47f19ea64c57766b24042850ae64b9a51b7e5db0378bf301d3de2c806da0d636c87ab51545c951ddeea8c67f3a25f7ea5eb4f2
-  data.tar.gz: 9565e7c7fc49bba02f81a7be70f1522d4aec3bfcf00ae5775055486095cc1ba0c1f4e233081f0b22abe6719bd62ebae50191f80cf2632a9d4e151c44e38e525e
+  metadata.gz: ca84b4b6c8ea47b932096d32e3878dd9f368da87671489cb2c019cc4ddd1ff4e03beb2c780fe38fae2d8b95f7d804b4d6e15a49e8d4b8bf656b9eff70797f57b
+  data.tar.gz: 6e3277be60e90c12d5d254227b6b051c1b0063be4f26cb300ecea19130ad0d37adcdce108d6c7e1d44dc1f4760743d1a5a3b693720b66e0e8337cb04119bdef1

data/README.md

@@ -29,7 +29,7 @@ And you've got an array of objects. By default the result has `100` nested array
 **Available options**:
 ```
 query(String)
-count(Integer) - maximum 100(10 by default)
+count(Integer) - maximum 100(100 by default)
 format(String) - if you need a certain format of images(jpg, png, etc.)
 formats(Array) - array of allow formats
 ```

data/image_searcher.gemspec

@@ -5,7 +5,7 @@ require 'image_searcher/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "image_searcher"
-  spec.version       = '0.1.4'
+  spec.version       = '0.1.5'
   spec.authors       = ["Vitaliy"]
   spec.email         = ["vitaliy.fry@gmail.com"]
 
@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
-  spec.add_dependency             "httparty"
+  spec.add_development_dependency "rspec", "~> 3.5.0"
+  spec.add_dependency             "httparty", "~> 0.14.0"
 end

data/lib/image_searcher.rb

@@ -1,6 +1,6 @@
 require 'image_searcher/version'
 require 'httparty'
 require 'image_searcher/api'
-require 'image_searcher/search'
+require 'image_searcher/client'
 
 module ImageSearcher; end

data/lib/image_searcher/client.rb

@@ -0,0 +1,41 @@
+module ImageSearcher
+  class Client
+    attr_reader :options, :result
+
+    def search(opts = {})
+      @options = opts 
+      raise_errors
+      @result = ImageSearcher::API.get_json(build_json_url)
+      filter_by_format if options[:format]
+      result
+    end
+
+
+    private
+
+    def raise_errors
+      raise "Missing params" if options[:query].nil?
+      raise "Missing query" if options[:query].empty?
+    end
+
+    def build_json_url
+      base_uri = ImageSearcher::API::BASE_URI
+      url = "#{base_uri}?q=#{options[:query]}"
+      url += "&count=#{options[:count]}" if options[:count]
+      url
+    end
+
+    def filter_by_format
+      format = options[:format]
+      if format.is_a?(Array)
+        format.each do |f|
+          @result = result.keep_if { |h| h['url'].match(/.#{f}/i) }
+        end
+      else
+        @result = result.keep_if { |h| h["url"].match(/.#{format}/i) }
+      end
+
+      @result
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_searcher
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Vitaliy
@@ -42,30 +42,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
 description: A ruby wrapper for the Ababeen images search API
 email:
 - vitaliy.fry@gmail.com
@@ -85,8 +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/client.rb
 - lib/image_searcher/version.rb
 homepage: https://github.com/Frylock13/image_searcher
 licenses:

data/lib/image_searcher/filter.rb

@@ -1,14 +0,0 @@
-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,35 +0,0 @@
-module ImageSearcher
-
-  require_relative 'filter'
-  extend Filter
-
-  def self.search(options = {})
-    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
-
-    if options[:formats]
-      result = filter_by_formats(result, options[:formats])
-    end
-  end
-end