geekier_factory 0.1.3 → 0.1.4

data/lib/geekier_factory/action.rb

@@ -1,5 +1,7 @@
 module GeekierFactory  
   class Action
+    AttributesMissing = Class.new(Exception)
+
     def initialize(api, structure)
       @api = api
       @structure = structure
@@ -13,6 +15,10 @@ module GeekierFactory
       params.select{ |p| p['paramType'] == 'body' }
     end
 
+    def path_params
+      params.select{ |p| p['paramType'] == 'path' }
+    end
+
     def url_params
       params.select{ |p| p['paramType'] == 'query' }
     end
@@ -27,8 +33,21 @@ module GeekierFactory
       param_values.select{ |k,v| names.include?(k.to_s) }
     end
 
+    def path_hash(param_values)
+      names = path_params.map{ |p| p['name'] }
+      param_values.select{ |k,v| names.include?(k.to_s) }
+    end
+
     def build_url(param_values)
-      api_connection.build_url(path, url_hash(param_values))
+      vals = path_hash(param_values)
+      if (as = (path_variables - vals.keys.map(&:to_s))).any?
+        raise AttributesMissing.new(as)
+      end
+      p = path
+      vals.each do |k, v|
+        p = p.sub("{#{k}}", v)
+      end
+      api_connection.build_url(p, url_hash(param_values))
     end
 
     def build_body(param_values)
@@ -42,6 +61,10 @@ module GeekierFactory
     def path
       @structure['path'].start_with?('/') ? @structure['path'][1..-1] : @structure['path']
     end
+    
+    def path_variables
+      path.scan(/\{(\w*)\}/).flatten
+    end
 
     def request_hash(param_values)
       { 

data/lib/geekier_factory/version.rb

@@ -1,3 +1,3 @@
 module GeekierFactory
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/test/mock_definition.json

@@ -40,12 +40,28 @@
                             "name": "b2", 
                             "paramType": "body", 
                             "required": false
+                        },  
+                        {
+                            "allowMultiple": false, 
+                            "dataType": "string", 
+                            "description": "specify action", 
+                            "name": "action", 
+                            "paramType": "path", 
+                            "required": true
+                        },
+                        {
+                            "allowMultiple": false, 
+                            "dataType": "string", 
+                            "description": "specify format", 
+                            "name": "format", 
+                            "paramType": "path", 
+                            "required": true
                         }
                     ], 
                     "summary": "Call to test the API"
                 }, 
             ], 
-            "path": "/action.do"
+            "path": "/{action}.{format}"
         }
     ], 
     "errorResponses": [

data/test/test_factory.rb

@@ -21,8 +21,8 @@ class TestFactory < Test::Unit::TestCase
   end
 
   test "action should have 4 parameters" do
-    assert_equal 4, @action.params.size
-    assert_equal ['q1', 'q2', 'b1', 'b2'], @action.params.map{ |p| p['name'] }
+    assert_equal 6, @action.params.size
+    assert_equal ['q1', 'q2', 'b1', 'b2', 'action', 'format'], @action.params.map{ |p| p['name'] }
   end
 
   test "action should have 2 body and 2 query parameters and they should be different" do
@@ -32,8 +32,8 @@ class TestFactory < Test::Unit::TestCase
   end
 
   test "calling the action should call the right url" do
-    stub_http_request(:post, "localhost/api/v0.1/action.do").
+    stub_http_request(:post, "localhost/api/v0.1/call.json").
       with(:body => {:b1 => "body", :b2 => "test"}, :query => {:q1 => 'testing', :q2 => 'query'})
-    @action.call(:b1 => "body", :b2 => "test", :q1 => 'testing', :q2 => 'query')
+    @action.call(:b1 => "body", :b2 => "test", :q1 => 'testing', :q2 => 'query', :action => 'call', :format => 'json')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geekier_factory
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler