view_composer 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e46f45af2b4bd79d6069b07847b238671fcbc529
-  data.tar.gz: da79b5d6efdd919a71ba06be34c0852735d06dd4
+  metadata.gz: 3134b78ce4dbd47e5a2fe59217adbde30a9c5006
+  data.tar.gz: f51006dee86d3513e4b81e277d1094b0360dbe6f
 SHA512:
-  metadata.gz: bd5a7e8a0e7212138c2053d753ac8b8cb0495c5dae15c75c07b8c022980f885da0dfcb26da10c285f2d548973df6b378496ac2fc55add20269158bcf21fd6e61
-  data.tar.gz: aa248cb57ebadb0302fa5c27cd03e340a98430cfa63e47a70db5163840eed7516afec384403cccd09bea245948e113aa60a91196aa173f5a927531be6d3cda57
+  metadata.gz: cfbb157f321453a582e5c03f365d5e05b55e928b9a52099a29623de93e1b08f356a8b4306a0b3d6ddc32d77352d430e2107016bd39ddc713f9dc4dcfd6b73752
+  data.tar.gz: 31c212080adbe9e6be5ab0dbf91962dfd575abccf7b9ab2e142d722f83d86923a39bd60af7edd0ba2f6890bc81061bf0aa820917d25816064fb874573224162c

data/lib/view_composer/base_composer.rb

@@ -1,47 +1,31 @@
 require 'json'
 EXCLUDED_METHODS = [:to_json, :hash_attrs,
-                    :set_inherited_methods_list,
-                    :instance_methods,
-                    :inherited_methods,
                     :attributes,
-                    :instance_attributes,
-                    :set_model_methods,
-                    :super_model_methods]
+                    :definable_model_methods]
 module ViewComposer
   class BaseComposer
     class << self
-      attr_accessor :_attributes,
-      :_instance_attrs,
-      :_model_methods,
-      :_instance_defined_methods,
-      :_inherited_methods
+      attr_accessor :_attributes
     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 = {}
+
       set_model_methods
-      set_instance_defined_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
-      base._model_methods = self._model_methods.dup
     end
 
     def hash_attrs
@@ -55,32 +39,8 @@ module ViewComposer
     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 set_instance_defined_methods
-      if self.class._instance_defined_methods != nil
-        self.class._instance_defined_methods += self.class._model_methods
-      else
-        self.class._instance_defined_methods = self.class._model_methods
-      end
-    end
-
-    def instance_attributes
-      @instance_attributes ||= self.class._instance_attrs || []
-    end
-
-    def super_model_methods
-      return [] if self.class.superclass === Object
-      @super_model ||= self.class.superclass._model_methods || []
+      new_model_methods = attributes - self.methods
+      set_model_methods_array(new_model_methods)
     end
 
     def attributes
@@ -91,17 +51,8 @@ module ViewComposer
       @instance_methods ||= self.class.instance_methods(false)
     end
 
-    def inherited_methods
-      @inherted_methods ||= self.class._inherited_methods
-    end
-
     def get_all_methods
-      (attributes + 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
+      (attributes + instance_methods).uniq
     end
 
     def methods_to_hash
@@ -111,12 +62,19 @@ module ViewComposer
       end
     end
 
-    def set_attributes_methods
-      define_methods(definable_methods, @model)
+    def definable_model_methods
+      []
     end
 
-    def definable_methods
-      self.class._instance_defined_methods + self.class._model_methods
+    def set_model_methods_array(new_model_methods)
+      dup_of_methods = definable_model_methods.dup
+      self.class.send(:define_method, "definable_model_methods") do
+        (dup_of_methods + new_model_methods).uniq
+      end
+    end
+
+    def set_attributes_methods
+      define_methods(definable_model_methods, @model)
     end
 
     def setup_comp_objs(comp_objs_array)
@@ -129,7 +87,7 @@ module ViewComposer
 
     def define_methods(method_names, method_owner)
       method_names.uniq.each do |attr|
-        self.class.send(:define_method, attr) do
+        send(:define_singleton_method, attr) do
           method_owner.send(attr)
         end
       end

data/lib/view_composer/version.rb

@@ -1,3 +1,3 @@
 module ViewComposer
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_composer
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Kory Tegman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler