imagga 0.0.3 → 0.0.5

data/spec/lib/parametizer_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+class DummyParametizer; include Imagga::Parametizer; end
+
+describe Imagga::Parametizer do
+  subject { DummyParametizer.new }
+
+  describe "#build_comma_separated_string" do
+    it "builds list of object fields" do
+      object = stub(field: 'asdf')
+      subject.build_comma_separated_string([object]*2, :field).should == 'asdf,asdf'
+    end
+
+    it "defaults to default value, if field is not present" do
+      object = Object.new
+      object2 = stub(field: 'asdf')
+      subject.build_comma_separated_string([object, object2], :field, 'qwer').should == 'qwer,asdf'
+    end
+
+    it "produces no result if all items default to the default value" do
+      object = Object.new
+      subject.build_comma_separated_string([object]*3, :field, 'qwer').should == nil
+    end
+  end
+
+  describe "#build_boolean_options" do
+    it "produces hash with boolean values coded as 1 and 0" do
+      input = { foo: true, boo: false }
+      subject.build_boolean_options(input, [:foo, :boo]).should ==  { foo: 1, boo: 0 }
+    end
+
+    it "produces hash with initial boolean values '1' and '0' coded as 1 and 0" do
+      input = { foo: '1', boo: '0' }
+      subject.build_boolean_options(input, [:foo, :boo]).should ==  { foo: 1, boo: 0 }
+    end
+
+    it "produces hash with initial boolean values 1 and 0 coded as 1 and 0" do
+      input = { foo: 1, boo: 0 }
+      subject.build_boolean_options(input, [:foo, :boo]).should ==  { foo: 1, boo: 0 }
+    end
+  end
+end

data/spec/lib/rank_color_parametizer_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Imagga::RankColorParametizer do
+  subject { described_class.new }
+
+  describe "#parametrize" do
+    it "generates string presentation of the rank color object" do
+      subject.parametrize(Imagga::RankColor.new(percent: 40, hex: '#123456')).should == { color_vector: '40,18,52,86' }
+    end
+
+    it "generates string presentation of many rank color objects" do
+      subject.parametrize([
+        Imagga::RankColor.new(percent: 40, hex: '#123456'),
+        Imagga::RankColor.new(percent: 10, hex: '#23421e'),
+        Imagga::RankColor.new(percent: 33, hex: '#09238f')
+      ]).should == { color_vector: '40,18,52,86,10,35,66,30,33,9,35,143' }
+    end
+
+    it "does not change the given color vector string" do
+      subject.parametrize([
+        Imagga::RankColor.new(percent: 40, hex: '#123456'),
+        '10,35,66,30',
+        Imagga::RankColor.new(percent: 33, hex: '#09238f')
+      ]).should == { color_vector: '40,18,52,86,10,35,66,30,33,9,35,143' }
+    end
+  end
+end

data/spec/lib/rank_color_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe Imagga::RankColor do
+  context "when initialized through rgb values" do
+    subject { described_class.new(percent: 40, r: 200, g: 100, b: 50) } 
+
+    it "has percent" do
+      subject.percent.should == 40
+    end
+
+    it "has r value" do
+      subject.r.should == 200
+    end
+
+    it "has g value" do
+      subject.g.should == 100
+    end
+
+    it "has b value" do
+      subject.b.should == 50
+    end
+
+    it "has hex value" do
+      subject.hex.should == '#c86432'
+    end
+  end
+
+  context "when initialized through hex value" do
+    subject { described_class.new(percent: 40, hex: '#c86432') } 
+
+    it "has percent" do
+      subject.percent.should == 40
+    end
+
+    it "has r value" do
+      subject.r.should == 200
+    end
+
+    it "has g value" do
+      subject.g.should == 100
+    end
+
+    it "has b value" do
+      subject.b.should == 50
+    end
+
+    it "has hex value" do
+      subject.hex.should == '#c86432'
+    end
+  end
+end

data/spec/lib/rank_options_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Imagga::RankOptions do
+  subject { described_class.new('apikey', 'secret') }
+
+  describe "#options" do
+
+    it "builds options" do
+      subject.options(
+        color_vector:  '49,33,44,55,11,22,33,44',
+        urls:           'http://image',
+        type:           :object,
+        dist:           3000,
+        count:          10
+      ).should == {
+        api_key:      'apikey',
+        color_vector: '49,33,44,55,11,22,33,44',
+        count:        '10',
+        dist:         '3000',
+        method:       'imagga.colorsearch.rank',
+        sig:          '96185035e02a781a7b3455eb500eeec9',
+        type:         'object',
+        urls:         'http://image',
+        v:            '1.0'
+      }
+    end
+  end
+end

data/spec/lib/rank_result_builder_spec.rb

@@ -1,18 +1,7 @@
 require 'spec_helper'
 
 describe Imagga::RankResultBuilder do
-  let(:result) { {
-    'rank_similarity' =>  [
-      {
-        "id" => 8774077,
-        "dist" => 2597.38299
-      },
-      {
-        "id" => 9085916,
-        "dist" => 2681.33259
-      }
-    ]
-  } }
+  let(:result) { JSON.parse(IO.read('./spec/fixtures/rank_response.txt')) }
 
   subject { described_class.new }
 

data/spec/lib/resolution_parametizer_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe Imagga::ResolutionParametizer do
+  subject { described_class.new }
+
+  describe "#parametrize" do
+    it "creates a resolutions parameter for the service" do
+      subject.parametrize('123x342').should == { resolutions: '123,342' }
+    end
+  end
+
+  describe "#build_resolutions" do
+    it "produces empty string from nil input" do
+      subject.build_resolutions(nil).should ==  ''
+    end
+
+    it "produces empty string from empty string input" do
+      subject.build_resolutions('').should ==  ''
+    end
+
+    it "produces empty string from empty array" do
+      subject.build_resolutions([]).should ==  ''
+    end
+
+    it "produces comma separated string from single a x b resolution string" do
+      subject.build_resolutions('123x234').should ==  '123,234'
+    end
+
+    it "produces comma separated string from many a x b resolutions in one string" do
+      subject.build_resolutions('123x234,90x33,432x88').should ==  '123,234,90,33,432,88'
+    end
+
+    it "leaves comma seperated resolution as is" do
+      subject.build_resolutions('123,234').should ==  '123,234'
+    end
+
+    it "produces comma separated string from single element a x b resolution array" do
+      subject.build_resolutions(['123x234']).should ==  '123,234'
+    end
+
+    it "produces comma separated string from many a x b resolutions in one array" do
+      subject.build_resolutions(['123x234','90x33','432x88']).should ==  '123,234,90,33,432,88'
+    end
+
+    it "produces comma separated string from mixed format array" do
+      subject.build_resolutions(['123x234,90,33','432x88']).should ==  '123,234,90,33,432,88'
+    end
+  end
+
+  describe "#build_resolution_string" do
+    it "translates a x b resolution form to comma seperated string" do
+      subject.build_resolution_string('123x234').should ==  '123,234'
+    end
+
+    it "leaves comma seperated resolution as is" do
+      subject.build_resolution_string('123,234').should ==  '123,234'
+    end
+  end
+end
+

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: imagga
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Mart Karu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,15 +34,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: color
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -108,58 +111,90 @@ files:
 - imagga.gemspec
 - lib/imagga.rb
 - lib/imagga/client.rb
+- lib/imagga/commands.rb
+- lib/imagga/core_client.rb
 - lib/imagga/exceptions.rb
-- lib/imagga/extract_options.rb
-- lib/imagga/extract_result_builder.rb
 - lib/imagga/image.rb
-- lib/imagga/rank_result_builder.rb
+- lib/imagga/image_or_url_parametizer.rb
+- lib/imagga/options.rb
+- lib/imagga/parametizer.rb
+- lib/imagga/rank_color_parametizer.rb
+- lib/imagga/resolution_parametizer.rb
+- lib/imagga/result_builder.rb
 - lib/imagga/version.rb
-- spec/lib/client_spec.rb
+- spec/fixtures/crop_response.txt
+- spec/fixtures/extract_response.txt
+- spec/fixtures/rank_response.txt
+- spec/integration/crop_spec.rb
+- spec/integration/extract_spec.rb
+- spec/integration/rank_spec.rb
+- spec/lib/commands_spec.rb
+- spec/lib/core_client_spec.rb
+- spec/lib/crop_info_spec.rb
+- spec/lib/crop_options_spec.rb
+- spec/lib/crop_result_builder_spec.rb
 - spec/lib/extract_result_builder_spec.rb
 - spec/lib/extraction_options_spec.rb
 - spec/lib/image_color_spec.rb
+- spec/lib/image_crop_spec.rb
 - spec/lib/image_info_spec.rb
+- spec/lib/image_or_url_parametizer_spec.rb
 - spec/lib/image_spec.rb
+- spec/lib/parametizer_spec.rb
+- spec/lib/rank_color_parametizer_spec.rb
+- spec/lib/rank_color_spec.rb
+- spec/lib/rank_options_spec.rb
 - spec/lib/rank_result_builder_spec.rb
 - spec/lib/rank_similarity_spec.rb
+- spec/lib/resolution_parametizer_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1906087538434497145
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1906087538434497145
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby client for accessing Imagga API
 test_files:
-- spec/lib/client_spec.rb
+- spec/fixtures/crop_response.txt
+- spec/fixtures/extract_response.txt
+- spec/fixtures/rank_response.txt
+- spec/integration/crop_spec.rb
+- spec/integration/extract_spec.rb
+- spec/integration/rank_spec.rb
+- spec/lib/commands_spec.rb
+- spec/lib/core_client_spec.rb
+- spec/lib/crop_info_spec.rb
+- spec/lib/crop_options_spec.rb
+- spec/lib/crop_result_builder_spec.rb
 - spec/lib/extract_result_builder_spec.rb
 - spec/lib/extraction_options_spec.rb
 - spec/lib/image_color_spec.rb
+- spec/lib/image_crop_spec.rb
 - spec/lib/image_info_spec.rb
+- spec/lib/image_or_url_parametizer_spec.rb
 - spec/lib/image_spec.rb
+- spec/lib/parametizer_spec.rb
+- spec/lib/rank_color_parametizer_spec.rb
+- spec/lib/rank_color_spec.rb
+- spec/lib/rank_options_spec.rb
 - spec/lib/rank_result_builder_spec.rb
 - spec/lib/rank_similarity_spec.rb
+- spec/lib/resolution_parametizer_spec.rb
 - spec/spec_helper.rb

data/lib/imagga/extract_options.rb

@@ -1,74 +0,0 @@
-module Imagga
-  class BaseOptions
-    attr_accessor :api_key, :api_secret
-
-    def initialize(api_key, api_secret)
-      @version    = '1.0'
-      @api_key    = api_key    || raise_missing(:api_key)
-      @api_secret = api_secret || raise_missing(:api_secret)
-    end
-
-    def base_options
-      { v: @version, api_key: @api_key }
-    end
-
-    def sign(options)
-      sorted_options_string = options.keys.sort.map do |key|
-        "%s=%s" % [key.to_s, options[key]]
-      end.join('') << @api_secret
-      Digest::MD5.hexdigest(sorted_options_string)
-    end
-  end
-
-  class ExtractOptions < BaseOptions
-
-    def options(urls_or_images, additional_options={})
-      options = base_options.merge(
-        method: 'imagga.colorsearch.extract',
-        urls: build_urls(urls_or_images),
-      )
-
-      if ids = build_ids(urls_or_images)
-        options.merge!(ids: ids)
-      end
-
-      [:extract_overall_colors, :extract_object_colors].each do |key|
-        if additional_options.keys.include?(key) && (value = additional_options[key] ? 1 : 0)
-          options.merge!(key => value)
-        end
-      end
-
-      options.merge!(sig: sign(options))
-    end
-
-    def build_urls(urls_or_images)
-      [urls_or_images].flatten.map{ |o| o.url rescue o }.join(',')
-    end
-
-    def build_ids(urls_or_images)
-      ids = [urls_or_images].flatten.map{ |o| o.id rescue 0 }
-      return if ids.uniq == [0]
-      ids.join(',')
-    end
-
-  end
-
-  class RankOptions < BaseOptions
-    def options(opts)
-      color_vector = opts.fetch(:color_vector)
-      type         = opts.fetch(:type)
-      dist         = opts.fetch(:dist)
-      count        = opts.fetch(:count)
-
-      options = base_options.merge(
-        method:       'imagga.colorsearch.rank',
-        color_vector: color_vector,
-        type:         type,
-        dist:         dist,
-        count:        count
-      )
-
-      options.merge!(sig: sign(options))
-    end
-  end
-end