ViewComposer 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e01710912069f547c2f251e819955b4dfdf76c2c
-  data.tar.gz: 15315b3fcdc08e1cd8ef1f43afd23f35f9adce13
+  metadata.gz: bd8b4384af9920af4a5170465c1da6ff82fa424e
+  data.tar.gz: 3e25d90731d18cc8e0a6d2e65e8d55e0aa83f9ad
 SHA512:
-  metadata.gz: de0ded3689cf1873e8c08dff447c262f94645720cf7bae67d1090a920d1be3445eec8259cda3f22f0e2e5e49d9352648e848bc25b6171b77d4f8392c6c748771
-  data.tar.gz: 2fbf89468409977c0f009eb7c0e3fa3719c04a23d867dd568bca11ca613e0674102eb1bcbac02fbc01e26e58addbf7288945431a345d2f074a2386f886b1692d
+  metadata.gz: 28531525aacedf8b0fa5ec5cd4349b551483a7ee020c3e585f90cc698df30478c405aa7a9dc8f726359266ba07921f552285e84bf43b3a6f01d4af41b0c5ca0e
+  data.tar.gz: e2c7ed6bf365d9afd36870ea67d75c0ac818ae78a7adb4aee979e89364d47dc7de766b7ac4e3ea66539412cd9bd682bbbb60eef805f571ecaa04bb4c3538b026

data/lib/ViewComposer/base_composer.rb

@@ -1,19 +1,20 @@
 require 'json'
+EXCLUDED_METHODS = [:to_json, :hash_attrs, :set_inherited_methods_list]
 class BaseComposer
   class << self
-    attr_accessor :_attributes
+    attr_accessor :_attributes, :_inherited_methods
   end
   self._attributes = []
+  self._inherited_methods = []
 
   def initialize(model:, composable_objects: [] )
+    set_inherited_methods_list
     @model = model
     @json_hash = {}
-
-    @parent_methods = self.class.superclass.instance_methods(false)
-    @composer_methods = self.class.instance_methods(false)
-    @dont_redefine = @parent_methods + @composer_methods
     @_attrs = self.class._attributes
-    set_attributes
+    @inherited_methods = self.class._inherited_methods
+    @instance_methods = self.class.instance_methods(false)
+    set_attributes_methods
     setup_comp_objs(composable_objects)
     methods_to_hash
   end
@@ -33,21 +34,34 @@ class BaseComposer
   def self.inherited(base)
     super
     base._attributes = self._attributes.dup
+    base._inherited_methods = self._inherited_methods.dup
   end
 
 private
 
+  def get_all_methods
+    (@_attrs + @inherited_methods + @instance_methods).uniq
+  end
+
+  def set_inherited_methods_list
+    _methods = self.class.superclass.instance_methods(false) - EXCLUDED_METHODS
+    self.class._inherited_methods += _methods
+  end
+
   def methods_to_hash
-    methods = self.class.instance_methods(false) - [:to_json, :hash_attrs]
+    methods = get_all_methods - EXCLUDED_METHODS
     methods.each do |method|
       @json_hash[method] = self.send(method)
     end
   end
 
-  def set_attributes
-    defineable_methods = @_attrs - @dont_redefine
-    #puts "#{self}: #{defineable_methods}"
-    define_methods(defineable_methods, @model)
+  def set_attributes_methods
+    define_methods(definable_methods, @model)
+  end
+
+  def definable_methods
+    m = @_attrs - @inherited_methods
+    m - @instance_methods
   end
 
   def setup_comp_objs(comp_objs_array)
@@ -61,7 +75,6 @@ private
   def define_methods(method_names, method_owner)
     method_names.each do |attr|
       self.class.send(:define_method, attr) do
-        #puts method_owner.send(attr)
         method_owner.send(attr)
       end
     end

data/lib/ViewComposer/version.rb

@@ -1,3 +1,3 @@
 module ViewComposer
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ViewComposer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kory Tegman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler