kelredd-sinatra-helpers 0.1.8 → 0.1.9

data/README.rdoc

@@ -10,8 +10,6 @@ I've written a generator for new Sinatra apps.  Please note: I've written this g
 
  * Most, if not all, of the helpers in this gem
  * Gem configuration (via gemsconfig: http://github.com/kelredd/gemsconfig)
- * Sprockets (via sprockets-sinatra: http://github.com/kelredd/sprockets-sinatra)
- * Less (coming)
  * Capistrano deployment scheme
  * Source control with Git
  * Erb (with generators from useful: http://github.com/kelredd/useful/tree/master/lib/useful/erb_helpers/)
@@ -19,8 +17,9 @@ I've written a generator for new Sinatra apps.  Please note: I've written this g
  * Default layout that I like
  * Rack::Cache using my configuration (see admin/production.ru)
  * Rack::Flash
- * Unit testing with Test::Unit (coming)
- * BDD using Cucumber (coming)
+ * Rack::Less (http://github.com/kelredd/rack-less)
+ * Rack::Sprockets (http://github.com/kelredd/rack-sprockets)
+ * Unit testing with Test::Unit
  
 If you don't like/want to use something that this generates, don't use the generator, or back out some generated code manually.  Ok, enough about that.  On to usage:
 
@@ -36,17 +35,13 @@ Have environment tests like development? and production? available in your app c
 Helpful view template helpers for partial rendering and html generation.  See
 http://github.com/kelredd/useful/tree/master/lib/useful/erb_helpers/ for more info.
 
-=== Sprockets
-
-Coming.
-
 === ActiveRecord
 
 Coming.
 
 == Installation
 
-    sudo gem install kelredd-sinatra-helpers --source http://gemcutter.org
+    gem install kelredd-sinatra-helpers
 
 == Usage
 
@@ -54,7 +49,7 @@ Coming.
 
 == License
 
-Copyright (c) 2009 Kelly Redding
+Copyright (c) 2010 Kelly Redding (mailto:kelly@kelredd.com)
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/Rakefile

@@ -17,7 +17,12 @@ spec = Gem::Specification.new do |s|
   s.files            = %w(README.rdoc Rakefile) + Dir.glob("{bin,lib}/**/*")
   s.executables    = ['sinatra']
   
-  s.add_dependency('kelredd-useful', '>= 0.2.6')
+  s.add_dependency('kelredd-useful', ['>= 0.2.6'])
+  
+  s.add_development_dependency("shoulda", [">= 2.10.2"])
+  s.add_development_dependency("sinatra", [">= 0.9.4"])
+  s.add_development_dependency("rack-test", [">= 0.5.3"])
+  s.add_development_dependency("webrat", [">= 0.6.0"])
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
@@ -47,7 +52,6 @@ rescue LoadError
   task :default => :test
 end
 
-
 desc 'Generate the gemspec to serve this gem'
 task :gemspec do
   file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"

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

@@ -15,12 +15,17 @@ load_app 'models'
 use Rack::Session::Cookie, :key => '_sess'
 use Rack::Flash
 
-# setup the LESS helper
-Sinatra::Application.register SinatraHelpers::Less
-require 'sinatra_helpers/less/erb'
-Sinatra::Application.helpers SinatraHelpers::Less::Erb
+use Rack::Less
+Rack::Less.configure do |config|
+  config.combinations = {
+    'web' => ['reset', 'app']
+  }
+  config.compress = config.cache = production? 
+end
 
-# setup the Sprockets helper
-Sinatra::Application.register SinatraHelpers::Sprockets
-require 'sinatra_helpers/sprockets/erb'
-Sinatra::Application.helpers SinatraHelpers::Sprockets::Erb
+use Rack::Sprockets
+Rack::Sprockets.configure do |config|
+  if config.cache = production? 
+    config.compress = :whitespace
+  end
+end

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

@@ -4,12 +4,7 @@ use Rack::Cache,
   :metastore   => "file:#{root_path('cache-rack', 'meta')}",
   :entitystore => "file:#{root_path('cache-rack', 'body')}"
 
-
 FileUtils.mkdir_p 'log' unless File.exists?('log')
 log = File.new("log/#{RACK_ENV.downcase}.log", "a+")
 $stdout.reopen(log)
 $stderr.reopen(log)
-
-SinatraHelpers::Less.configure do |config|
-  config.compress = true
-end

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

@@ -8,11 +8,10 @@ Gemsconfig::init do |config|
   
   config.gem 'rack-flash', :lib => 'rack-flash'
   config.gem 'rack-cache', :lib => false
+  config.gem 'rack-less', :lib => 'rack/less'
+  config.gem 'rack-sprockets', :lib => 'rack/sprockets'
     
   config.gem 'kelredd-useful', :lib => 'useful/ruby_extensions'
-
   config.gem 'kelredd-sinatra-helpers', :lib => 'sinatra_helpers'
-  config.gem 'kelredd-sinatra-helpers', :lib => 'sinatra_helpers/less'
-  config.gem 'kelredd-sinatra-helpers', :lib => 'sinatra_helpers/sprockets'
 
 end if defined?(Gemsconfig)

data/lib/sinatra_helpers/generator/file_templates/gitignore.erb

@@ -1 +1,2 @@
 /log/*.log
+.DS_Store

data/lib/sinatra_helpers/generator/file_templates/layout

@@ -11,9 +11,9 @@
     <meta name="robots" content="noindex,nofollow" />
   <% end %>
   <link rel="icon" type="image/png" href="/favicon.png"></link>
-  <%= less_link_tag 'reset', 'app', :media => "all", :concat => 'web' %>
+  <%= spreadsheet_link_tag Rack::Less.combinations('web'), :media => "all" %>
 	<% unless @noscript %>
-	  <%= sprockets_include_tag 'app.js' %>
+	  <%= javascript_include_tag 'app.js' %>
   <% end %>
 </head>
 <body class="body">

data/lib/sinatra_helpers/generator/template.rb

@@ -9,9 +9,7 @@ module SinatraHelpers::Generator
     'gitignore.erb' => '.gitignore',
     
     :admin => {
-      'production.ru.erb' => 'production.ru',
-      :vhosts => {},
-      :logrotate => {}
+      'production.ru.erb' => 'production.ru'
     },
     
     :app => {

data/lib/sinatra_helpers/version.rb

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

data/lib/sinatra_helpers.rb

@@ -3,11 +3,6 @@ require 'sinatra_helpers/erb'
 
 module SinatraHelpers
 
-  HTTP_STATUS = {
-    :not_found => 404,
-    :ok => 200
-  }
-
   class << self
     
     def page_cache?(app)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kelredd-sinatra-helpers
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 -06:00
+date: 2010-02-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,46 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.2.6
     version: 
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.10.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: webrat
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
+    version: 
 description: 
 email: kelly@kelredd.com
 executables: 
@@ -64,12 +104,6 @@ files:
 - lib/sinatra_helpers/generator/file_templates/test_helper.rb.erb
 - lib/sinatra_helpers/generator/template.rb
 - lib/sinatra_helpers/generator.rb
-- lib/sinatra_helpers/less/config.rb
-- lib/sinatra_helpers/less/erb.rb
-- lib/sinatra_helpers/less.rb
-- lib/sinatra_helpers/sprockets/config.rb
-- lib/sinatra_helpers/sprockets/erb.rb
-- lib/sinatra_helpers/sprockets.rb
 - lib/sinatra_helpers/version.rb
 - lib/sinatra_helpers.rb
 has_rdoc: true

data/lib/sinatra_helpers/less/config.rb

@@ -1,22 +0,0 @@
-module SinatraHelpers; end
-module SinatraHelpers::Less
-
-  class Config
-    ATTRIBUTES = [:hosted_root, :src_root, :concat, :compress]
-    DEFAULTS = {
-      :hosted_root => '/stylesheets',
-      :src_root => 'app/stylesheets',
-      :concat => {},
-      :compress => false
-    }
-
-    attr_accessor *ATTRIBUTES
-    
-    def initialize(args={})
-      ATTRIBUTES.each do |a|
-        instance_variable_set("@#{a}", args[a] || DEFAULTS[a])
-      end
-    end
-  end
-  
-end

data/lib/sinatra_helpers/less/erb.rb

@@ -1,32 +0,0 @@
-require "sinatra_helpers/erb"
-require 'useful/ruby_extensions/object' unless ::Object.new.respond_to?('blank?')
-
-module SinatraHelpers; end
-module SinatraHelpers::Less
-
-  module Erb
-    
-    def less_link_tag(*args)
-      the_args = args.flatten
-      srcs, options = if the_args.last && the_args.last.kind_of?(::Hash)
-        [the_args[0..-2], the_args.last]
-      else
-        [the_args, {}]
-      end
-      
-      options[:environment] ||= SinatraHelpers::Less.app.environment.to_s
-      
-      concat = options.delete(:concat)
-      if concat && !(concat.to_s).blank?
-        SinatraHelpers::Less.config do |config|
-          config.concat[concat.to_s] = srcs
-        end
-        srcs = concat.to_s if SinatraHelpers.page_cache?(SinatraHelpers::Less.app) 
-      end
-        
-      stylesheet_link_tag srcs, options
-    end
-
-  end
-
-end

data/lib/sinatra_helpers/less.rb

@@ -1,91 +0,0 @@
-begin
-  require 'less'
-rescue LoadError => err
-  err.message << "\n**** Install less (gem install less) to use the sinatra less helpers ****\n"
-  raise err
-end
-
-require 'sinatra_helpers/less/config'
-
-module SinatraHelpers; end
-module SinatraHelpers::Less
-  
-  CONTENT_TYPE = "text/css"
-  
-  class << self
-    attr_reader :app
-    
-    def config
-      if instance_variable_get("@config").nil?
-        instance_variable_set("@config", SinatraHelpers::Less::Config.new)
-      end
-      yield instance_variable_get("@config") if block_given?
-      instance_variable_get("@config")
-    end
-    
-    def [](config_attribute)
-      config.send(config_attribute)
-    end
-  
-    def registered(app)
-      instance_variable_set("@app", app)
-
-      app.get "/less-sinatra-helper-test" do
-        if SinatraHelpers::Less.config
-          "The LESS sinatra helper is configured and ready :)"
-        else
-          "The LESS sinatra helper is NOT configured and ready :("
-        end
-      end
-
-      app.get "#{SinatraHelpers::Less[:hosted_root]}/*.css" do
-        file_name = params['splat'].first.to_s
-        less_path = File.join([
-          app.root, SinatraHelpers::Less[:src_root], "#{file_name}.less"
-        ])
-        css_path = File.join([
-          app.root, SinatraHelpers::Less[:src_root], "#{file_name}.css"
-        ])
-
-        content_type CONTENT_TYPE
-
-        if File.exists?(less_path)
-          SinatraHelpers::Less.compile(file_name, [less_path])
-        elsif File.exists?(css_path)
-          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(file_name, less_paths)
-        else
-          halt SinatraHelpers::HTTP_STATUS[:not_found]
-        end
-      end    
-    end
-    
-    def compile(css_name, file_paths)
-      compiled_less = file_paths.collect do |file_path|
-        Less::Engine.new(File.new(file_path)).to_css
-      end.join("\n")
-      compiled_less.delete!("\n") if use_compression?
-      if SinatraHelpers.page_cache?(SinatraHelpers::Less.app)
-        pub_path = File.join(SinatraHelpers::Less.app.public, SinatraHelpers::Less[:hosted_root])
-        FileUtils.mkdir_p(pub_path)
-        hosted = File.join(pub_path, "#{css_name}.css")
-        File.open(hosted, "w") do |file|
-          file.write(compiled_less)
-        end
-      end
-      compiled_less
-    end
-    
-    def use_compression?
-      SinatraHelpers::Less[:compress]
-    end
-
-  end
-  
-end

data/lib/sinatra_helpers/sprockets/config.rb

@@ -1,22 +0,0 @@
-module SinatraHelpers; end
-module SinatraHelpers::Sprockets
-
-  class Config
-    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
-    }
-
-    attr_accessor *ATTRIBUTES
-    
-    def initialize(args={})
-      ATTRIBUTES.each do |a|
-        instance_variable_set("@#{a}", args[a] || DEFAULTS[a])
-      end
-    end
-  end
-
-end

data/lib/sinatra_helpers/sprockets/erb.rb

@@ -1,24 +0,0 @@
-require "sinatra_helpers/erb"
-require 'useful/ruby_extensions/object' unless ::Object.new.respond_to?('blank?')
-
-module SinatraHelpers; end
-module SinatraHelpers::Sprockets
-
-  module Erb
-    
-    def sprockets_include_tag(*args)
-      the_args = args.flatten
-      srcs, options = if the_args.last && the_args.last.kind_of?(::Hash)
-        [the_args[0..-2], the_args.last]
-      else
-        [the_args, {}]
-      end
-      
-      options[:environment] ||= SinatraHelpers::Sprockets.app.environment.to_s
-      
-      javascript_include_tag srcs, options
-    end
-
-  end
-
-end

data/lib/sinatra_helpers/sprockets.rb

@@ -1,88 +0,0 @@
-begin
-  require 'sprockets'
-rescue LoadError => err
-  err.message << "\n**** Install sprockets (gem install sprockets) to use the sinatra sprockets helpers ****\n"
-  raise err
-end
-
-require 'sinatra_helpers/sprockets/config'
-
-module SinatraHelpers; end
-module SinatraHelpers::Sprockets
-  
-  CONTENT_TYPE = "text/javascript; charset=utf-8"
-
-  class << self
-    attr_reader :app
-    
-    def config
-      if instance_variable_get("@config").nil?
-        instance_variable_set("@config", SinatraHelpers::Sprockets::Config.new)
-      end
-      yield instance_variable_get("@config") if block_given?
-      instance_variable_get("@config")
-    end
-    
-    def secretary
-      if instance_variable_get("@secretary").nil?
-        instance_variable_set("@secretary", {
-          :root => app.root,
-          :load_path => config.load_path,
-          :expand_paths => config.expand_paths
-        })
-      end
-      yield instance_variable_get("@secretary") if block_given?
-      instance_variable_get("@secretary")      
-    end
-    
-    def [](config_attribute)
-      config.send(config_attribute)
-    end
-  
-    def registered(app)
-      instance_variable_set("@app", app)
-
-      app.get "/sprockets-sinatra-helper-test" do
-        if SinatraHelpers::Sprockets.config
-          "The sprockets sinatra helper is configured and ready :)"
-        else
-          "The sprockets sinatra helper is NOT configured and ready :("
-        end
-      end
-      
-      app.get "#{SinatraHelpers::Sprockets[:hosted_root]}/*.js" do
-        src_name = params['splat'].first.to_s
-        src_file_path = File.join([
-          SinatraHelpers::Sprockets[:src_root], "#{src_name}.js"
-        ])
-        src_path = File.join(app.root, src_file_path)
-
-        content_type CONTENT_TYPE
-
-        if File.exists?(src_path)
-          SinatraHelpers::Sprockets.compile(src_file_path)
-        else
-          halt SinatraHelpers::HTTP_STATUS[:not_found]
-        end
-      end    
-    end
-    
-    def compile(src_file_name)
-      secretary_params = SinatraHelpers::Sprockets.secretary do |params|
-        params[:source_files] = [src_file_name]
-      end
-      compiled_src = Sprockets::Secretary.new(secretary_params).concatenation.to_s
-      if SinatraHelpers.page_cache?(SinatraHelpers::Sprockets.app)
-        pub_path = File.join(SinatraHelpers::Sprockets.app.public, SinatraHelpers::Sprockets[:hosted_root])
-        FileUtils.mkdir_p(pub_path)
-        hosted = File.join(pub_path, File.basename(src_file_name))
-        File.open(hosted, "w") do |file|
-          file.write(compiled_src)
-        end
-      end
-      compiled_src
-    end
-    
-  end
-
-end