kinu 1.0.0.alpha2 → 1.0.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f710fb1988d92057b17d59ab96e5df61267f0f0c
-  data.tar.gz: 87a017732b59fc113a2ac53c2adbfa6c5d73b856
+  metadata.gz: 6f46174555d31b43e3a7082e186965e0284bd092
+  data.tar.gz: 621be10284e1dc629701c401412f63e5d23a9c04
 SHA512:
-  metadata.gz: d74612519aec8ef309f08d5a78b8bd75e502cafea6e34b171fdb5ae51b4084e25748f11719cc2eaeda770cb3098cfb2c10f58d41859838ffa1f1f81fdc8c9b36
-  data.tar.gz: e162bebd3f6ef304429ffff2eb9003ccf5411f60fcdda6aec229ad56bb31694ea2e754efc797acf27af7e0cad7d3d962f858aa5a78ed69b68f998fd3edb012e3
+  metadata.gz: 4fb44cb947607ad80049c9e3df9be26835c548dc468f963cee3288abcc8ecec468d30f826fb0fe0994b77e26140cf89eda075b4ab64d54ec5a2a1a74f35b3b62
+  data.tar.gz: 841bf7d256dece209fe375aaec7028078ad944d2fd249f2f262b35f4cf0bde7d7251c933654ef02f96232b0087fb234afcff53bf2c6bbefc8a179da96033b8dd

data/.gitignore

@@ -7,3 +7,87 @@
 /pkg/
 /spec/reports/
 /tmp/
+/spec/examples.txt
+
+### https://raw.github.com/github/gitignore/58d953f03f9b9eb2ec160fe320f9041141dc8b31/Global/macOS.gitignore
+
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+### https://raw.github.com/github/gitignore/58d953f03f9b9eb2ec160fe320f9041141dc8b31/ruby.gitignore
+
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+# Used by dotenv library to load environment variables.
+# .env
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/README.md

@@ -1,6 +1,6 @@
 # Kinu ruby client
 
-[Kinu](https://github.com/TakatoshiMaeda/kinu) ruby client
+[Kinu](https://github.com/tokubai/kinu) ruby client
 
 ## Installation
 
@@ -16,7 +16,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install kinu
+    $ gem install kinu --pre
 
 ## Usage
 
@@ -31,10 +31,10 @@ end
 
 resource = Kinu::Resource.new(:foods, 1)
 resource.upload(open('/path/to/image.jpg'))
-resource.uri(width: 280, height: 300) # => #<URI::HTTP http://127.0.0.1/images/foods/w=280,h=300/1.jpg>
+resource.uri(width: 280, height: 300) # => #<URI::HTTP https://127.0.0.1/images/foods/w=280,h=300/1.jpg>
 
 sandbox = Kinu::Sandbox.upload(open('/path/to/image.jpg'))
-sandbox.uri(width: 280, height: 300) # => #<URI::HTTP http://192.168.99.100:5001/images/__sandbox__/w=280,h=300/1abd5e51-2ba4-43e5-a355-c2abee318d3f.jpg>
+sandbox.uri(width: 280, height: 300) # => #<URI::HTTP https://192.168.99.100:5001/images/__sandbox__/w=280,h=300/1abd5e51-2ba4-43e5-a355-c2abee318d3f.jpg>
 sandbox.attach_to(:foods, 1) # => #<Kinu::Resource:0x007fa4538098b0 @id="1", @name="foods">
 ```
 

data/kinu.gemspec

@@ -29,4 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "rspec", "~> 3.4"
+  spec.add_development_dependency "webmock", "~> 2.3"
 end

data/lib/kinu.rb

@@ -8,8 +8,14 @@ module Kinu
   USER_AGENT = "KinuRubyClient/#{Kinu::VERSION}".freeze
 
   def self.base_uri
-    raise "Kinu.config.host is not set." if config.host.empty?
-    URI::HTTP.build(scheme: config.scheme, host: config.host, port: config.port)
+    raise "Kinu.config.host is not set." unless config.host
+    http_class.build(host: config.host, port: config.port)
+  end
+
+  def self.base_upload_uri
+    host = config.upload_host || config.host
+    raise "Kinu.config.upload_host and Kinu.config.upload_host is not set. Please set one or the other." unless host
+    http_class.build(host: host, port: config.port)
   end
 
   def self.configure
@@ -19,4 +25,10 @@ module Kinu
   def self.config
     @config ||= Configuration.new
   end
+
+  private
+
+  def self.http_class
+    config.ssl? ? URI::HTTPS : URI::HTTP
+  end
 end

data/lib/kinu/configuration.rb

@@ -1,9 +1,13 @@
 module Kinu
   class Configuration
-    attr_writer :host, :port, :ssl
+    attr_writer :host, :upload_host, :port, :ssl
 
     def host
-      @host || ""
+      @host
+    end
+
+    def upload_host
+      @upload_host
     end
 
     def port

data/lib/kinu/geometry.rb

@@ -7,18 +7,36 @@ module Kinu
       crop:     :c,
       original: :o,
       middle:   :m,
+      manual_crop: :mc,
+      width_offset: :wo,
+      height_offset: :ho,
+      crop_width: :cw,
+      crop_height: :ch,
+      assumption_width: :aw,
     }.freeze
 
     def initialize(options)
       @options = options
+      validate
     end
 
-    def empty?
-      @options.empty?
+    def validate
+      raise ArgumentError, "required geometry hash." if empty?
+
+      return if !(@options[:width].nil? && @options[:height].nil?)
+      return if @options[:middle] == true
+      return if @options[:original] == true
+
+      raise ArgumentError, <<~EOS
+      invalid geometry, geometry must be met least one condition.
+      - set width or height any numeric.
+      - set middle true.
+      - set original true.
+      EOS
     end
 
-    def valid?
-      !(@options[:width].nil? && @options[:height].nil?)
+    def empty?
+      @options.empty?
     end
 
     def to_s

data/lib/kinu/http_client.rb

@@ -3,15 +3,16 @@ require 'kinu/errors'
 
 module Kinu
   class HttpClient
-    def self.post(path, params)
-      new(:post, path, params).run
+    def self.post(base_uri, path, params)
+      new(base_uri, :post, path, params).run
     end
 
-    def self.multipart_post(path, params)
-      new(:post, path, params, multipart: true).run
+    def self.multipart_post(base_uri, path, params)
+      new(base_uri, :post, path, params, multipart: true).run
     end
 
-    def initialize(method, path, params, multipart: false)
+    def initialize(base_uri, method, path, params, multipart: false)
+      @base_uri = base_uri
       @method = method
       @path = path
       @params = params
@@ -40,7 +41,7 @@ module Kinu
     private
 
     def connection
-      Faraday::Connection.new(Kinu.base_uri) do |builder|
+      Faraday::Connection.new(@base_uri) do |builder|
         builder.request :multipart if @multipart
         builder.request :url_encoded
         builder.adapter :net_http

data/lib/kinu/resource.rb

@@ -6,6 +6,7 @@ module Kinu
   class Resource < ResourceBase
     def upload(file)
       Kinu::HttpClient.multipart_post(
+        Kinu.base_upload_uri,
         '/upload',
         {
           name: @name,
@@ -17,7 +18,7 @@ module Kinu
     end
 
     def attach_from_sandbox(sandbox_id)
-      Sandbox.attach(@name, @id, sandbox_id)
+      Sandbox.attach(Kinu.base_upload_uri, @name, @id, sandbox_id)
     end
   end
 end

data/lib/kinu/resource_base.rb

@@ -25,8 +25,6 @@ module Kinu
     private
 
     def build_path(geometry, format)
-      raise ArgumentError, "required geometry hash." if geometry.empty?
-      raise ArgumentError, "invalid geometry, height or width is required." unless geometry.valid?
       "/images/#{@name}/#{geometry}/#{@id}.#{format}"
     end
 

data/lib/kinu/version.rb

@@ -1,3 +1,3 @@
 module Kinu
-  VERSION = "1.0.0.alpha2"
+  VERSION = "1.0.0.alpha3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kinu
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha2
+  version: 1.0.0.alpha3
 platform: ruby
 authors:
 - Takatoshi Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 description: image server kinu ruby client
 email:
 - me@tmd.tw
@@ -74,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - README.md
@@ -110,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: image server kinu ruby client