sinatra_more 0.0.10 → 0.0.11

data/TODO

@@ -1,5 +1,6 @@
 = UNFINISHED
 
+* fix content_block_tag to eliminate need for concat option
 * image_tag should start in images_path (or /images)
 * I have got to add tests, basically create dummy sinatra applications and use Webrat
 * Become total warden solution (basically just require warden gem installed, do everything else)

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/sinatra_more/markup_plugin.rb

@@ -1,4 +1,6 @@
-Dir.glob(File.dirname(__FILE__) + '/markup_plugin/**/*.rb').each  { |f| require f }
+require File.dirname(__FILE__) + '/markup_plugin/form_builder/abstract_form_builder'
+require File.dirname(__FILE__) + '/markup_plugin/form_builder/standard_form_builder'
+Dir[File.dirname(__FILE__) + '/markup_plugin/*.rb'].each {|file| load file }
 
 module SinatraMore
   module MarkupPlugin

data/lib/sinatra_more/render_plugin/render_helpers.rb

@@ -46,7 +46,7 @@ module SinatraMore
       # resolve_template_engine('users/new') => :haml
       def resolve_template_engine(template_path)
         resolved_template_path = File.join(self.options.views, template_path + ".*")
-        template_file = Dir.glob(resolved_template_path).first
+        template_file = Dir[resolved_template_path].first
         raise "Template path '#{template_path}' could not be located in views!" unless template_file
         template_engine = File.extname(template_file)[1..-1].to_sym
       end

data/lib/sinatra_more/render_plugin.rb

@@ -1,4 +1,4 @@
-Dir.glob(File.dirname(__FILE__) + '/render_plugin/**/*.rb').each  { |f| require f }
+Dir[File.dirname(__FILE__) + '/render_plugin/**/*.rb'].each {|file| load file }
 
 module SinatraMore
   module RenderPlugin

data/lib/sinatra_more/warden_plugin.rb

@@ -1,4 +1,4 @@
-Dir.glob(File.dirname(__FILE__) + '/warden_plugin/**/*.rb').each  { |f| require f }
+Dir[File.dirname(__FILE__) + '/warden_plugin/**/*.rb'].each {|file| load file }
 
 module SinatraMore
   module WardenPlugin

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Nathan Esquenazi