view_delegates 0.3.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a2098f3a03b8fe17ed203cfee173b4fa423c6ce9bbd74759e8502f77763ec8
-  data.tar.gz: bd64101ba553ed5be452f64625bb66e690c3aea3f5ae8dedc39cc7bd70acdf14
+  metadata.gz: a4f301f9e859df07bfe34ad06884a7d88d4f7e4c32d36012e869a05ea0c1fd76
+  data.tar.gz: c65ce7cf16879bde4ac489c827ebc1dcb0216735609f3839321b91ba85f37b80
 SHA512:
-  metadata.gz: c520ff513cec3f1369f6033c559ee027f00bef82e0ce33e014c7f9174ea7784feb4a1cdda8fb86af27079f71c621ee455fcf19f5f544f7338fec4a6207956e96
-  data.tar.gz: ec6d451757a6d8f69a67530f48f1b0e52df25239e63c38c78f2dab5210d5c3e04baadff815cbf4bb4d9aa43be29d06a74855dac2ecedf54790569db878c995e0
+  metadata.gz: 8cc61a8da5b7c73acc650050b8e5a787dc6178c15c28a437f851ca48bed5e1875c07f970e093fb358983dc881e2b65c10ad3ef2b319d21409c9da9394d8741ff
+  data.tar.gz: df39de327efe8e8f90185a738ac5e1cfb3040055e488107698a4f872a238ef134fa64daff42f935b0c1111dcf9a3aae53e0683c7653a7c37e417f46d6d99c0d5

data/lib/view_delegates/poros/view_delegate.rb

@@ -6,9 +6,13 @@ module ViewDelegates
       attr_accessor :delegate_cache
     end
     class_attribute :view_locals
-    class_attribute :models
     class_attribute :ar_models
     class_attribute :properties
+    # We need self, Ruby gets confused without the self and thinks of a local variable instead
+    # of ivar
+    self.view_locals = self.view_locals || []
+    self.ar_models = self.ar_models || []
+    self.properties = self.properties || []
     # View delegate cache system
     # @return [ViewDelegates::Cache]
     def self.delegate_cache
@@ -39,12 +43,12 @@ module ViewDelegates
       end
       self.ar_models = {}
       self.class.ar_models&.each do |ar_model|
-        self.ar_models[ar_model] = instance_variable_get(:"@#{ar_model}")
+        ar_models[ar_model] = instance_variable_get(:"@#{ar_model}")
       end
       self.class.properties&.each do |property|
         locals[property] = instance_variable_get "@#{property}"
       end
-      locals = locals.merge(self.ar_models).merge(local_params)
+      locals = locals.merge(ar_models).merge(local_params)
       result = ViewDelegateController.render(self.class.view_path + '/' + view.to_s,
                                              locals: locals)
 
@@ -57,7 +61,7 @@ module ViewDelegates
 
     private
 
-    def model_to_struct model, struct
+    def model_to_struct(model, struct)
       initialize_hash = {}
       struct_members = struct.members
       struct_members.each do |k|
@@ -66,116 +70,113 @@ module ViewDelegates
       struct.new(*initialize_hash.values_at(*struct_members))
     end
 
-
-    # Override the new, we may need polymorphism
-    # @param [Hash] args
-    def self.new *args
-      if @polymorph_function
-        command = super(*args)
-        klazz = command.instance_eval(&@polymorph_function)
-        if klazz == self
-          super(*args)
+    class << self
+      # Override the new, we may need polymorphism
+      # @param [Hash] args
+      def new(*args)
+        if @polymorph_function
+          command = super(*args)
+          klazz = command.instance_eval(&@polymorph_function)
+          if klazz == self
+            super(*args)
+          else
+            klazz.new(*args)
+          end
         else
-          klazz.new(*args)
+          super
         end
-      else
-        super
       end
-    end
 
-    # Activates cache on the view delegate
-    # option must be true/false
-    # size is an optional parameter, controls the max size of the cache array
-    # @param [Boolean] option
-    # @param [Integer] size
-    def self.cache(option, size: 50)
-      if option
-        render_method = instance_method :render
-        @delegate_cache = ViewDelegates::Cache.new(max_size: size)
-        define_method(:render) do |view, local_params: {}, &block|
-          value_key = "#{hash}#{local_params.hash}#{view.to_s}"
-          result = self.class.delegate_cache.get value_key
-          if result.nil?
-            result = render_method.bind(self).call(view, local_params: local_params)
-            self.class.delegate_cache.add key: value_key, value: result
-          end
-          if block
-            block.call(result)
-          else
-            result
+      # Activates cache on the view delegate
+      # option must be true/false
+      # size is an optional parameter, controls the max size of the cache array
+      # @param [Boolean] option
+      # @param [Integer] size
+      def cache(option, size: 50)
+        if option
+          render_method = instance_method :render
+          @delegate_cache = ViewDelegates::Cache.new(max_size: size)
+          define_method(:render) do |view, local_params: {}, &block|
+            value_key = "#{hash}#{local_params.hash}#{view.to_s}"
+            result = self.class.delegate_cache.get value_key
+            if result.nil?
+              result = render_method.bind(self).call(view, local_params: local_params)
+              self.class.delegate_cache.add key: value_key, value: result
+            end
+            if block
+              block.call(result)
+            else
+              result
+            end
           end
         end
       end
-    end
 
-    # Gets the path for the delegate views
-    def self.view_path
-      @view_path ||= to_s.sub(/Delegate/, ''.freeze).underscore
-    end
+      # Gets the path for the delegate views
+      def view_path
+        @view_path ||= to_s.sub(/Delegate/, ''.freeze).underscore
+      end
 
-    # Marks a method as a view local
-    # @param [Symbol] method
-    def self.view_local(*methods)
-      self.view_locals = [] if view_locals.nil?
-      self.view_locals += methods
-    end
+      # Marks a method as a view local
+      # @param [Symbol] method
+      def view_local(*methods)
+        self.view_locals += methods
+      end
 
-    # View properties
-    # @param [Symbol] method
-    def self.property(*methods)
-      self.properties = [] if self.properties.nil?
-      methods.each do |method|
-        attr_accessor method
+      # View properties
+      # @param [Symbol] method
+      def property(*methods)
+        methods.each do |method|
+          attr_accessor method
+        end
+        self.properties += methods
       end
-      self.properties += methods
-    end
 
-    # Polymorphism method
-    # The block must return the class we must use
-    # @param [Proc] block
-    def self.polymorph &block
-      @polymorph_function = block
-    end
+      # Polymorphism method
+      # The block must return the class we must use
+      # @param [Proc] block
+      def polymorph &block
+        @polymorph_function = block
+      end
 
-    # The models this delegate will use
-    # @param [method] method The variable name this model will use
-    # @param [Array] properties The model properties to extract
-    # from the active record model
-    def self.model(method, properties: [])
-      attr_accessor method
-      self.ar_models = [] if self.ar_models.nil?
-      # Add the method name to the array of delegate models
-      self.ar_models += [method]
-      # Define a setter for the model
-      define_method "#{method}=" do |val|
-        # Create a struct with the model properties
-        model_delegate = if properties.any?
-                           Struct.new(*properties)
-                         else
-                           Struct.new(*val.attributes.keys)
-                         end
-        model_delegate = model_to_struct(val, model_delegate)
-        # set the struct to instance model
-        instance_variable_set(:"@#{method}", model_delegate)
+      # The models this delegate will use
+      # @param [method] method The variable name this model will use
+      # @param [Array] properties The model properties to extract
+      # from the active record model
+      def model(method, properties: [])
+        attr_accessor method
+        # Add the method name to the array of delegate models
+        self.ar_models += [method]
+        # Define a setter for the model
+        define_method "#{method}=" do |val|
+          # Create a struct with the model properties
+          model_delegate = if properties.any?
+                             Struct.new(*properties)
+                           else
+                             Struct.new(*val.attributes.keys)
+                           end
+          model_delegate = model_to_struct(val, model_delegate)
+          # set the struct to instance model
+          instance_variable_set(:"@#{method}", model_delegate)
+        end
       end
-    end
 
-    def self.model_array method, properties: []
-      attr_accessor method
-      # Add the method name to the array of delegate models
-      self.ar_models = [] if self.ar_models.nil?
-      self.ar_models += [method]
-      # Define a setter for the model
-      define_method "#{method}=" do |model_array|
-        # Create a struct with the model properties
-        model_delegate = if properties.any?
-                           Struct.new(*properties)
-                         else
-                           Struct.new(*val.attributes.keys)
-                         end
-        model_array.map! {|e| model_to_struct(e, model_delegate)}
-        instance_variable_set(:"@#{method}", model_array)
+      def model_array(method, properties: [])
+        attr_accessor method
+        # Add the method name to the array of delegate models
+        self.ar_models += [method]
+        # Define a setter for the model
+        define_method "#{method}=" do |model_array|
+          # Create a struct with the model properties
+          model_delegate = if properties.any?
+                             Struct.new(*properties)
+                           else
+                             Struct.new(*val.attributes.keys)
+                           end
+          model_array.map! {|e| model_to_struct(e, model_delegate)}
+          instance_variable_set(:"@#{method}", model_array)
+        end
       end
     end
   end
-end
+end

data/lib/view_delegates/version.rb

@@ -1,4 +1,4 @@
 module ViewDelegates
   # Gem version
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_delegates
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors:
 - Miguel Aurelio Lamas Murias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails