riot_js-rails 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2caab9b9960cca67b7470af50ce43bb3daca763
-  data.tar.gz: 6fd2a649d36cfee3669b1fedf839647a2d56f105
+  metadata.gz: 3336fa961ac6cc151f8e325563c2c8def675d4a4
+  data.tar.gz: 84134a612de5ae749d084399be8d23c4fd4084de
 SHA512:
-  metadata.gz: b076a2783b991b3e2f29e8973f8bfd9b2ec08395960257482073dd9d8a8324c38d6fa0c4b21b16dbf0d951cc315417c4cb5d21a3af9a740ba3fa58a73e525769
-  data.tar.gz: 881f5d86d9ca7844b10efb615320203fb7973035b1515c90cbaedf28a9eee7c533d20f91b42fc2dad6ae3c7084f68f63b17f11313dced0b88f241bb5a17e811d
+  metadata.gz: f985f48151efe46b088871a08232459e6dd29bb2b1d869ccd7f02fb2c99c88d86d99d3c9377a820d41cc534a94936fa946d7ff67fd62750009509a919e199e9f
+  data.tar.gz: d12a75cc7b410a7ece60a27aff51ffb7f3fe6edde10ccd1f9e5bfcfb1fe10ecc457880db3a22ab96a23d46193d5880ac84bc49fb336fcc61fd7eca8335a35010

data/README.md

@@ -49,7 +49,7 @@ Alternative approach is to use view helper, e.g.:
 ```
 This will generate following HTML:
 ```html
-<example-tag id="riot-example-tag-2822884" class="riot-rails-component"></example-tag>
+<example-tag data-opts="{&quot;header&quot;:&quot;Some header&quot;}" data-mount></example-tag>
 ```
 and immediate mount it with given options.
 
@@ -59,7 +59,7 @@ You can also use HTML element as tag:
 ```
 which will generate following code:
 ```html
-<div id="riot-example-tag-5012227" class="riot-rails-component" riot-tag="example-tag"></div>
+<div data-opts="{&quot;header&quot;:&quot;Some header&quot;}" data-mount riot-tag="example-tag"></div>
 ```
 
 To generate tag with content use block:
@@ -74,7 +74,32 @@ If you want to add your own classes to component or any other attributes, pass i
 <%= riot_component(:div, :example_tag, { :header => 'Some header' }, { class: 'my-class' }) %>
 ```
 
-# HAML, SASS and CoffeeScript
+If you don't want to use helper you can use plain HTML:
+```html
+<example-tag data-riot></example-tag>
+```
+
+# Built-in preprocessing
+
+You can use one of the Riot built-in preprocessors for javascript.
+Available options are: "coffee", "typescript", "es6" and "none"
+
+Example:
+```
+<my-tag>
+  <script type="coffee">
+    # your coffeescript logic goes here
+  </script>
+</my-tag>
+```
+
+Note that this may require some extra NodeJS modules. Riot-rails uses by default global modules installed by npm (installed with option ```-g```).
+If you want to use local modules add following line to your ```config/application.rb```:
+```
+config.riot.node_paths << '/path/to/your/node_modules'
+```
+
+# Rails preprocessing: HAML, SASS and CoffeeScript
 
 You can define tag using HAML, SASS and CoffeeScript. Example:
 ```haml
@@ -83,7 +108,7 @@ You can define tag using HAML, SASS and CoffeeScript. Example:
     = "{header}"
 
   :scss
-    timer-haml {
+    example-haml {
       h1 {
         background-color: #ffff00;
       }

data/lib/riot_js/rails/helper.rb

@@ -28,10 +28,8 @@ module RiotJs
       def component_attributes(name, data, attributes)
         component_name = name.to_s.gsub('_', '-')
         attributes_data = attributes[:data] || attributes['data'] || {}
-        attributes_class = attributes[:class] || attributes['class']
-        attributes = attributes.merge(id: "riot-#{component_name}-#{Random.rand(10000000)}",
-                                      class: "#{attributes_class} riot-rails-component".strip,
-                                      data: attributes_data.merge(opts: data.to_json))
+        riot_data = { opts: data.to_json, riot: true }
+        attributes = attributes.merge(data: attributes_data.merge(riot_data))
         return component_name, attributes
       end
 

data/lib/riot_js/rails/processors/compiler.rb

@@ -12,6 +12,7 @@ module RiotJs
           encoding: 'UTF-8',
           runner_path: File.expand_path('../../../../../vendor/assets/javascripts/compiler/node_runner.js', __FILE__),
       )
+      JS_RUNTIME.instance_variable_set :@binary, JS_RUNTIME.send(:locate_binary) if defined?(::Barista)
 
       RIOT_COMPILER_PATH = File.expand_path('../../../../../vendor/assets/javascripts/compiler/compiler.js', __FILE__)
 

data/lib/riot_js/rails/railtie.rb

@@ -5,6 +5,9 @@ require 'riot_js/rails/helper'
 module RiotJs
   module Rails
     class Railtie < ::Rails::Railtie
+      config.riot = ActiveSupport::OrderedOptions.new
+      config.riot.node_paths = []
+
       initializer :setup_sprockets do |app|
         Processor.register_self app
 
@@ -20,6 +23,26 @@ module RiotJs
         ::Rails.application.assets.context_class.class_eval(helpers)
       end
 
+      config.after_initialize do |app|
+        node_paths = ENV['NODE_PATH'].to_s.split(':')
+        node_paths += app.config.riot.node_paths
+        node_global_path = detect_node_global_path
+        node_paths << node_global_path if node_global_path
+
+        ENV['NODE_PATH'] = node_paths.join(':')
+      end
+
+
+      def detect_node_global_path
+        prefix = `npm config get prefix`.to_s.chomp("\n")
+        possible_paths = [ "#{prefix}/lib/node", "#{prefix}/lib/node_modules" ]
+
+        possible_paths.each do |path|
+          return path if File.directory?(path)
+        end
+        return
+      end
+
     end
   end
 end

data/lib/riot_js/rails/version.rb

@@ -1,5 +1,5 @@
 module RiotJs
   module Rails
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/vendor/assets/javascripts/riot_rails.js

@@ -1,14 +1,20 @@
 ;(function($) {
 
   var riotRails = {
-    componentClass: 'riot-rails-component',
+    componentSelector: '[data-riot]',
     mounted: [],
-    mount: function(selector) {
-      var component = $(selector);
+    mount: function(component) {
+      var mounted, id, generated;
       var opts = component.data('opts');
+      var id = component.attr('id') || 'riot-' + Math.floor((Math.random() * 10000000));
+
+      component.attr('id', id);
+
       component.removeAttr('data-opts');
-      var mounted = riot.mount(selector, opts);
-      this.mounted.push(mounted[0]);
+      component.removeAttr('data-riot');
+
+      mounted = riot.mount('#' + id, opts);
+      this.mounted.concat(mounted);
     },
     unmountAll: function () {
       $.each(this.mounted, function(index, component) {
@@ -18,8 +24,8 @@
     },
     mountAll: function() {
       var self = this;
-      $('.' + self.componentClass).each(function(){
-        self.mount('#' + $(this).attr('id'));
+      $(self.componentSelector).each(function(){
+        self.mount($(this));
       });
     }
   };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riot_js-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Bartosz Jaroszewski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails