rjs-rails 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dff38938652a0701fef1f2104811298da7d5060a
-  data.tar.gz: bc0792ad64df754893be31ebfd62e7a769350aa9
+  metadata.gz: d03357dc42a524d14a96a92d0558bb0bbf90a1f5
+  data.tar.gz: e4b4b038dfb70351d7cc5f0745b48221dcf6b6cc
 SHA512:
-  metadata.gz: 7a7d56035c5930620b2e96dd3057f9ceedef9c188ce605fe5717e7a28a7d774fcffb77d9f8ad98f1466e0ee21433233f62ff02937d85ad7e1573c724ee657f10
-  data.tar.gz: a5c343914c6528fa5cceb2f2b893c9f262ea9f5d8c967068b9495cc56b349228201c7a22deee15f9d87df744adf414175744185b6ea4b31498bcdc09766df61d
+  metadata.gz: 2a0f556e170e39ca84162a108768c53e965beabde97a7a20cfd62324f856bb2e2633d7106aa505fb0e744175e2b6b3d6ef1d6aef79452d38e20a36054f84a748
+  data.tar.gz: 499cea07c02aa931cc19cf975e92e0743bbffd59dc62d6233b19be1005596f1c280f3e129ebdef1b7b8e7ac58aac8781fb7ec5ad9690b3d4688908e6ddbf5d39

data/lib/rjs-rails.rb

@@ -1,7 +1,5 @@
 require 'rjs-rails/env'
-require 'rjs-rails/build_env'
-require 'rjs-rails/runtime_env'
-require 'rjs-rails/rjs_helpers'
+require 'rjs-rails/build/api'
 
 module RjsRails
 end

data/lib/rjs-rails/build.js.erb

@@ -1,4 +1,4 @@
-var baseConfig = <%= JSON.pretty_generate(build_env.config) %>
+var baseConfig = <%= JSON.pretty_generate(config_hash) %>
 baseConfig["onModuleBundleComplete"] = function(data) {
   console.log("Module Finished:", data.path);
   for (var i=0; i<data.included.length; i++) {
@@ -7,7 +7,7 @@ baseConfig["onModuleBundleComplete"] = function(data) {
   console.log("total files:", data.included.length);
 };
 
-var requirejs = require("<%= config.rjs_path %>");
+var requirejs = require("<%= env.rjs_path %>");
 
 requirejs.optimize(baseConfig);
 

data/lib/rjs-rails/build/api.rb

@@ -0,0 +1,140 @@
+require 'rjs-rails/env'
+require 'rjs-rails/sources'
+require 'rjs-rails/sprockets'
+require 'rjs-rails/build/config'
+
+module RjsRails
+  module Build
+    class Api
+      
+      def env
+        @env ||= ::RjsRails::Env.new
+      end
+
+      def precompile
+        copy_sources
+        generate_build_js
+        optimize
+        prepend_path
+        add_assets_for_precompile
+      end
+
+      def copy_sources
+        empty_dirs
+        puts "=> copying sources"
+        asset_paths.each_with_index do |logical_path, i|
+          cr = "\r"
+          clear = "\e[0K"
+          print cr
+          print clear
+          print "#{i+1}/#{num_assets} #{logical_path}"
+          write_asset logical_path
+        end
+        puts
+      end
+
+
+      def generate_build_js
+        puts "=> generating build.js"
+        template = env.template
+        output_file = env.build_js
+        File.open(template) do |f|
+          erb = ERB.new(f.read)
+          File.open(output_file , 'w') do |of|
+            of.write erb.result(binding)
+          end
+        end
+      end
+
+      def optimize
+        puts "=> optimizing "
+        command = "node #{env.build_js}"
+        IO.popen(command) do |f|
+          f.each { |line| puts line }
+        end
+      end
+
+      def prepend_path
+        puts "=> prepend_path"
+        assets_env = sprockets.rails_assets_env
+        assets_env.prepend_path env.build_dir
+        case Rails.env
+        when "development"
+          Rails.application.assets = assets_env
+        else
+          Rails.application.assets = assets_env.index
+        end
+      end
+
+      def add_assets_for_precompile
+        puts "=> auto adding assets for precompile"
+        assets_array = config.assets_for_precompile
+        Rails.application.config.assets.precompile.concat(assets_array)
+      end
+
+
+      def config
+        @config ||= Config.new(env) 
+      end
+
+      def config_hash
+        config.to_h
+      end
+
+      def assets
+        @assets ||= sprockets.index
+      end
+
+      def sources
+        @sources || ::RjsRails::Sources.new(env)
+      end
+
+      def reload!
+        @env = nil
+        @sources = nil
+        @assets = nil
+        @config = nil
+        @asset_paths = nil
+        @num_assets = nil
+      end
+
+      private
+
+      def empty_dirs
+        puts "Emptying #{env.sources_dir}"
+        FileUtils.remove_entry_secure(env.sources_dir, true)
+        FileUtils.mkpath env.sources_dir
+      
+        puts "Emptying #{env.build_dir}"
+        FileUtils.remove_entry_secure(env.build_dir, true)
+        FileUtils.mkpath env.build_dir
+      end
+
+      def logical_paths
+        sources.paths + config.sources
+      end
+
+      def write_asset(logical_path)
+       if asset = assets.find_asset(logical_path)
+          filename = "#{env.sources_dir}/#{logical_path}"
+          asset.write_to(filename)
+        else
+          puts "WARNING could not find #{logical_path}"
+        end
+      end
+
+      def asset_paths
+        @asset_paths ||= assets.each_logical_path(logical_paths)
+      end
+
+      def num_assets
+        @num_assets ||= asset_paths.count
+      end
+
+      def sprockets
+        @sprockets ||= ::RjsRails::Sprockets.new
+      end
+
+    end
+  end
+end

data/lib/rjs-rails/build/config.rb

@@ -0,0 +1,99 @@
+module RjsRails
+module Build
+  class Config
+
+    attr_accessor :env
+
+    def initialize(env = nil)
+      self.env = env
+    end
+
+    def config
+      @config ||= base_config.merge(user_config)
+    end  
+
+    def to_h
+      config
+    end
+
+    def modules
+      config.fetch "modules", []
+    end  
+
+    def module_names
+      modules.collect { |m| m["name"] }
+    end
+
+    def shims
+      config.fetch "shim", {}
+    end
+
+    def paths
+      config.fetch "paths", {}
+    end  
+
+    def sources
+      sources = []
+      module_names.each { |m| sources << "#{m}.js" }
+      paths_hash = paths
+      shims.each do |key, _|
+        if paths_hash.has_key? key
+          sources << "#{paths_hash[key]}.js"
+        else
+          sources << "#{key}.js"
+        end
+      end
+      return sources
+    end
+
+    def assets_for_precompile
+      js = []
+      js << 'require.js'
+      module_names.each { |m| js << "#{m}.js" }
+      js
+    end
+
+    def precompile_required?
+      ! user_config.empty?
+    end 
+
+    private
+
+    def env
+      @env ||= ::RjsRails::Env.new
+    end
+
+    def config_path
+      @config_path ||= Pathname.new(env.build_yml)
+    end
+
+    def readable?
+      config_path.readable?
+    end  
+
+
+    def load_config
+      return {} if not readable?
+      File.open config_path do |f|
+        YAML.load f.read
+      end
+    end  
+
+    def base_config
+      base_config = ({
+        "baseUrl"             => env.sources_dir,
+        "dir"                 => env.build_dir,
+        "optimize"            => "none",
+        "skipDirOptimize"     => true,
+        "keepBuildDir"        => false,
+        "normalizeDirDefines" => "skip"
+      })
+    end  
+
+    def user_config
+      @user_config ||= load_config
+    end
+
+  end
+end
+end

data/lib/rjs-rails/env.rb

@@ -1,46 +1,30 @@
 module RjsRails
   class Env
     
-    def config
-      return @conf if @conf
-      c = ::ActiveSupport::OrderedOptions.new
-      c.extensions         = [/.js$/]
-      c.source_dir         = "#{Rails.root}/tmp/assets_source_dir"
-      c.build_dir   = "#{Rails.root}/tmp/assets_build_dir"
-      c.rjs_build_yml   = "#{Rails.root}/config/rjs_build.yml"
-      c.rjs_runtime_yml = "#{Rails.root}/config/rjs_runtime.yml"
-      c.rjs_path           = File.expand_path("../../vendor/assets/javascripts/r.js", File.dirname(__FILE__))
-      c.template           = File.expand_path("./build.js.erb", File.dirname(__FILE__))
-      c.build_js           = "#{Rails.root}/tmp/build.js"
-      @conf = c
-    end  
+    attr_accessor :sources_dir, :build_dir, :build_js
+    attr_accessor :build_yml, :sources_yml, :rjs_path
+    attr_accessor :template, :runtime_yml
 
-    def build_env
-      @build_env ||= RjsRails::BuildEnv.new(config)
-    end
-
-    def runtime_env
-      @runtime_env ||= RjsRails::RuntimeEnv.new(config)
-    end  
 
-    def reload!
-      @build_env = nil
-      @runtime_env = nil
-      build_env
-      runtime_env
+    def initialize
+      self.sources_dir = rails_path "tmp/assets_source_dir"
+      self.build_dir = rails_path "tmp/assets_build_dir"
+      self.build_js = rails_path "tmp/build.js" 
+      self.build_yml = rails_path "config/rjs/build.yml"
+      self.sources_yml = rails_path "config/rjs/sources.yml"
+      self.runtime_yml = rails_path "config/rjs/runtime.yml"
+      self.rjs_path = relative_path "../../vendor/assets/javascripts/r.js"
+      self.template = relative_path "./build.js.erb"
     end
 
-    def get_binding()
-      binding()
-    end  
-
-    def precompile_required?
-      build_env.yml_exists?
+    def relative_path(path)
+      dir = File.dirname(__FILE__)
+      File.expand_path path, dir
     end
 
-    def assets_for_precompile
-      build_env.assets_for_precompile
-    end  
+    def rails_path(path)
+      "#{Rails.root}/#{path}"
+    end
 
   end
-end  
+end

data/lib/rjs-rails/{build_env.rb → moved/build_env.rb}

@@ -64,7 +64,7 @@ module RjsRails
     def load_yml_config
       return {} if not File.exists? yml
       File.open(yml) { |f|
-        return YAML.load(f.read)
+        YAML.load(f.read)
       }  
     end  
 

data/lib/rjs-rails/moved/env.rb

@@ -0,0 +1,46 @@
+module RjsRails
+  class Env
+    
+    def config
+      return @conf if @conf
+      c = ::ActiveSupport::OrderedOptions.new
+      c.extensions         = [/.js$/]
+      c.source_dir         = "#{Rails.root}/tmp/assets_source_dir"
+      c.build_dir   = "#{Rails.root}/tmp/assets_build_dir"
+      c.rjs_build_yml   = "#{Rails.root}/config/rjs_build.yml"
+      c.rjs_runtime_yml = "#{Rails.root}/config/rjs_runtime.yml"
+      c.rjs_path           = File.expand_path("../../vendor/assets/javascripts/r.js", File.dirname(__FILE__))
+      c.template           = File.expand_path("./build.js.erb", File.dirname(__FILE__))
+      c.build_js           = "#{Rails.root}/tmp/build.js"
+      @conf = c
+    end  
+
+    def build_env
+      @build_env ||= RjsRails::BuildEnv.new(config)
+    end
+
+    def runtime_env
+      @runtime_env ||= RjsRails::RuntimeEnv.new(config)
+    end  
+
+    def reload!
+      @build_env = nil
+      @runtime_env = nil
+      build_env
+      runtime_env
+    end
+
+    def get_binding()
+      binding()
+    end  
+
+    def precompile_required?
+      build_env.yml_exists?
+    end
+
+    def assets_for_precompile
+      build_env.assets_for_precompile
+    end  
+
+  end
+end  

data/lib/rjs-rails/moved/railtie.rb

@@ -0,0 +1,17 @@
+module RjsRails
+  class Railtie < Rails::Railtie
+    initializer "rjs_rails.configure_rails_initialization" do
+      config.rjs = RjsRails::Env.new
+      ActionView::Base.send :include, RjsRails::RjsHelpers
+    end
+
+    config.to_prepare do
+      Rails.application.config.rjs.reload!
+    end
+
+    rake_tasks do
+      load File.expand_path("../tasks/rjs-rails.rake", File.dirname(__FILE__))
+    end
+
+  end
+end  

data/lib/rjs-rails/railtie.rb

@@ -1,12 +1,15 @@
+require "rjs-rails/runtime/api"
+require "rjs-rails/rjs_helpers"
+
 module RjsRails
   class Railtie < Rails::Railtie
     initializer "rjs_rails.configure_rails_initialization" do
-      config.rjs = RjsRails::Env.new
+      config.rjs_runtime = RjsRails::Runtime::Api.new
       ActionView::Base.send :include, RjsRails::RjsHelpers
     end
 
     config.to_prepare do
-      Rails.application.config.rjs.reload!
+      Rails.application.config.rjs_runtime.reload!
     end
 
     rake_tasks do
@@ -14,4 +17,4 @@ module RjsRails
     end
 
   end
-end  
+end