signaling 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8784fb8e4727801f77797c4e4ebabf9fe826f079
-  data.tar.gz: dc9aa50680a5bc469f12c00bc03a86faddfef1b6
+  metadata.gz: ca19fc3b658bd738c01325701134017ced13e62c
+  data.tar.gz: 8085032158fb6309eb198105fae4d8610b5b9f07
 SHA512:
-  metadata.gz: 5eedfa6faf94e6514bdf7f2111d8c232f0b7ca75c4afc58fb70246bd77191fb6ce025d3e585ba73ec9f350a42da132ad753b72631b7fc9c3ddf6520a7c59131f
-  data.tar.gz: 00adad312a2ad7716ee5fe8da03c3ef17c6f355e1898235f98121019d6524e45503af5e6e0724f267ca1ec6433cd49283dd6050815daa1802a670d9656a2ab8c
+  metadata.gz: 4f0242e051f363d0c4547d821b0774fccd073eb1856651881bd136e428d279c326a7aa0568341e8cbaee0ffde3d2761abcbe9192839636f15b268798999775a4
+  data.tar.gz: 76a065116c5c79a40b6468330ec4195b0513eb7beb31f2f9a87a8af9b4d10e5210f43bb973a3ced442127470b31f9aa004682fc75dd9ef70c64f54d4ba251dac

data/lib/signaling/base/http.rb

@@ -1,3 +1,5 @@
+require 'addressable/template'
+
 module Signaling::Base::Http
   extend ActiveSupport::Concern
 
@@ -13,11 +15,14 @@ module Signaling::Base::Http
 
   module ClassMethods
     def request(action, params = {}, &block)
+      params = params.with_indifferent_access
+
       http_method = http_method_for(action)
-      path = path_for(action, id: params[:id])
-      scoped_params = scope_params(params.except(:id))
+      path_params, body_params = split_params(action, params)
+      path = path_for(action, path_params)
+      body = scope_params(body_params)
 
-      response = connection.send(http_method, path, scoped_params)
+      response = connection.send(http_method, path, body)
 
       block ? block.call(response.body) : response.body
     end
@@ -48,13 +53,33 @@ module Signaling::Base::Http
 
     protected
 
-    def path_for(action, options = nil)
-      path = _defined_actions.try(:[], action).try(:[], :path)
+    def defined_action(action)
+      _defined_actions.try(:[], action) or raise(UndefinedAction, action)
+    end
+
+    def split_params(action, params)
+      path = defined_action(action)[:path]
+
+      path_params = params.slice(*path_parameters(path))
+      body_params = params.except(*path_parameters(path))
+
+      return path_params, body_params
+    end
+
+    def path_parameters(path)
+      path.scan(/:([^\/.]*)/).flatten
+    end
 
-      raise(UndefinedAction, action) unless path
+    def path_for(action, parameters = {})
+      path = defined_action(action)[:path]
+
+      parameters = parameters.merge(route_key: route_key)
+
+      path_parameters(path).each do |parameter|
+        path = path.gsub(":#{parameter}", parameters[parameter].to_s)
+      end
 
-      path.gsub(":route_key", route_key)
-        .gsub(":id") { options[:id] || raise('missing :id parameter for route') }
+      path
     end
 
     def http_method_for(action)

data/lib/signaling/version.rb

@@ -1,3 +1,3 @@
 module Signaling
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signaling
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Neer Friedman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Signaling maps REST-like APIs to ruby objects