rugular 0.6.10 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47a11ca208aa3fe67fd088930ca59e1c22a4c197
-  data.tar.gz: 22139c8f960024939bc70e801806ba18e3dd0ee3
+  metadata.gz: e96bdcc148fa765870a84025def02d9f0ecfd8a1
+  data.tar.gz: 8b466dd3da01b21c7c4a08b792b15849bf14b74b
 SHA512:
-  metadata.gz: b9836e2de2e159cab6736353ad6d23a75df0bbf24a3d46fdf08fa8c83f8cd2028a39bd18c42f6d62bb36ad90d59b45843248d854715937d3f4704f762f5c815c
-  data.tar.gz: 563f626aeba5746c5101ed9e655b39e116ec0703c98b8724da811dd7e5ac4dd2fd63dc38b9f1b5575c1fd565d7a97df8d2dbab4fc7aec2cd2e0a80a1b355d77e
+  metadata.gz: 75924fbf53fefe398d2d7838befe6701e7164d53cdac2d5e86bf47c0d1767bfff653fb945d36158be8d3da139157595bd88d9895a06cf2b6518eaa61f8d7ab0d
+  data.tar.gz: 48a06d4d0fff1f1f20da99057860ddbc71492fdae098a73bac305f6ffba061eef26e3a0d7f0aa5c3481f0dc453198e4961b99941680ddf800f91341228b076f3

data/lib/rugular/tasks/helpers/javascript_files.rb

@@ -1,17 +1,17 @@
 module Rugular
   class JavascriptFiles
     def self.ordered_array
-      Dir.glob('src/components/**/*.module.coffee') +
-        Dir.glob('src/components/**/*.constant.coffee') +
-        Dir.glob('src/components/**/*.factory.coffee') +
-        Dir.glob('src/components/**/*.filter.coffee') +
-        Dir.glob('src/components/**/*.controller.coffee') +
-        Dir.glob('src/components/**/*.directive.coffee') +
-        Dir.glob('src/app/**/*.module.coffee') +
-        Dir.glob('src/app/**/*.config.coffee') +
-        Dir.glob('src/app/**/*.constant.coffee') +
-        Dir.glob('src/app/**/*.controller.coffee') +
-        Dir.glob('src/app/**/*.routes.coffee')
+      Dir.glob('src/components/**/*.module.{coffee,es6}') +
+        Dir.glob('src/components/**/*.constant.{coffee,es6}') +
+        Dir.glob('src/components/**/*.factory.{coffee,es6}') +
+        Dir.glob('src/components/**/*.filter.{coffee,es6}') +
+        Dir.glob('src/components/**/*.controller.{coffee,es6}') +
+        Dir.glob('src/components/**/*.directive.{coffee,es6}') +
+        Dir.glob('src/app/**/*.module.{coffee,es6}') +
+        Dir.glob('src/app/**/*.config.{coffee,es6}') +
+        Dir.glob('src/app/**/*.constant.{coffee,es6}') +
+        Dir.glob('src/app/**/*.controller.{coffee,es6}') +
+        Dir.glob('src/app/**/*.routes.{coffee,es6}')
     end
   end
 end

data/lib/rugular/tasks/server/guards/rugular_bower_components.rb

@@ -1,6 +1,5 @@
 require 'uglifier'
 require 'coffee_script'
-require 'uglifier'
 
 class RugularBowerComponents
   def self.compile
@@ -16,7 +15,7 @@ class RugularBowerComponents
       file.write bower_css
     end
     File.open('.tmp/vendor.js', 'w') do |file|
-      file.write(Uglifier.compile(bower_javascript))
+      file.write bower_javascript
     end
 
     'Successfully created manifest bower files'
@@ -25,22 +24,26 @@ class RugularBowerComponents
   private
 
   def bower_css
-    bower_yaml.fetch('css').map do |filename|
-      bower_component_file = 'bower_components/' + filename
-      next unless File.file? bower_component_file
-      File.read('bower_components/' + filename)
-    end.join
+    bower_yaml.fetch('css').reduce('', &read_bower_component_files)
   end
 
   def bower_javascript
-    bower_yaml.fetch('js').map do |filename|
-      bower_component_file = 'bower_components/' + filename
-      next unless File.file? bower_component_file
-      File.read('bower_components/' + filename)
-    end.join
+    Uglifier.compile(
+      bower_yaml.fetch('js').reduce('', &read_bower_component_files)
+    )
   end
 
   def bower_yaml
     YAML.load(File.read('bower_components.yaml'))
   end
+
+  def read_bower_component_files
+    lambda do |accumulator, filename|
+      bower_component_file = 'bower_components/' + filename
+
+      fail "#{filename} does not exist" unless File.file? bower_component_file
+
+      accumulator += File.read bower_component_file
+    end
+  end
 end

data/lib/rugular/tasks/server/guards/rugular_coffee.rb

@@ -16,7 +16,7 @@ class RugularCoffee
   def compile
     write_tmp_file
 
-    "Successfully compiled #{coffee_file} to html!\n"
+    "Successfully compiled #{coffee_file} to js!\n"
   end
 
   def delete

data/lib/rugular/tasks/server/guards/rugular_es6.rb

@@ -16,7 +16,7 @@ class RugularES6
   def compile
     write_tmp_file
 
-    "Successfully compiled #{es6_file} to html!\n"
+    "Successfully compiled #{es6_file} to js!\n"
   end
 
   def delete
@@ -30,7 +30,7 @@ class RugularES6
   attr_reader :es6_file
 
   def javascript
-    @_javascript ||= Babel::Transpiler.transform File.read(es6_file)
+    Babel::Transpiler.transform File.read(es6_file)
   end
 
   def tmp_file

data/lib/rugular/tasks/server/guards/rugular_index_html.rb

@@ -35,7 +35,7 @@ class RugularIndexHtml
 
   def convert_to_script_tag
     lambda do |javascript_file|
-      tmp_filename = javascript_file.gsub('src', '').gsub('coffee', 'js')
+      tmp_filename = javascript_file.gsub('src', '').gsub(/coffee|es6/, 'js')
 
       Nokogiri::XML::Node.new 'script', application_html do |node|
         node['src'] = tmp_filename

data/lib/rugular/templates/new/src/app/{app.controller.coffee → app.controller.es6}

@@ -1,5 +1,6 @@
-AppController = ->
-  @title = 'App'
+AppController = function() {
+  this.title = 'App'
+}
 
 angular.module('app').controller('AppController', AppController)
 

data/lib/rugular/version.rb

@@ -1,3 +1,3 @@
 module Rugular
-  VERSION = '0.6.10'
+  VERSION = '0.6.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugular
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
 platform: ruby
 authors:
 - Nicholas Shook
@@ -364,7 +364,7 @@ files:
 - lib/rugular/templates/new/e2e/app_spec.coffee
 - lib/rugular/templates/new/karma.conf.js
 - lib/rugular/templates/new/protractor.conf.js
-- lib/rugular/templates/new/src/app/app.controller.coffee
+- lib/rugular/templates/new/src/app/app.controller.es6
 - lib/rugular/templates/new/src/app/app.controller.spec.coffee
 - lib/rugular/templates/new/src/app/app.haml
 - lib/rugular/templates/new/src/app/app.module.coffee