spark_engine 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 517d9135194b594223815ccfdd158a389fffcde671e037b191b9462725b060e1
-  data.tar.gz: d629ce93d47645c2e9f65269ccaabf50a849e12f9c39e40248a870735a6bcdbd
+  metadata.gz: 03d7698e4656fa18b65b6f012927deb2492725d8006a9eac0aaec010b62a7905
+  data.tar.gz: e29f1d210de4f88f804a827309fe73765eca1e55ad186ee8efefeaa5b8c1a3db
 SHA512:
-  metadata.gz: 32a7666db7a2c1640762d0996b68e1cbe02be194d123a7e14fea2bf7f5df3664b3c6225cabf2eec92d11f4394b63b719ccf14e2482dd30c18c9e75672809a4b5
-  data.tar.gz: a4c1b56772f399a9bb07939290c0cb954b3de2baca9a34649585d0f7fda39744519543963d72ae9f0854483fe18f74ba92ac70a197defd7b3ebde5acac070823
+  metadata.gz: 73affa9f9892de7d01889afa017cc52e579ee44d7b76ddb1c32ced2e1914cf0ddf4ec852facde87bb0ee03bacef18ab9c8fd3eebc44eb7d6493e506f58f8ca5a
+  data.tar.gz: f0df88619ba26cdbbc3932d372e03cd3f0c82b6da10e49ebddb92309a6f647df745f706557c4072cd613a079bfc91b302197bc3711c60887a80858ee4de63864

data/bin/spark

@@ -41,6 +41,35 @@ OptionParser.new do |opts|
     end
   end
 
+  if %w(g generate).include? options[:command]
+    options[:component] = next_arg
+
+    opts.on("-f", "--force", "overwrite existing files") do
+      options[:force] = true
+    end
+
+    opts.on("-t", "--skip-template", "Skip html template for component") do
+      options[:template] = false
+    end
+
+    opts.on("-s", "--skip-sass", "Skip Sass for component") do
+      options[:sass] = false
+    end
+
+    opts.on("-j", "--skip-js", "Skip javascript for component") do
+      options[:js] = false
+    end
+
+    opts.on("-c", "--class ClassName", String, "Component extends a classname (default: Components::Component)") do |val|
+      options[:class] = val
+    end
+
+    opts.on('-D', '--delete', "Remove component files") do
+      options[:delete] = true
+    end
+
+  end
+
   if %w(s server).include? options[:command]
     opts.on("-w", "--watch", "Watch assets") do |val|
       options[:watch] = true

data/lib/spark_engine/command/help.rb

@@ -21,7 +21,7 @@ Options:
     end
 
     def engine_commands
-      list = %w(help build watch server help gem:build gem:install gem:release)
+      list = %w(help build watch server generate clean gem:build gem:install gem:release)
       begin
         gem 'bump'
         list.concat %w(gem:bump:patch gem:bump:minor gem:bump:major)
@@ -42,6 +42,7 @@ Options:
       when 'build', 'b'; build
       when 'watch', 'w'; watch
       when 'server', 's'; server
+      when 'generate', 'g'; generate
       when 'clean', 'c'; clean
       when 'help', 'h'; help
       when 'gem:build'; gem_build
@@ -54,55 +55,55 @@ Options:
     end
 
     def new
-      "new name [options]   # Create a new Spark framework engine"
+      "new name [options]       # Create a new Spark framework engine"
     end
 
     def help
-      "help [command]       # Show help for a specific command"
+      "help [command]           # Show help for a specific command"
+    end
+
+    def generate
+      "generate name [options]  # Generate a Component"
     end
 
     def build
-      "build [options]      # Build assets"
+      "build [options]          # Build assets"
     end
 
     def watch
-      "watch [options]      # Build assets when files change"
+      "watch [options]          # Build assets when files change"
     end
 
     def server
-      "server [options]     # Serve documentation site"
-    end
-
-    def clean
-      "clean                # Remove cache files"
+      "server [options]         # Serve documentation site"
     end
 
-    def help
-      "help [command]       # Show help for a specific command"
+    def gem_build
+      "gem:build                # Build assets for production and build gem"
     end
 
-    def gem_build
-      "gem:build            # Build assets for production and build gem"
+    def clean
+      "clean                    # Remove cache files"
     end
 
     def gem_install
-      "gem:install          # Build assets for production, build, and install gem"
+      "gem:install              # Build assets for production, build, and install gem"
     end
 
     def gem_release
-      "gem:release          # Build assets for production, build, and release gem to rubygems.org"
+      "gem:release              # Build assets for production, build, and release gem to rubygems.org"
     end
 
     def gem_bump_patch
-      "gem:bump:patch       # Bump version v0.0.0 -> v0.0.1"
+      "gem:bump:patch           # Bump version v0.0.0 -> v0.0.1"
     end
 
     def gem_bump_minor
-      "gem:bump:minor       # Bump version v0.0.0 -> v0.1.0"
+      "gem:bump:minor           # Bump version v0.0.0 -> v0.1.0"
     end
 
     def gem_bump_major
-      "gem:bump:major       # Bump version v0.0.0 -> v1.0.0"
+      "gem:bump:major           # Bump version v0.0.0 -> v1.0.0"
     end
   end
 end

data/lib/spark_engine/command.rb

@@ -15,6 +15,12 @@ module SparkEngine
       when 'new', 'n'
         require "spark_engine/scaffold"
         Scaffold.new(options)
+      when 'generate', 'g'
+        from_root { 
+          require "spark_engine/scaffold"
+          require_rails
+          Scaffold.new(options) 
+        }
       when 'build', 'b'
         from_root { dispatch(:build, options) }
       when 'watch', 'w'
@@ -60,6 +66,7 @@ module SparkEngine
       FileUtils.rm_rf('public')
       dispatch(:build)
       system "bundle exec rake build"
+      system "git add Gemfile*"
     end
 
     def gem_install

data/lib/spark_engine/data.rb

@@ -0,0 +1,30 @@
+module SparkEngine
+  module Data
+    extend self
+
+    def read
+      data_files(SparkEngine.plugin.root, Rails.root).each_with_object({}) do |path, data|
+        name = File.basename(path, '.*')
+        data[name] ||= {}
+
+        case File.extname(path)
+        when '.json'
+          data[name].merge!(JSON.parse(File.read(path)))
+        when '.yml'
+          data[name].merge!(YAML.load_file(path))
+        end
+
+        data
+      end
+    end
+
+    def data_files(*roots)
+      files = []
+      [roots].flatten.each do |root|
+        files.concat Dir[File.join(root, 'config', SparkEngine.plugin.name, '**/*.json')]
+        files.concat Dir[File.join(root, 'config', SparkEngine.plugin.name, '**/*.yml')]
+      end
+      files.flatten.compact.uniq
+    end
+  end
+end

data/lib/spark_engine/helpers/asset_helpers.rb

@@ -55,6 +55,7 @@ module SparkEngine
       end
 
       def sass_data(key=nil)
+        require 'spark_engine/sass/sass_yaml'
         if key
           SparkEngine.plugin.stylesheets.data[key]
         else

data/lib/spark_engine/helpers/block_helper.rb

@@ -21,7 +21,7 @@ module SparkEngine
           def #{method_name}(*args, &block)
             
             # Get the current helper object which has all the normal helper methods
-            if self.is_a?(SparkEngine::BlockHelper) 
+            if self.is_a?(SparkEngine::BlockHelper)
               top_level_helper = self.helper
               parent_block_helper = self
             else
@@ -34,24 +34,16 @@ module SparkEngine
             #{klass.name}.current_helper = top_level_helper
             #{klass.name}.current_parent_block_helper = parent_block_helper
             renderer = #{klass.name}.new(*args)
+
             # ...then set them anyway on the renderer so that renderer methods can use it
             renderer.send(:helper=, top_level_helper)
             renderer.send(:parent=, parent_block_helper)
 
             body = block ? capture(renderer, &block) : nil
-            processed_body = renderer.display(body)
-            if processed_body
 
-              if ::Rails::VERSION::MAJOR >= 3
-                return processed_body
-              elsif top_level_helper.method(:concat).arity == 2
-                concat processed_body, binding
-              else
-                concat processed_body
-              end
-              
+            if processed_body = renderer.display(body)
+              return processed_body
             end
-            renderer
           end
         )
       end
@@ -89,21 +81,16 @@ module SparkEngine
         super
       end
     end
-    
+
     def capture(*args)
       # ActiveSupport 3.1 breaks capture method (defines it on all objects)
       # so we have to resort to rewrite it
-      if Rails.version < "3.1"
-         ActionView::Helpers::CaptureHelper.capture(renderer, &block)
-      else
-        value = nil
-        buffer = with_output_buffer { value = yield(*args) }
-        if string = buffer.presence || value and string.is_a?(String)
-          ERB::Util.html_escape string
-        end
+      value = nil
+      buffer = with_output_buffer { value = yield(*args) }
+      if string = buffer.presence || value and string.is_a?(String)
+        ERB::Util.html_escape string
       end
     end
-    
   end
 
 end

data/lib/spark_engine/plugin/assets/stylesheets.rb

@@ -1,4 +1,3 @@
-require 'sass'
 begin
   require "autoprefixer-rails"
 rescue
@@ -61,19 +60,48 @@ module SparkEngine
         compress(destination(file))
       end
 
-      def build_sass(file)
-        style = SparkEngine.production? ? "compressed" : 'nested'
-        dest = destination(file)
+      def render_sass(file)
+        require "spark_engine/sass/engine.rb"
 
         Sass.logger.log_level = :error if SparkEngine.production?
+        Sass.compile_file(file, style: sass_style)
+      end
 
-        css = prefix_css( Sass.compile_file(file, style: style) )
+      def render_sassc(file)
+        require "spark_engine/sassc/importer"
+        SassC.logger.log_level = :error if SparkEngine.production?
 
-        File.open(dest, 'w') { |io| io.write(css) }
+        source = File.open(file, 'rb') { |f| f.read }
+        options = {
+          importer: SassC::SparkEngine::Importer,
+          load_paths: load_paths,
+          style: sass_style
+        }
+
+        SassC::Engine.new(source, options).render
+      end
+
+      def sass_style
+        SparkEngine.production? ? "compressed" : 'nested'
+      end
+
+      def build_sass(file)
+        css = prefix_css begin
+          render_sassc(file)
+        rescue LoadError => e
+          render_sass(file)
+        end
+
+        dest = destination(file)
 
+        File.open(dest, 'w') { |io| io.write(css) }
         compress(dest)
       end
 
+      def load_paths
+        [SparkEngine.plugin.paths[:stylesheets], SparkEngine.plugin.paths[:components]]
+      end
+
       def prefix_css(css)
         if defined? AutoprefixerRails
           AutoprefixerRails.process(css, autoprefixer_config).css
@@ -83,18 +111,11 @@ module SparkEngine
       end
 
       def data
-        if @data
-          @data
-        else
-          data = {}
-
-          Dir[File.join(base, "**/*.yml")].each do |file|
-            key = file.sub(base+"/", '').sub(/^_/,'').sub('.yml','')
-
-            data[key] = SassParser.parse(file)
-          end
+        return @data if @data && SparkEngine.production?
 
-          @data = data if SparkEngine.production?
+        @data = Dir[File.join(base, "**/*.yml")].each_with_object({}) do |file, data|
+          key = File.basename(file, '.*').sub(/^_/,'')
+          data[key] = SassYaml.new(file: file).to_yaml
           data
         end
       end

data/lib/spark_engine/plugin.rb

@@ -19,8 +19,8 @@ module SparkEngine
       @engine.name.sub(/::Engine/,'')
     end
 
+    # Create a new Rails::Engine
     def create_engine(&block)
-      # Create a new Rails::Engine
       @engine = parent_module.const_set('Engine', Class.new(Rails::Engine) do
 
         def spark_plugin_path
@@ -36,6 +36,7 @@ module SparkEngine
 
         require 'spark_engine/middleware'
 
+        # Ensure compiled assets in /public are served
         initializer "#{name}.static_assets" do |app|
           if app.config.public_file_server.enabled
             app.middleware.insert_after ::ActionDispatch::Static, SparkEngine::StaticAssets, "#{root}/public", engine_name: SparkEngine.plugin.name
@@ -43,8 +44,39 @@ module SparkEngine
           end
         end
 
+        initializer "#{name}.view_paths" do |app|
+          # Ensure Components are readable from engine paths
+          ActiveSupport.on_load :action_controller do
+            append_view_path "#{SparkEngine.plugin.paths[:components]}"
+          end
+
+        end
+
+        initializer "#{name}.asset_paths" do |app|
+          app.config.assets.paths << SparkEngine.plugin.paths[:components]
+        end
+
       end)
 
+      # Autoload engine lib and components path
+      @engine.config.autoload_paths.concat [
+        File.join(@engine.spark_plugin_path, "lib"),
+        SparkEngine.plugin.paths[:components]
+      ]
+
+      @engine.config.after_initialize do |app|
+        if defined?(SassC) && defined?(SassC::Rails)
+          # Inject Sass importer for yaml files
+          require "spark_engine/sassc/importer"
+          SassC::Rails::Importer::EXTENSIONS << SassC::SparkEngine::Importer::SassYamlExtension.new
+        elsif defined?(Sass)
+          # Overwrite Sass engine with Yaml support
+          require "spark_engine/sass/engine"
+        end
+      end
+
+      # Takes a block passed an evaluates it in the context of a Rails engine
+      # This allows plugins to modify engines when created.
       @engine.instance_eval(&block) if block_given?
     end
 
@@ -82,7 +114,6 @@ module SparkEngine
       assets(options).each do |asset|
         asset.build
       end
-
     end
 
     def watch(options)
@@ -109,6 +140,7 @@ module SparkEngine
         paths: {
           stylesheets: "app/assets/stylesheets/#{name}",
           javascripts: "app/assets/javascripts/#{name}",
+          components:  "app/components/#{name}",
           images:      "app/assets/images/#{name}",
           svgs:        "app/assets/svgs/#{name}",
         }

data/lib/spark_engine/sass/engine.rb

@@ -1,7 +1,7 @@
+require 'sass'
 require 'spark_engine/sass/importer'
 
 # Taken from https://github.com/chriseppstein/sass-css-importer/blob/master/lib/sass/css_importer/monkey_patches.rb
-# TODO: This feels wrong, surely there must be a better way to handle this
 
 class Sass::Engine
   alias initialize_without_yaml_importer initialize

data/lib/spark_engine/sass/importer.rb

@@ -1,50 +1,6 @@
-require 'sass'
-require 'yaml'
+require "spark_engine/sass/sass_yaml"
 
 module SparkEngine
-  module SassParser
-    extend self
-
-    # Global vars beginning with underscore will have their children promoted to globals
-    # and will be assigned without the underscore
-    #
-    # For example: _colors: { yellow: '#fco' }
-    #     becomes: colors: { yellow: '#fco'}, yellow: '#fco'
-    #
-    #
-    def load_yaml(data)
-      promote_globals YAML.load(data)
-    end
-
-    def read_file(file)
-      IO.read(file)
-    end
-
-    def promote_globals( data )
-      data.keys.select{|k| k.start_with?('_') }.each do |key|
-        data[key.sub(/^_/,'')] = data[key]
-        data = data.delete(key).merge(data)
-      end
-
-      data
-    end
-
-    def expand_vars(file)
-      content   = read_file(file)
-      file_data = load_yaml(content)
-
-      content = content.gsub(/\$(?<var>\w+)/) do
-        file_data[$~[:var]].inspect
-      end
-
-      load_yaml content
-    end
-
-    def parse(file)
-      expand_vars file
-    end
-  end
-
   class Importer < Sass::Importers::Filesystem
 
     def watched_file?(uri)
@@ -65,38 +21,17 @@ module SparkEngine
     private
 
     def _find(dir, name, options)
-      return unless yaml? name
-
       full_filename, syntax = Sass::Util.destructure(find_real_file(dir, name, options))
-      return unless full_filename && File.readable?(full_filename)
+      return unless full_filename && yaml?(full_filename) && File.readable?(full_filename)
 
-      yaml       = SassParser.parse(full_filename)
-      variables  = yaml.map { |key, value| "$#{key}: #{_convert_to_sass(value)};" }.join("\n")
+      variables  = SassC::SassYaml.new(file: full_filename).to_sass
 
       Sass::Engine.new(variables, options.merge(
-          :filename => full_filename,
-          :importer => self,
-          :syntax   => :scss
+        :filename => full_filename,
+        :importer => self,
+        :syntax   => :scss
       ))
     end
-
-    def _convert_to_sass(item)
-      if item.is_a? Array
-        _make_list(item)
-      elsif item.is_a? Hash
-        _make_map(item)
-      else
-        item.to_s
-      end
-    end
-
-    def _make_list(item)
-      '(' + item.map { |i| _convert_to_sass(i) }.join(',') + ')'
-    end
-
-    def _make_map(item)
-      '(' + item.map {|key, value| key.to_s + ':' + _convert_to_sass(value) }.join(',') + ')'
-    end
   end
 
 end

data/lib/spark_engine/sass/sass_yaml.rb

@@ -0,0 +1,90 @@
+require 'yaml'
+
+module SassC
+  class SassYaml
+
+    # Global vars beginning with underscore will have their children promoted to globals
+    # and will be assigned without the underscore
+    #
+    # For example: _colors: { yellow: '#fco' }
+    #     becomes: colors: { yellow: '#fco'}, yellow: '#fco'
+    #
+    #
+    def initialize(options={})
+      @content = options[:content]
+
+      if options[:file] && File.exist?(options[:file])
+        @content = File.open(options[:file], 'rb') { |f| f.read }
+      end
+
+      @data = promote_keys YAML.load(@content)
+    end
+
+    # Flatten dollar values and promote keys before returning YAML
+    def to_yaml
+      promote_keys YAML.load(convert_dollar_values)
+    end
+
+    # Convert each key to $key and process each value to a 
+    # Sass data structure (creating maps, lists, strings)
+    def to_sass
+      @data.map { |key, value| 
+        "$#{key}: #{convert_to_sass_value(value)};" 
+      }.join("\n")
+    end
+
+    # If underscore keys, copy children to top level vars too
+    # Input:
+    #   _colors:
+    #     yellow: '#fco'
+    # Output:
+    #   colors: { yellow: '#fco' }
+    #   yellow: '#fco'
+    #
+    def promote_keys( data )
+      data.keys.select{|k| k.start_with?('_') }.each do |key|
+        data[key.sub(/^_/,'')] = data[key]
+        data = data.delete(key).merge(data)
+      end
+
+      data
+    end
+    
+    # Allow vars to reference other vars in their value with $
+    # Example Input:¬
+    #   blue: 'blue'¬
+    #   green: 'green'
+    #   gradient: [$blue, $green]
+    # Output:
+    #   blue: 'blue'¬
+    #   green: 'green'
+    #   gradient: ['blue', 'green']
+    #
+    def convert_dollar_values
+      @content.gsub(/\$(?<var>\w+)/) {
+        @data[$~[:var]].inspect
+      }
+    end
+    
+    # Convert
+    def convert_to_sass_value(item)
+      if item.is_a? Array
+        make_list(item)
+      elsif item.is_a? Hash
+        make_map(item)
+      else
+        item.to_s
+      end
+    end
+
+    # Convert arrays to Sass list syntax
+    def make_list(item)
+      '(' + item.map { |i| convert_to_sass_value(i) }.join(',') + ')'
+    end
+
+    # Convert hashes to Sass map syntax
+    def make_map(item)
+      '(' + item.map {|key, value| key.to_s + ':' + convert_to_sass_value(value) }.join(',') + ')'
+    end  
+  end
+end

data/lib/spark_engine/sassc/importer.rb

@@ -0,0 +1,37 @@
+# Extracted from sassc-rails
+require "sassc-rails"
+require "spark_engine/sass/sass_yaml"
+
+module SassC
+  module SparkEngine
+    class Importer < SassC::Rails::Importer
+      
+      # Create a new importer to process yaml files
+      class SassYamlExtension < Extension
+        def postfix
+          ".yml"
+        end
+
+        def import_for(full_path, parent_dir, options={})
+          parsed_scss = SassYaml.new(file: full_path).to_sass
+          SassC::Importer::Import.new(full_path, source: parsed_scss)
+        end
+      end
+
+      # Inject importer into Rails 
+      def imports(path, parent_path)
+        EXTENSIONS << SassYamlExtension.new
+        super(path, parent_path)
+      end
+
+
+      private
+
+      def record_import_as_dependency(path)
+        # Replace reference to sprockets for ease of use without Rails
+        # environment
+      end
+      
+    end
+  end
+end

data/lib/spark_engine/scaffold/gem/Gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in <%= @gem %>.gemspec
+gemspec
+
+gem 'listen'
+gem 'bump'
+
+# Select whichever sass implementation suits your setup
+# gem 'sass'
+gem 'sassc-rails'

data/lib/spark_engine/scaffold/gem/gem.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rails", ">= 4"
   spec.add_runtime_dependency "spark_engine"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
 end

data/lib/spark_engine/scaffold/gem/lib/gem.rb

@@ -6,7 +6,12 @@ module <%= @gem_module %>
   end
 end
 
-SparkEngine.register(<%= @gem_module %>::Plugin, {
+plugin_options = {
   gem: '<%= @gem %>'<% unless @engine.nil? %>,
   engine: '<%= @engine %>'<% end %>
-})
+}
+
+SparkEngine.register(<%= @gem_module %>::Plugin, plugin_options) do
+  # Customize Engine here. 
+  # This block is evaluated when Engine is created.
+end

data/lib/spark_engine/scaffold.rb

@@ -6,14 +6,23 @@ module SparkEngine
     attr_reader :gem, :engine, :namespace, :plugin_module, :path, :gemspec_path
 
     def initialize(options)
-      @cwd = File.expand_path(File.dirname(options[:name]))
-      @gem = underscorize(File.basename(options[:name]))
-      @engine = underscorize(options[:engine] || @gem)
+      require 'erb'
+      @options = options
+
+      return new_component(@options) if @options[:component]
+
+      @cwd = File.expand_path(File.dirname(@options[:name]))
+      @gem = underscorize(File.basename(@options[:name]))
+      @engine = underscorize(@options[:engine] || @gem)
       @namespace = @engine
       @plugin_module = modulize @engine
       @gem_module = modulize @gem
       @gem_temp = ".#{@gem}-temp"
 
+      if Dir.exist?(@options[:name]) && !@options[:force]
+        return puts "Path #{@options[:name]} exists. Use --force to override"
+      end
+
       FileUtils.mkdir_p @cwd
 
       Dir.chdir @cwd do
@@ -53,10 +62,10 @@ module SparkEngine
       scaffold_path = File.expand_path("scaffold/**/*", File.dirname(__FILE__))
 
       Dir.glob(scaffold_path, File::FNM_DOTMATCH).select{|f| File.file? f}.each do |f|
-        write_template f.split(/spark_engine\/scaffold\//)[1]
+        write_template f.split(/spark_engine\/scaffold\//)[1], force: true
       end
 
-      system "bundle add listen bump"
+      system 'bundle'
     end
 
     # Create an Rails plugin engine for documentation site
@@ -109,7 +118,7 @@ module SparkEngine
       end
     end
 
-    def write_template(template, target=nil)
+    def write_template(template, options)
       template_path = File.expand_path("scaffold/#{template}", File.dirname(__FILE__))
 
       # Extract file extension
@@ -122,7 +131,7 @@ module SparkEngine
         'namespace' => @namespace
       }) + ext
 
-      write_file target_path, read_template(template_path)
+      write_file target_path, read_template(template_path), options
     end
 
     def read_template(file_path)
@@ -133,22 +142,28 @@ module SparkEngine
       contents
     end
 
-    def write_file(paths, content='', mode='w')
-      paths = [paths].flatten
-      paths.each do |path|
-        if File.exist?(path)
+    def write_file(path, content='', options={})
+      options[:mode] ||= 'w'
+
+      if File.exist?(path) 
+        if options[:force]
           type = 'update'
         else
-          FileUtils.mkdir_p(File.dirname(path))
-          type = 'create'
+          return action_log('skipped', path)
         end
+      else
+        type = 'create'
+      end
 
-        File.open path, mode do |io|
-          io.write(content)
-        end
+      FileUtils.mkdir_p(File.dirname(path))
 
-        action_log(type, path)
+      if content.empty?
+        FileUtils.touch(path)
+      else
+        File.open(path, options[:mode]) { |io| io.write(content) }
       end
+
+      action_log(type, path)
     end
 
     def post_install
@@ -173,14 +188,58 @@ module SparkEngine
       puts dashes + "\n\n"
     end
 
+    def new_component(options={})
+      options = {
+        sass: true,
+        template: true,
+        js: true
+      }.merge(options)
+
+      path = File.join(SparkEngine.plugin.paths[:components], options[:component])
+      name = options[:component].split('/').last
+
+      paths = {
+        base: path,
+        component: path+'_component.rb',
+        template: File.join(path, "_#{name}.html.erb"),
+        sass: File.join(path, "_#{name}.scss"),
+        js: File.join(SparkEngine.plugin.paths[:javascripts], "components", "#{options[:component].sub(name, '_'+name)}.js")
+      }
+
+      if options[:delete]
+        return paths.values.each do |p| 
+          action_log('delete', FileUtils.rm_rf(p).first) if File.exist?(p)
+        end
+      end
+
+      # Write component class
+      component_content = %Q{class #{modulize(options[:component])}Component < #{options[:class] || 'Components::Component' }\nend} 
+      write_file(paths[:component], component_content, options)
+
+      write_file(paths[:template], '', options) if options[:template]
+      write_file(paths[:sass], '', options)     if options[:sass]
+      write_file(paths[:js], '', options)       if options[:js] 
+    end
+
+
     def action_log(action, path)
-      puts action.rjust(12).colorize(:green).bold + "  #{path}"
+      color = case action
+              when 'create', 'update'
+                :green
+              when 'skip'
+                :white
+              when 'delete'
+                :red
+              end
+      puts action.rjust(12).colorize(color).bold + "  #{path.sub(Dir.pwd+'/','')}"
     end
 
     def modulize(input)
-      input.split('_').collect { |name|
-        (name =~ /[A-Z]/) ? name : name.capitalize
-      }.join
+      classify = lambda { |name| 
+        name = (name =~ /_/) ? name.split('_').map(&classify).join : name
+        (name =~ /[A-Z]/) ? name : name.capitalize 
+      }
+      input.split('/').map(&classify).join('::')
     end
 
     def underscorize(input)

data/lib/spark_engine/version.rb

@@ -1,3 +1,3 @@
 module SparkEngine
-  VERSION = "1.2.9"
+  VERSION = "1.2.10"
 end

data/lib/spark_engine.rb

@@ -5,9 +5,7 @@ require "colorize"
 require "spark_engine/version"
 require "spark_engine/plugin"
 require "spark_engine/assets"
-require "spark_engine/sass/engine"
-require "spark_engine/sass/importer"
-require "spark_engine/config_data"
+require "spark_engine/data"
 
 module SparkEngine
   autoload :BlockHelper,     'spark_engine/helpers/block_helper'
@@ -23,8 +21,12 @@ module SparkEngine
     @plugin
   end
 
-  def config_data
-    SparkEngine::ConfigData.read(SparkEngine.plugin.root, Rails.root)
+  def data
+    if production?
+      @data ||= SparkEngine::Data.read
+    else
+      SparkEngine::Data.read
+    end
   end
 
   def register(plugin_module, options={}, &block)

data/spark_engine.gemspec

@@ -17,10 +17,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'sass', '~> 3.4'
   spec.add_runtime_dependency 'esvg', '~> 4.2'
   spec.add_runtime_dependency 'colorize', '~> 0.8'
-  spec.add_runtime_dependency 'bundler', '~> 1.10'
+  spec.add_runtime_dependency 'bundler', '>= 1.10'
   spec.add_runtime_dependency 'autoprefixer-rails', '>= 8.0', '< 10'
 
   spec.add_development_dependency 'rails', '>= 5.0', '< 6'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spark_engine
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: esvg
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +42,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
@@ -168,7 +154,7 @@ files:
 - lib/spark_engine/command.rb
 - lib/spark_engine/command/help.rb
 - lib/spark_engine/command/npm.rb
-- lib/spark_engine/config_data.rb
+- lib/spark_engine/data.rb
 - lib/spark_engine/helpers/asset_helpers.rb
 - lib/spark_engine/helpers/block_helper.rb
 - lib/spark_engine/helpers/layout_helpers.rb
@@ -180,8 +166,12 @@ files:
 - lib/spark_engine/plugin/assets/svgs.rb
 - lib/spark_engine/sass/engine.rb
 - lib/spark_engine/sass/importer.rb
+- lib/spark_engine/sass/sass_yaml.rb
+- lib/spark_engine/sassc/importer.rb
 - lib/spark_engine/scaffold.rb
 - lib/spark_engine/scaffold/gem/.gitignore
+- lib/spark_engine/scaffold/gem/Gemfile
+- lib/spark_engine/scaffold/gem/app/assets/components/namespace/.keep
 - lib/spark_engine/scaffold/gem/app/assets/images/namespace/.keep
 - lib/spark_engine/scaffold/gem/app/assets/javascripts/namespace/engine.js
 - lib/spark_engine/scaffold/gem/app/assets/stylesheets/namespace/_index.scss
@@ -221,8 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A design system framework for Rails (and humans).

data/lib/spark_engine/config_data.rb

@@ -1,29 +0,0 @@
-module SparkEngine
-  module ConfigData
-    extend self
-    def read(*roots)
-      @data ||= {}
-
-      data_files(*roots).each do |path|
-        name = File.basename(path, '.*')
-        case File.extname(path)
-        when '.json'
-          @data[name] = JSON.parse(File.read(path))
-        when '.yml'
-          @data[name] = YAML.load_file(path)
-        end
-      end
-
-      @data
-    end
-
-    def data_files(*roots)
-      files = []
-      [roots].flatten.each do |root|
-        files.concat Dir[File.join(root, 'config/data/**/*.json')]
-        files.concat Dir[File.join(root, 'config/data/**/*.yml')]
-      end
-      files.flatten.compact.uniq
-    end
-  end
-end