ruby-json-home 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b704a0ba185c79406a60d9a7147bea2c1b36fb8
-  data.tar.gz: 4b7fe113fb946fa877ab4bf388b0f9541f0faa0c
+  metadata.gz: bba96e8360159bc95c214c30eabb3fc8110afc44
+  data.tar.gz: 0e06f41c3f1b27a969d7c54a353fbc937dfb9e11
 SHA512:
-  metadata.gz: e01d8abe49854076bda23d795766d22a25d6f98fd7438a461b25b47d5559a50869211e618578478639a1ff8c0d977d099e9c9b4785554ecceb7b80bfdbeeb6a7
-  data.tar.gz: 2a4bb75b3fca97dc78049d696531354e2b4fe9e5ff8e2ed3d95af51c8d4a8e65deefaff6bf74ecf396999f62247fb161b2a729c913ec76864823c107fb264dd5
+  metadata.gz: 67111dca97aac5329ddac374d83ed7338c3a8cd8f25f060352aa75e2d3ecf9a3ac38a2b0a3488bd6215837110801e4874807d854e1bfc1261602db618af051b8
+  data.tar.gz: 0ed557f7fdfaf5685089d1bd0035b7c48d1ec4e9f281f9b925abe58573208f5574a7e4582ee8585c220579bdecc7770a67b9a04b3b0ace8042597d1232b94e0f

data/lib/json_home.rb

@@ -19,85 +19,116 @@ class JSONHome
 
   attr_reader :base_uri
 
+  DEFAULT_NAMESPACE = 'http://helloworld.innoq.com'
+
   class << self
-    attr_accessor :logger, :ignore_http_errors
+    attr_accessor :logger, :ignore_http_errors, :default_namespace, :use_additional_params
   end
+  self.default_namespace = DEFAULT_NAMESPACE
 
   def initialize(base_uri, local_resources = nil)
-    @base_uri = URI.parse(base_uri)
+    @base_uri  = URI.parse(base_uri)
     @resources = {}
     reload(local_resources)
   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) do |http|
       req = if local_resources.is_a?(Hash)
-        r = Net::HTTP::Put.new(base_uri.request_uri)
-        r.body = JSON.generate("resources" => local_resources.each_with_object({}) { |(k, v), memo|
-            k = "http://helloworld.innoq.com/#{k}" unless k.to_s.include?("/")
-            memo[k] = v
-          })
-        r["Content-Type"] = "application/json"
+        r = Net::HTTP::Put.new(@base_uri.request_uri)
+        r.body = JSON.generate('resources' => with_namespaces(local_resources))
+        r['Content-Type'] = 'application/json'
         r
       else
-        Net::HTTP::Get.new(base_uri.request_uri)
+        Net::HTTP::Get.new(@base_uri.request_uri)
       end
-      req['Accept'] = "application/json-home"
+      req['Accept'] = 'application/json-home'
       res = http.request(req)
       if res.is_a?(Net::HTTPSuccess)
-        @resources = JSON.parse(res.body)["resources"] || {}
-        JSONHome.logger && JSONHome.logger.info("Found ForeignLinks: #{@resources.keys.inspect}")
+        @resources = JSON.parse(res.body)['resources'] || {}
+        self.class.logger.info("Found ForeignLinks: #{@resources.keys.inspect}") if self.class.logger
       else
         raise RuntimeError.new("HTTP error: '#{res.code} #{res.message}'")
       end
     end
   rescue Net::HTTPExceptions, Errno::ECONNREFUSED, RuntimeError => e
-    if JSONHome.ignore_http_errors
+    if self.class.ignore_http_errors
       puts e
-      JSONHome.logger && JSONHome.logger.error(e)
-      @resources = {}
+      self.class.logger.error(e) if self.class.logger
+      @resources = with_namespaces(local_resources)
     else
       raise e
     end
   end
 
   def uri(resource, params = {})
-    JSONHome.uri(@resources, resource, params)
+    self.class.uri(@resources, resource, params)
   end
 
   def uri?(resource)
-    JSONHome.uri?(@resources, resource)
+    self.class.uri?(@resources, resource)
   end
 
   def self.uri(resources, resource, params = {})
+    resource = with_namespace(resource)
     unless uri?(resources, resource)
-      JSONHome.logger && JSONHome.logger.warn("Couldn't find valid JSON home data for '#{resource}'")
+      self.warn "Couldn't find valid JSON home data for '#{resource}'"
       return nil
     end
 
     params = params.inject({}) { |h, (k, v)| h.merge(k.to_s => v)  }
+    data   = resources[resource.to_s]
 
-    data = resources[resource.to_s]
-    if data["href"].is_a?(String)
-      data["href"].to_s
-    elsif data["href-template"].is_a?(String)
-      uri = data["href-template"].to_s
-      unknown_keys = (params.keys - data["href-vars"].keys)
-      JSONHome.logger && JSONHome.logger.warn("Unknown keys #{unknown_keys.inspect} in ForeignLinks#uri call") if unknown_keys.any?
-      data["href-vars"].each do |key, type_uri|
-        JSONHome.logger && JSONHome.logger.warn("Missing key '#{key}' in ForeignLinks#uri call") unless params[key]
+    if data['href'].is_a?(String)
+      data['href']
+    elsif data['href-template'].is_a?(String)
+      uri = data['href-template']
+      unknown_keys = (params.keys - data['href-vars'].keys)
+      self.warn "Unknown keys #{unknown_keys.inspect} in ForeignLinks#uri call" if unknown_keys.any?
+      data['href-vars'].each do |key, type_uri|
+        self.warn("Missing key '#{key}' in ForeignLinks#uri call") unless params[key]
         uri = uri.gsub("{#{key}}", params[key].to_s)
       end
-      uri
+      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
+      else
+        uri
+      end
     end
   end
 
   def self.uri?(resources, resource)
-    data = resources[resource.to_s]
+    data = resources[self.with_namespace(resource)]
     data.is_a?(Hash) && (
-      data["href"].is_a?(String) ||
-          (data["href-template"].is_a?(String) && data["href-vars"].is_a?(Hash))
+      data['href'].is_a?(String) ||
+          (data['href-template'].is_a?(String) && data['href-vars'].is_a?(Hash))
     )
   end
 
-end
+  protected
+
+  def self.with_namespace(resource)
+    if resource.to_s.include?('/')
+      resource.to_s
+    else
+      [self.default_namespace, resource].join('/')
+    end
+  end
+
+  # appends the default namespace to each resource given in :local_resources
+  def with_namespaces(local_resources)
+    local_resources.each_with_object({}) do |(k, v), memo|
+      memo[self.class.with_namespace(k)] = v
+    end
+  end
+
+  def self.warn(msg)
+    self.logger.warn msg if self.logger
+  end
+
+end

data/lib/ruby-json-home.rb

@@ -18,7 +18,7 @@ require 'json_home'
 
 module RubyJSONHome
 
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
 end
 
@@ -28,4 +28,4 @@ if Kernel.const_defined?(:Rails)
   JSONHome.logger = Rails.logger
 else
   JSONHome.logger = Logger.new(STDOUT)
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-json-home
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Till Schulte-Coerne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler