clementine 0.0.2 → 0.0.3

data/README.md

@@ -2,8 +2,7 @@ Clementine
 ====
 
 * https://github.com/yokolet/clementine
-* http://yokolet.blogspot.com/2011/11/clojurescript-on-rails-asset-pipeline.html
-* http://yokolet.blogspot.com/2011/11/tilt-template-for-clojurescript.html
+* http://yokolet.blogspot.com/2012/10/clementine-gem-clojurescript-on-rails.html
 
 Description
 -----------
@@ -11,11 +10,16 @@ Description
 Clementine is a gem to use ClojureScript (https://github.com/clojure/clojurescript) from Ruby.
 Clementine is a Tilt (https://github.com/rtomayko/tilt) Template, which is available to use
 on Rails asset pipeline. Also, it is avilable to use in a Tilt way.
+You don't need to compile ClojureScript by yourself anymore. Clementine does for you.
 
 Clementine runs on Rails 3.1 and later.
 
 Clementine supports JRuby and CRuby. When you use from CRuby, make sure java command is on your PATH.
 
+Please be aware. When you run Clementine on CRuby, you hook up JVM everytime ClojureScript code is changed.
+This takes long time since starting JVM is a heavy weight job.
+For a shorter compilation time, I recommend using JRuby.
+
 Installation
 -----------
 
@@ -23,29 +27,43 @@ Installation
 gem install clementine
 ```
 
+While installing this gem, you'll see a confusing phrase, "Installing clementine (version string) with native extensions."
+This means clementine is bootstrapping ClojureScript. Clementine never relies on any C library.
+
 Configuration
 -----------
 
 Create clementine.rb file in your ${Rails.root}/config/initializer directory.
 
-Examples:
+Example:
 
 ```ruby
-Clementine.options[:optimizations] = :simple
-Clementine.options[:output_dir] = "assets/javascripts"
+Clementine.options[:optimizations] = :whitespace
+Clementine.options[:pretty_print] = true
 ```
 
 Available options:
 
 ```
-  KEY                VALUES
-  ------------------ -----------------------
-  :optimazation      :simple,:whitespace,:advanced
-  :target            :nodejs
-  :output_dir        directory name (:output_dir will be converted to ":output-dir")
-  :output_to         file name (:output_to will be converted to ":output-to")
+  KEY                VALUES                  DEFAULT
+  ------------------ ----------------------- -------------------
+  :optimizations     :whitespace, :advanced  :advanced
+  :pretty_print      false, true             false
+  :target            :nodejs                 (none)
+  :output_dir        directory name          (none)
+  :output_to         file name               (none)
 ```
 
+*note*<br/>
+If you want to see a readable JavaScript code on the browser,
+set :whitespace for :optimazations and true for :pretty_print in
+${Rails.root}/config/initializer/clementine.rb like the example above.
+
+*note*<br/>
+ClojureScript has :none value for :optimizations, which also works with Clementine.
+However, there's no way to see the output with Rails asset pipeline.
+So, I didn't add :none in the above table.
+
 Copyright and License
 -----------
 Clementine is Copyright (c) 2011-2012 [Yoko Harada](https://github.com/yokolet) and
@@ -54,4 +72,4 @@ distributed under the MIT license.
 Clojure and ClojureSript are Copyright (c) Rich Hickey and covered by the Eclipse
 Public License 1.0 [http://opensource.org/licenses/eclipse-1.0.php](http://opensource.org/licenses/eclipse-1.0.php)
 
-Google Closure Compiler and Library are covered by Apache License 2.0 license.
+Google Closure Compiler and Library are covered by Apache License 2.0.

data/Rakefile

@@ -1,4 +1,3 @@
-require "bundler/gem_tasks"
 require 'rake/testtask'
 
 task :default => :bootstrap

data/lib/clementine/clojurescript_engine/base.rb

@@ -2,14 +2,7 @@
 module Clementine
   class ClojureScriptEngineBase
     def default_opts
-      key = "output_dir"
-      value = ""
-      if defined?(Rails)
-        value = File.join(Rails.root, "app", "assets", "javascripts", "clementine")
-      else
-        value = Dir.pwd
-      end
-      {key => value}
+      {:optimizations => :advanced, :pretty_print => false}
     end
   end
 end

data/lib/clementine/clojurescript_engine/jruby.rb

@@ -19,7 +19,7 @@ module Clementine
     end
 
     def compile
-      @options = Clementine.options if @options.empty?
+      @options = default_opts.merge(Clementine.options) if Clementine.options
       cl_opts = PersistentHashMap.create(convert_options(@options))
       RT.loadResourceScript("cljs/closure.clj")
       builder = RT.var("cljs.closure", "build")
@@ -29,7 +29,6 @@ module Clementine
     #private
     def convert_options(options)
       opts = {}
-      options = options.empty? ? default_opts : options
       options.each do |k, v|
         cl_key = Keyword.intern(Clementine.ruby2clj(k.to_s))
         case 

data/lib/clementine/clojurescript_engine/mri.rb

@@ -15,7 +15,7 @@ module Clementine
     end
 
     def compile
-      @options = Clementine.options if @options.empty?
+      @options = default_opts.merge(Clementine.options) if Clementine.options
       begin
         cmd = %Q{#{command} #{@file} '#{convert_options(@options)}' 2>&1}
         result = `#{cmd}`

data/lib/clementine/version.rb

@@ -1,3 +1,3 @@
 module Clementine
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clementine
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt