spark-component 1.0.0.pre.alpha → 1.0.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e80ca22fbbdff560a6bf1c412bd44ddda40621249e0a88da79a7c689cfe96374
-  data.tar.gz: eb224b7a35ba9d5e638aa34b6100a33a796922edff6dccd158a2952553e82360
+  metadata.gz: 7531fb1b2668f9d7aa7fc2b76653f4f87638cbffb919d4fcc556192e14c87a5e
+  data.tar.gz: 34882f3cac0dbc33f6fbfcbebb9195c7564ffdd2e94a82145c7c76e4f8a24bea
 SHA512:
-  metadata.gz: 1dcfa28c2753d30bcd99b8999122be6f9001be34aa2d2e0efafdb8bd3c57edc8165826a454c9c7d166e2817fc397d072e84d4f082ad994ac05d863f05aaa9ea2
-  data.tar.gz: 673702ead1f88344bf279a0eb507c61a3e49fce8ad3b5153839bf83198a7ad166d898ead08dc5d4117cfd26b9ae7b8e33d44b4c4b7f65eab03c71ef95d8e7653
+  metadata.gz: be3f47247ba35d4ee29525eaa93ffee5025c605c4d585a7f7573e680a61d68ad43595e6ebf10ba8a79375f5aa9059577ec29161717cea1e2ffc02a5d2ffb3505
+  data.tar.gz: fe98c4fdab4bc3bf36c2e8748d695e725e4e6ab66bfbeb2c9f33d6c5657a009db5bcc02b197955fdd1b62a893ca7c42515f3bb343265b97564179570bc308dc1

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/test/log/*.log

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in spark-component.gemspec
@@ -5,3 +7,4 @@ gemspec
 
 gem "pry-byebug", group: %i[development test]
 gem "rails", "~> 6.0.0"
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spark-component (1.0.0.pre.alpha)
+    spark-component (1.0.0.pre.alpha.1)
 
 GEM
   remote: https://rubygems.org/

data/Rakefile

@@ -4,13 +4,14 @@ require "bundler/gem_tasks"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs = %w(lib test)
-  t.pattern = 'test/**/*_test.rb'
+  t.libs = %w[lib test]
+  t.pattern = "test/**/*_test.rb"
 end
 
 Rake::TestTask.new(:bench) do |t|
-  t.libs = %w(lib test)
-  t.pattern = 'test/**/*_benchmark.rb'
+  t.libs = %w[lib test]
+  t.pattern = "test/**/*_benchmark.rb"
 end
 
 task default: :test
+

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "spark/component"
@@ -12,3 +13,4 @@ require "spark/component"
 
 require "irb"
 IRB.start(__FILE__)
+

data/lib/spark/component/attr.rb

@@ -40,3 +40,4 @@ module Spark
     end
   end
 end
+

data/lib/spark/component/attribute.rb

@@ -33,8 +33,8 @@ require "spark/component/tag_attr"
 #
 #  Attributes can also be accessed with a helper method
 #
-#    some_instance.attr(:label)
-#    some_instance.attr(:size)
+#    some_instance.attribute(:label)
+#    some_instance.attribute(:size)
 #
 #  Extending a class will extend its attributes and their defaults.
 #
@@ -66,17 +66,16 @@ module Spark
           value = attrs[name] || (!default.nil? ? default : nil)
           if set?(value)
             instance_variable_set(:"@#{name}", value)
-            attributes[name] = value
           end
         end
       end
 
-      def attr(name)
-        instance_variable_get(:"@#{name}")
+      def attribute(name)
+        attributes[name]
       end
 
       def attributes
-        @attributes ||= {}
+        attr_hash(*self.class.attributes.keys)
       end
 
       # Accepts an array of instance variables and returns
@@ -90,7 +89,7 @@ module Spark
       #
       # Example use case:
       #
-      # tag.div(data: attr_hash(:remote, :method)) { ... }
+      # <div data="<%= attr_hash(:remote, :method)) %>">
       #
       def attr_hash(*args)
         args.each_with_object({}) do |name, obj|
@@ -195,3 +194,4 @@ module Spark
     end
   end
 end
+

data/lib/spark/component/classname.rb

@@ -54,3 +54,4 @@ module Spark
     end
   end
 end
+

data/lib/spark/component/element.rb

@@ -17,8 +17,15 @@ module Spark
         end
       end
 
-      def initialize(attributes = nil)
-        initialize_attributes(attributes)
+      def initialize(attrs = nil)
+        # Extract core element attributes
+        unless attrs.nil? || attrs.empty?
+          @_parent      = attrs.delete(:_parent)
+          @_block       = attrs.delete(:_block)
+          @view_context = attrs.delete(:_view)
+        end
+
+        initialize_attributes(attrs)
         initialize_elements
         super
       end
@@ -26,7 +33,7 @@ module Spark
       def render_self
         return @content unless @content.nil?
 
-        @content = render_block(view_context, &_block)
+        @content = render_block(@view_context, &_block)
         validate! if defined?(ActiveModel::Validations)
         @content
       end
@@ -66,17 +73,17 @@ module Spark
       end
 
       # Override the default value for an element's attribute(s)
-      def set_element_attr_default(element, attrs = {})
-        element_attr_default[element] = attrs
+      def set_element_attribute_default(element, attrs = {})
+        element_attribute_default[element] = attrs
       end
 
-      def element_attr_default
-        @element_attr_default ||= {}
+      def element_attribute_default
+        @element_attribute_default ||= {}
       end
 
       # Merge user defined attributes with the overriden attributes of an element
-      def merge_element_attr_default(name, attributes)
-        attrs = element_attr_default[name]
+      def merge_element_attribute_default(name, attributes)
+        attrs = element_attribute_default[name]
         attributes = attrs.merge(attributes || {}) unless attrs.nil? || attrs.empty?
         attributes
       end
@@ -154,12 +161,15 @@ module Spark
           define_method_if_able(name) do |attributes = nil, &block|
             return get_element_variable(multiple ? plural : name) unless block || attributes
 
-            attributes = merge_element_attr_default(name, attributes)
+            attributes ||= {}
+            attributes = merge_element_attribute_default(name, attributes)
+            attributes.merge!(
+              _parent: self,
+              _block: block,
+              _view: view_context
+            )
 
             element = klass.new(attributes)
-            element._parent = self
-            element._block = block
-            element.view_context = view_context
 
             # If element supports multiple instances, inject instance
             # into array for later enumeration
@@ -183,6 +193,7 @@ module Spark
         # If an element extends a component, extend that component's class and include the necessary modules
         def extend_class(component, &config)
           base = Class.new(component || Spark::Component::Element::Base, &config)
+          # base.include(Spark::Component::Element)
           define_model_name(base) if defined?(ActiveModel)
 
           return base unless component
@@ -221,13 +232,22 @@ module Spark
       # Base class for non-component elements
       class Base
         include ActiveModel::Validations if defined?(ActiveModel)
-        include Spark::Component::Element
 
-        def initialize(attributes)
-          initialize_attributes(attributes)
+        def initialize(attrs = nil)
+          # Extract core element attributes
+          unless attrs.nil? || attrs.empty?
+            @_parent      = attrs.delete(:_parent)
+            @_block       = attrs.delete(:_block)
+            @view_context = attrs.delete(:_view)
+          end
+
+          initialize_attributes(attrs)
           initialize_elements
         end
+
+        include Spark::Component::Element
       end
     end
   end
 end
+

data/lib/spark/component/integration/action_view_component.rb

@@ -20,15 +20,21 @@ module Spark
         @lookup_context ||= view_context.lookup_context
         @view_flow ||= view_context.view_flow
         @virtual_path ||= virtual_path
+        @variant = @lookup_context.variants.first
+        old_current_template = @current_template
+        @current_template = self
 
         # Pass self as a block parameter
         @content = render_block(view_context, &block) if block_given?
         validate!
-        call
+
+        send(self.class.call_method_name(@variant))
+      ensure
+        @current_template = old_current_template
       end
 
       def render_self
-        render_in(view_context, &_block)
+        render_in(@view_context, &@_block)
       end
 
       # Override class methods for components
@@ -64,3 +70,4 @@ module Spark
     end
   end
 end
+

data/lib/spark/component/tag_attr.rb

@@ -42,3 +42,4 @@ module Spark
     end
   end
 end
+

data/lib/spark/component/version.rb

@@ -2,6 +2,7 @@
 
 module Spark
   module Component
-    VERSION = "1.0.0-alpha".freeze
+    VERSION = "1.0.0.pre.alpha.1"
   end
 end
+

data/lib/spark/component.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spark/component/version"
 require "spark/component/element"
 
@@ -18,3 +20,4 @@ module Spark
     end
   end
 end
+

data/spark-component.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "spark/component/version"
@@ -8,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Brandon Mathis"]
   spec.email         = ["brandon@imathis.com"]
 
-  spec.summary       = %q{Add a Spark of awesome to your ActionView Component.}
+  spec.summary       = "Add a Spark of awesome to your ActionView Component."
   spec.homepage      = "https://github.com/spark-engine/component"
   spec.license       = "MIT"
 
@@ -20,7 +22,7 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
 
@@ -28,11 +30,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "actionview-component"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "memory_profiler"
   spec.add_development_dependency "minitest", "= 5.1.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "slim"
 end
+

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: spark-component
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha
+  version: 1.0.0.pre.alpha.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: actionview-component
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionview-component
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: memory_profiler
   requirement: !ruby/object:Gem::Requirement