clarifai-rails 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5be6cebafc81e05908db735da87c5fbdb0940102
-  data.tar.gz: 4f6cdf1efd108c823b239b056793e8c2e30c9a73
+  metadata.gz: 7bada0ca5c7cc4594a0a449144b13799f4f65973
+  data.tar.gz: 62a997af00984238fc741d4179a6393c5c5470bf
 SHA512:
-  metadata.gz: eada820d2430b077964e4453ddf8cad8fccae884ac4a16297079a8420db20d5092ce2b048ee2e64c6f926c6b3ae12d371d336dbc99bb01bdcfdd4ae36416b3db
-  data.tar.gz: dae8da72ef309e32ea535a553b24ba5b336240362b7e695fabffe8e04d7ee3e864b3099ed6fbc0cca20922078ce33c2d87f90539615bc718d65004a35daec6f6
+  metadata.gz: f792436b7f7ebdcc9cbdbee7a62e5bd73085a31cd2e158e8ba49576f948fdf1cb6629133ee91d912ae8f8e38f30b3d9e395109ded7ceaa7a6e8f7375a36abfe8
+  data.tar.gz: bce5ac6b6972c60cbe88dcc64219270d8b5a48beba6a8640f5c7dc23a30f6cc35a96e3ceb8649abde8602c4c85a49bd828a70acb8453f656e8478849a41d67c8

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'rest-client', '~> 1.8'
+
 # Specify your gem's dependencies in clarifai-rails.gemspec
 gemspec

data/README.md

@@ -2,14 +2,12 @@
 
 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/clarifai/rails`. To experiment with that code, run `bin/console` for an interactive prompt.
 
-TODO: Delete this and the text above, and describe your gem
-
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'clarifai-rails'
+  gem 'clarifai-rails'
 ```
 
 And then execute:
@@ -33,7 +31,7 @@ Insert your application info in ```config/initializers/clarifai.rb```
 ### How to detect image
 
 ```ruby
-Clarifai::Rails::Detector.new(image_url).image
+  Clarifai::Rails::Detector.new(image_url).image
 ```
 
 Return ```Clarifai::Rails::Image``` object
@@ -41,64 +39,75 @@ Return ```Clarifai::Rails::Image``` object
 ### For multiple images
 
 ```ruby
-Clarifai::Rails::Detector.new([image_url_1, image_url_2]).images
+  Clarifai::Rails::Detector.new([image_url_1, image_url_2]).images
+```
+
+Return array ```Clarifai::Rails::Image``` object
+
+### If you want to download images before detect (Facebook images, ...)
+
+```ruby
+  clarifai_detector = Clarifai::Rails::Detector.new([image_url_1, image_url_2])
+  clarifai_detector.need_download!
+  clarifai_detector.images
 ```
 
 Return array ```Clarifai::Rails::Image``` object
 
+### Note
 
 With ```image``` is ```Clarifai::Rails::Image``` object
 
 #### Get tags
 
-```
-image.tags
+```ruby
+  image.tags
 ```
 Return for you is a String array, it is tags list
 
 #### Get tags with percent in image
 
-```
-image.tags_with_percent
+```ruby
+  image.tags_with_percent
 ```
 Return is a Hash with key is tag and value is percent
 
 #### Get url
 
-```
-image.url
+```ruby
+  image.url
 ```
 Return ia a String
 
 #### Get docid
 
-```
-image.docid
+```ruby
+  image.docid
 ```
 Return ia a Number
 
 #### Get docid_str
 
-```
-image.docid_str
+```ruby
+  image.docid_str
 ```
 Return ia a String
 
 #### Check status
 
-```
-image.success?
+```ruby
+  image.success?
 ```
 AND
 
-```
-image.error?
+```ruby
+  image.error?
 ```
 
 #### Get status_code
 
-```
-image.status_code
+```ruby
+  image.status_code
 ```
 Return ia a String
 
@@ -106,8 +115,8 @@ Can you see more info at https://developer.clarifai.com/docs/status_codes
 
 #### Get status_msg
 
-```
-image.status_messages
+```ruby
+  image.status_messages
 ```
 Return ia a String
 

data/clarifai-rails.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "rest-client", "1.8"
 end

data/lib/clarifai/rails.rb

@@ -10,10 +10,11 @@ module Clarifai
       yield self
     end
 
-    mattr_accessor :client_id, :client_secret
+    mattr_accessor :client_id, :client_secret, :tag_url
 
     @@client_id = nil
     @@client_secret = nil
+    @@tag_url = "https://api.clarifai.com/v1/tag"
 
   end
 end

data/lib/clarifai/rails/detector.rb

@@ -1,19 +1,26 @@
 require "open-uri"
+require "rest-client"
 
 module Clarifai
   module Rails
     class Detector
 
-      def initialize(urls)
+      def initialize(urls, download=false)
         raise "Input data not supported! (String Array or String only)" unless urls.is_a?(Array) || urls.is_a?(String)
-        @@urls = urls.is_a?(Array) ? urls : [urls]
 
-        @@clarifai_token_expire ||= Time.current
+        @urls = urls.is_a?(Array) ? urls : [urls]
+        @download = download
+        $clarifai_token_expire ||= Time.current
+      end
+
+      def need_download!
+        @download = true
+        self
       end
 
       def to_hash
-        @data_urls ||= fetch
-        JSON.parse(@data_urls).symbolize_keys
+        @data_urls = fetch if @data_urls.blank?
+        @data_urls.is_a?(Hash) ? @data_urls : JSON.parse(@data_urls).symbolize_keys
       end
 
       def results
@@ -47,15 +54,32 @@ module Clarifai
       private
 
       def fetch
-        new_token if @@clarifai_token_expire <= Time.current
-        params_string = @@urls.join("&url=")
-        response = open("https://api.clarifai.com/v1/tag?url=#{params_string}", "Authorization" => "Bearer #{@@clarifai_token[:access_token]}")
+        new_token if $clarifai_token_expire <= Time.current
+        @download ? urls_protected : urls_unprotected
+      end
+
+      def urls_unprotected
+        params_string = @urls.join("&url=")
+        response = open("#{Clarifai::Rails.tag_url}?url=#{params_string}", "Authorization" => "Bearer #{$clarifai_token[:access_token]}")
         response.read
       end
 
+      def urls_protected
+        data = { results: [], status_code: nil }
+        @urls.each do |url|
+          result = RestClient.post( Clarifai::Rails.tag_url,
+                                   { encoded_data: File.new(open(url)) },
+                                   Authorization: "Bearer #{$clarifai_token[:access_token]}")
+          json = JSON.parse(result).symbolize_keys
+          data[:results] << json[:results].first
+          data[:status_code] = json[:status_code]
+        end
+        data
+      end
+
       def new_token
-        @@clarifai_token = Clarifai::Rails::Token.new.create.symbolize_keys
-        @@clarifai_token_expire = Time.current + @@clarifai_token[:expires_in]
+        $clarifai_token = Clarifai::Rails::Token.new.create.symbolize_keys
+        $clarifai_token_expire = Time.current + $clarifai_token[:expires_in]
       end
 
     end

data/lib/clarifai/rails/version.rb

@@ -1,5 +1,5 @@
 module Clarifai
   module Rails
-    VERSION = "0.1.1"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clarifai-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Karl Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: Clarifai API Rails Client
 email:
 - thanhkhoait@gmail.com