compose_url 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f02e1ca714b06f3162a64ccc1aad00263342ae5
-  data.tar.gz: a02d63d16c71d7519c1379fb986cf9f1003a0e1e
+  metadata.gz: 6729d272071f8a515e6077829668636e2617c41f
+  data.tar.gz: c8e776fd305bd085e922de1c09a503c035e73f80
 SHA512:
-  metadata.gz: 60b15d22131abe5877144faaffdae86a8f8fac04820aef93d299f39429bf616e804cf4bbdc7d031cc26dbba6ccb88df9d6f7ee5ac6f0653b63f9d5eb394bcf20
-  data.tar.gz: 94d78cbcfaefd8baf1e98e18fe153507f4feee202cccae8baf122dbdfe7f8ab9fa86769e7ce762218a3e0aa53d2adc8bf8c8e6be1692c2c3846fd048a117dc3f
+  metadata.gz: bd1bbc682fd5373258f0e7edae303594577bbe7a06797474defba7ee9238709508c4de1d3afe6e9115c27cc0000801bd9ddaf3a95a9d76e700416d1916df1eb1
+  data.tar.gz: 4e0cf2696d342c325c570dd411dcb095eb1cc24b1950534b8e539c7352f91dae80184002f82e1baa76fa267227664e3c798ffb524901d832361c1bbb0a0170b4

data/lib/compose_url.rb

@@ -4,9 +4,9 @@ require 'uri'
 class ComposeURL
   attr_accessor :params
 
-  def initialize(baseurl, params={})
-    @url = baseurl
-    @params = params
+  def initialize(base_url, params={})
+    @url = init_url(base_url)
+    @params = init_params(base_url).merge(params)
   end
 
   def add_param(k, v)
@@ -27,15 +27,16 @@ class ComposeURL
 
   private
 
-  # todo: is this a valid key?
-  def validate_key(k)
-    raise ComposeURLError.new('Invalid key') unless k == escape(k) # key shouldn't require escaping, or should it?
-    escape(k)
+  def init_url(base_url)
+    base_url[/[^?]+/]
   end
 
-  # todo: is this a valid value?
-  def validate_value(v)
-    escape(v)
+  def init_params(base_url)
+    base_url.gsub(init_url(base_url), '').gsub('?', '').split('&').inject({}) {|h, pair|
+      pair = pair.split('=')
+      h[pair[0]] = pair[1]
+      ; h
+    }
   end
 
   def validate_url(url)
@@ -45,7 +46,7 @@ class ComposeURL
 
   def params_string
     @params.map { |k,v|
-      "#{validate_key(k)}=#{validate_value(v)}"
+      "#{escape(k)}=#{escape(v)}"
     }.join('&')
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compose_url
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ryan Burnette