sinatra_more 0.1.0 → 0.1.1

data/README.rdoc

@@ -142,7 +142,7 @@ A form_tag might look like:
     - field_set_tag(:class => 'buttons') do
       = submit_tag "Login"
     
-==== FormBuilders ====
+==== FormBuilders
 
 * form_for(object, url, settings={}, &block)
   * Constructs a form using given or default form_builder
@@ -266,7 +266,8 @@ provided to make interacting with warden dead simple.
 
 == Acknowledgements
 
-Thanks to keldredd for the sinatra-helpers code that helped me to create erb capture and concat methods!
+Thanks to keldredd for the sinatra_helpers code that helped me to create erb capture and concat methods.
+Thanks to sbfaulkner for the sinatra-helpers code that I looked over while building a few helper methods.
 
 == Contributers
 

data/TODO

@@ -4,11 +4,23 @@
   * Make warden password strategy support a callback which explains what to do with username, password
   * WardenPlugin.authenticate_callback { |username, password| User.authenticate(username, password) }
 * Remove dependency on activesupport! and enumerate dependencies in rakefile
+* Look into creating sinatra generators using rubigen (http://github.com/drnic/rubigen)
+  * http://github.com/quirkey/sinatra-gen
+* Look into adding any missing helpers from:
+  * http://github.com/sbfaulkner/sinatra-helpers/tree/master/lib/sinatra-helpers/haml/
+  * http://github.com/sbfaulkner/sinatra-helpers/blob/master/lib/sinatra-helpers/html/escape.rb
+  * http://github.com/sbfaulkner/sinatra-helpers/blob/master/lib/sinatra-helpers/haml/links.rb
+  * http://github.com/kelredd/sinatra-helpers/tree/master/lib/sinatra_helpers/mailer/
+  * http://github.com/kelredd/sinatra-helpers/blob/master/lib/sinatra_helpers/erb/links.rb
+  * http://github.com/kelredd/sinatra-helpers/blob/master/lib/sinatra_helpers/erb/forms.rb
 
 = COMPLETED
 
 * Pull from sinatra-helpers and make erb templates work (and credit keldredd)
-  - http://github.com/kelredd/sinatra-helpers/tree/master/lib/sinatra_helpers/erb/
+  * http://github.com/kelredd/sinatra-helpers/tree/master/lib/sinatra_helpers/erb/
 * 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
+* I have got to add tests, basically create dummy sinatra applications and use Webrat
+* Partials with counter (and add to tests)
+  * http://github.com/sbfaulkner/sinatra-helpers/blob/master/lib/sinatra-helpers/haml/partials.rb
+  * http://github.com/kelredd/sinatra-helpers/blob/master/lib/sinatra_helpers/erb/partials.rb

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/sinatra_more/render_plugin/render_helpers.rb

@@ -23,21 +23,24 @@ module SinatraMore
     # Partials implementation which includes collections support
     # partial 'photo/_item', :object => @photo
     # partial 'photo/_item', :collection => @photos
-    def partial(template, *args)
-      options = args.extract_options!
+    def partial(template, options={})
       options.merge!(:layout => false)
       path = template.to_s.split(File::SEPARATOR)
       object_name = path[-1].to_sym
       path[-1] = "_#{path[-1]}"
       template_path = File.join(path)
+      raise 'Partial collection specified but is nil' if options.has_key?(:collection) && options[:collection].nil?
       if collection = options.delete(:collection)
+        counter = 0
         collection.inject([]) do |buffer, member|
-          collection_options = options.merge(:layout => false, :locals => { object_name => member })
-          buffer << render_template(template_path, collection_options)
+          counter += 1
+          current_options = options.merge(:locals => { object_name => member, "#{object_name}_counter".to_sym => counter })
+          buffer << render_template(template_path, current_options)
         end.join("\n")
-      elsif object_record = options.delete(:object)
-        render_template(template_path, options.merge(:locals => { object_name => object_record }))
       else
+        if member = options.delete(:object)
+          options.merge!(:locals => {object_name => member})
+        end
         render_template(template_path, options)
       end
     end
@@ -48,7 +51,7 @@ module SinatraMore
       # Returns the template engine (i.e haml) to use for a given template_path
       # resolve_template_engine('users/new') => :haml
       def resolve_template_engine(template_path)
-        resolved_template_path = File.join(self.options.views, template_path + ".*")
+        resolved_template_path = File.join(self.options.views, template_path.to_s + ".*")
         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

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
@@ -60,7 +60,6 @@ Gem::Specification.new do |s|
      "test/markup_plugin/test_format_helpers.rb",
      "test/markup_plugin/test_output_helpers.rb",
      "test/markup_plugin/test_tag_helpers.rb",
-     "test/test_markup_plugin.rb",
      "test/test_render_plugin.rb",
      "test/test_warden_plugin.rb"
   ]
@@ -80,7 +79,6 @@ Gem::Specification.new do |s|
      "test/markup_plugin/test_format_helpers.rb",
      "test/markup_plugin/test_output_helpers.rb",
      "test/markup_plugin/test_tag_helpers.rb",
-     "test/test_markup_plugin.rb",
      "test/test_render_plugin.rb",
      "test/test_warden_plugin.rb"
   ]

data/test/fixtures/render_app/views/template/_user.haml

@@ -1 +1,4 @@
-%h1 User name is #{user.name}
+%h1 User name is #{user.name}
+
+- if defined?(user_counter)
+  %p My counter is #{user_counter} 

data/test/helper.rb

@@ -10,6 +10,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'sinatra_more'
 
 class Test::Unit::TestCase
+  include SinatraMore::OutputHelpers
+  include SinatraMore::TagHelpers
   include Rack::Test::Methods
   include Webrat::Methods
   include Webrat::Matchers

data/test/markup_plugin/test_asset_tag_helpers.rb

@@ -1,12 +1,17 @@
-require 'test_markup_plugin' unless defined?(TestMarkupPlugin)
+require 'helper'
+require 'fixtures/markup_app/app'
 
-class TestAssetTagHelpers < TestMarkupPlugin
+class TestAssetTagHelpers < Test::Unit::TestCase
   include SinatraMore::AssetTagHelpers
-  
+
+  def app
+    MarkupDemo.tap { |app| app.set :environment, :test }
+  end
+
   def flash
-    { :notice => "Demo notice" }    
+    { :notice => "Demo notice" }
   end
-  
+
   context 'for #flash_tag method' do
     should "display flash with no given attributes" do
       assert_equal '<div class="flash">Demo notice</div>', flash_tag(:notice)
@@ -16,7 +21,7 @@ class TestAssetTagHelpers < TestMarkupPlugin
       assert_equal flash_expected, flash_tag(:notice, :class => 'notice', :id => 'notice-area')
     end
   end
-  
+
   context 'for #link_to method' do
     should "display link element with no given attributes" do
       assert_equal '<a href="/register">Sign up</a>', link_to('Sign up', '/register')
@@ -44,7 +49,7 @@ class TestAssetTagHelpers < TestMarkupPlugin
       # assert_have_selector :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
     end
   end
-  
+
   context 'for #image_tag method' do
     should "display image tag absolute link with no options" do
       assert_equal '<img src="/absolute/pic.gif" />', image_tag('/absolute/pic.gif')
@@ -56,7 +61,7 @@ class TestAssetTagHelpers < TestMarkupPlugin
       assert_equal '<img class="photo" src="/images/relative/pic.gif" />', image_tag(' relative/ pic.gif  ', :class => 'photo')
     end
   end
-  
+
   context 'for #stylesheet_link_tag method' do
     should "display stylesheet link item" do
       time = stop_time_for_test
@@ -71,7 +76,7 @@ class TestAssetTagHelpers < TestMarkupPlugin
       assert_equal expected_style, stylesheet_link_tag('style', 'layout.css', 'http://google.com/style.css')
     end
   end
-  
+
   context 'for #javascript_include_tag method' do
     should "display javascript item" do
       time = stop_time_for_test
@@ -86,4 +91,4 @@ class TestAssetTagHelpers < TestMarkupPlugin
       assert_equal expected_include, javascript_include_tag('application', 'base.js', 'http://google.com/lib.js')
     end
   end
-end
+end

data/test/markup_plugin/test_form_builder.rb

@@ -1,5 +1,10 @@
-require 'test_markup_plugin' unless defined?(TestMarkupPlugin)
+require 'helper'
+require 'fixtures/markup_app/app'
+
+class TestFormBuilder < Test::Unit::TestCase
+  def app
+    MarkupDemo.tap { |app| app.set :environment, :test }
+  end
 
-class TestFormBuilder < TestMarkupPlugin
   # TODO Test the form builder methods
-end
+end

data/test/markup_plugin/test_form_helpers.rb

@@ -1,5 +1,10 @@
-require 'test_markup_plugin' unless defined?(TestMarkupPlugin)
+require 'helper'
+require 'fixtures/markup_app/app'
 
-class TestFormHelpers < TestMarkupPlugin
- # Test the form helper methods
-end
+class TestFormHelpers < Test::Unit::TestCase
+  def app
+    MarkupDemo.tap { |app| app.set :environment, :test }
+  end
+
+  # Test the form helper methods
+end

data/test/markup_plugin/test_format_helpers.rb

@@ -1,8 +1,13 @@
-require 'test_markup_plugin' unless defined?(TestMarkupPlugin)
+require 'helper'
+require 'fixtures/markup_app/app'
+
+class TestFormatHelpers < Test::Unit::TestCase
+  def app
+    MarkupDemo.tap { |app| app.set :environment, :test }
+  end
 
-class TestFormatHelpers < TestMarkupPlugin
   include SinatraMore::FormatHelpers
-  
+
   context 'for #relative_time_ago method' do
     should "display today" do
       assert_equal 'today', relative_time_ago(Time.now)
@@ -26,7 +31,7 @@ class TestFormatHelpers < TestMarkupPlugin
       assert_equal 500.days.ago.strftime('%A, %B %e, %Y'), relative_time_ago(500.days.ago)
     end
   end
-  
+
   context 'for #escape_javascript method' do
     should "escape double quotes" do
       assert_equal "\"hello\"", escape_javascript('"hello"')
@@ -38,4 +43,4 @@ class TestFormatHelpers < TestMarkupPlugin
       assert_equal "\"\\n<p>hello<\\/p>\\n\"", escape_javascript("\n\r<p>hello</p>\r\n")
     end
   end
-end
+end

data/test/markup_plugin/test_output_helpers.rb

@@ -1,32 +1,37 @@
-require 'test_markup_plugin' unless defined?(TestMarkupPlugin)
+require 'helper'
+require 'fixtures/markup_app/app'
+
+class TestOutputHelpers < Test::Unit::TestCase
+  def app
+    MarkupDemo.tap { |app| app.set :environment, :test }
+  end
 
-class TestOutputHelpers < TestMarkupPlugin
   context 'for #capture_html method' do
     should "work for erb templates" do
       visit '/erb/capture_concat'
       assert_have_selector 'p span', :content => "Captured Line 1"
       assert_have_selector 'p span', :content => "Captured Line 2"
     end
-    
+
     should "work for haml templates" do
       visit '/haml/capture_concat'
       assert_have_selector 'p span', :content => "Captured Line 1"
       assert_have_selector 'p span', :content => "Captured Line 2"
     end
   end
-  
+
   context 'for #concat_content method' do
     should "work for erb templates" do
       visit '/erb/capture_concat'
       assert_have_selector 'p', :content => "Concat Line 3", :count => 1
     end
-    
+
     should "work for haml templates" do
       visit '/haml/capture_concat'
       assert_have_selector 'p', :content => "Concat Line 3", :count => 1
-    end    
+    end
   end
-  
+
   context 'for #block_is_template?' do
     should "work for erb templates" do
       visit '/erb/capture_concat'
@@ -34,11 +39,11 @@ class TestOutputHelpers < TestMarkupPlugin
       # assert_have_selector 'p', :content => "The erb block passed in is a template", :class => 'is_template'
       assert_have_no_selector 'p', :content => "The ruby block passed in is a template", :class => 'is_template'
     end
-    
+
     should "work for haml templates" do
       visit '/haml/capture_concat'
       assert_have_selector 'p', :content => "The haml block passed in is a template", :class => 'is_template'
       assert_have_no_selector 'p', :content => "The ruby block passed in is a template", :class => 'is_template'
-    end    
+    end
   end
-end
+end

data/test/markup_plugin/test_tag_helpers.rb

@@ -1,9 +1,14 @@
-require 'test_markup_plugin' unless defined?(TestMarkupPlugin)
+require 'helper'
+require 'fixtures/markup_app/app'
+
+class TestTagHelpers < Test::Unit::TestCase
+  def app
+    MarkupDemo.tap { |app| app.set :environment, :test }
+  end
 
-class TestTagHelpers < TestMarkupPlugin  
   context 'for #tag method' do
     should("support tags with no content no attributes") do
-       assert_equal '<br />', tag(:br) 
+      assert_equal '<br />', tag(:br)
     end
     should("support tags with no content with attributes") do
       assert_equal '<br class="yellow" style="clear:both" />', tag(:br, :style => 'clear:both', :class => 'yellow')
@@ -15,7 +20,7 @@ class TestTagHelpers < TestMarkupPlugin
       assert_equal '<p class="large" id="intro">Demo</p>', tag(:p, :content => "Demo", :class => 'large', :id => 'intro')
     end
   end
-  
+
   context 'for #content_tag method' do
     should "support tags with content as parameter" do
       assert_equal '<p class="large" id="intro">Demo</p>', content_tag(:p, "Demo", :class => 'large', :id => 'intro')
@@ -28,7 +33,7 @@ class TestTagHelpers < TestMarkupPlugin
       assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1'
       assert_have_selector :p, :content => "Test 2"
       # TODO get these to work in erb
-      # assert_have_selector :p, :content => "Test 3" 
+      # assert_have_selector :p, :content => "Test 3"
       # assert_have_selector :p, :content => "Test 4"
     end
     should "support tags with haml" do
@@ -39,7 +44,7 @@ class TestTagHelpers < TestMarkupPlugin
       assert_have_selector :p, :content => "Test 4"
     end
   end
-  
+
   context 'for #input_tag method' do
     should "support field with type" do
       assert_equal '<input type="text" />', input_tag(:text)
@@ -48,5 +53,5 @@ class TestTagHelpers < TestMarkupPlugin
       assert_equal '<input class="first" id="texter" type="text" />', input_tag(:text, :class => "first", :id => 'texter')
     end
   end
-  
-end
+
+end

data/test/test_render_plugin.rb

@@ -39,6 +39,9 @@ class TestRenderPlugin < Test::Unit::TestCase
     should "render partial html with object" do
       assert_have_selector "h1", :content => "User name is John"
     end
+    should "have no counter index for single item" do
+      assert_have_no_selector "p", :content => "My counter is 1", :count => 1
+    end
   end
   
   context 'for #partial method and collection' do
@@ -47,6 +50,10 @@ class TestRenderPlugin < Test::Unit::TestCase
       assert_have_selector "h1", :content => "User name is John"
       assert_have_selector "h1", :content => "User name is Billy"
     end
+    should "include counter which contains item index" do
+      assert_have_selector "p", :content => "My counter is 1"
+      assert_have_selector "p", :content => "My counter is 2"
+    end
   end
   
   context 'for #partial method and locals' do
@@ -54,6 +61,9 @@ class TestRenderPlugin < Test::Unit::TestCase
     should "render partial html with locals" do
       assert_have_selector "h1", :content => "User name is John"
     end
+    should "have no counter index for single item" do
+      assert_have_no_selector "p", :content => "My counter is 1", :count => 1
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -75,7 +75,6 @@ files:
 - test/markup_plugin/test_format_helpers.rb
 - test/markup_plugin/test_output_helpers.rb
 - test/markup_plugin/test_tag_helpers.rb
-- test/test_markup_plugin.rb
 - test/test_render_plugin.rb
 - test/test_warden_plugin.rb
 has_rdoc: true
@@ -117,6 +116,5 @@ test_files:
 - test/markup_plugin/test_format_helpers.rb
 - test/markup_plugin/test_output_helpers.rb
 - test/markup_plugin/test_tag_helpers.rb
-- test/test_markup_plugin.rb
 - test/test_render_plugin.rb
 - test/test_warden_plugin.rb

data/test/test_markup_plugin.rb

@@ -1,15 +0,0 @@
-require 'helper'
-require 'fixtures/markup_app/app'
-
-class TestMarkupPlugin < Test::Unit::TestCase
-  include SinatraMore::OutputHelpers
-  include SinatraMore::TagHelpers
-  
-  def app
-    MarkupDemo.tap { |app| app.set :environment, :test }
-  end
-  
-  should "work properly by adding tag methods" do
-    assert self.respond_to?(:tag)
-  end
-end