web_blocks 2.0.4.dev → 2.0.5.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3056171fbb818b0465746dd882467671d4c51275
-  data.tar.gz: 1f6f4f7d02abc207f38217664f1dc093084ccc65
+  metadata.gz: 6b45e9ad8b7e3af77d52db79b0685c78ca0dac1f
+  data.tar.gz: 92aa552f7c50dd4985a8b0fa6efafc6668c10aaa
 SHA512:
-  metadata.gz: b8fc781f422e5239fd2bda350d58075f8777dbb7a13dda7b0930a6f60ee48cd1ee25eb1a52731fe4f1976d939e52f790b3a57750f4dd5d174588e66d4d98422f
-  data.tar.gz: c228529bd7a500b6f319918d8cc822bd9cb2b518946e882f0744d38385eec195a92c2d8a0c8be8e1e921f9e083a51ef14e496e5c2888d2f816fb39cd28b4a9be
+  metadata.gz: aa248d75286aa4001c87cc5c8934063195a780e5caa4e2fd877c4764b73ec9d84eeba1135e8fd1f3edc303e24e5d421179247ab3eb8d3bb7d70f9761e1c73607
+  data.tar.gz: f2ff6239be72f149a6271de716aa456b9c4ae9ac529fd5ee8c3ad6b87e8d2050b3dce3c0e5ebee1169a41140106ca121c670d88144be15c8c4184ba9dda49950

data/README.md

@@ -302,6 +302,16 @@ Further, in this example, suppose the goal is to use the `WebBlocks-visibility`
 }
 ```
 
+While blocks should carefully define their dependencies to be as accepting as possible, two blocks will sometimes require completely different versions of the same dependency. This can be resolved by manually specifying a resolution in `bower.json`:
+
+```json
+{
+  "resolutions": {
+    "jquery": "~2.1.0"
+  }
+}
+```
+
 ### Including a Block
 
 While packages define blocks to include, generally they will not be included unless specified explicitly.
@@ -441,6 +451,8 @@ blocks watch
 
 Any time that a bower component, blockfile or source file changes, it will rebuild the necessary components.
 
+**NOTE: The `watch` command will not work properly under inotify (Linux) for modifications to `Blockfile.rb`.**
+
 ### Using Depedencies to Control Load Order
 
 The WebBlocks-breakpoints module provides a set of variables that it will define unless they're already defined. This enables WebBlocks-visibility's breakpoint-based classes. Suppose, however, that we wish to inject our own variables.
@@ -656,6 +668,67 @@ $ blocks inspect dependency_order
 /Users/ebollens/Sites/test/bower_components/efx/src/driver/toggle.js
 ```
 
+### Modifying the WebBlocks DSL
+
+At any block level, you can register a new facade into the DSL:
+
+```ruby
+block 'efx' do
+
+  register_facade :file_name_block, ::WebBlocks::Facade::FileNameBlock
+
+  file_name_block 'engine', :required => true do
+    loose_dependency framework.route 'jquery'
+  end
+
+end
+```
+
+This registration is available to child nodes as well:
+
+```ruby
+block 'efx' do
+
+  register_facade :file_name_block, ::WebBlocks::Facade::FileNameBlock
+
+  # ..
+
+  block 'driver', :path => 'driver' do
+
+      dependency efx.route 'engine'
+
+      file_name_block 'accordion'
+      file_name_block 'tabs'
+      file_name_block 'toggle'
+
+    end
+
+end
+```
+
+Resolution of the facade occurs by way of closest parent. For example, Ex2 wins over Ex1 for the sub-block:
+
+```ruby
+block 'top-level' do
+
+  register_facade :ex, Ex1
+
+  block 'driver', :path => 'driver' do
+
+    register_facade :ex, Ex2
+
+      ex 'Ex2_is_used_as_handler_here'
+
+    end
+
+end
+```
+
+### Available Facades
+
+* **WebBlocks::Facade::FileNameBlock** takes the name passed to it and finds CSS, JS and SCSS files by the same name and loading them into a block by that name.
+* **WebBlocks::Facade::RecursiveFileNamesBlock** takes the name passed to it and finds all directories, making sub-blocks of them and calling this recursively, while also finding all CSS, JS and SCSS files by the same name and loading them into a block by that name.
+
 ### Learn More
 
 See the `demo` folder for a example setup.

data/lib/web_blocks/facade/base.rb

@@ -0,0 +1,16 @@
+require 'web_blocks/facade/base'
+
+module WebBlocks
+  module Facade
+    class Base
+
+      attr_reader :context
+
+      def initialize context
+        @context = context
+      end
+
+    end
+  end
+end
+

data/lib/web_blocks/facade/block.rb

@@ -0,0 +1,15 @@
+require 'web_blocks/facade/base'
+require 'web_blocks/structure/block'
+
+module WebBlocks
+  module Facade
+    class Block < Base
+
+      def handle name, attributes = {}, &block
+        context.child_eval ::WebBlocks::Structure::Block, name, attributes, block
+      end
+
+    end
+  end
+end
+

data/lib/web_blocks/facade/external_component_block.rb

@@ -0,0 +1,20 @@
+require 'web_blocks/facade/base'
+require 'web_blocks/structure/block'
+
+module WebBlocks
+  module Facade
+    class ExternalComponentBlock < Base
+
+      def handle name, attributes = {}, &block
+        if attributes.has_key?(:path)
+          attributes[:path] = "bower_components/#{name}/#{attributes[:path]}"
+        else
+          attributes[:path] = "bower_components/#{name}"
+        end
+        context.block name, attributes, &block
+      end
+
+    end
+  end
+end
+

data/lib/web_blocks/facade/file_name_block.rb

@@ -0,0 +1,35 @@
+require 'web_blocks/facade/base'
+
+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
+
+        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}")
+          end
+          block_entity.instance_eval &block if block_was_given
+        end
+
+      end
+
+    end
+  end
+end

data/lib/web_blocks/facade/js_file.rb

@@ -0,0 +1,15 @@
+require 'web_blocks/facade/base'
+require 'web_blocks/structure/js_file'
+
+module WebBlocks
+  module Facade
+    class JsFile < Base
+
+      def handle name, attributes = {}, &block
+        context.child_eval ::WebBlocks::Structure::JsFile, name, attributes, block
+      end
+
+    end
+  end
+end
+

data/lib/web_blocks/facade/recursive_file_names_block.rb

@@ -0,0 +1,47 @@
+require 'set'
+require 'web_blocks/facade/base'
+require 'web_blocks/facade/file_name_block'
+
+module WebBlocks
+  module Facade
+    class RecursiveFileNamesBlock < 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
+          directory_facade = ::WebBlocks::Facade::RecursiveFileNamesBlock.new(directory_block)
+          file_facade = ::WebBlocks::Facade::FileNameBlock.new(directory_block)
+          file_names = Set.new
+
+          Dir.entries(directory_path).each do |name|
+            next if name == '.' or name == '..'
+            path = "#{directory_path}/#{name}"
+            if File.directory? path
+              directory_facade.handle name, path: name
+            else
+              segs = name.split('.')
+              ext = segs.pop
+              if file_facade.types.keys.include? ext
+                file_names << segs.join('.')
+              end
+            end
+          end
+
+          file_names.each { |name| file_facade.handle name }
+
+          directory_block.instance_eval &block if block_was_given
+
+        end
+      end
+
+    end
+  end
+end

data/lib/web_blocks/facade/scss_file.rb

@@ -0,0 +1,15 @@
+require 'web_blocks/facade/base'
+require 'web_blocks/structure/scss_file'
+
+module WebBlocks
+  module Facade
+    class ScssFile < Base
+
+      def handle name, attributes = {}, &block
+        context.child_eval ::WebBlocks::Structure::ScssFile, name, attributes, block
+      end
+
+    end
+  end
+end
+

data/lib/web_blocks/manager/bower.rb

@@ -38,6 +38,10 @@ module WebBlocks
         ::Bower.context.call "bower.commands.prune"
       end
 
+      def clean_components!
+        FileUtils.rm_rf @components_path
+      end
+
       def install!
         ::Bower.context.call "bower.commands.install"
       end

data/lib/web_blocks/structure/block.rb

@@ -1,94 +1,18 @@
-require 'web_blocks/framework'
-require 'web_blocks/structure/tree/node'
-require 'web_blocks/structure/block'
-require 'web_blocks/structure/scss_file'
-require 'web_blocks/structure/js_file'
-require 'web_blocks/structure/attribute/dependency'
-require 'web_blocks/structure/attribute/loose_dependency'
-require 'web_blocks/structure/attribute/reverse_dependency'
-require 'web_blocks/structure/attribute/reverse_loose_dependency'
+require 'web_blocks/facade/block'
+require 'web_blocks/facade/js_file'
+require 'web_blocks/facade/scss_file'
+require 'web_blocks/structure/block_core'
 
 module WebBlocks
   module Structure
-    class Block < ::WebBlocks::Structure::Tree::Node
-
-      include WebBlocks::Framework
-      include WebBlocks::Structure::Attribute::Dependency
-      include WebBlocks::Structure::Attribute::LooseDependency
-      include WebBlocks::Structure::Attribute::ReverseDependency
-      include WebBlocks::Structure::Attribute::ReverseLooseDependency
+    class Block < BlockCore
 
       set :required, false
 
-      def resolved_path
-        path = attributes.has_key?(:path) ? attributes[:path] : ''
-        if attributes.has_key? :base_path
-          Pathname.new(attributes[:base_path]) + path
-        elsif parent
-          parent.resolved_path + path
-        else
-          Pathname.new(path)
-        end
-      end
-
-      def block name, attributes = {}, &block
-        child_eval ::WebBlocks::Structure::Block, name, attributes, block
-      end
-
-      def scss_file name, attributes = {}, &block
-        child_eval ::WebBlocks::Structure::ScssFile, name, attributes, block
-      end
-
-      def js_file name, attributes = {}, &block
-        child_eval ::WebBlocks::Structure::JsFile, name, attributes, block
-      end
-
-      def files
-        computed = []
-        children.each do |name,object|
-          if object.is_a? Block
-            computed = computed + object.files
-          elsif object.is_a? RawFile
-            computed << object
-          end
-        end
-        computed
-      end
-
-      def select_leaf_nodes branch_select_proc, leaf_select_proc
-        leaf_nodes = []
-        nodes = [self]
-        while nodes.length > 0
-          node = nodes.pop
-          if node.respond_to? :children
-            nodes |= node.children.values.select(&branch_select_proc)
-          elsif leaf_select_proc.call(node)
-            leaf_nodes << node
-          end
-        end
-        leaf_nodes
-      end
-
-      def required_files
-        select_leaf_nodes Proc.new(){ |node| node.get(:required) }, Proc.new(){ |node| node.is_a? RawFile }
-      end
-
-      private
-
-      def child_add_or_update klass, name, attributes = {}
-        unless has_child? name
-          add_child klass.new(name, attributes)
-        else
-          attributes.each { |key, value| children[name].set key, value }
-        end
-        children[name]
-      end
+      register_facade :block, WebBlocks::Facade::Block
+      register_facade :js_file, WebBlocks::Facade::JsFile
+      register_facade :scss_file, WebBlocks::Facade::ScssFile
 
-      def child_eval klass, name, attributes = {}, block
-        child = child_add_or_update klass, name, attributes
-        child.instance_exec children[name], &block if block
-        child
-      end
 
     end
   end

data/lib/web_blocks/structure/block_core.rb

@@ -0,0 +1,126 @@
+require 'web_blocks/framework'
+require 'web_blocks/structure/tree/node'
+require 'web_blocks/structure/attribute/dependency'
+require 'web_blocks/structure/attribute/loose_dependency'
+require 'web_blocks/structure/attribute/reverse_dependency'
+require 'web_blocks/structure/attribute/reverse_loose_dependency'
+
+module WebBlocks
+  module Structure
+    class BlockCore < ::WebBlocks::Structure::Tree::Node
+
+      include WebBlocks::Framework
+
+      include WebBlocks::Structure::Attribute::Dependency
+      include WebBlocks::Structure::Attribute::LooseDependency
+      include WebBlocks::Structure::Attribute::ReverseDependency
+      include WebBlocks::Structure::Attribute::ReverseLooseDependency
+
+      def register_facade name, handler
+        @facade_map = {} unless defined? @facade_map
+        @facade_map[name.to_sym] = handler
+      end
+
+      def self.register_facade name, handler
+        @@class_facade_map = {} unless defined? @@class_facade_map
+        @@class_facade_map[name.to_sym] = handler
+      end
+
+      def resolve_facade name
+        if @facade_map and @facade_map.has_key?(name)
+          @facade_map[name]
+        elsif parent
+          parent.resolve_facade name
+        else
+          nil
+        end
+      end
+
+      def resolve_class_facade name
+        if @@class_facade_map and @@class_facade_map[name]
+          @@class_facade_map[name]
+        elsif parent
+          parent.resolve_class_facade name
+        else
+          nil
+        end
+      end
+
+      def isolated_facade_registration_scope &block
+        facade_map = @facade_map
+        begin
+          instance_eval &block
+          @facade_map = facade_map
+        rescue => e
+          @facade_map = facade_map
+          raise e
+        end
+      end
+
+      def method_missing name, *arguments, &block
+        handler_class = resolve_facade(name)
+        handler_class = resolve_class_facade(name) unless handler_class
+        raise NoMethodError, "undefined facade `#{name}' for #{self}" unless handler_class
+        handler = handler_class.new(self)
+        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
+        elsif parent
+          parent.resolved_path + path
+        else
+          Pathname.new(path)
+        end
+      end
+
+      def files
+        computed = []
+        children.each do |name,object|
+          if object.is_a? Block
+            computed = computed + object.files
+          elsif object.is_a? RawFile
+            computed << object
+          end
+        end
+        computed
+      end
+
+      def select_leaf_nodes branch_select_proc, leaf_select_proc
+        leaf_nodes = []
+        nodes = [self]
+        while nodes.length > 0
+          node = nodes.pop
+          if node.respond_to? :children
+            nodes |= node.children.values.select(&branch_select_proc)
+          elsif leaf_select_proc.call(node)
+            leaf_nodes << node
+          end
+        end
+        leaf_nodes
+      end
+
+      def required_files
+        select_leaf_nodes Proc.new(){ |node| node.get(:required) }, Proc.new(){ |node| node.is_a? RawFile }
+      end
+
+      def child_add_or_update klass, name, attributes = {}
+        unless has_child? name
+          add_child klass.new(name, attributes)
+        else
+          attributes.each { |key, value| children[name].set key, value }
+        end
+        children[name]
+      end
+
+      def child_eval klass, name, attributes = {}, block
+        child = child_add_or_update klass, name, attributes
+        child.instance_exec children[name], &block if block
+        child
+      end
+
+    end
+  end
+end

data/lib/web_blocks/structure/framework.rb

@@ -1,3 +1,4 @@
+require 'web_blocks/facade/external_component_block'
 require 'web_blocks/structure/block'
 require 'web_blocks/structure/raw_file'
 require 'web_blocks/support/tsort/hash'
@@ -6,6 +7,8 @@ module WebBlocks
   module Structure
     class Framework < Block
 
+      register_facade :external_component_block, WebBlocks::Facade::ExternalComponentBlock
+
       set :required, true
 
       def register hash
@@ -14,9 +17,11 @@ module WebBlocks
         resolved_block_path = resolved_path + path
         blockfile_path =  resolved_block_path + "Blockfile.rb"
         raise "Undefined blockfile for #{path}" unless File.exists?(blockfile_path)
-        instance_eval File.read(blockfile_path)
-        block name do
-          set :base_path, resolved_block_path
+        isolated_facade_registration_scope do
+          block name do
+            set :base_path, resolved_block_path
+          end
+          instance_eval File.read(blockfile_path)
         end
       end
 

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

@@ -35,6 +35,10 @@ module WebBlocks
 
             begin
 
+              if self.options.reload_bower
+                clean_bower_components! log
+              end
+
               if !bower_manager.installed? or self.options.reload_bower
                 install_bower_components! log
               elsif self.options.reload_registry
@@ -75,6 +79,15 @@ module WebBlocks
 
       end
 
+      def clean_bower_components! log
+
+        log.debug do
+          bower_manager.clean_components!
+          'Cleaned bower components'
+        end
+
+      end
+
       def clean_bower_registry! log
 
         log.debug do
@@ -96,7 +109,7 @@ module WebBlocks
                     register :name => name, :path => path
                     "Loaded"
                   end
-                rescue
+                rescue RuntimeError
                   log.warn("#{name}") { "Skipped -- Blockfile.rb does not exist" }
                 end
               end

data/lib/web_blocks/thor/watch/all.rb

@@ -25,17 +25,45 @@ module WebBlocks
         triggers << base_path + '.blocks/cache/bower/registry.yaml'
         triggers << base_path + 'bower_components/*/Blockfile.rb'
 
+        monitor = nil
+
         handler = Proc.new do |base, relative|
 
+          rerun_monitor = false
           changed_file = Pathname.new(base) + relative
           relink_needed = changed_file.to_s.match(/Blockfile.rb$/)
 
           log.info("Watch"){ "Detected change to #{changed_file}" }
 
           if relink_needed
+
             root.remove_all_children
             initialize_root!
             prepare_blocks!
+
+            # This is a super hacky way to detach all handlers for FSSM.monitor and then initialize a new FSSM.monitor
+            # with the right triggers based on the latest changes. This does NOT work with inotify.
+            if monitor.instance_variable_get("@backend").is_a?(FSSM::Backends::RBFSEvent) or monitor.instance_variable_get("@backend").is_a?(FSSM::Backends::Polling)
+
+              monitor.instance_variable_get("@backend").instance_variable_set("@handlers", [])
+
+              triggers = root.adjacency_list.keys.map(){|f| f.resolved_path.to_s }
+              triggers << base_path + 'Blockfile.rb'
+              triggers << base_path + '.blocks/cache/bower/registry.yaml'
+              triggers << base_path + 'bower_components/*/Blockfile.rb'
+
+              monitor = FSSM::Monitor.new
+              monitor.path @base_path do
+                glob triggers
+                update &handler
+                delete &handler
+                create &handler
+              end
+
+              rerun_monitor = true
+
+            end
+
           end
 
           begin
@@ -59,6 +87,10 @@ module WebBlocks
 
           end
 
+          if rerun_monitor
+            monitor.run
+          end
+
         end
 
         if options.build

data/lib/web_blocks/version.rb

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

data/web_blocks.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'thor'
   spec.add_dependency 'ruby-bower'
-  spec.add_dependency 'execjs'
+  spec.add_dependency 'execjs', '~> 2.2', '<= 2.2.2'
   spec.add_dependency 'extend_method'
   spec.add_dependency 'compass'
   spec.add_dependency 'sass-css-importer'
@@ -33,5 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'test-unit'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_blocks
 version: !ruby/object:Gem::Version
-  version: 2.0.4.dev
+  version: 2.0.5.alpha
 platform: ruby
 authors:
 - Eric Bollens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -42,16 +42,22 @@ dependencies:
   name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: extend_method
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +198,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Package, configuration and dependency manager for web assets (SCSS, JS,
   images, and fonts)
 email:
@@ -217,6 +237,13 @@ files:
 - demo/package.json
 - demo/src/config/WebBlocks-breakpoints.scss
 - lib/web_blocks.rb
+- lib/web_blocks/facade/base.rb
+- lib/web_blocks/facade/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/scss_file.rb
 - lib/web_blocks/framework.rb
 - lib/web_blocks/manager/bower.rb
 - lib/web_blocks/manager/builder/base.rb
@@ -239,6 +266,7 @@ files:
 - lib/web_blocks/structure/attribute/reverse_dependency.rb
 - lib/web_blocks/structure/attribute/reverse_loose_dependency.rb
 - lib/web_blocks/structure/block.rb
+- lib/web_blocks/structure/block_core.rb
 - lib/web_blocks/structure/font_file.rb
 - lib/web_blocks/structure/framework.rb
 - lib/web_blocks/structure/img_file.rb
@@ -304,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: package, configuration and dependency manager for web assets (SCSS, JS, images,