ruby-json-home 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bba96e8360159bc95c214c30eabb3fc8110afc44
-  data.tar.gz: 0e06f41c3f1b27a969d7c54a353fbc937dfb9e11
+  metadata.gz: 9e989a483c3cf9e0775337128c1dce711e073f6e
+  data.tar.gz: bbe903bf2c2b5de92e525f63f8f2837c075cc949
 SHA512:
-  metadata.gz: 67111dca97aac5329ddac374d83ed7338c3a8cd8f25f060352aa75e2d3ecf9a3ac38a2b0a3488bd6215837110801e4874807d854e1bfc1261602db618af051b8
-  data.tar.gz: 0ed557f7fdfaf5685089d1bd0035b7c48d1ec4e9f281f9b925abe58573208f5574a7e4582ee8585c220579bdecc7770a67b9a04b3b0ace8042597d1232b94e0f
+  metadata.gz: f6df672465490dc400a1732372ebff2b0332595a5253a0855ef05914d54b16331fd4d4196a1ca17df76a586ac80b3d272004cc65aa6ba7e6689974da08124c23
+  data.tar.gz: 8e08d2efd35be25dc26280dbddbdf8c722319c442b07a13d781b3769e5baad59141d5cf698c606eec56b495f82feeaa3806263c918613feb75e2012a7c0df346

data/lib/json_home.rb

@@ -33,7 +33,7 @@ class JSONHome
   end
 
   def reload(local_resources = nil)
-    Net::HTTP.start(@base_uri.host, @base_uri.port) do |http|
+    Net::HTTP.start(@base_uri.host, @base_uri.port, :use_ssl => @base_uri.scheme == 'https') do |http|
       req = if local_resources.is_a?(Hash)
         r = Net::HTTP::Put.new(@base_uri.request_uri)
         r.body = JSON.generate('resources' => with_namespaces(local_resources))
@@ -80,7 +80,8 @@ class JSONHome
     data   = resources[resource.to_s]
 
     if data['href'].is_a?(String)
-      data['href']
+      uri = data['href']
+      unknown_keys = params.keys
     elsif data['href-template'].is_a?(String)
       uri = data['href-template']
       unknown_keys = (params.keys - data['href-vars'].keys)
@@ -89,16 +90,17 @@ class JSONHome
         self.warn("Missing key '#{key}' in ForeignLinks#uri call") unless params[key]
         uri = uri.gsub("{#{key}}", params[key].to_s)
       end
-      if self.use_additional_params and unknown_keys.any?
-        additional_params = URI.encode_www_form params.select{|k, v| unknown_keys.include? k }
-        if uri.include? '?'
-          uri + '&' + additional_params
-        else
-          uri + '?' + additional_params
-        end
+    end
+
+    if self.use_additional_params and unknown_keys.any?
+      additional_params = URI.encode_www_form params.select{|k, v| unknown_keys.include? k }
+      if uri.include? '?'
+        uri + '&' + additional_params
       else
-        uri
+        uri + '?' + additional_params
       end
+    else
+      uri
     end
   end
 

data/lib/ruby-json-home.rb

@@ -18,7 +18,7 @@ require 'json_home'
 
 module RubyJSONHome
 
-  VERSION = '0.0.2'
+  VERSION = '0.0.4'
 
 end
 

data/ruby-json-home.gemspec

@@ -12,25 +12,26 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "ruby-json-home"
+# encoding: utf-8
+
+$:.push File.expand_path('../lib', __FILE__)
+require 'ruby-json-home'
 
 Gem::Specification.new do |s|
-  s.name        = "ruby-json-home"
+  s.name        = 'ruby-json-home'
   s.version     = RubyJSONHome::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Till Schulte-Coerne"]
-  s.email       = ["till.schulte-coerne@innoq.com"]
-  s.homepage    = "http://github.com/innoq/ruby-json-home"
-  s.summary     = "A client for json-home"
+  s.authors     = ['Till Schulte-Coerne', 'Willem van Kerkhof']
+  s.email       = ['till.schulte-coerne@innoq.com', 'willem.van-kerkhof@innoq.com']
+  s.homepage    = 'http://github.com/innoq/ruby-json-home'
+  s.summary     = 'A client for json-home'
   s.description = s.summary
   s.extra_rdoc_files = ['README.md', 'LICENSE']
 
-  s.add_dependency "bundler"
+  s.add_dependency 'bundler'
 
-  s.files = %w(LICENSE README.md Rakefile ruby-json-home.gemspec) + Dir.glob("{lib,test}/**/*")
-  s.test_files = Dir.glob("{test}/**/*")
-  s.executables = Dir.glob("{bin}/**/*")
-  s.require_paths = ["lib"]
-end
+  s.files = %w(LICENSE README.md Rakefile ruby-json-home.gemspec) + Dir.glob('{lib,test}/**/*')
+  s.test_files    = Dir.glob '{test}/**/*'
+  s.executables   = Dir.glob '{bin}/**/*'
+  s.require_paths = ['lib']
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ruby-json-home
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Till Schulte-Coerne
+- Willem van Kerkhof
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -27,6 +28,7 @@ dependencies:
 description: A client for json-home
 email:
 - till.schulte-coerne@innoq.com
+- willem.van-kerkhof@innoq.com
 executables: []
 extensions: []
 extra_rdoc_files: