clementine 0.0.1 → 0.0.2

data/lib/clementine/clojurescript_engine/base.rb

@@ -0,0 +1,15 @@
+
+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}
+    end
+  end
+end

data/lib/clementine/clojurescript_engine/jruby.rb

@@ -0,0 +1,46 @@
+require "java"
+
+$: << CLOJURESCRIPT_LIB
+
+%w{clojure.jar compiler.jar goog.jar js.jar}.each {|name| $CLASSPATH << CLOJURESCRIPT_LIB + name}
+%w{clj cljs}.each {|path| $CLASSPATH << CLOJURESCRIPT_HOME + "/src/" + path}
+
+require 'clementine/clojurescript_engine/base'
+
+%w{RT Keyword PersistentHashMap}.each do |name|
+  java_import "clojure.lang.#{name}"
+end
+
+module Clementine
+  class ClojureScriptEngine < ClojureScriptEngineBase
+    def initialize(file, options)
+      @file = file
+      @options = options
+    end
+
+    def compile
+      @options = Clementine.options if @options.empty?
+      cl_opts = PersistentHashMap.create(convert_options(@options))
+      RT.loadResourceScript("cljs/closure.clj")
+      builder = RT.var("cljs.closure", "build")
+      builder.invoke(@file, cl_opts)
+    end
+
+    #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 
+          when (v.kind_of? Symbol)
+            cl_value = Keyword.intern(Clementine.ruby2clj(v.to_s))
+          else
+            cl_value = v
+        end
+        opts[cl_key] = cl_value
+      end
+      opts
+    end
+  end
+end

data/lib/clementine/{clojurescript_engine_mri.rb → clojurescript_engine/mri.rb}

@@ -1,8 +1,13 @@
-module Clementine
+CLASSPATH = []
+%w{clojure.jar compiler.jar goog.jar js.jar}.each {|name| CLASSPATH << CLOJURESCRIPT_LIB + name}
+%w{clj cljs}.each {|path| CLASSPATH << CLOJURESCRIPT_HOME + "/src/" + path}
+
+require 'clementine/clojurescript_engine/base'
 
+module Clementine
   class Error < StandardError; end
 
-  class ClojureScriptEngine
+  class ClojureScriptEngine < ClojureScriptEngineBase
     def initialize(file, options)
       @file = file
       @options = options
@@ -12,10 +17,10 @@ module Clementine
     def compile
       @options = Clementine.options if @options.empty?
       begin
-        cmd = "#{command} #{@file} #{convert_options(@options)} 2>&1"
+        cmd = %Q{#{command} #{@file} '#{convert_options(@options)}' 2>&1}
         result = `#{cmd}`
       rescue Exception
-        raise Error, "compression failed: #{result}"
+        raise Error, "compression failed: #{result || $!}"
       end
       unless $?.exitstatus.zero?
         raise Error, result
@@ -46,20 +51,22 @@ module Clementine
       end
     end
 
-    private
+    # private
     def convert_options(options)
       opts = ""
       options.each do |k, v|
         cl_key = ":" + Clementine.ruby2clj(k.to_s)
         case
-          when (v.kind_of? Symbol)
-            cl_value = ":" + Clementine.ruby2clj(v.to_s)
-          else
-            cl_value = "\"" + v + "\""
+        when (v.kind_of? Symbol)
+          cl_value = ":" + Clementine.ruby2clj(v.to_s)
+        when v.is_a?(TrueClass) || v.is_a?(FalseClass)
+          cl_value = v.to_s
+        else
+          cl_value = "\"" + v + "\""
         end
         opts += cl_key + " " + cl_value + " "
       end
-      opts.chop!
+      "{" + opts.chop! + "}"
     end
   end
 end

data/lib/clementine/version.rb

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

data/test/clojurescript_engine_test.rb

@@ -2,6 +2,14 @@ require "test/unit"
 
 class ClojureScriptEngineTest < Test::Unit::TestCase
 
+  def self.jruby?
+    defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
+  end
+
+  def jruby?
+    self.class.jruby?
+  end
+
   # Called before every test method runs. Can be used
   # to set up fixture information.
   def setup
@@ -23,24 +31,38 @@ class ClojureScriptEngineTest < Test::Unit::TestCase
   end
 
   def test_convert_options
-    options = {:optimizations => :advanced,  :output_dir => "#{Dir.pwd}"}
+    options = {:optimizations => :advanced,  :output_dir => "#{Dir.pwd}", :pretty_print => true}
     engine = Clementine::ClojureScriptEngine.new("", "")
     opts = engine.convert_options(options)
-    opts.each do |k, v|
-      assert_equal Java::clojure.lang.Keyword, k.class
-      assert k.to_s == ":optimizations" || k.to_s == ":output-dir"
-      assert v.to_s == ":advanced" || v.to_s == "#{Dir.pwd}"
+
+    if jruby?
+      assert_equal 3, opts.length
+      opts.keys.each {|k| assert_equal Java::clojure.lang.Keyword, k.class }
+      assert_equal [":optimizations", ":output-dir", ":pretty-print"], opts.keys.map(&:to_s).sort
+
+      opts.each do |k, v|
+        case k.to_s
+        when ":optimizations" then assert_equal ":advanced", v.to_s
+        when ":output-dir"    then assert_equal "#{Dir.pwd}", v.to_s
+        when ":pretty-print"  then assert_equal "true", v.to_s
+        end
+      end
+    else
+      assert_equal %Q{{:optimizations :advanced :output-dir \"/home/mike/code/oss/clementine\" :pretty-print true}}, opts
     end
   end
 
-  def test_created_clojure_map
-    options = {:optimizations => :advanced,  :output_dir => "#{Dir.pwd}"}
-    engine = Clementine::ClojureScriptEngine.new("", "")
-    opts = engine.convert_options(options)
-    map = PersistentHashMap.create(convert_options(opts))
-    map.each do |k, v|
-      assert_equal Java::clojure.lang.Keyword, k.class
-      assert k.to_s == ":optimizations" || k.to_s == ":output-dir"
+  if jruby?
+    def test_created_clojure_map
+      options = {:optimizations => :advanced,  :output_dir => "#{Dir.pwd}", :pretty_print => true}
+      engine = Clementine::ClojureScriptEngine.new("", "")
+      opts = engine.convert_options(options)
+      map = PersistentHashMap.create(opts)
+      assert_equal 3, map.length
+      map.each do |k, v|
+        assert_equal Java::clojure.lang.Keyword, k.class
+        assert [":optimizations", ":output-dir", ":pretty-print"].include? k.to_s
+      end
     end
   end
-end
+end

metadata

@@ -1,103 +1,197 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: clementine
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  version: 0.0.1
 platform: ruby
-authors: 
-  - Yoko Harada
+authors:
+- Yoko Harada
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-06 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: tilt
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    type: :runtime
-    version_requirements: *id001
+date: 2012-10-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: clojurescript tilt template gem and available to use on Rails asset pipeline.
-email: 
-  - yokolet@gmail.com
+email:
+- yokolet@gmail.com
 executables: []
-
-extensions: []
-
+extensions:
+- Rakefile
 extra_rdoc_files: []
-
-files: 
-  - .gitignore
-  - Gemfile
-  - README.md
-  - Rakefile
-  - clementine.gemspec
-  - lib/clementine.rb
-  - lib/clementine/clementine_rails.rb
-  - lib/clementine/clojurescript_engine.rb
-  - lib/clementine/clojurescript_engine_mri.rb
-  - lib/clementine/clojurescript_template.rb
-  - lib/clementine/options.rb
-  - lib/clementine/version.rb
-  - test/clojurescript_engine_test.rb
-  - test/options_test.rb
-  - vendor/assets/bin/cljsc.clj
-  - vendor/assets/lib/clojure.jar
-  - vendor/assets/lib/compiler.jar
-  - vendor/assets/lib/goog.jar
-  - vendor/assets/lib/js.jar
-  - vendor/assets/src/clj/cljs/closure.clj
-  - vendor/assets/src/clj/cljs/compiler.clj
-  - vendor/assets/src/clj/cljs/core.clj
-  - vendor/assets/src/clj/cljs/repl.clj
-  - vendor/assets/src/clj/cljs/repl/browser.clj
-  - vendor/assets/src/clj/cljs/repl/rhino.clj
-  - vendor/assets/src/cljs/cljs/core.cljs
-  - vendor/assets/src/cljs/cljs/nodejs.cljs
-  - vendor/assets/src/cljs/cljs/nodejs_externs.js
-  - vendor/assets/src/cljs/cljs/nodejscli.cljs
-  - vendor/assets/src/cljs/cljs/reader.cljs
-  - vendor/assets/src/cljs/clojure/browser/dom.cljs
-  - vendor/assets/src/cljs/clojure/browser/event.cljs
-  - vendor/assets/src/cljs/clojure/browser/net.cljs
-  - vendor/assets/src/cljs/clojure/browser/repl.cljs
-  - vendor/assets/src/cljs/clojure/set.cljs
-  - vendor/assets/src/cljs/clojure/string.cljs
-  - vendor/assets/src/cljs/clojure/walk.cljs
-  - vendor/assets/src/cljs/clojure/zip.cljs
+files:
+- .gitignore
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- clementine.gemspec
+- ext/clojure-clojurescript-bef56a7/.gitignore
+- ext/clojure-clojurescript-bef56a7/Clojurescript.iml
+- ext/clojure-clojurescript-bef56a7/README.md
+- ext/clojure-clojurescript-bef56a7/benchmark/cljs/benchmark_runner.cljs
+- ext/clojure-clojurescript-bef56a7/bin/cljsc
+- ext/clojure-clojurescript-bef56a7/bin/cljsc.bat
+- ext/clojure-clojurescript-bef56a7/bin/cljsc.clj
+- ext/clojure-clojurescript-bef56a7/devnotes/README.org
+- ext/clojure-clojurescript-bef56a7/devnotes/bcrepl.org
+- ext/clojure-clojurescript-bef56a7/devnotes/cljs.org
+- ext/clojure-clojurescript-bef56a7/devnotes/corelib.org
+- ext/clojure-clojurescript-bef56a7/devnotes/day1.org
+- ext/clojure-clojurescript-bef56a7/devnotes/day2.org
+- ext/clojure-clojurescript-bef56a7/devnotes/talk.org
+- ext/clojure-clojurescript-bef56a7/devnotes/testing
+- ext/clojure-clojurescript-bef56a7/devnotes/todo.org
+- ext/clojure-clojurescript-bef56a7/epl-v10.html
+- ext/clojure-clojurescript-bef56a7/pom.template.xml
+- ext/clojure-clojurescript-bef56a7/samples/dom/.gitignore
+- ext/clojure-clojurescript-bef56a7/samples/dom/src/dom/test.cljs
+- ext/clojure-clojurescript-bef56a7/samples/dom/test.html
+- ext/clojure-clojurescript-bef56a7/samples/hello-js/.gitignore
+- ext/clojure-clojurescript-bef56a7/samples/hello-js/README.md
+- ext/clojure-clojurescript-bef56a7/samples/hello-js/externed-lib.js
+- ext/clojure-clojurescript-bef56a7/samples/hello-js/externs.js
+- ext/clojure-clojurescript-bef56a7/samples/hello-js/hello-extern.html
+- ext/clojure-clojurescript-bef56a7/samples/hello-js/hello-js-dev.html
+- ext/clojure-clojurescript-bef56a7/samples/hello-js/hello-js.html
+- ext/clojure-clojurescript-bef56a7/samples/hello-js/my-external-lib.js
+- ext/clojure-clojurescript-bef56a7/samples/hello-js/src/hello-js/core.cljs
+- ext/clojure-clojurescript-bef56a7/samples/hello-js/src/hello-js/extern-example.cljs
+- ext/clojure-clojurescript-bef56a7/samples/hello/.gitignore
+- ext/clojure-clojurescript-bef56a7/samples/hello/README.md
+- ext/clojure-clojurescript-bef56a7/samples/hello/hello-dev.html
+- ext/clojure-clojurescript-bef56a7/samples/hello/hello.html
+- ext/clojure-clojurescript-bef56a7/samples/hello/src/hello/core.cljs
+- ext/clojure-clojurescript-bef56a7/samples/hello/src/hello/foo/bar.cljs
+- ext/clojure-clojurescript-bef56a7/samples/nodehello.cljs
+- ext/clojure-clojurescript-bef56a7/samples/nodels.cljs
+- ext/clojure-clojurescript-bef56a7/samples/repl/.gitignore
+- ext/clojure-clojurescript-bef56a7/samples/repl/README.md
+- ext/clojure-clojurescript-bef56a7/samples/repl/index.html
+- ext/clojure-clojurescript-bef56a7/samples/repl/src/repl/test.cljs
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/.gitignore
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/README.md
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/index-advanced.html
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/index.html
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/reset.css
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/src/twitterbuzz/anneal.cljs
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/src/twitterbuzz/core.cljs
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/src/twitterbuzz/dom-helpers.cljs
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/src/twitterbuzz/layout.cljs
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/src/twitterbuzz/leaderboard.cljs
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/src/twitterbuzz/radial.cljs
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/src/twitterbuzz/showgraph.cljs
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/src/twitterbuzz/timeline.cljs
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/style.css
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/test_data.txt
+- ext/clojure-clojurescript-bef56a7/samples/twitterbuzz/tweet_maps.txt
+- ext/clojure-clojurescript-bef56a7/script/benchmark
+- ext/clojure-clojurescript-bef56a7/script/bootstrap
+- ext/clojure-clojurescript-bef56a7/script/browser-repl
+- ext/clojure-clojurescript-bef56a7/script/build
+- ext/clojure-clojurescript-bef56a7/script/clean
+- ext/clojure-clojurescript-bef56a7/script/closure-library-release/google-closure-library-third-party.pom.template
+- ext/clojure-clojurescript-bef56a7/script/closure-library-release/google-closure-library.pom.template
+- ext/clojure-clojurescript-bef56a7/script/closure-library-release/make-closure-library-jars.sh
+- ext/clojure-clojurescript-bef56a7/script/compile
+- ext/clojure-clojurescript-bef56a7/script/repl
+- ext/clojure-clojurescript-bef56a7/script/repl.bat
+- ext/clojure-clojurescript-bef56a7/script/repljs
+- ext/clojure-clojurescript-bef56a7/script/repljs.bat
+- ext/clojure-clojurescript-bef56a7/script/test
+- ext/clojure-clojurescript-bef56a7/script/test-compile
+- ext/clojure-clojurescript-bef56a7/src/clj/cljs/analyzer.clj
+- ext/clojure-clojurescript-bef56a7/src/clj/cljs/closure.clj
+- ext/clojure-clojurescript-bef56a7/src/clj/cljs/compiler.clj
+- ext/clojure-clojurescript-bef56a7/src/clj/cljs/core.clj
+- ext/clojure-clojurescript-bef56a7/src/clj/cljs/repl.clj
+- ext/clojure-clojurescript-bef56a7/src/clj/cljs/repl/browser.clj
+- ext/clojure-clojurescript-bef56a7/src/clj/cljs/repl/reflect.clj
+- ext/clojure-clojurescript-bef56a7/src/clj/cljs/repl/rhino.clj
+- ext/clojure-clojurescript-bef56a7/src/clj/cljs/repl/server.clj
+- ext/clojure-clojurescript-bef56a7/src/clj/cljs/tagged_literals.clj
+- ext/clojure-clojurescript-bef56a7/src/cljs/cljs/core.cljs
+- ext/clojure-clojurescript-bef56a7/src/cljs/cljs/nodejs.cljs
+- ext/clojure-clojurescript-bef56a7/src/cljs/cljs/nodejs_externs.js
+- ext/clojure-clojurescript-bef56a7/src/cljs/cljs/nodejscli.cljs
+- ext/clojure-clojurescript-bef56a7/src/cljs/cljs/reader.cljs
+- ext/clojure-clojurescript-bef56a7/src/cljs/clojure/browser/dom.cljs
+- ext/clojure-clojurescript-bef56a7/src/cljs/clojure/browser/event.cljs
+- ext/clojure-clojurescript-bef56a7/src/cljs/clojure/browser/net.cljs
+- ext/clojure-clojurescript-bef56a7/src/cljs/clojure/browser/repl.cljs
+- ext/clojure-clojurescript-bef56a7/src/cljs/clojure/core/reducers.cljs
+- ext/clojure-clojurescript-bef56a7/src/cljs/clojure/data.cljs
+- ext/clojure-clojurescript-bef56a7/src/cljs/clojure/reflect.cljs
+- ext/clojure-clojurescript-bef56a7/src/cljs/clojure/set.cljs
+- ext/clojure-clojurescript-bef56a7/src/cljs/clojure/string.cljs
+- ext/clojure-clojurescript-bef56a7/src/cljs/clojure/walk.cljs
+- ext/clojure-clojurescript-bef56a7/src/cljs/clojure/zip.cljs
+- ext/clojure-clojurescript-bef56a7/test/cljs/cljs/binding_test.cljs
+- ext/clojure-clojurescript-bef56a7/test/cljs/cljs/binding_test_other_ns.cljs
+- ext/clojure-clojurescript-bef56a7/test/cljs/cljs/core_test.cljs
+- ext/clojure-clojurescript-bef56a7/test/cljs/cljs/import_test.cljs
+- ext/clojure-clojurescript-bef56a7/test/cljs/cljs/import_test/foo.cljs
+- ext/clojure-clojurescript-bef56a7/test/cljs/cljs/letfn_test.cljs
+- ext/clojure-clojurescript-bef56a7/test/cljs/cljs/macro_test.cljs
+- ext/clojure-clojurescript-bef56a7/test/cljs/cljs/macro_test/macros.clj
+- ext/clojure-clojurescript-bef56a7/test/cljs/cljs/ns_test.cljs
+- ext/clojure-clojurescript-bef56a7/test/cljs/cljs/ns_test/bar.cljs
+- ext/clojure-clojurescript-bef56a7/test/cljs/cljs/ns_test/foo.cljs
+- ext/clojure-clojurescript-bef56a7/test/cljs/cljs/reader_test.cljs
+- ext/clojure-clojurescript-bef56a7/test/cljs/clojure/data_test.cljs
+- ext/clojure-clojurescript-bef56a7/test/cljs/clojure/string_test.cljs
+- ext/clojure-clojurescript-bef56a7/test/cljs/foo/ns_shadow_test.cljs
+- ext/clojure-clojurescript-bef56a7/test/cljs/test_runner.cljs
+- lib/clementine.rb
+- lib/clementine/clementine_rails.rb
+- lib/clementine/clojurescript_engine.rb
+- lib/clementine/clojurescript_engine/base.rb
+- lib/clementine/clojurescript_engine/jruby.rb
+- lib/clementine/clojurescript_engine/mri.rb
+- lib/clementine/clojurescript_template.rb
+- lib/clementine/options.rb
+- lib/clementine/version.rb
+- test/clojurescript_engine_test.rb
+- test/options_test.rb
 homepage: https://github.com/yokolet/clementine
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: clojurescript tilt template gem
-test_files: 
-  - test/clojurescript_engine_test.rb
-  - test/options_test.rb
+test_files:
+- test/clojurescript_engine_test.rb
+- test/options_test.rb