octoparts 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 317c9ff049a5f765301e3565e3d0950cdd4b10bd
-  data.tar.gz: 08f78bb01fc87dd29220192f43900e0947805409
+  metadata.gz: bf543c1883b814993628ea8d6bdb403f6662839a
+  data.tar.gz: cb94b2e8bfea66b815bc3f4b5c36919797df260f
 SHA512:
-  metadata.gz: 1e6dad732918d9f8c14ce0cbf4a0f0ab333257da067ee42f73667b111483939867311da3925a7ae052e8feb0c6b88cb73eea03cbe62560ba567afe01edb72107
-  data.tar.gz: 5a80bc14ed1264a540b63f329ab0e8a88c6ca0ffae534534dbedb7f8074f370a9d2442802bf6087a98dc91510ec90c4e19a7ac8380f1b42c2c0cd75d0c9573df
+  metadata.gz: b95b57df111373982427a8c2f44067ef95764f8745a81029bbb4c63fa0499c37af4cbd8d575921b9c687c0ba3048372371fad13b51b785adbdd1ecfcd0914563
+  data.tar.gz: 7cbd4a7a26ff4dc5d8d240b9722f3f4974b6f8a89943f090fe7116e8185fa6b2c692db256f58c8e7c267d42e57fd2d4a53a748e6363f54fe2858002ba218f40b

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.travis.yml

@@ -1,10 +1,7 @@
 language: ruby
 rvm:
-  - 2.0.0-p598
-  - 2.1.5
-  - 2.2.0
-gemfile:
-  - Gemfile
-  - gemfiles/faraday-0_8_8.gemfile
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
 sudo: false
 cache: bundler

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2015 Takayuki Matsubara
+Copyright (c) 2014-2017 Takayuki Matsubara, M3, Inc.
 
 MIT License
 

data/README.md

@@ -1,10 +1,7 @@
 # Octoparts
 
 [![Gem Version](https://badge.fury.io/rb/octoparts.svg)](http://badge.fury.io/rb/octoparts)
-[![Build Status](https://travis-ci.org/ma2gedev/octoparts-rb.svg)](https://travis-ci.org/ma2gedev/octoparts-rb)
-[![Coverage Status](https://img.shields.io/coveralls/ma2gedev/octoparts-rb.svg)](https://coveralls.io/r/ma2gedev/octoparts-rb)
-[![Code Climate](https://codeclimate.com/github/ma2gedev/octoparts-rb/badges/gpa.svg)](https://codeclimate.com/github/ma2gedev/octoparts-rb)
-[![endorse](https://api.coderwall.com/ma2gedev/endorsecount.png)](https://coderwall.com/ma2gedev)
+[![Build Status](https://travis-ci.org/m3dev/octoparts-rb.svg?branch=master)](https://travis-ci.org/m3dev/octoparts-rb)
 
 Octoparts Client for Ruby
 
@@ -80,7 +77,7 @@ client.invalidate_cache_group('echo_group', param_value: 'fooValue')
 
 ## Contributing
 
-1. Fork it ( https://github.com/ma2gedev/octoparts/fork )
+1. Fork it ( https://github.com/m3dev/octoparts/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/octoparts/client.rb

@@ -94,7 +94,7 @@ module Octoparts
                           else
                             raise Octoparts::ArgumentError
                           end
-      aggregate_request.to_json(camelize: true)
+      aggregate_request.to_json(user_options: {camelize: true})
     end
   end
 end

data/lib/octoparts/representer/aggregate_request_representer.rb

@@ -9,7 +9,7 @@ module Octoparts
       end
 
       def call(_represented, args)
-        args[:camelize] ? @camelcase : @camelcase.underscore
+        args.fetch(:user_options, {})[:camelize] ? @camelcase : @camelcase.underscore
       end
     end
 

data/lib/octoparts/version.rb

@@ -1,3 +1,3 @@
 module Octoparts
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/octoparts.gemspec

@@ -6,21 +6,24 @@ require 'octoparts/version'
 Gem::Specification.new do |spec|
   spec.name          = "octoparts"
   spec.version       = Octoparts::VERSION
-  spec.authors       = ["Takayuki Matsubara"]
-  spec.email         = ["takayuki.1229@gmail.com"]
+  spec.authors       = ["Takayuki Matsubara", "M3, inc."]
+  spec.email         = ["takayuki.1229@gmail.com", "platform-dev@m3.com"]
   spec.summary       = %q{ Ruby client for the Octoparts API }
   spec.description   = %q{ Ruby client library for the Octoparts API }
-  spec.homepage      = "https://github.com/ma2gedev/octoparts-rb"
+  spec.homepage      = "https://github.com/m3dev/octoparts-rb"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
+  spec.files.reject! {|f| f == 'Gemfile.lock'}
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "representable"
+  spec.required_ruby_version = '~> 2.2'
+  spec.add_dependency "representable", "~> 3.0"
   spec.add_dependency "activesupport", "> 4.0.0"
   spec.add_dependency "faraday"
+  spec.add_dependency "multi_json"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/test/representer/test_aggregate_request_representer.rb

@@ -58,7 +58,7 @@ class TestAggregateRequestRepresenter < Test::Unit::TestCase
     aggregate_request = Octoparts::Model::AggregateRequest.new
       .extend(Octoparts::Representer::AggregateRequestRepresenter).from_hash(JSON.parse(@json))
     assert do
-      JSON.parse(aggregate_request.to_json(camelize: true)) == convert_hash_keys(JSON.parse(@json))
+      JSON.parse(aggregate_request.to_json(user_options: {camelize: true})) == convert_hash_keys(JSON.parse(@json))
     end
   end
 end

data/test/test_client.rb

@@ -153,29 +153,24 @@ class TestClient < Test::Unit::TestCase
 
   sub_test_case "timeout" do
     setup do
-      @endpoint = Octoparts.configuration.endpoint
-      Octoparts.configure do |c|
-        # avoiding connection failed error, sorry heroku...
-        # we should find other way
-        c.endpoint = 'http://octoparts.herokuapp.com'
-      end
       @exception_class = defined?(Faraday::TimeoutError) ? Faraday::TimeoutError : Faraday::Error::TimeoutError
     end
 
     teardown do
       Octoparts.configure do |c|
-        c.endpoint = @endpoint
         c.timeout_sec = nil
       end
     end
 
     test "timeout_sec option" do
+      stub_request(:get, 'localhost:9000').to_raise(Timeout::Error)
       assert_raise @exception_class do
         Octoparts::Client.new(timeout_sec: 0).get('/')
       end
     end
 
     test "open_timeout_sec option" do
+      stub_request(:get, 'localhost:9000').to_raise(Timeout::Error)
       Octoparts.configure do |c|
         c.timeout_sec = 0
       end
@@ -193,4 +188,46 @@ class TestClient < Test::Unit::TestCase
       end
     end
   end
+
+  sub_test_case "#create_request_body" do
+    test "return camelized keys" do
+      request_hash = {
+        request_meta: {
+          id: 1,
+          service_id: 'hoge',
+          user_id: 2,
+          session_id: 3,
+          request_url: 'http://test.com',
+          user_agent: 'ruby',
+          timeout: 4
+        },
+        requests: [{
+          part_id: 'fuga',
+          id: 5,
+          params: [{
+            key: 'value_of_key',
+            value: 'value_of_value'
+          }]
+        }]
+      }
+      body_json = Octoparts::Client.new(timeout_sec: 0).send(:create_request_body, request_hash)
+      body = JSON.parse(body_json, symbolize_names: true)
+      assert { body[:requestMeta] != nil }
+      request_meta = body[:requestMeta]
+      assert { request_meta[:id] == 1 }
+      assert { request_meta[:serviceId] == 'hoge' }
+      assert { request_meta[:userId] == 2 }
+      assert { request_meta[:sessionId] == 3 }
+      assert { request_meta[:requestUrl] == 'http://test.com' }
+      assert { request_meta[:userAgent] == 'ruby' }
+      assert { request_meta[:timeout] == 4 }
+      assert { body[:requests].instance_of?(Array) }
+      request_item = body[:requests].first
+      assert { request_item[:partId] == 'fuga' }
+      assert { request_item[:id] == 5 }
+      assert { request_item[:params] != nil }
+      assert { request_item[:params].first[:key] == 'value_of_key' }
+      assert { request_item[:params].first[:value] == 'value_of_value' }
+    end
+  end
 end

metadata

@@ -1,29 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: octoparts
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Takayuki Matsubara
+- M3, inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +168,7 @@ dependencies:
 description: " Ruby client library for the Octoparts API "
 email:
 - takayuki.1229@gmail.com
+- platform-dev@m3.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -198,7 +214,7 @@ files:
 - test/test_builder.rb
 - test/test_client.rb
 - test/test_octoparts.rb
-homepage: https://github.com/ma2gedev/octoparts-rb
+homepage: https://github.com/m3dev/octoparts-rb
 licenses:
 - MIT
 metadata: {}
@@ -208,9 +224,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -218,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby client for the Octoparts API