forml-rails 0.0.4 → 0.0.5

data/lib/forml/forml_engine.rb

@@ -1,23 +1,25 @@
 module Forml
+  class Error < StandardError; end
+
   class FormlEngine
     def initialize(file, options)
       @file = file
+      @forml = "forml"
       @options = options
     end
 
     def compile
       begin
         cmd = if ::Rails.env.production?
-          %Q{forml #{@file} -silent -flush}
+          %Q{#{@forml} -silent -flush -no-test #{@file}}
         else
-          %Q{forml #{@file} -silent -flush -no-opt}
+          %Q{#{@forml} -silent -flush -no-opt -no-test #{@file}}
         end
         puts cmd
         result = `#{cmd}`
-        puts "Forml compiled!"
         result
       rescue Exception
-        raise Error, "compression failed: #{result || $!}"
+        raise Error, "Compilation failed: #{result || $!}"
       end
     end
   end

data/lib/forml/version.rb

@@ -1,3 +1,3 @@
 module Forml
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/rails/generators/forml/assets/assets_generator.rb

@@ -6,7 +6,7 @@ module Forml
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_forml
-        template "javascript.js.forml", File.join('app/assets/javascripts', class_path, "#{file_name}.js.forml")
+        template "javascript.js.forml.erb", File.join('app/assets/javascripts', class_path, "#{file_name}.js.forml")
       end
     end
   end

data/lib/rails/generators/forml/assets/templates/javascript.js.forml.erb

@@ -0,0 +1,6 @@
+
+module <%= name %>
+
+    main =
+        let greeting = "Welcome to Forml!  This template is located in <%= name %>.js.forml"
+        do! `alert(greeting)`

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: forml-rails
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Joshua Hawkins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-10 00:00:00 Z
+date: 2013-01-20 00:00:00 Z
 dependencies: []
 
 description: Enjoy Forml in your Rails with forml-rails, an adapter for the Rails asset pipeline.
@@ -41,7 +41,7 @@ files:
 - lib/forml/forml_template.rb
 - lib/forml/version.rb
 - lib/rails/generators/forml/assets/assets_generator.rb
-- lib/rails/generators/forml/assets/templates/javascript.js.forml
+- lib/rails/generators/forml/assets/templates/javascript.js.forml.erb
 - test/lib/forml-rails_test.rb
 - test/lib/forml/version_test.rb
 - test/lib/rails/generators/forml/assets/assets_generator_test.rb

data/lib/rails/generators/forml/assets/templates/javascript.js.forml

@@ -1 +0,0 @@
-TODO - make this an actual template