field_mapper 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 100e5da0cf981570ea7897589e43795fb6e5612e
-  data.tar.gz: 8d3aa80d9a2ba033c1fae673f833e92c81fb16c9
+  metadata.gz: 43226c49e641e6c7534c9aa0656857af80d4e8e0
+  data.tar.gz: 9169cce64f196bbd5a8ecad35ef5c9fdf57bb34c
 SHA512:
-  metadata.gz: bb58a45ce818e2e077977e4d378d9d21b0ca6a9b6e5a873e2b7f0060b2ca59679e79027e667bf326a045b6762b7d9e3bc82d91b4a321392d43b60f7e84413088
-  data.tar.gz: ec9b6803100b484d82d40386716392af06587d29fbc992d83722e2c92a397580e497acd7925d152abc3bef1fff095edeb3fe47835865ca07c963de3be99bacf7
+  metadata.gz: b2b5fb6da267576062469504cdf7c93fc07d07a1d26912f5431f89648a16106328a89958d8d43b75fa316152848d74c190576a921bd72fd6a8c5b04ab478cc64
+  data.tar.gz: 0e78802579e987fafab953d42b31e114b9372f446c97413d08189916b85c7392a6abd229e5d14bb0799e8c3a6bae6968c6404c228c1baf2e6dad9787f67eae82

data/lib/field_mapper/custom/field.rb

@@ -23,13 +23,14 @@ module FieldMapper
         type: nil,
         desc: nil,
         default: nil,
+        placeholder: nil,
         standard_field: nil,
         custom_to_standard: DefaultFlipper,
         standard_to_custom: DefaultFlipper,
         &block
       )
         type ||= standard_field.type unless standard_field.nil?
-        super name, type: type, desc: desc, default: default
+        super name, type: type, desc: desc, default: default, placeholder: placeholder
 
         @standard_field = standard_field
         @custom_to_standard = custom_to_standard
@@ -42,6 +43,12 @@ module FieldMapper
         end
       end
 
+      attr_writer :placeholder
+
+      def placeholder
+        @placeholder || standard_field.placeholder
+      end
+
       def value(value, standard: nil, priority: nil)
         @values ||= []
         @values << FieldMapper::Custom::Value.new(

data/lib/field_mapper/custom/plat.rb

@@ -19,6 +19,7 @@ module FieldMapper
           type: nil,
           desc: nil,
           default: nil,
+          placeholder: nil,
           standard: nil,
           custom_to_standard: FieldMapper::Custom::Field::DefaultFlipper,
           standard_to_custom: FieldMapper::Custom::Field::DefaultFlipper,
@@ -31,6 +32,7 @@ module FieldMapper
             type: type,
             desc: desc,
             default: default,
+            placeholder: placeholder,
             standard_field: standard_plat.fields[standard],
             custom_to_standard: custom_to_standard,
             standard_to_custom: standard_to_custom

data/lib/field_mapper/standard/field.rb

@@ -12,20 +12,24 @@ module FieldMapper
         :type,
         :desc,
         :default,
-        :values
+        :values,
       )
 
+      attr_accessor :placeholder
+
       def initialize(
         name,
         type: nil,
         desc: nil,
-        default: nil
+        default: nil,
+        placeholder: nil
       )
         raise TypeNotSpecified.new("type not specified for: #{name}") if type.nil?
         @name = name.to_sym
         @type = type
         @desc= desc
         @default = default
+        @placeholder = placeholder
       end
 
       def list?

data/lib/field_mapper/standard/plat.rb

@@ -26,6 +26,7 @@ module FieldMapper
           type: nil,
           desc: nil,
           default: nil,
+          placeholder: nil,
           &block
         )
           field_names[attr_name(name)] = name
@@ -34,7 +35,8 @@ module FieldMapper
             name,
             type: type,
             desc: desc,
-            default: default
+            default: default,
+            placeholder: placeholder
           )
 
           field.instance_exec(&block) if block_given?

data/lib/field_mapper/version.rb

@@ -1,3 +1,3 @@
 module FieldMapper
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/test/custom/converter_test.rb

@@ -119,5 +119,9 @@ module Custom
       assert standard.letters = ["a", "c"]
     end
 
+    test "converted_to different datatype mapped to standard" do
+
+    end
+
   end
 end

data/test/custom/plat_example.rb

@@ -54,5 +54,10 @@ module Custom
     field :parent_plat, type: FieldMapper::Types::Plat[Custom::PlatExample], standard: :parent
     field :child_plats, type: FieldMapper::Types::List[Custom::PlatExample], standard: :children, default: []
 
+    field :time, standard: :timestamp, type: String,
+      standard_to_custom: -> (value, standard_instance: nil) {
+        value.strftime("%Y-%m-%m") unless value.nil?
+      }
+
   end
 end

data/test/custom/plat_test.rb

@@ -61,6 +61,7 @@ module Custom
         "color"       => nil,
         "painter"     => nil,
         "characters"  => nil,
+        "time"        => nil,
         "parent_plat" => {
           "_node_id"  => @instance.parent_plat.object_id,
           "_flat"       => false,
@@ -70,6 +71,7 @@ module Custom
           "color"       => nil,
           "painter"     => nil,
           "characters"  => nil,
+          "time"        => nil,
           "parent_plat" => nil,
           "child_plats" => []
         },
@@ -98,5 +100,9 @@ module Custom
       }
     end
 
+    test "placeholder" do
+      assert @instance.class.fields[:name].placeholder == "TYPE YOUR NAME"
+    end
+
   end
 end

data/test/standard/converter_test.rb

@@ -84,5 +84,15 @@ module Standard
       assert custom.parent_plat.to_hash.merge(_node_id: nil) == custom_parent.to_hash.merge(_node_id: nil)
     end
 
+    test "convert_to (different datatype)" do
+      @standard.timestamp = Time.now
+      custom = @converter.convert_to(Custom::PlatExample)
+      assert custom.time == @standard.timestamp.strftime("%Y-%m-%m")
+    end
+
+    test "placeholder" do
+      assert @standard.class.fields[:name].placeholder == "TYPE YOUR NAME"
+    end
+
   end
 end

data/test/standard/plat_example.rb

@@ -3,7 +3,7 @@ require_relative "../test_helper"
 module Standard
   class PlatExample < FieldMapper::Standard::Plat
 
-    field :name, type: String
+    field :name, type: String, placeholder: "TYPE YOUR NAME"
     field :desc, type: String
 
     field :score, default: 2, type: Integer do
@@ -44,5 +44,7 @@ module Standard
     field :parent, type: FieldMapper::Types::Plat[Standard::PlatExample]
     field :children, type: FieldMapper::Types::List[Standard::PlatExample], default: []
 
+    field :timestamp, type: Time
+
   end
 end

data/test/standard/plat_test.rb

@@ -108,6 +108,7 @@ module Standard
         "artist"     => nil,
         "day"        => nil,
         "letters"    => ["a", "b"],
+        "timestamp"  => nil,
         "parent"=>{
            "_node_id" => parent.object_id,
            "_flat"      => false,
@@ -120,6 +121,7 @@ module Standard
            "artist"     => nil,
            "day"        => nil,
            "letters"    => ["a", "b"],
+           "timestamp"  => nil,
            "parent"     => nil,
            "children"   => [@instance.object_id]
         },
@@ -136,6 +138,7 @@ module Standard
            "artist"     => nil,
            "day"        => nil,
            "letters"    => ["a", "b"],
+           "timestamp"  => nil,
            "parent"     => @instance.object_id,
            "children"   => []
           },
@@ -151,6 +154,7 @@ module Standard
            "artist"     => nil,
            "day"        => nil,
            "letters"    => ["a", "b"],
+           "timestamp"  => nil,
            "parent"     => @instance.object_id,
            "children"   => []
           }
@@ -183,8 +187,9 @@ module Standard
         "artist"     => nil,
         "day"        => nil,
         "letters"    => "[\"a\",\"b\"]",
-        "parent"     => "{\"_node_id\":#{parent.object_id},\"_flat\":true,\"name\":null,\"desc\":null,\"score\":2,\"color\":null,\"camelCase\":null,\"PascalCase\":null,\"artist\":null,\"day\":null,\"letters\":\"[\\\"a\\\",\\\"b\\\"]\",\"parent\":null,\"children\":\"[#{@instance.object_id}]\"}",
-        "children"   => "[{\"_node_id\":#{child1.object_id},\"_flat\":true,\"name\":null,\"desc\":null,\"score\":2,\"color\":null,\"camelCase\":null,\"PascalCase\":null,\"artist\":null,\"day\":null,\"letters\":\"[\\\"a\\\",\\\"b\\\"]\",\"parent\":#{@instance.object_id},\"children\":[]},{\"_node_id\":#{child2.object_id},\"_flat\":true,\"name\":null,\"desc\":null,\"score\":2,\"color\":null,\"camelCase\":null,\"PascalCase\":null,\"artist\":null,\"day\":null,\"letters\":\"[\\\"a\\\",\\\"b\\\"]\",\"parent\":#{@instance.object_id},\"children\":[]}]"
+        "timestamp"  => nil,
+        "parent"     => "{\"_node_id\":#{parent.object_id},\"_flat\":true,\"name\":null,\"desc\":null,\"score\":2,\"color\":null,\"camelCase\":null,\"PascalCase\":null,\"artist\":null,\"day\":null,\"letters\":\"[\\\"a\\\",\\\"b\\\"]\",\"parent\":null,\"children\":\"[#{@instance.object_id}]\",\"timestamp\":null}",
+        "children"   => "[{\"_node_id\":#{child1.object_id},\"_flat\":true,\"name\":null,\"desc\":null,\"score\":2,\"color\":null,\"camelCase\":null,\"PascalCase\":null,\"artist\":null,\"day\":null,\"letters\":\"[\\\"a\\\",\\\"b\\\"]\",\"parent\":#{@instance.object_id},\"children\":[],\"timestamp\":null},{\"_node_id\":#{child2.object_id},\"_flat\":true,\"name\":null,\"desc\":null,\"score\":2,\"color\":null,\"camelCase\":null,\"PascalCase\":null,\"artist\":null,\"day\":null,\"letters\":\"[\\\"a\\\",\\\"b\\\"]\",\"parent\":#{@instance.object_id},\"children\":[],\"timestamp\":null}]"
       }
 
       actual = @instance.to_hash(flatten: true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: field_mapper
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Nathan Hopkins