Implement 'attr' filter

flexferrum · flexferrum · commit 27230f9d93c1 · 2018-05-20T18:51:57.000+03:00
diff --git a/include/jinja2cpp/reflected_value.h b/include/jinja2cpp/reflected_value.h
@@ -153,6 +153,12 @@ struct ContainerReflector
     {
         return GenericList([accessor = PtrItemAccessor<T>(cont)]() {return &accessor;});
     }
+
+    template<typename T>
+    static Value CreateFromPtr(std::shared_ptr<T> cont)
+    {
+        return GenericList([ptr = std::move(cont), accessor = PtrItemAccessor<T>(cont.get())]() {return &accessor;});
+    }
 };
 
 template<typename T>
@@ -197,7 +203,7 @@ struct Reflector<T, IsReflectedType<T>>
 
     static auto CreateFromPtr(std::shared_ptr<T> val)
     {
-        return GenericMap([accessor = ReflectedMapImpl<T>(val.get())]() {return &accessor;});
+        return GenericMap([ptr = val, accessor = ReflectedMapImpl<T>(val.get())]() {return &accessor;});
     }
 };
 
diff --git a/src/filters.cpp b/src/filters.cpp
@@ -92,12 +92,13 @@ InternalValue Sort::Filter(const InternalValue& baseVal, RenderContext& context)
 
 Attribute::Attribute(FilterParams params)
 {
-
+    ParseParams({{"name", true}}, params);
 }
 
 InternalValue Attribute::Filter(const InternalValue& baseVal, RenderContext& context)
 {
-    return InternalValue();
+    InternalValue attrNameVal = GetArgumentValue("name", context);
+    return Subscript(baseVal, attrNameVal);
 }
 
 Default::Default(FilterParams params)
diff --git a/test/filters_test.cpp b/test/filters_test.cpp
@@ -149,3 +149,14 @@ INSTANTIATE_TEST_CASE_P(Unique, ListIteratorTest, ::testing::Values(
                             InputOutputPair{"[3.0, 3, 1] | unique",                                   "3, 1"}
                             // InputOutputPair{"reflectedList | unique(attribute='strValue')",           "test string 0test string 1test string 2test string 3test string 4test string 5test string 6test string 7test string 8test string 9"}
                             ));
+
+INSTANTIATE_TEST_CASE_P(Attr, FilterGenericTest, ::testing::Values(
+                            InputOutputPair{"{'key'='itemName', 'value'='itemValue'} | attr('key')", "itemName"},
+                            InputOutputPair{"mapValue | attr('intVal')", "10"},
+                            InputOutputPair{"mapValue | attr(name='dblVal')", "100.5"},
+                            InputOutputPair{"mapValue | attr('stringVal')", "string100.5"},
+                            InputOutputPair{"mapValue | attr('boolValue')", "true"},
+                            InputOutputPair{"reflectedVal | attr('intValue')", "0"},
+                            InputOutputPair{"filledReflectedPtrVal | attr('strValue')", "test string 0"}
+                            ));
+

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,12 @@ struct ContainerReflector`
`153`	`153`	`{`
`154`	`154`	`return GenericList([accessor = PtrItemAccessor<T>(cont)]() {return &accessor;});`
`155`	`155`	`}`
	`156`	`+`
	`157`	`+ template<typename T>`
	`158`	`+ static Value CreateFromPtr(std::shared_ptr<T> cont)`
	`159`	`+ {`
	`160`	`+ return GenericList([ptr = std::move(cont), accessor = PtrItemAccessor<T>(cont.get())]() {return &accessor;});`
	`161`	`+ }`
`156`	`162`	`};`
`157`	`163`
`158`	`164`	`template<typename T>`
`@@ -197,7 +203,7 @@ struct Reflector<T, IsReflectedType<T>>`
`197`	`203`
`198`	`204`	`static auto CreateFromPtr(std::shared_ptr<T> val)`
`199`	`205`	`{`
`200`		`- return GenericMap([accessor = ReflectedMapImpl<T>(val.get())]() {return &accessor;});`
	`206`	`+ return GenericMap([ptr = val, accessor = ReflectedMapImpl<T>(val.get())]() {return &accessor;});`
`201`	`207`	`}`
`202`	`208`	`};`
`203`	`209`
Original file line number	Diff line number	Diff line change
`@@ -92,12 +92,13 @@ InternalValue Sort::Filter(const InternalValue& baseVal, RenderContext& context)`
`92`	`92`
`93`	`93`	`Attribute::Attribute(FilterParams params)`
`94`	`94`	`{`
`95`		`-`
	`95`	`+ ParseParams({{"name", true}}, params);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`InternalValue Attribute::Filter(const InternalValue& baseVal, RenderContext& context)`
`99`	`99`	`{`
`100`		`- return InternalValue();`
	`100`	`+ InternalValue attrNameVal = GetArgumentValue("name", context);`
	`101`	`+ return Subscript(baseVal, attrNameVal);`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`Default::Default(FilterParams params)`