less-js 0.1.0 → 0.1.1

data/Gemfile

@@ -1,7 +1,5 @@
 source "http://rubygems.org"
 
 gem 'rake'
-gem 'less-js-source'
-gem 'execjs'
 # Specify your gem's dependencies in ruby-less-js.gemspec
 gemspec

data/README.md

@@ -24,13 +24,6 @@ the `less-js-source` gem.
 
 *Note: verion 1.1.1 is tagged as 1.1.1.1 on the `less-js-source` gem.*
 
-### JSON
-
-The `json` library is also required but is not explicitly stated as a
-gem dependency. If you're on Ruby 1.8 you'll need to install the
-`json` or `json_pure` gem. On Ruby 1.9, `json` is included in the
-standard library.
-
 ### ExecJS
 
 The [ExecJS](https://github.com/sstephenson/execjs) library is used to automatically choose the best JavaScript engine for your platform. Check out its [README](https://github.com/sstephenson/execjs/blob/master/README.md) for a complete list of supported engines.

data/lib/less_js.rb

@@ -2,8 +2,7 @@ require 'execjs'
 require 'less_js/source'
 
 module LessJs
-  EngineError      = ExecJS::RuntimeError
-  CompilationError = ExecJS::ProgramError
+  class ParseError < StandardError; end
 
   module Source
     def self.path
@@ -11,7 +10,7 @@ module LessJs
     end
 
     def self.path=(path)
-      @contents = @version = @bare_option = @context = nil
+      @contents = @version = @context = nil
       @path = path
     end
 
@@ -20,46 +19,39 @@ module LessJs
     end
 
     def self.version
-      @version ||= contents[/Less.js Compiler v([\d.]+)/, 1]
+      @version ||= contents[/LESS - Leaner CSS v([\d.]+)/, 1]
     end
 
     def self.context
-      @context ||= ExecJS.compile(contents)
+      @context ||= ExecJS.compile <<-EOS
+        #{contents}
+
+        function compile(data) {
+          var result;
+          new less.Parser().parse(data, function(error, tree) {
+            result = [error, tree.toCSS()];
+          });
+          return result;
+        }
+      EOS
     end
   end
 
   class << self
-    def engine
-    end
-
-    def engine=(engine)
-    end
-
     def version
       Source.version
     end
 
-		def callback(error, tree)
-			puts tree.inspect
-		end
-
     # Compile a script (String or IO) to CSS.
     def compile(script, options = {})
       script = script.read if script.respond_to?(:read)
+      error, data = Source.context.call('compile', script)
 
-			code = <<-EOS
-(function(input) {
-	var resp = "error";
-	new(less.Parser)().parse(input, function(error, tree) {
-		resp = [error, tree.toCSS()]
-	});
-	return resp;
-})
-			EOS
-
-			(error, response) = Source.context.call(code, script)
-			raise CompilationError, error if error
-			response
+      if error
+        raise ParseError, error['message']
+      else
+        data
+      end
     end
   end
 end

data/ruby-less-js.gemspec

@@ -3,10 +3,10 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "less-js"
-  s.version     = '0.1.0'
+  s.version     = '0.1.1'
 
-  s.authors     = ["Adnan Ali"]
-  s.email       = ["adnan.ali@gmail.com"]
+  s.authors     = ["Joshua Peek", "Adnan Ali"]
+  s.email       = ["josh@joshpeek.com", "adnan.ali@gmail.com"]
   s.homepage    = "https://github.com/thisduck/ruby-less-js"
 	s.summary     = "Ruby Less.js Compiler"
 	s.description = <<-EOS

data/test/test_less_js.rb

@@ -15,7 +15,7 @@ class TestLessJs < Test::Unit::TestCase
   end
 
   def test_compilation_error
-    assert_raise LessJs::CompilationError do
+    assert_raise LessJs::ParseError do
       LessJs.compile("&&&&.a")
     end
   end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: less-js
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
+- Joshua Peek
 - Adnan Ali
 autorequire: 
 bindir: bin
@@ -48,6 +49,7 @@ dependencies:
   version_requirements: *id002
 description: "\t\tRuby Less.js is a bridge to the JS Less.js compiler.\n"
 email: 
+- josh@joshpeek.com
 - adnan.ali@gmail.com
 executables: []