ruby-wisp 0.1.0 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb09d11913057e974e0115457cbaf81d210642d4
-  data.tar.gz: 452aeebd8ec60dbc42945316febf25c340ada1da
+  metadata.gz: 65f7ed31cf6399269dbde06e60456c18efbbabf6
+  data.tar.gz: 2f72e442a5e253d84d5c1503cd6ab023b978c8e6
 SHA512:
-  metadata.gz: d0fcfd9bfd0d4a3dd1f372a2a64fc633ffc77dbb492026aaebdf011cab0acc6141cc490da27ae3d75cc368bafa608314d6d0fa533f6c6b5f266be86c7357bfb5
-  data.tar.gz: 7dff623e9eec19f5ef08fd1057cd3010ddb33e8e8a3aa416c45c6f30fa37da4df2f365cc479fd3f6f6fd49ed141c497a83ed3e42dca8be0802069ce353c2d944
+  metadata.gz: 15bcdb70c5f08cb7f2df04e901473b1f36d1483be7b8bfead1605c7b554502b6266beada0eb38cb0010bb047f2d4ee92085448f1c6824d0d1feca06b3800d3be
+  data.tar.gz: 96e7a0251334c658d1617eff6148a44a3a79e35c31c4dcc98d03251684990d3fe7f3e646ff0085cd8663556c230389c5d4553eee21884af5ae0b16ca6da2cdac

data/.travis.yml

@@ -0,0 +1,7 @@
+bundler_args: --without development
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - jruby-19mode
+  - rbx-19mode

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+### 1.0.0.beta1
+
+* Integration with Rails >= 4.0.0.beta
+* Add tests
+* Add travis
+
+### 0.1.0
+
+Initial build, one method: `Wisp.compile 'source'`

data/README.md

@@ -1,6 +1,6 @@
-# Ruby::Wisp
+# Ruby Wisp
 
-TODO: Write a gem description
+Ruby bridge for [Wisp](https://github.com/Gozala/wisp) compiler
 
 ## Installation
 
@@ -18,7 +18,16 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+```ruby
+require 'wisp'
+
+Wisp.compile "(:foo bar)"
+# => "(bar || 0)[\"foo\"]"
+
+Wisp.compile File.new "app.wisp"
+Wisp.compile File.read "app.wisp"
+Wisp.compile File.open "app.wisp"
+```
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,13 @@
-require "bundler/gem_tasks"
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+task default: :test

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

@@ -0,0 +1,13 @@
+require "rails/generators/named_base"
+
+module Wisp
+  module Generators
+    class AssetsGenerator < ::Rails::Generators::NamedBase
+      source_root File.expand_path "../templates", __FILE__
+
+      def copy_wisp
+        template "javascript.js.wisp", File.join('app/assets/javascripts', class_path, "#{file_name}.js.wisp")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+;; Place all the behaviors and hooks related to the matching controller here.
+;; All this logic will automatically be available in application.js.
+;; You can use Wisp in this file: https://github.com/Gozala/wisp

data/lib/wisp/rails/railtie.rb

@@ -0,0 +1,39 @@
+require 'rails/engine'
+require 'tilt'
+
+module Wisp
+  module Rails
+    class Railtie < ::Rails::Railtie
+      config.app_generators.javascript_engine :wisp
+
+      config.before_initialize do |app|
+        require 'wisp'
+        Sprockets::Engines
+        Sprockets.register_engine '.wisp', Wisp::Rails::WispTemplate
+      end
+    end
+
+    class WispTemplate < Tilt::Template
+      self.default_mime_type = 'text/javascript'
+
+      # check to see if wisp is loaded
+      def self.engine_initialized?
+        defined? ::Wisp
+      end
+
+      # autoload wisp library
+      def initialize_engine
+        require_template_library 'wisp'
+      end
+
+      def prepare
+      end
+
+      # compile template data with ruby wisp compiler
+      def evaluate scope, locals, &block
+        Wisp.compile data
+      end
+
+    end
+  end
+end

data/lib/wisp/rails/template_handler.rb

@@ -0,0 +1,18 @@
+module Wisp
+  module Rails
+    class TemplateHandler
+      def self.erb_handler
+        @@erb_handler ||= ActionView::Template.registered_template_handler(:erb)
+      end
+
+      def self.call template
+        compiled_source = erb_handler.call(template)
+        "Wisp.compile(begin;#{compiled_source};end)"
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:action_view) do
+  ActionView::Template.register_template_handler :wisp, Wisp::Rails::TemplateHandler
+end

data/lib/wisp/rails.rb

@@ -0,0 +1,2 @@
+require 'wisp/rails/railtie'
+require 'wisp/rails/template_handler'

data/lib/wisp/runtime.rb

@@ -32,4 +32,4 @@ module Wisp
       )
     end
   end
-end
+end

data/lib/wisp/version.rb

@@ -1,3 +1,3 @@
 module Wisp
-  VERSION = "0.1.0"
+  VERSION = "1.0.0.beta1"
 end

data/lib/wisp.rb

@@ -1,23 +1,36 @@
 require 'execjs'
 require 'wisp/source'
 require 'wisp/runtime'
+require 'wisp/rails' if defined? ::Rails
 
 module Wisp
   extend Runtime
 
   class << self
+    # compiles wisp to js. The source object can be a File,
+    # StringIO, String or anything that responds to :read
     def compile source, options = {}
       source = source.read if source.respond_to?(:read)
 
-      exec 'compile', source
+      begin
+        exec 'compile', source
+      rescue Exception => e
+        raise RuntimeError, e.to_s.delete("\n")
+      end
     end
 
   protected
-    
+    # path to wisp library, defined in ruby-wisp-source gem
     def bundled_path
       File.dirname Wisp::Source.bundled_path
     end
   end
 
-  ENV['NODE_PATH'] = "#{File.expand_path('node_modules')}:#{File.expand_path('vendor/node_modules')}:#{bundled_path}:#{ENV['NODE_PATH']}"
+  # to require node packages that installed locally
+  ENV['NODE_PATH'] = [
+    File.expand_path('node_modules'),
+    File.expand_path('vendor/node_modules'),
+    bundled_path,
+    ENV['NODE_PATH']
+  ].join ':'
 end

data/ruby-wisp.gemspec

@@ -1,19 +1,21 @@
 # encoding: utf-8
 $:.push File.expand_path("../lib", __FILE__)
-require "wisp/version"
+require 'wisp/version'
 
 Gem::Specification.new do |s|
-  s.name          = "ruby-wisp"
+  s.name          = 'ruby-wisp'
   s.version       = Wisp::VERSION
-  s.authors       = ["Yuri Artemev"]
-  s.email         = ["i@artemeff.com"]
+  s.authors       = ['Yuri Artemev']
+  s.email         = ['i@artemeff.com']
   s.description   = %q{Ruby Wisp is a bridge to the JS Wisp compiler}
   s.summary       = %q{Ruby Wisp compiler}
-  s.homepage      = "https://github.com/artemeff/ruby-wisp"
-  s.license       = "MIT"
+  s.homepage      = 'https://github.com/artemeff/ruby-wisp'
+  s.license       = 'MIT'
 
   s.files         = `git ls-files`.split($/)
 
-  s.add_dependency "ruby-wisp-source"
-  s.add_dependency "execjs"
+  s.add_dependency 'execjs'
+  s.add_dependency 'ruby-wisp-source'
+
+  s.add_development_dependency 'railties',    '>= 4.0.0.beta', '< 5.0'
 end

data/test/assets_generator_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+require 'rails/generators/wisp/assets/assets_generator'
+
+class AssetGeneratorTest < Rails::Generators::TestCase
+  tests Wisp::Generators::AssetsGenerator
+
+  destination File.expand_path("../tmp", __FILE__)
+  setup :prepare_destination
+
+  def test_assets
+    run_generator  %w(posts)
+    assert_no_file "app/assets/javascripts/posts.js"
+    assert_file    "app/assets/javascripts/posts.js.wisp"
+  end
+end

data/test/controller_generator_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+require 'rails/generators/rails/controller/controller_generator'
+require 'rails/generators/wisp/assets/assets_generator'
+
+class ControllerGeneratorTest < Rails::Generators::TestCase
+  tests Rails::Generators::ControllerGenerator
+
+  destination File.expand_path("../tmp", __FILE__)
+  setup do
+    prepare_destination
+    copy_routes
+  end
+
+  def test_assets
+    run_generator  %w(posts --javascript-engine=wisp --orm=false)
+    assert_no_file "app/assets/javascripts/posts.js"
+    assert_file    "app/assets/javascripts/posts.js.wisp"
+  end
+end

data/test/scaffold_generator_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+require 'rails/generators/rails/scaffold/scaffold_generator'
+require 'rails/generators/wisp/assets/assets_generator'
+
+class ScaffoldGeneratorTest < Rails::Generators::TestCase
+  tests Rails::Generators::ScaffoldGenerator
+
+  destination File.expand_path("../tmp", __FILE__)
+  setup do
+    prepare_destination
+    copy_routes
+  end
+
+  def test_assets
+    run_generator  %w(posts --javascript-engine=wisp --orm=false)
+    assert_no_file "app/assets/javascripts/posts.js"
+    assert_file    "app/assets/javascripts/posts.js.wisp"
+  end
+end

data/test/support/site/index.js.wisp

@@ -0,0 +1 @@
+(print "hello world")

data/test/template_handler_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+require 'action_controller'
+require 'wisp'
+
+class SiteController < ActionController::Base
+  self.view_paths = File.expand_path("../support", __FILE__)
+end
+
+App = ActionDispatch::Routing::RouteSet.new
+App.draw do
+  get "site/index"
+end
+
+class TemplateHandlerTest < ActiveSupport::TestCase
+  include Rack::Test::Methods
+
+  def app
+    @app ||= App
+  end
+
+  test "coffee views are served as javascript" do
+    get "/site/index.js"
+
+    assert_match 'console.log("hello world")', last_response.body
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,16 @@
+# configure rails envinronment
+ENV["RAILS_ENV"] = "test"
+
+require 'rails'
+require "rails/test_help"
+
+# for generators
+require 'rails/generators/test_case'
+
+def copy_routes
+  routes = File.expand_path "../support/routes.rb", __FILE__
+  destination = File.join destination_root, "config"
+
+  FileUtils.mkdir_p destination
+  FileUtils.cp routes, destination
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-wisp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Yuri Artemev
@@ -11,7 +11,7 @@ cert_chain: []
 date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-wisp-source
+  name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: execjs
+  name: ruby-wisp-source
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -38,6 +38,26 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0.beta
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0.beta
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: Ruby Wisp is a bridge to the JS Wisp compiler
 email:
 - i@artemeff.com
@@ -46,16 +66,30 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- lib/rails/generators/wisp/assets/assets_generator.rb
+- lib/rails/generators/wisp/assets/templates/javascript.js.wisp
 - lib/wisp.rb
+- lib/wisp/rails.rb
+- lib/wisp/rails/railtie.rb
+- lib/wisp/rails/template_handler.rb
 - lib/wisp/runtime.rb
 - lib/wisp/runtime/compiler.js
 - lib/wisp/runtime/runner.js
 - lib/wisp/version.rb
 - ruby-wisp.gemspec
+- test/assets_generator_test.rb
+- test/controller_generator_test.rb
+- test/scaffold_generator_test.rb
+- test/support/routes.rb
+- test/support/site/index.js.wisp
+- test/template_handler_test.rb
+- test/test_helper.rb
 homepage: https://github.com/artemeff/ruby-wisp
 licenses:
 - MIT
@@ -71,9 +105,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3