volt 0.8.15 → 0.8.16

data/lib/volt/cli/asset_compile.rb

@@ -1,13 +1,12 @@
 module Volt
   class CLI
-
-    desc "precompile", "precompile all application assets"
+    desc 'precompile', 'precompile all application assets'
 
     def precompile
       compile
     end
 
-    desc "watch", "compiles the project to /compiled when a file changes"
+    desc 'watch', 'compiles the project to /compiled when a file changes'
 
     def watch
       require 'listen'
@@ -18,7 +17,7 @@ module Volt
 
       listener.start # non-blocking
 
-      Signal.trap("SIGINT") do
+      Signal.trap('SIGINT') do
         listener.stop
       end
 
@@ -32,8 +31,9 @@ module Volt
     end
 
     private
+
     def compile
-      print "compiling project..."
+      print 'compiling project...'
       require 'fileutils'
       require 'opal'
       require 'volt'
@@ -46,7 +46,7 @@ module Volt
       @root_path ||= Dir.pwd
       Volt.root  = @root_path
 
-      @app_path = File.expand_path(File.join(@root_path, "app"))
+      @app_path = File.expand_path(File.join(@root_path, 'app'))
 
       @component_paths   = ComponentPaths.new(@root_path)
       @app               = Rack::Builder.new
@@ -67,7 +67,7 @@ module Volt
       @opal_files.environment.each_logical_path do |logical_path|
         logical_path = logical_path.to_s
         # Only include files that aren't compiled elsewhere, like fonts
-        if !logical_path[/[.](y|css|js|html|erb)$/]
+        unless logical_path[/[.](y|css|js|html|erb)$/]
           write_file(logical_path)
         end
       end
@@ -78,7 +78,6 @@ module Volt
         logical_path = logical_path.gsub(/^\/assets\//, '')
         write_file(logical_path)
       end
-
     end
 
     def write_file(logical_path)
@@ -88,7 +87,7 @@ module Volt
 
       begin
         content = @opal_files.environment[logical_path].to_s
-        File.open(path, "wb") do |file|
+        File.open(path, 'wb') do |file|
           file.write(content)
         end
       rescue Sprockets::FileNotFound, SyntaxError => e
@@ -106,7 +105,6 @@ module Volt
       end
     end
 
-
     def write_index
       path = "#{@root_path}/compiled/index.html"
       FileUtils.mkdir_p(File.dirname(path))

data/lib/volt/cli/generate.rb

@@ -1,26 +1,24 @@
 class Generate < Thor
   include Thor::Actions
 
-  desc "model NAME COMPONENT", "Creates a model named NAME in the component named COMPONENT"
-  method_option :name, :type => :string, :banner => "The name of the model."
-  method_option :component, :type => :string, :default => 'main', :banner => "The component the model should be created in.", :required => false
-  def model(name, component='main')
+  desc 'model NAME COMPONENT', 'Creates a model named NAME in the component named COMPONENT'
+  method_option :name, type: :string, banner: 'The name of the model.'
+  method_option :component, type: :string, default: 'main', banner: 'The component the model should be created in.', required: false
+  def model(name, component = 'main')
     output_file = Dir.pwd + "/app/#{component.underscore}/models/#{name.underscore.singularize}.rb"
-    template("model/model.rb.tt", output_file, {model_name: name.camelize.singularize})
+    template('model/model.rb.tt', output_file, model_name: name.camelize.singularize)
   end
 
-  desc "component NAME", "Creates a component named NAME in the app folder."
-  method_option :name, :type => :string, :banner => "The name of the component."
+  desc 'component NAME', 'Creates a component named NAME in the app folder.'
+  method_option :name, type: :string, banner: 'The name of the component.'
   def component(name)
     name = name.underscore
     component_folder = Dir.pwd + "/app/#{name}"
     @component_name = name
-    directory("component", component_folder, {component_name: name})
+    directory('component', component_folder, component_name: name)
   end
 
-
   def self.source_root
     File.expand_path(File.join(File.dirname(__FILE__), '../../../templates'))
   end
-
-end
+end

data/lib/volt/cli/new_gem.rb

@@ -1,5 +1,5 @@
-require "net/http"
-require "uri"
+require 'net/http'
+require 'uri'
 require 'fileutils'
 
 # Creates a new "volt" gem, which can be used to easily repackage
@@ -7,8 +7,8 @@ require 'fileutils'
 class NewGem
   def initialize(thor, name, options)
     @thor = thor
-    @component_name = name.chomp("/")
-    @name = "volt-" + @component_name # remove trailing slash if present
+    @component_name = name.chomp('/')
+    @name = 'volt-' + @component_name # remove trailing slash if present
 
     if gem_is_available?
       @thor.say("#{@name} is available!  Making gem files.", :green)
@@ -37,80 +37,80 @@ class NewGem
     request = Net::HTTP::Get.new(uri.request_uri)
     response = http.request(request)
 
-    return response.code == "404"
+    return response.code == '404'
   rescue SocketError => e
     # rubygems is down, skip check
     return true
   end
 
   def copy_files
-    @thor.directory("newgem/app/newgem", File.join("#{@target}", "app/#{@component_name}"), @opts)
-    copy("newgem/Gemfile.tt", "Gemfile")
-    copy("newgem/Rakefile.tt", "Rakefile")
-    copy("newgem/README.md.tt", "README.md")
-    copy("newgem/gitignore.tt", ".gitignore")
-    copy("newgem/newgem.gemspec.tt", "#{@name}.gemspec")
-    copy("newgem/lib/newgem.rb.tt", "lib/#{@namespaced_path}.rb")
-    copy("newgem/VERSION", "VERSION")
+    @thor.directory('newgem/app/newgem', File.join("#{@target}", "app/#{@component_name}"), @opts)
+    copy('newgem/Gemfile.tt', 'Gemfile')
+    copy('newgem/Rakefile.tt', 'Rakefile')
+    copy('newgem/README.md.tt', 'README.md')
+    copy('newgem/gitignore.tt', '.gitignore')
+    copy('newgem/newgem.gemspec.tt', "#{@name}.gemspec")
+    copy('newgem/lib/newgem.rb.tt', "lib/#{@namespaced_path}.rb")
+    copy('newgem/VERSION', 'VERSION')
     FileUtils.mkdir_p(File.join(@target, "lib/#{@namespaced_path}"))
   end
 
   def copy_options
     if @options[:bin]
-      copy("newgem/bin/newgem.tt", "bin/#{@name}")
+      copy('newgem/bin/newgem.tt', "bin/#{@name}")
     end
     case @options[:test]
     when 'rspec'
-      copy("newgem/rspec.tt", ".rspec")
-      copy("newgem/spec/spec_helper.rb.tt", "spec/spec_helper.rb")
-      copy("newgem/spec/newgem_spec.rb.tt", "spec/#{@namespaced_path}_spec.rb")
+      copy('newgem/rspec.tt', '.rspec')
+      copy('newgem/spec/spec_helper.rb.tt', 'spec/spec_helper.rb')
+      copy('newgem/spec/newgem_spec.rb.tt', "spec/#{@namespaced_path}_spec.rb")
     when 'minitest'
-      copy("newgem/test/minitest_helper.rb.tt", "test/minitest_helper.rb")
-      copy("newgem/test/test_newgem.rb.tt", "test/test_#{@namespaced_path}.rb")
+      copy('newgem/test/minitest_helper.rb.tt', 'test/minitest_helper.rb')
+      copy('newgem/test/test_newgem.rb.tt', "test/test_#{@namespaced_path}.rb")
     end
     puts "Initializing git repo in #{@target}"
     Dir.chdir(@target) { `git init`; `git add .` }
 
     if @options[:edit]
-      run("#{@options["edit"]} \"#{gemspec_dest}\"")  # Open gemspec in editor
+      run("#{@options['edit']} \"#{gemspec_dest}\"")  # Open gemspec in editor
     end
   end
 
   private
-    def copy(from, to)
-      @thor.template(File.join(from), File.join(@target, to), @opts)
-    end
 
-    def gem_options
-      constant_name = get_constant_name
-      constant_array = constant_name.split('::')
-      git_user_name = `git config user.name`.chomp
-      git_user_email = `git config user.email`.chomp
-
-      opts = {
-        :name            => @name,
-        :namespaced_path => @namespaced_path,
-        :constant_name   => constant_name,
-        :constant_array  => constant_array,
-        :author          => git_user_name.empty? ? "TODO: Write your name" : git_user_name,
-        :email           => git_user_email.empty? ? "TODO: Write your email address" : git_user_email,
-        :test            => @options[:test],
-        :volt_version_base => volt_version_base
-      }
-
-      return opts
-    end
+  def copy(from, to)
+    @thor.template(File.join(from), File.join(@target, to), @opts)
+  end
 
-    def volt_version_base
-      version_path = File.join(File.dirname(__FILE__), '../../../VERSION')
-      File.read(version_path).split('.').tap {|v| v[v.size-1] = 0 }.join('.')
-    end
+  def gem_options
+    constant_name = get_constant_name
+    constant_array = constant_name.split('::')
+    git_user_name = `git config user.name`.chomp
+    git_user_email = `git config user.email`.chomp
+
+    opts = {
+      name: @name,
+      namespaced_path: @namespaced_path,
+      constant_name: constant_name,
+      constant_array: constant_array,
+      author: git_user_name.empty? ? 'TODO: Write your name' : git_user_name,
+      email: git_user_email.empty? ? 'TODO: Write your email address' : git_user_email,
+      test: @options[:test],
+      volt_version_base: volt_version_base
+    }
+
+    opts
+  end
 
-    def get_constant_name
-      constant_name = @name.split('_').map{|p| p[0..0].upcase + p[1..-1] }.join
-      constant_name = constant_name.split('-').map{|q| q[0..0].upcase + q[1..-1] }.join('::') if constant_name =~ /-/
+  def volt_version_base
+    version_path = File.join(File.dirname(__FILE__), '../../../VERSION')
+    File.read(version_path).split('.').tap { |v| v[v.size - 1] = 0 }.join('.')
+  end
 
-      return constant_name
-    end
+  def get_constant_name
+    constant_name = @name.split('_').map { |p| p[0..0].upcase + p[1..-1] }.join
+    constant_name = constant_name.split('-').map { |q| q[0..0].upcase + q[1..-1] }.join('::') if constant_name =~ /-/
 
+    constant_name
+  end
 end

data/lib/volt/config.rb

@@ -1,9 +1,8 @@
 # Config lets a user set global config options for Volt.
 module Volt
   module Config
-
     def setup
-      yield self.config
+      yield config
     end
 
     def config
@@ -18,7 +17,7 @@ module Volt
           app_name:  app_name,
           db_name:   ENV['DB_NAME'] || (app_name + '_' + Volt.env.to_s),
           db_host:   ENV['DB_HOST'] || 'localhost',
-          db_port:   (ENV['DB_PORT'] || 27017).to_i,
+          db_port:   (ENV['DB_PORT'] || 27_017).to_i,
           db_driver: ENV['DB_DRIVER'] || 'mongo'
       )
     end

data/lib/volt/console.rb

@@ -4,7 +4,7 @@ class Pry
   # To make the console more useful, we make it so we flush the event registry
   # after each line.  This makes it so events are triggered after each line.
   # To accomplish this we monkey-patch pry.
-  def rep(target=TOPLEVEL_BINDING)
+  def rep(target = TOPLEVEL_BINDING)
     target = Pry.binding_for(target)
     result = re(target)
 

data/lib/volt/controllers/model_controller.rb

@@ -18,14 +18,14 @@ module Volt
       if Symbol === val || String === val
         collections = [:page, :store, :params, :controller]
         if collections.include?(val.to_sym)
-          self.current_model = self.send(val)
+          self.current_model = send(val)
         else
-          raise "#{val} is not the name of a valid model, choose from: #{collections.join(', ')}"
+          fail "#{val} is not the name of a valid model, choose from: #{collections.join(', ')}"
         end
       elsif val
         self.current_model = val
       else
-        raise "model can not be #{val.inspect}"
+        fail "model can not be #{val.inspect}"
       end
     end
 
@@ -37,17 +37,17 @@ module Volt
         model = model.call
       end
 
-      return model
+      model
     end
 
     def self.new(*args, &block)
-      inst = self.allocate
+      inst = allocate
 
       inst.model = (@default_model || :controller)
 
       inst.initialize(*args, &block)
 
-      return inst
+      inst
     end
 
     attr_accessor :attrs

data/lib/volt/data_stores/data_store.rb

@@ -6,7 +6,7 @@ module Volt
       if Volt.config.db_driver == 'mongo'
         return MongoDriver.fetch
       else
-        raise "#{database_name} is not a supported database"
+        fail "#{database_name} is not a supported database"
       end
     end
   end

data/lib/volt/data_stores/mongo_driver.rb

@@ -7,7 +7,7 @@ module Volt
         @@mongo_db ||= Mongo::MongoClient.new(Volt.config.db_host, Volt.config.db_path)
         @@db ||= @@mongo_db.db(Volt.config.db_name)
 
-        return @@db
+        @@db
       end
     end
   end

data/lib/volt/extra_core/array.rb

@@ -1,10 +1,10 @@
 class Array
   def sum
     total = 0
-    self.each do |val|
+    each do |val|
       total += val
     end
 
-    return total
+    total
   end
 end

data/lib/volt/extra_core/blank.rb

@@ -17,7 +17,6 @@ class Object
   def present?
     !blank?
   end
-
 end
 
 class NilClass
@@ -73,7 +72,7 @@ class String
   def blank?
     # self !~ /[^[:space:]]/
     # TODO: Opal fails with the previous regex
-    self.strip == ''
+    strip == ''
   end
 end
 

data/lib/volt/extra_core/extra_core.rb

@@ -1,4 +1,4 @@
-require 'volt/extra_core/log'
+require 'volt/extra_core/logger'
 require 'volt/extra_core/array'
 require 'volt/extra_core/object'
 require 'volt/extra_core/blank'

data/lib/volt/extra_core/inflector/methods.rb

@@ -39,7 +39,6 @@ module Volt
       apply_inflections(word, inflections(locale).singulars)
     end
 
-
     private
 
     # Applies inflection rules for +singularize+ and +pluralize+.

data/lib/volt/extra_core/logger.rb

@@ -1,12 +1,18 @@
-class Logger
-  def initialize(log_to)
-  end
+if RUBY_PLATFORM == 'opal'
+  # The basic front-end logger, log to console
+  class Logger
+    def initialize(*args)
+      # TODO: handle options
+    end
 
-  [:fatal, :info, :warn, :debug, :error].each do |method_name|
-    define_method(method_name) do |text, &block|
-      text = block.call if block
+    [:fatal, :info, :warn, :debug, :error].each do |method_name|
+      define_method(method_name) do |text, &block|
+        text = block.call if block
 
-      `console[method_name](text);`
+        `console[method_name](text);`
+      end
     end
   end
+else
+  require 'logger'
 end

data/lib/volt/extra_core/numeric.rb

@@ -6,4 +6,4 @@ class Numeric
       return "#{self} #{unit}s"
     end
   end
-end
+end

data/lib/volt/extra_core/string.rb

@@ -7,20 +7,20 @@ class String
   # Turns a string into the camel case version.  If it is already camel case, it should
   # return the same string.
   def camelize(first_letter = :upper)
-    new_str = self.gsub(/_[a-z]/) { |a| a[1].upcase }
+    new_str = gsub(/_[a-z]/) { |a| a[1].upcase }
     new_str = new_str[0].capitalize + new_str[1..-1] if first_letter == :upper
 
-    return new_str
+    new_str
   end
 
   # Returns the underscore version of a string.  If it is already underscore, it should
   # return the same string.
   def underscore
-    self.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').downcase
+    gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
   end
 
   def dasherize
-    self.gsub('_', '-')
+    gsub('_', '-')
   end
 
   def pluralize
@@ -32,16 +32,16 @@ class String
   end
 
   def titleize
-    self.gsub('_', ' ').split(' ').map {|w| w.capitalize }.join(' ')
+    gsub('_', ' ').split(' ').map(&:capitalize).join(' ')
   end
 
   def plural?
     # TODO: Temp implementation
-    self.pluralize == self
+    pluralize == self
   end
 
   def singular?
     # TODO: Temp implementation
-    self.singularize == self
+    singularize == self
   end
 end