magic_path 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60fc211126220aad9cfa38f5267ee8817c98d08e
-  data.tar.gz: b850dace2bf6c6f75dff819a654d3680ad43b495
+  metadata.gz: ad0b6a1ea95f12ad3f5ba4d847772b89553a2504
+  data.tar.gz: 91d23e387a5b3620b7f25e795bbe60a77066a4e8
 SHA512:
-  metadata.gz: 10da9388d49cedaafc28ce05c5ee10ae4f09996333ccd4b1efc30ffbf0bdbc5f363503194d5f4edc415f6368823557b40c0e4e7f2cc15b127a4c40c14c2186a8
-  data.tar.gz: 7ae953bbb7ba30a278ed75e97802d8793d891a77c524c0765ec947d0b17ccf4d6e73090495c6333f1fdab61644fd094dbe979b2a673c711c33e03b33417f58a7
+  metadata.gz: 24711525b65540a7e62ab57ca345cb9dca3db2a033f45cb3c3365735b73f5c907d5fdd7b798b4b888a418f5020f804ba91f5bb12364b6fd79f341493b0231add
+  data.tar.gz: ad7413202b5549e33d1f5733e6bcce07ce75bc6a20a9b1a65ff4fcbd71db445f7163b4bdc8532b2b9c0e62e4983413eb462cfd419ad3136178b2b5ee09c79f67

data/lib/magic_path/dynamic_path.rb

@@ -19,7 +19,9 @@ module MagicPath
     def resolve(extra_params = {})
       return @locked_path unless @locked_path.nil?
       full_params = @params.merge(extra_params)
-      @pattern.split('/').map { |f| f[0] == ':' ? _var(f[1..-1], full_params) : f }.join('/')
+      resolved_path = @pattern.dup
+      @pattern.scan(/(\:\w(?:\w+|\d+))/).flatten.each { |t| resolved_path.gsub!(t, _var(t, full_params)) }
+      resolved_path
     end
 
     def finalize(extra_params = {})
@@ -64,11 +66,11 @@ module MagicPath
 
     private
 
-    def _var(var_name, full_params = {})
+    def _var(var, full_params = {})
+      var_name = var.delete ':'
       return full_params[var_name] if full_params.key?(var_name)
       return full_params[var_name.to_sym] if full_params.key?(var_name.to_sym)
-
-      return MagicPath.send(var_name).resolve(full_params) if MagicPath.respond_to? var_name
+      return MagicPath.send(var_name.to_sym).resolve(full_params) if MagicPath.instance.respond_to? var_name
       resolver = _resolver_for(var_name)
       return resolver.send(var_name) unless resolver.nil?
       raise ArgumentError, "Could not locate #{var_name}, in params or resolvers."

data/lib/magic_path/version.rb

@@ -1,3 +1,3 @@
 module MagicPath
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_path
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Donavan Stanley