ViewComposer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd8b4384af9920af4a5170465c1da6ff82fa424e
-  data.tar.gz: 3e25d90731d18cc8e0a6d2e65e8d55e0aa83f9ad
+  metadata.gz: e5ce5c93cbd8b88877f158582da991558951ed51
+  data.tar.gz: 9381c479f662719b877733ab8fd44dd185b6c3c1
 SHA512:
-  metadata.gz: 28531525aacedf8b0fa5ec5cd4349b551483a7ee020c3e585f90cc698df30478c405aa7a9dc8f726359266ba07921f552285e84bf43b3a6f01d4af41b0c5ca0e
-  data.tar.gz: e2c7ed6bf365d9afd36870ea67d75c0ac818ae78a7adb4aee979e89364d47dc7de766b7ac4e3ea66539412cd9bd682bbbb60eef805f571ecaa04bb4c3538b026
+  metadata.gz: ade15dc7ef22e932464c2ef42f8d7111147b9053b464097cacd0df52083753684d07fb30648315d6706b3e6d43c6bd0782ca5dc60165b051df5432f7b80ca00e
+  data.tar.gz: a8283efa6c1a59c14f6400143b191d493aea8d53f0ccc4d64eb153260af45c83e2ffaaad848c9987a43b2e0e4a5f7aa081cffd84c3a363bce0060c743f7c0175

data/lib/ViewComposer/base_composer.rb

@@ -1,24 +1,45 @@
 require 'json'
-EXCLUDED_METHODS = [:to_json, :hash_attrs, :set_inherited_methods_list]
+EXCLUDED_METHODS = [:to_json, :hash_attrs,
+                    :set_inherited_methods_list,
+                    :instance_methods,
+                    :inherited_methods,
+                    :attributes,
+                    :instance_attributes,
+                    :set_model_methods,
+                    :super_model_methods]
 class BaseComposer
   class << self
-    attr_accessor :_attributes, :_inherited_methods
+    attr_accessor :_attributes,
+                  :_instance_attrs,
+                  :_model_methods,
+                  :_inherited_methods
   end
   self._attributes = []
+  self._instance_attrs = []
   self._inherited_methods = []
+  self._model_methods = []
 
   def initialize(model:, composable_objects: [] )
     set_inherited_methods_list
     @model = model
     @json_hash = {}
-    @_attrs = self.class._attributes
-    @inherited_methods = self.class._inherited_methods
-    @instance_methods = self.class.instance_methods(false)
+    set_model_methods
     set_attributes_methods
     setup_comp_objs(composable_objects)
     methods_to_hash
   end
 
+  def self.attributes(*attrs)
+    self._instance_attrs = attrs
+    Array(attrs).each {|attr| self._attributes << attr}
+  end
+
+  def self.inherited(base)
+    super
+    base._attributes = self._attributes.dup
+    base._inherited_methods = self._inherited_methods.dup
+  end
+
   def hash_attrs
     @json_hash
   end
@@ -27,20 +48,43 @@ class BaseComposer
     @json_hash.to_json
   end
 
-  def self.attributes(*attrs)
-    Array(attrs).each {|attr| self._attributes << attr}
+private
+
+  def set_model_methods
+    new_model_methods = attributes - instance_methods
+    new_model_methods = new_model_methods - inherited_methods
+    new_model_methods = new_model_methods + super_model_methods
+
+    if self.class.superclass != Object
+      self.class._model_methods = super_model_methods + new_model_methods
+    else
+      self.class._model_methods = new_model_methods
+    end
   end
 
-  def self.inherited(base)
-    super
-    base._attributes = self._attributes.dup
-    base._inherited_methods = self._inherited_methods.dup
+  def instance_attributes
+    @instance_attributes ||= self.class._instance_attrs || []
   end
 
-private
+  def super_model_methods
+    return [] if self.class.superclass === Object
+    @super_model ||= self.class.superclass._model_methods || []
+  end
+
+  def attributes
+    @attributes ||= self.class._attributes
+  end
+
+  def instance_methods
+    @instance_methods ||= self.class.instance_methods(false)
+  end
+
+  def inherited_methods
+    @inherted_methods ||= self.class._inherited_methods
+  end
 
   def get_all_methods
-    (@_attrs + @inherited_methods + @instance_methods).uniq
+    (attributes + inherited_methods + instance_methods).uniq
   end
 
   def set_inherited_methods_list
@@ -60,8 +104,7 @@ private
   end
 
   def definable_methods
-    m = @_attrs - @inherited_methods
-    m - @instance_methods
+    self.class._model_methods
   end
 
   def setup_comp_objs(comp_objs_array)
@@ -79,5 +122,4 @@ private
       end
     end
   end
-
 end

data/lib/ViewComposer/version.rb

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

metadata

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