kelredd-sinatra-helpers 0.1.5 → 0.1.6

data/lib/sinatra_helpers.rb

@@ -7,7 +7,6 @@ module SinatraHelpers
     :not_found => 404,
     :ok => 200
   }
-  DEFAULT_CACHE_CONTROL = 'public, max-age=86400' # cache for 24 hours
 
   class << self
     
@@ -15,7 +14,7 @@ module SinatraHelpers
       if defined?(Rails)
         Rails.configuration.action_controller.perform_caching
       elsif app.respond_to?(:environment)
-        app.environment == 'production'
+        app.environment.to_s == 'production'
       else
         false
       end

data/lib/sinatra_helpers/generator/file_templates/boot.rb.erb

@@ -9,9 +9,9 @@ def public_path(*args)
   root_path('public', *args)
 end
 
+require 'config/env'
 begin
-  require "config/environments/#{RACK_ENV.downcase}"
+  require "config/envs/#{RACK_ENV.downcase}"
 rescue LoadError => err
   puts "no environment config set up for '#{RACK_ENV.downcase}', ignoring..."
 end
-require 'config/environment'

data/lib/sinatra_helpers/less.rb

@@ -39,30 +39,27 @@ module SinatraHelpers::Less
       end
 
       app.get "#{SinatraHelpers::Less[:hosted_root]}/*.css" do
-        css_name = params['splat'].first.to_s
+        file_name = params['splat'].first.to_s
         less_path = File.join([
-          app.root, SinatraHelpers::Less[:src_root], "#{css_name}.less"
+          app.root, SinatraHelpers::Less[:src_root], "#{file_name}.less"
         ])
         css_path = File.join([
-          app.root, SinatraHelpers::Less[:src_root], "#{css_name}.css"
+          app.root, SinatraHelpers::Less[:src_root], "#{file_name}.css"
         ])
 
         content_type CONTENT_TYPE
-        if SinatraHelpers.page_cache?(SinatraHelpers::Less.app)
-          headers['Cache-Control'] = SinatraHelpers::Less[:cache_control]
-        end
 
         if File.exists?(less_path)
-          SinatraHelpers::Less.compile(css_name, [less_path])
+          SinatraHelpers::Less.compile(file_name, [less_path])
         elsif File.exists?(css_path)
-          SinatraHelpers::Less.compile(css_name, [css_path])
-        elsif SinatraHelpers::Less[:concat].include?(css_name)
-          less_paths = SinatraHelpers::Less[:concat][css_name].collect do |css_name|
-            File.join(app.root, SinatraHelpers::Less[:src_root], "#{css_name}.less")
+          SinatraHelpers::Less.compile(file_name, [css_path])
+        elsif SinatraHelpers::Less[:concat].include?(file_name)
+          less_paths = SinatraHelpers::Less[:concat][file_name].collect do |concat_name|
+            File.join(app.root, SinatraHelpers::Less[:src_root], "#{concat_name}.less")
           end.select do |less_path|
             File.exists?(less_path)
           end
-          SinatraHelpers::Less.compile(css_name, less_paths)
+          SinatraHelpers::Less.compile(file_name, less_paths)
         else
           halt SinatraHelpers::HTTP_STATUS[:not_found]
         end

data/lib/sinatra_helpers/less/config.rb

@@ -2,12 +2,11 @@ module SinatraHelpers; end
 module SinatraHelpers::Less
 
   class Config
-    ATTRIBUTES = [:hosted_root, :src_root, :concat, :cache_control, :compress]
+    ATTRIBUTES = [:hosted_root, :src_root, :concat, :compress]
     DEFAULTS = {
       :hosted_root => '/stylesheets',
       :src_root => 'app/stylesheets',
       :concat => {},
-      :cache_control => SinatraHelpers::DEFAULT_CACHE_CONTROL,
       :compress => false
     }
 

data/lib/sinatra_helpers/sprockets.rb

@@ -58,9 +58,6 @@ module SinatraHelpers::Sprockets
         src_path = File.join(app.root, src_file_path)
 
         content_type CONTENT_TYPE
-        if SinatraHelpers.page_cache?(SinatraHelpers::Sprockets.app)
-          headers['Cache-Control'] = SinatraHelpers::Sprockets[:cache_control]
-        end
 
         if File.exists?(src_path)
           SinatraHelpers::Sprockets.compile(src_file_path)

data/lib/sinatra_helpers/sprockets/config.rb

@@ -2,13 +2,12 @@ module SinatraHelpers; end
 module SinatraHelpers::Sprockets
 
   class Config
-    ATTRIBUTES = [:hosted_root, :src_root, :load_path, :expand_paths, :cache_control]
+    ATTRIBUTES = [:hosted_root, :src_root, :load_path, :expand_paths]
     DEFAULTS = {
       :hosted_root => '/javascripts',
       :src_root => 'app/javascripts',
       :load_path => ['app/javascripts/**', 'vendor/javascripts', 'vendor/sprockets'],
-      :expand_paths => true,
-      :cache_control => SinatraHelpers::DEFAULT_CACHE_CONTROL
+      :expand_paths => true
     }
 
     attr_accessor *ATTRIBUTES

data/lib/sinatra_helpers/version.rb

@@ -3,7 +3,7 @@ module SinatraHelpers
     
     MAJOR = 0
     MINOR = 1
-    TINY  = 5
+    TINY  = 6
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kelredd-sinatra-helpers
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Kelly Redding