restpack_serializer 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2020691b4623c0b58df86ecceea26246293f9437
-  data.tar.gz: 54788f45514f191808b5c4a7c7280775fb60807d
+  metadata.gz: 637bfafd73311f2c1dc436e0e39c6b8a50c1be80
+  data.tar.gz: c289ea1c60720cde17d4d42b5cf01d7badc85fba
 SHA512:
-  metadata.gz: fcac1147825f4ea7d1f74e684e10b596c95d07faa2873272824be9a34391565d991e8f6e65cc94bef97a60357df358047334f45e86a97bd0dd4b2248f41dd9ad
-  data.tar.gz: 8a6bf2bfb3e2aad290469ad4c907c8af2fcb0e8039ac8bf0d2ff539a1c0bce0ac3a49bf499238ab6366180ac7ec2c2e98c1907c1913e19722678645a166e4ede
+  metadata.gz: 877854ce2c5087a9ff2d932df36405f7ee9463de7a9372e66bd5f66a23b9f830259451f6b9bde92f20189dead4c7f2a7790ea926a489ee1cafe19fe231752842
+  data.tar.gz: 825c0a666ed9b6afb31346083e7536a233a5ce654ac2a4efe3d0ef73b5926616621d0586162ea71fd8c59fc1231d6bae743a9be73482f208713941c643d59662

data/lib/restpack_serializer/serializable/attributes.rb

@@ -25,11 +25,13 @@ module RestPack::Serializer::Attributes
     def transform_attribute(name, transform_lambda, options = {})
       add_to_serializable(name, options)
 
+      self.track_defined_methods = false
       define_method name do
         transform_lambda.call(name, @model)
       end
 
       define_include_method name
+      self.track_defined_methods = true
     end
 
     def attribute(name, options={})
@@ -46,6 +48,7 @@ module RestPack::Serializer::Attributes
 
     def define_attribute_method(name)
       unless method_defined?(name)
+        self.track_defined_methods = false
         define_method name do
           value = self.default_href if name == :href
           if @model.is_a?(Hash)
@@ -57,6 +60,7 @@ module RestPack::Serializer::Attributes
           value = value.to_s if name == :id
           value
         end
+        self.track_defined_methods = true
       end
     end
 
@@ -68,11 +72,7 @@ module RestPack::Serializer::Attributes
       method = "include_#{name}?".to_sym
 
       unless method_defined?(method)
-        if include_by_default
-          define_method method do
-            @context[method].nil? || @context[method]
-          end
-        else
+        unless include_by_default
           define_method method do
             @context[method].present?
           end
@@ -84,7 +84,10 @@ module RestPack::Serializer::Attributes
       options[:key] ||= name.to_sym
 
       @serializable_attributes ||= {}
-      @serializable_attributes[options[:key]] = name
+      @serializable_attributes[options[:key]] = {
+        name: name,
+        include_method_name: "include_#{options[:key]}?".to_sym
+      }
     end
   end
 end

data/lib/restpack_serializer/serializable.rb

@@ -38,11 +38,22 @@ module RestPack
       end
 
       @model, @context = model, context
+      user_defined_methods = self.class.user_defined_methods
 
       data = {}
       if self.class.serializable_attributes.present?
-        self.class.serializable_attributes.each do |key, name|
-          data[key] = self.send(name) if include_attribute?(name)
+        self.class.serializable_attributes.each do |key, attribute|
+          method_name = attribute[:include_method_name]
+          name = attribute[:name]
+
+          if user_defined_methods.include?(method_name)
+            data[key] = self.send(name) if self.send(method_name)
+          else
+            #the default implementation of `include_abc?`
+            if @context[method_name].nil? || @context[method_name]
+              data[key] = self.send(name)
+            end
+          end
         end
       end
 
@@ -53,7 +64,7 @@ module RestPack
     end
 
     def custom_attributes
-      {}
+      nil
     end
 
     private
@@ -83,12 +94,16 @@ module RestPack
       data
     end
 
-    def include_attribute?(name)
-      self.send("include_#{name}?".to_sym)
-    end
-
     module ClassMethods
-      attr_accessor :model_class, :href_prefix, :key
+      attr_accessor :model_class, :href_prefix, :key, :user_defined_methods, :track_defined_methods
+
+      def method_added(name)
+        #we track used defined methods so that we can make quick decisions at runtime
+        @user_defined_methods ||= []
+        if @track_defined_methods
+          @user_defined_methods << name
+        end
+      end
 
       def array_as_json(models, context = {})
         new.as_json(models, context)

data/lib/restpack_serializer/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Serializer
-    VERSION = '0.6.3'
+    VERSION = '0.6.4'
   end
 end

data/performance/perf.rb

@@ -6,7 +6,14 @@ class SimpleSerializer
   attributes :id, :title
 end
 
-iterations = 180_000 #180_000 ~> 1 second
+class ComplexSerializer
+  include RestPack::Serializer
+
+  attributes :a, :b, :c, :d, :e, :f, :g, :h, :i, :j, :k, :l, :m, :n, :o, :p, :q, :r, :s, :t
+end
+
+iterations = 180_000
+
 Benchmark.bm(22) do |bm|
   bm.report('simple serializer') do
 
@@ -19,4 +26,16 @@ Benchmark.bm(22) do |bm|
       SimpleSerializer.as_json(model)
     end
   end
+
+  bm.report('complex serializer') do
+
+    model = {
+      a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8, i: 9, j: 10,
+      k: 11, l: 12, m: 13, n: 14, o: 15, p: 16, q: 17, r: 18, s: 19, t: 20,
+    }
+
+    iterations.times do
+      ComplexSerializer.as_json(model)
+    end
+  end
 end

data/spec/serializable/attributes_spec.rb

@@ -18,12 +18,18 @@ describe RestPack::Serializer::Attributes do
 
   it "correctly maps normal attributes" do
     [:a, :b, :c, :d, :e, :f?].each do |attr|
-      expect(attributes[attr]).to eq(attr)
+      expect(attributes[attr]).to eq({
+        name: attr,
+        include_method_name: "include_#{attr}?".to_sym
+      })
     end
   end
 
   it "correctly maps attribute with :key options" do
-    expect(attributes[:new_key]).to eq(:old_attribute)
+    expect(attributes[:new_key]).to eq({
+      name: :old_attribute,
+      include_method_name: :include_new_key?
+    })
   end
 
   describe "optional attributes" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restpack_serializer
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport