web_blocks 2.0.5.alpha → 2.1.0.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b45e9ad8b7e3af77d52db79b0685c78ca0dac1f
-  data.tar.gz: 92aa552f7c50dd4985a8b0fa6efafc6668c10aaa
+  metadata.gz: 54d667a2922c092ca505ebba10d8688f133adb66
+  data.tar.gz: 34dab65bd98305bd50533cdab2802d660b7b89dd
 SHA512:
-  metadata.gz: aa248d75286aa4001c87cc5c8934063195a780e5caa4e2fd877c4764b73ec9d84eeba1135e8fd1f3edc303e24e5d421179247ab3eb8d3bb7d70f9761e1c73607
-  data.tar.gz: f2ff6239be72f149a6271de716aa456b9c4ae9ac529fd5ee8c3ad6b87e8d2050b3dce3c0e5ebee1169a41140106ca121c670d88144be15c8c4184ba9dda49950
+  metadata.gz: 4d9a51b7252410a7f74c2ce82c1ba177612cae219a07a42ffec9f378447b2e7603c996e6b2add43c184689ff035dad76c8ccdbd1744cbdd459789f1e51aafd00
+  data.tar.gz: 8caf18f9cd3335c24e1f10fc240b768a73bf5c63277fc101954256b282a53ab7281d1f7e45dd83d4c3682ea56eaf6782fe6f07ccb08e3a02378b3122b0fca51a

data/lib/web_blocks/facade/directory_name_block.rb

@@ -0,0 +1,49 @@
+require 'set'
+require 'web_blocks/facade/base'
+
+module WebBlocks
+  module Facade
+    class DirectoryNameBlock < Base
+
+      def handle name, attributes = {}, &block
+
+        this = self
+
+        attributes[:path] = name unless attributes.has_key? :path
+
+        block_was_given = block_given?
+
+        this.context.block name, attributes do |directory_block|
+
+          directory_path = directory_block.resolved_path
+          js_file_names = Set.new
+          scss_file_names = Set.new
+
+          Dir.entries(directory_path).each do |name|
+            next if name == '.' or name == '..'
+            path = "#{directory_path}/#{name}"
+            if File.file? path
+              segs = name.split('.')
+              ext = segs.pop
+              if ext == 'css'
+                scss_file_names << "#{segs.join('.')}.css"
+              elsif ext == 'js'
+                js_file_names << "#{segs.join('.')}.js"
+              elsif ext == 'scss'
+                scss_file_names << segs.join('.').gsub(/^_/, '')
+              end
+            end
+          end
+
+          js_file_names.each { |name| directory_block.js_file name }
+          scss_file_names.each { |name| directory_block.scss_file name }
+
+          directory_block.instance_eval &block if block_was_given
+
+        end
+
+      end
+
+    end
+  end
+end

data/lib/web_blocks/facade/external_component_block.rb

@@ -7,9 +7,9 @@ module WebBlocks
 
       def handle name, attributes = {}, &block
         if attributes.has_key?(:path)
-          attributes[:path] = "bower_components/#{name}/#{attributes[:path]}"
+          attributes[:path] = "#{context.framework.resolved_path}/bower_components/#{name}/#{attributes[:path]}"
         else
-          attributes[:path] = "bower_components/#{name}"
+          attributes[:path] = "#{context.framework.resolved_path}/bower_components/#{name}"
         end
         context.block name, attributes, &block
       end

data/lib/web_blocks/facade/file_name_block.rb

@@ -4,17 +4,6 @@ module WebBlocks
   module Facade
     class FileNameBlock < Base
 
-      attr_reader :types
-
-      def initialize context
-        super context
-        @types = {
-            'css' => :scss_file,
-            'js' => :js_file,
-            'scss' => :scss_file
-        }
-      end
-
       def handle name, attributes = {}, &block
 
         this = self
@@ -22,10 +11,21 @@ module WebBlocks
         block_was_given = block_given?
 
         this.context.block name, attributes do |block_entity|
-          this.types.each do |extension, method_name|
-            block_entity.send(method_name, "#{name}.#{extension}") if File.exists?("#{block_entity.resolved_path}/#{name}.#{extension}")
+
+          if File.exists? "#{block_entity.resolved_path}/#{name}.css"
+            block_entity.scss_file "#{name}.css"
+          end
+
+          if File.exists? "#{block_entity.resolved_path}/#{name}.js"
+            block_entity.js_file "#{name}.js"
           end
+
+          if File.exists?("#{block_entity.resolved_path}/#{name}.scss") or File.exists?("#{block_entity.resolved_path}/_#{name}.scss")
+            block_entity.scss_file name
+          end
+
           block_entity.instance_eval &block if block_was_given
+
         end
 
       end

data/lib/web_blocks/facade/recursive_file_names_block.rb

@@ -29,8 +29,10 @@ module WebBlocks
             else
               segs = name.split('.')
               ext = segs.pop
-              if file_facade.types.keys.include? ext
+              if ext == 'css' or ext == 'js'
                 file_names << segs.join('.')
+              elsif ext == 'scss'
+                file_names << segs.join('.').gsub(/^_/, '')
               end
             end
           end

data/lib/web_blocks/facade/registration_scope.rb

@@ -0,0 +1,25 @@
+require 'web_blocks/facade/base'
+
+module WebBlocks
+  module Facade
+    class RegistrationScope < Base
+
+      def initialize context
+        super context
+        @@registration_scope = nil unless defined? @@registration_scope
+      end
+
+      def handle command = nil, data = {}, &block
+        case command
+          when :set
+            @@registration_scope = data
+          when :unset
+            @@registration_scope = nil
+        end
+        @@registration_scope
+      end
+
+    end
+  end
+end
+

data/lib/web_blocks/structure/block_core.rb

@@ -1,3 +1,5 @@
+require 'extend_method'
+require 'web_blocks/facade/block'
 require 'web_blocks/framework'
 require 'web_blocks/structure/tree/node'
 require 'web_blocks/structure/attribute/dependency'
@@ -9,6 +11,10 @@ module WebBlocks
   module Structure
     class BlockCore < ::WebBlocks::Structure::Tree::Node
 
+      class << self
+        include ExtendMethod
+      end
+
       include WebBlocks::Framework
 
       include WebBlocks::Structure::Attribute::Dependency
@@ -16,8 +22,12 @@ module WebBlocks
       include WebBlocks::Structure::Attribute::ReverseDependency
       include WebBlocks::Structure::Attribute::ReverseLooseDependency
 
+      ##
+      # Methods supporting extending the block DSL with facades for non-primitive blocks
+      #
+
       def register_facade name, handler
-        @facade_map = {} unless defined? @facade_map
+        @facade_map = {} unless (defined?(@facade_map) and @facade_map)
         @facade_map[name.to_sym] = handler
       end
 
@@ -65,17 +75,115 @@ module WebBlocks
         handler.handle *arguments, &block
       end
 
-      def resolved_path
-        path = attributes.has_key?(:path) ? attributes[:path] : ''
-        if attributes.has_key? :base_path
-          Pathname.new(attributes[:base_path]) + path
+      ##
+      # Methods supporting pathing enabled by WebBlocks::Structure::Framework#register
+      #
+
+      def scoped_base_path
+        if defined?(@isolated_from_parent_scoped_base_path)
+          nil
+        elsif defined?(@scoped_base_path)
+          @scoped_base_path
         elsif parent
-          parent.resolved_path + path
+           parent.scoped_base_path
         else
-          Pathname.new(path)
+          nil
+        end
+      end
+
+      def has_scoped_base_path?
+        return false if defined? @isolated_from_parent_scoped_base_path
+        return true if defined? @scoped_base_path
+        return true if (parent and parent.has_scoped_base_path?)
+        return false
+      end
+
+      def set_scoped_base_path path
+        @scoped_base_path = path
+      end
+
+      def isolate_subgraph_from_scoped_base_path!
+        @isolated_from_parent_scoped_base_path = true
+      end
+
+      def forget_scoped_base_path!
+        remove_instance_variable :@scoped_base_path if defined? @scoped_base_path
+        remove_instance_variable :@isolated_from_parent_scoped_base_path if defined? @isolated_from_parent_scoped_base_path
+        parent.forget_scoped_base_path! if parent
+      end
+
+      def with_base_path base_path, &block
+        set_scoped_base_path base_path
+        klass = Class.new(::WebBlocks::Facade::Block)
+        klass.class_variable_set :@@default_base_path, base_path
+        klass.class_eval do
+          def handle *params, &block
+            subblock = super *params, &block
+            default_base_path = self.class.class_variable_get(:@@default_base_path).to_s
+            subblock.define_singleton_method(:default_base_path){ default_base_path }
+            subblock
+          end
+        end
+        register_facade :block, klass
+        instance_eval &block
+        register_facade :block, ::WebBlocks::Facade::Block
+        forget_scoped_base_path!
+      end
+
+      # Extending set_parent method from WebBlocks::Support::Attributes::Container, which is included by way of
+      # inheritance through self.class -> WebBlocks::Structure::Tree::Node -> WebBlocks::Structure::Tree::LeafNode.
+      # This is required for WebBlocks::Structure::Framework#register.
+
+      extend_method :set_parent do |parent|
+        parent_method parent
+        if has_scoped_base_path?
+          if has? :path
+            path = get(:path).to_s
+            set :path, "#{scoped_base_path}/#{path}" unless path[0,1] == '/'
+            isolate_subgraph_from_scoped_base_path!
+          end
         end
       end
 
+      ##
+      # Methods available for interpreting and manipulating the block
+      #
+
+      def resolved_path
+
+        parents_except_root = parents
+
+        # we're not going to use the root's path for determining if there's an implicit path
+        root = parents_except_root.pop
+
+        # get the sub-paths
+        subpaths = []
+        parents_except_root.each do |p|
+          subpaths.unshift(p.get(:path)) if p.has?(:path)
+        end
+
+        if subpaths.length == 0
+          [self, parents_except_root].flatten.each do |p|
+            if p.respond_to? :default_base_path
+              subpaths.push(p.default_base_path)
+              break
+            end
+          end
+        end
+
+        subpaths.unshift(Pathname.new((root and root.has?(:path)) ? root.get(:path) : '.'))
+
+        subpaths << attributes[:path] if attributes.has_key?(:path)
+
+        begin
+          subpaths.reduce(:+).realpath
+        rescue => e
+          puts "Error resolving block #{self.route} to path #{subpaths.reduce(:+).to_json} from #{subpaths.to_json}"
+          raise e
+        end
+
+      end
+
       def files
         computed = []
         children.each do |name,object|

data/lib/web_blocks/structure/framework.rb

@@ -1,4 +1,5 @@
 require 'web_blocks/facade/external_component_block'
+require 'web_blocks/facade/registration_scope'
 require 'web_blocks/structure/block'
 require 'web_blocks/structure/raw_file'
 require 'web_blocks/support/tsort/hash'
@@ -7,22 +8,19 @@ module WebBlocks
   module Structure
     class Framework < Block
 
+      set :required, true
+
+      # FRAMEWORK DSL
+
       register_facade :external_component_block, WebBlocks::Facade::ExternalComponentBlock
+      register_facade :registration_scope, WebBlocks::Facade::RegistrationScope
 
-      set :required, true
+      def after name, &block
+        for_notification "after_#{name}".to_sym, &block
+      end
 
-      def register hash
-        name = hash[:name]
-        path = hash[:path]
-        resolved_block_path = resolved_path + path
-        blockfile_path =  resolved_block_path + "Blockfile.rb"
-        raise "Undefined blockfile for #{path}" unless File.exists?(blockfile_path)
-        isolated_facade_registration_scope do
-          block name do
-            set :base_path, resolved_block_path
-          end
-          instance_eval File.read(blockfile_path)
-        end
+      def before name, &block
+        for_notification "before_#{name}".to_sym, &block
       end
 
       def include *args
@@ -41,6 +39,43 @@ module WebBlocks
         end
       end
 
+      # FRAMEWORK METHODS
+
+      def register hash
+        name = hash[:name]
+        path = hash[:path]
+        resolved_block_path = resolved_path + path
+        blockfile_path =  resolved_block_path + "Blockfile.rb"
+        raise "Undefined blockfile for #{path}" unless File.exists?(blockfile_path)
+        in_registration_scope resolved_block_path do
+          instance_eval File.read(blockfile_path)
+        end
+      end
+
+      def in_registration_scope resolved_block_path, &block
+        isolated_facade_registration_scope do
+          with_base_path(resolved_block_path) do
+            registration_scope :set, path: resolved_block_path
+            instance_eval &block
+            registration_scope :unset
+          end
+        end
+      end
+
+      def for_notification name, &block
+        @notification = {} unless defined? @notification
+        @notification[name] = [] unless @notification.has_key?(name)
+        @notification[name].push block
+      end
+
+      def notify name, opts = {}
+        if defined?(@notification) and @notification.has_key?(name)
+          @notification[name].each do |proc|
+            instance_exec opts, &proc
+          end
+        end
+      end
+
       def block_from_route route
         block = self
         route.each { |name| block = block.block(name) }
@@ -74,9 +109,7 @@ module WebBlocks
       end
 
       def get_file_load_order type = RawFile
-
         ::WebBlocks::Support::TSort::Hash.try_convert(adjacency_list).tsort.keep_if(){ |file| file.is_a? type }
-
       end
 
     end

data/lib/web_blocks/thor/base/prepare_blocks.rb

@@ -27,6 +27,11 @@ module WebBlocks
                    :default => nil,
                    :desc => 'Path where WebBlocks should build products'
 
+      class_option :env,
+                   :type => :string,
+                   :default => nil,
+                   :desc => 'Name of the environment'
+
       no_commands do
 
         def prepare_blocks!
@@ -62,10 +67,26 @@ module WebBlocks
             include_routes_from_command_line! log if self.options.include
             set_build_path_from_command_line!
 
+            framework.notify :after_prepare_blocks, runner: self, log: log
+
           end
 
         end
 
+        def reload_blocks! log
+
+          ::WebBlocks::Framework.class_variable_set(:@@framework, ::WebBlocks::Structure::Framework.new('framework'))
+
+          initialize_root!
+
+          load_bower_registry! log
+          load_blockfile! log
+          include_own_routes! log
+          include_routes_from_command_line! log if self.options.include
+          set_build_path_from_command_line!
+
+        end
+
       end
 
       private

data/lib/web_blocks/version.rb

@@ -1,3 +1,3 @@
 module WebBlocks
-  VERSION = "2.0.5.alpha"
+  VERSION = "2.1.0.dev"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_blocks
 version: !ruby/object:Gem::Version
-  version: 2.0.5.alpha
+  version: 2.1.0.dev
 platform: ruby
 authors:
 - Eric Bollens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -239,10 +239,12 @@ files:
 - lib/web_blocks.rb
 - lib/web_blocks/facade/base.rb
 - lib/web_blocks/facade/block.rb
+- lib/web_blocks/facade/directory_name_block.rb
 - lib/web_blocks/facade/external_component_block.rb
 - lib/web_blocks/facade/file_name_block.rb
 - lib/web_blocks/facade/js_file.rb
 - lib/web_blocks/facade/recursive_file_names_block.rb
+- lib/web_blocks/facade/registration_scope.rb
 - lib/web_blocks/facade/scss_file.rb
 - lib/web_blocks/framework.rb
 - lib/web_blocks/manager/bower.rb