resin 0.0.3 → 0.0.4

data/lib/resin/app/app.rb

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'sinatra/base'
 require 'haml'
 
+require File.expand_path(File.dirname(__FILE__) + '/helpers.rb')
+
 AMBER_PATH = File.expand_path('../../../../amber', __FILE__)
 
 module Resin
@@ -18,38 +20,10 @@ module Resin
   class Server < Sinatra::Base
     set :dump_errors, true
     set :port, ENV['PORT'] || 4567
-    set :views,  File.expand_path('../views', __FILE__)
-
     set :views, [File.join(Dir.pwd, 'views'), File.expand_path('../views', __FILE__)]
 
     helpers do
-      def find_template(views, name, engine, &block)
-        Array(views).each do |view|
-          super(view, name, engine, &block)
-        end
-      end
-
-      def embed_amber
-        return <<-END
-          <script type="text/javascript" src="/js/amber.js"></script>
-          <script type="text/javascript">
-            loadAmber({
-              files : [#{javascript_files}],
-              ready : function() { }
-            });
-          </script>
-        END
-      end
-    end
-
-    def javascript_files
-      files = []
-      Dir.glob("#{Dir.pwd}/js/*.js") do |filename|
-        unless filename.include? 'deploy'
-          files << "\"#{File.basename(filename)}\""
-        end
-      end
-      files.join(',')
+      include Resin::Helpers
     end
 
     get '/' do
@@ -64,32 +38,6 @@ module Resin
       end
     end
 
-    def load_resource(prefix, filename)
-      # A file in our working directory will take precedence over the
-      # Amber-bundled files. This should allow custom Kernel-Objects.js files
-      # for example.
-      local_file = File.join(Dir.pwd, "#{prefix}/", filename)
-      amber_file = File.join(AMBER_PATH, "/#{prefix}/", filename)
-
-      if File.exists? local_file
-        File.open(local_file, 'r').read
-      elsif File.exists? amber_file
-        File.open(amber_file, 'r').read
-      else
-        nil
-      end
-    end
-
-    def content_type_for_ext(filename)
-      if File.extname(filename) == '.js'
-        content_type 'application/javascript'
-      elsif File.extname(filename) == '.css'
-        content_type 'text/css'
-      else
-        content_type 'text/plain'
-      end
-    end
-
     ['js', 'css', 'images'].each do |path|
       get "/#{path}/*" do |filename|
         content_type_for_ext filename

data/lib/resin/app/helpers.rb

@@ -0,0 +1,64 @@
+
+module Resin
+  module Helpers
+    def javascript_files
+      files = []
+      Dir.glob("#{Dir.pwd}/js/*.js") do |filename|
+        if Resin.development?
+          unless filename.include? 'deploy'
+            files << "\"#{File.basename(filename)}\""
+          end
+        else
+          if filename.include? 'deploy'
+            files << "\"#{File.basename(filename)}\""
+          end
+        end
+      end
+      files.join(',')
+    end
+
+    def find_template(views, name, engine, &block)
+      Array(views).each do |view|
+        super(view, name, engine, &block)
+      end
+    end
+
+    def embed_amber
+      return <<-END
+        <script type="text/javascript" src="/js/amber.js"></script>
+        <script type="text/javascript">
+          loadAmber({
+            files : [#{javascript_files}],
+            ready : function() { }
+          });
+        </script>
+      END
+    end
+
+    def load_resource(prefix, filename)
+      # A file in our working directory will take precedence over the
+      # Amber-bundled files. This should allow custom Kernel-Objects.js files
+      # for example.
+      local_file = File.join(Dir.pwd, "#{prefix}/", filename)
+      amber_file = File.join(AMBER_PATH, "/#{prefix}/", filename)
+
+      if File.exists? local_file
+        File.open(local_file, 'r').read
+      elsif File.exists? amber_file
+        File.open(amber_file, 'r').read
+      else
+        nil
+      end
+    end
+
+    def content_type_for_ext(filename)
+      if File.extname(filename) == '.js'
+        content_type 'application/javascript'
+      elsif File.extname(filename) == '.css'
+        content_type 'text/css'
+      else
+        content_type 'text/plain'
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 Z
+date: 2012-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &7592780 !ruby/object:Gem::Requirement
+  requirement: &7592760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *7592780
+  version_requirements: *7592760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7592380 !ruby/object:Gem::Requirement
+  requirement: &7592360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7592380
+  version_requirements: *7592360
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &7591920 !ruby/object:Gem::Requirement
+  requirement: &7591900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7591920
+  version_requirements: *7591900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7591480 !ruby/object:Gem::Requirement
+  requirement: &7591440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7591480
+  version_requirements: *7591440
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &7591040 !ruby/object:Gem::Requirement
+  requirement: &7591020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7591040
+  version_requirements: *7591020
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &7590620 !ruby/object:Gem::Requirement
+  requirement: &7590600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7590620
+  version_requirements: *7590600
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &7590200 !ruby/object:Gem::Requirement
+  requirement: &7590180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7590200
+  version_requirements: *7590180
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &7589760 !ruby/object:Gem::Requirement
+  requirement: &7589740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7589760
+  version_requirements: *7589740
 description: 
 email: tyler@linux.com
 executables:
@@ -108,6 +108,7 @@ extra_rdoc_files:
 - README.markdown
 files:
 - bin/runresin
+- lib/resin/app/helpers.rb
 - lib/resin/app/app.rb
 - lib/resin.rb
 - lib/resin/app/views/index.haml