web_blocks 2.0.1.dev → 2.0.2.dev

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDI0MzQ5MmMwNmJhNzI0MGY4MGFhNTEwYTJiZTI4Mjg2YzJjNjdiZA==
+    NjlhYjg1NWE1YWEzNDNjMmU2MGZmYTczZWQ3ODE0ZmQwZjYyYzViYg==
   data.tar.gz: !binary |-
-    ZDIwODg5ZWFkZjcyN2IzYzc0ZTJiOTA4NjkxMjdmOTA2YTIwY2NlOQ==
+    NzcyNTM0NzQ0NTAxMTY5OWM1ZjE3NTVmOTBhM2QxZTc4NmQ0ZjZjZg==
 SHA512:
   metadata.gz: !binary |-
-    YjVkZDAxNzJkNTQ3Yjk3ZjQ0ODE2ZWM1MjMzM2ZkNWJmMzZhZDU1ZjcwMzJk
-    YjM1YzUxOTEyNTMxZTJlNzM3NDg4OTI3OGE0N2NiNGQ2NmE2ZjM4OTM3Yjc3
-    M2VkNmM1OWQzNWNhZDE2NDkyMzBjNzc2OTI0NWNlYTcxMDBlY2Q=
+    MThlZWJiMWJmZDdkYzFjZWQzM2Y4OWVlMGVlMjViNGI2MDk5YWNkNTFkNzUy
+    ZGY1ZmMxMzMzOWVkMzkxZTIwY2VmZGUzZTA4ZTIzN2JlOThhZjNhYWFjZmU1
+    OTFlYTZmYTBhOGE5NTMzMzdjZWRlMzczMGQ0M2U4YzgxMDRhZTI=
   data.tar.gz: !binary |-
-    MTc4ZmY5YjNjYWZkZjU3MzUyMzkyZjUzZTEzNTg4OWQxZGMyNmVmZTk0ODlm
-    OTNkNDQ0ZGYyZTY5YThmYzcxYjEwM2UxMDEyZDBlYmMxZGQ0ZTA3MjYzZGUx
-    YjQzMDlkNzgzMzk3ZGM2NDk3ZmVkMDhkY2JlMmQyNzhkMWM0YTQ=
+    ZTgzZTA1YWFiODMzNmUxZDQwYzVlZDM2NGI3NTllNjI1ZmU3ZGQ0NDgwOTA2
+    NWUzOWY3NTNjYmJmMTgyMWM1ZmE2MzYwYWNjNGMxZGQ0OTA1NTI3YjVkZDc3
+    MTE5YTljNGViMmUwYWVmNzA2YjRlODY3ZDg4M2MwZDBiYzY1Yjc=

data/README.md

@@ -4,7 +4,7 @@ WebBlocks is package, configuration and dependency manager for web assets (SCSS,
 
 ## Status
 
-[![Code Climate](https://codeclimate.com/github/WebBlocks/WebBlocks.png)](https://codeclimate.com/github/WebBlocks/WebBlocks) [![Build Status](https://travis-ci.org/WebBlocks/WebBlocks.png?branch=master)](https://travis-ci.org/WebBlocks/WebBlocks) [![Coverage Status](https://coveralls.io/repos/WebBlocks/WebBlocks/badge.png?branch=master)](https://coveralls.io/r/WebBlocks/WebBlocks?branch=master) [![Dependency Status](https://gemnasium.com/WebBlocks/WebBlocks.png)](https://gemnasium.com/WebBlocks/WebBlocks)
+[![Gem Version](https://badge.fury.io/rb/web_blocks.png)](http://badge.fury.io/rb/web_blocks) [![Dependency Status](https://gemnasium.com/WebBlocks/WebBlocks.png)](https://gemnasium.com/WebBlocks/WebBlocks) [![Code Climate](https://codeclimate.com/github/WebBlocks/WebBlocks.png)](https://codeclimate.com/github/WebBlocks/WebBlocks) [![Build Status](https://travis-ci.org/WebBlocks/WebBlocks.png?branch=master)](https://travis-ci.org/WebBlocks/WebBlocks) [![Coverage Status](https://coveralls.io/repos/WebBlocks/WebBlocks/badge.png?branch=master)](https://coveralls.io/r/WebBlocks/WebBlocks?branch=master)
 
 This repository contains the code base for WebBlocks 2.0, which is currently **under development** and **not intended for use at this time**. For those interested in using WebBlocks today, please see WebBlocks 1 under the [ucla/WebBlocks](https://github.com/ucla/WebBlocks) repository.
 
@@ -24,6 +24,14 @@ WebBlocks is built on top of a number of outstanding open source platforms and p
 
 **NOTE** Assuming installation in one of the ways described as follows, this documentation uses `blocks` as a shell command; in cases where it's installed locally by bundle rather than globally, it may be necessary to use `bundle exec blocks` instead.
 
+### Pre-requisites
+
+The following are required:
+
+* Ruby, RubyGems and Budler
+* Node.js and NPM
+* Java 1.4+ (only for compression)
+
 ### Download
 
 #### From Source

data/demo/Blockfile.rb

@@ -9,22 +9,13 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
 #
-# CUSTOM BLOCK DEFINITIONS
-#
-# Ideally, frameworks and tools should include Blockfile.rb; however, this will not always be the case. In some cases,
-# frameworks may not explicitly support WebBlocks (even though, through this syntax, WebBlocks can support them), and,
-# in others, it may be advantageous simply to download a build product.
+# BUILD SETTINGS
 #
 
-# Adding a jQuery block as jQuery does not include a Blockfile.rb defining it
-block 'jquery', :path => 'bower_components/jquery/dist' do
-  js_file 'jquery.js'
-end
+# Set where to build explicitly:
+#   set :build_path, 'build'
+
 
-# Adding a dependency on the jquery block for efx to include jquery if including efx
-block 'efx' do
-  dependency framework.route 'jquery'
-end
 
 #
 # BLOCK INCLUSIONS
@@ -45,6 +36,21 @@ include 'efx', 'driver', 'toggle'
 
 
 
+
+#
+# CUSTOM BLOCK DEFINITIONS
+#
+# In some cases, the existing definitions do not behave as desired, so reopen and modify accordingly.
+#
+
+# The efx block does not enforce a dependency on jQuery so add that here.
+block 'efx' do
+  dependency framework.route 'jquery'
+end
+
+
+
+
 #
 # CUSTOM SOURCES
 #

data/lib/web_blocks/manager/builder/base.rb

@@ -21,7 +21,7 @@ module WebBlocks
 
         def save!
 
-          yield task.base_path + task.root.get(:build_dir) if block_given?
+          yield task.base_path + task.root.get(:build_path) if block_given?
 
         end
 

data/lib/web_blocks/manager/builder/js.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'web_blocks/manager/builder/base'
 require 'web_blocks/strategy/link/js'
+require 'web_blocks/strategy/optimize/js'
 
 module WebBlocks
   module Manager
@@ -8,12 +9,14 @@ module WebBlocks
       class Js < Base
 
         attr_reader :link_strategy
+        attr_reader :optimize_strategy
 
         def initialize task
 
           super task
 
           @link_strategy = WebBlocks::Strategy::Link::Js.new(task)
+          @optimize_strategy = WebBlocks::Strategy::Optimize::Js.new(task)
 
         end
 
@@ -22,6 +25,7 @@ module WebBlocks
           super do
 
             link_strategy.execute!
+            optimize_strategy.execute!
 
           end
 
@@ -31,19 +35,19 @@ module WebBlocks
 
           super do |build_path|
 
-            log.info do
-
-              js_build_path = build_path + task.root.get(:js_build_dir)
-              FileUtils.mkdir_p js_build_path
-
-              source_path = link_strategy.product_path
-              product_path = js_build_path + source_path.basename
-              FileUtils.copy source_path, product_path
-
-              "Saved JS build #{product_path}"
+            js_build_path = build_path
+            FileUtils.mkdir_p js_build_path
 
+            [link_strategy, optimize_strategy].each do |strategy|
+              log.info do
+                source_path = strategy.product_path
+                product_path = js_build_path + source_path.basename
+                FileUtils.copy source_path, product_path
+                "Saved JS build #{product_path}"
+              end
             end
 
+
           end
 
         end

data/lib/web_blocks/manager/builder/scss.rb

@@ -1,6 +1,7 @@
 require 'web_blocks/manager/builder/base'
 require 'web_blocks/strategy/link/scss'
 require 'web_blocks/strategy/compile/scss'
+require 'web_blocks/strategy/optimize/css'
 
 module WebBlocks
   module Manager
@@ -9,6 +10,7 @@ module WebBlocks
 
         attr_reader :link_strategy
         attr_reader :compile_strategy
+        attr_reader :optimize_strategy
 
         def initialize task
 
@@ -16,6 +18,7 @@ module WebBlocks
 
           @link_strategy = WebBlocks::Strategy::Link::Scss.new(task)
           @compile_strategy = WebBlocks::Strategy::Compile::Scss.new(task)
+          @optimize_strategy = WebBlocks::Strategy::Optimize::Css.new(task)
 
         end
 
@@ -25,6 +28,7 @@ module WebBlocks
 
             link_strategy.execute!
             compile_strategy.execute!
+            optimize_strategy.execute!
 
           end
 
@@ -34,17 +38,16 @@ module WebBlocks
 
           super do |build_path|
 
-            log.info do
-
-              css_build_path = build_path + task.root.get(:css_build_dir)
-              FileUtils.mkdir_p css_build_path
-
-              source_path = compile_strategy.product_path
-              product_path = css_build_path + source_path.basename
-              FileUtils.copy source_path, product_path
-
-              "Saved CSS build #{product_path}"
+            css_build_path = build_path
+            FileUtils.mkdir_p css_build_path
 
+            [compile_strategy, optimize_strategy].each do |strategy|
+              log.info do
+                source_path = strategy.product_path
+                product_path = css_build_path + source_path.basename
+                FileUtils.copy source_path, product_path
+                "Saved CSS build #{product_path}"
+              end
             end
 
           end

data/lib/web_blocks/strategy/optimize/base.rb

@@ -0,0 +1,33 @@
+module WebBlocks
+  module Strategy
+    module Optimize
+      class Base
+
+        attr_reader :task
+        attr_reader :log
+        attr_reader :product_path
+        attr_reader :source_path
+
+        def initialize task
+
+          @task = task
+          @log = task.log.scope 'Optimize'
+          @product_path = false
+          @source_path = false
+
+        end
+
+        def execute!
+
+          log.info { "Starting" }
+
+          yield if block_given?
+
+          log.info { "Finished" }
+
+        end
+
+      end
+    end
+  end
+end

data/lib/web_blocks/strategy/optimize/css.rb

@@ -0,0 +1,37 @@
+require 'web_blocks/strategy/optimize/base'
+require 'yui/compressor'
+
+module WebBlocks
+  module Strategy
+    module Optimize
+      class Css < Base
+
+        def initialize task
+
+          super task
+
+          @log = task.log.scope 'CSS - Optimize'
+          @product_path = task.base_path + '.blocks/workspace/css/blocks.min.css'
+          @source_path = task.base_path + '.blocks/workspace/css/blocks.css'
+
+        end
+
+        def execute!
+
+          super do
+
+            File.open task.base_path + product_path, 'w' do |product|
+              File.open task.base_path + source_path, 'r' do |source|
+                compressor = YUI::CssCompressor.new
+                product.write compressor.compress source
+              end
+            end
+
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/web_blocks/strategy/optimize/js.rb

@@ -0,0 +1,37 @@
+require 'web_blocks/strategy/optimize/base'
+require 'yui/compressor'
+
+module WebBlocks
+  module Strategy
+    module Optimize
+      class Js < Base
+
+        def initialize task
+
+          super task
+
+          @log = task.log.scope 'JS - Optimize'
+          @product_path = task.base_path + '.blocks/workspace/js/blocks.min.js'
+          @source_path = task.base_path + '.blocks/workspace/js/blocks.js'
+
+        end
+
+        def execute!
+
+          super do
+
+            File.open task.base_path + product_path, 'w' do |product|
+              File.open task.base_path + source_path, 'r' do |source|
+                compressor = YUI::JavaScriptCompressor.new
+                product.write compressor.compress source
+              end
+            end
+
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -134,9 +134,7 @@ the APIs ad internals before release.
       def initialize_root!
 
         @root = framework do
-          set :build_dir, 'build'
-          set :css_build_dir, 'css'
-          set :js_build_dir, 'js'
+          set :build_path, 'build'
         end
 
       end

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

@@ -22,6 +22,11 @@ module WebBlocks
                    :default => nil,
                    :desc => 'Paths to explicitly include'
 
+      class_option :build_path,
+                   :type => :string,
+                   :default => nil,
+                   :desc => 'Path where WebBlocks should build products'
+
       no_commands do
 
         def prepare_blocks!
@@ -51,6 +56,7 @@ module WebBlocks
             load_blockfile! log
             include_own_routes! log
             include_routes_from_command_line! log if self.options.include
+            set_build_path_from_command_line!
 
           end
 
@@ -150,6 +156,12 @@ module WebBlocks
 
       end
 
+      def set_build_path_from_command_line!
+
+        root.set :build_path, self.options.build_path if self.options.build_path
+
+      end
+
     end
   end
 end

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

@@ -33,6 +33,7 @@ module WebBlocks
 
           if relink_needed
             root.remove_all_children
+            initialize_root!
             prepare_blocks!
           end
 

data/lib/web_blocks/version.rb

@@ -1,3 +1,3 @@
 module WebBlocks
-  VERSION = "2.0.1.dev"
+  VERSION = "2.0.2.dev"
 end

data/web_blocks.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sass-css-importer'
   spec.add_dependency 'fork'
   spec.add_dependency 'fssm'
+  spec.add_dependency 'yui-compressor'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_blocks
 version: !ruby/object:Gem::Version
-  version: 2.0.1.dev
+  version: 2.0.2.dev
 platform: ruby
 authors:
 - Eric Bollens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -122,6 +122,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yui-compressor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +216,9 @@ files:
 - lib/web_blocks/strategy/link/base.rb
 - lib/web_blocks/strategy/link/js.rb
 - lib/web_blocks/strategy/link/scss.rb
+- lib/web_blocks/strategy/optimize/base.rb
+- lib/web_blocks/strategy/optimize/css.rb
+- lib/web_blocks/strategy/optimize/js.rb
 - lib/web_blocks/structure.rb
 - lib/web_blocks/structure/attribute/dependency.rb
 - lib/web_blocks/structure/attribute/loose_dependency.rb