nice-n-easy 1.0.0 → 1.1.0

data/.gitignore

@@ -20,3 +20,5 @@ docs
 pkg
 
 ## PROJECT::SPECIFIC
+
+.rvmrc

data/README.md

@@ -15,12 +15,16 @@ ActiveSupport's "blank" functionality is included here, and I copy "`extract_opt
 "`symbolize_keys`" from there too but I add nothing else. Although if you include
 ActiveSupport yourself the `label` helper will take advantage of the `titleize` method.
 
+Another influence on my design was ease of compatibility with [mustache](http://github.com/defunkt/mustache).
+This meant that methods like `form_for` that take a block should be avoided,
+as these would be harder to implement in a mustache (although not impossible).
+
 
 ## Install & Usage
 
 Install:
 
-    sudo gem install nice-n-easy
+    sudo gem install nice-n-easy --source http://gemcutter.org
 
 Add this to your Sinatra app:
 
@@ -30,7 +34,7 @@ Add this to your Sinatra app:
       helpers Sinatra::NiceEasyHelpers
     end
 
-See the RDocs for how to use the individual helpers
+See the [RDocs](http://brianjlandau.github.com/nice-n-easy/) for how to use the individual helpers
 
 
 ## Note on Patches/Pull Requests
@@ -39,7 +43,7 @@ See the RDocs for how to use the individual helpers
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
+* Commit, do not mess with rake file, version, or history.
   (if you want to have your own version, that is fine but
    bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.

data/Rakefile

@@ -10,8 +10,8 @@ begin
     gem.email = "brian.landau@viget.com"
     gem.homepage = "http://github.com/brianjlandau/nice-n-easy"
     gem.authors = ["Brian Landau"]
-    gem.add_dependency('sinatra', '~> 0.9')
-    gem.add_dependency('activesupport', '~> 2.3')
+    gem.add_dependency('sinatra')
+    gem.add_dependency('activesupport', '~> 3.0')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -22,5 +22,4 @@ end
 require 'tasks/test'
 require 'tasks/rdoc'
 
-task :test => :check_dependencies
 task :default => :test

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/deps.rip

@@ -0,0 +1 @@
+git://github.com/sinatra/sinatra.git e0ee682 # 0.9.4

data/lib/sinatra/nice_easy_helpers.rb

@@ -1,6 +1,6 @@
 require 'sinatra/base'
 unless Object.method_defined?(:blank?)
-  require 'active_support/core_ext/blank'
+  require 'active_support/core_ext/object/blank'
 end
 
 module Sinatra #:nodoc:
@@ -11,6 +11,32 @@ module Sinatra #:nodoc:
     HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
     # :startdoc:
     
+    @@asset_sub_directories ||= {
+      :images => 'images',
+      :javascript => 'javascripts',
+      :stylesheets => 'stylesheets'
+    }
+    def self.asset_sub_directories
+      @@asset_sub_directories
+    end
+    def self.asset_sub_directories=(options)
+      @@asset_sub_directories = options
+    end
+    def asset_sub_directories
+      @@asset_sub_directories
+    end
+    
+    @@asset_directory = nil
+    def self.asset_directory
+      @@asset_directory
+    end
+    def self.asset_directory=(path)
+      @@asset_directory = path
+    end
+    def asset_directory
+      @@asset_directory
+    end
+    
     # Creates a link to a given URL with the given text as the link.
     #   link "Check this out", '/path/to/something' # =>
     #     <a href="/path/to/something">Check this out</a>
@@ -31,7 +57,7 @@ module Sinatra #:nodoc:
     #     <img src="http://www.example.com/close.jpg" />
     #
     def image_tag(src, options = {})
-      single_tag :img, options.merge(:src => compute_public_path(src, 'images'))
+      single_tag :img, options.merge(:src => compute_public_path(src, asset_sub_directories[:images]))
     end
     
     # Creates a script tag for each source provided. If you just supply a relative filename
@@ -53,7 +79,7 @@ module Sinatra #:nodoc:
     #
     def javascript_include_tag(*sources)
       sources.inject([]) { |tags, source|
-        tags << tag(:script, '', {:src => compute_public_path(source, 'javascripts', 'js'), :type => 'text/javascript'})
+        tags << tag(:script, '', {:src => compute_public_path(source, asset_sub_directories[:javascript], 'js'), :type => 'text/javascript'})
         tags
       }.join("\n")
     end
@@ -76,7 +102,7 @@ module Sinatra #:nodoc:
     def stylesheet_link_tag(*sources)
       options = sources.extract_options!.symbolize_keys
       sources.inject([]) { |tags, source|
-        tags << single_tag(:link, {:href => compute_public_path(source, 'stylesheets', 'css'),
+        tags << single_tag(:link, {:href => compute_public_path(source, asset_sub_directories[:stylesheets], 'css'),
                                    :type => 'text/css', :rel => 'stylesheet', :media => 'screen'}.merge(options))
         tags
       }.join("\n")
@@ -239,7 +265,7 @@ module Sinatra #:nodoc:
     #   image_input "buttons/save_close.png", :alt => 'Save and close'
     #     <input type="image" src="buttons/save_close.png" alt="Save and close" />
     def image_input(src, options = {})
-      single_tag :input, options.merge(:type => 'image', :src => compute_public_path(src, 'images'))
+      single_tag :input, options.merge(:type => 'image', :src => compute_public_path(src, asset_sub_directories[:images]))
     end
     
     # Creates as submit input field with the text and options provided.
@@ -537,10 +563,36 @@ module Sinatra #:nodoc:
       unless source =~ %r{^[-a-z]+://}
         source = "/#{dir}/#{source}" unless source[0] == ?/
       end
+      
+      source = add_asset_id(source)
 
       return source
     end
     
+    @@asset_timestamps_cache = {}
+    @@asset_timestamps_cache_guard = Mutex.new
+    
+    def add_asset_id(source)
+      if asset_directory.present?
+        if @@cache_asset_timestamps && (asset_id = @@asset_timestamps_cache[source])
+          asset_id
+        else
+          path = File.join(asset_directory, source)
+          asset_id = File.exist?(path) ? File.mtime(path).to_i.to_s : ''
+
+          if @@cache_asset_timestamps
+            @@asset_timestamps_cache_guard.synchronize do
+              @@asset_timestamps_cache[source] = asset_id
+            end
+          end
+        end
+        if asset_id.present?
+          source += "?#{asset_id}"
+        end
+      end
+      source
+    end
+    
   end
 end
 

data/nice-n-easy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nice-n-easy}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Landau"]
-  s.date = %q{2009-10-28}
+  s.date = %q{2011-06-06}
   s.description = %q{A set of Sinatra HTML view helpers to make your life nicer and easier. Helpers for forms, links, and assets.}
   s.email = %q{brian.landau@viget.com}
   s.extra_rdoc_files = [
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "VERSION",
+     "deps.rip",
      "lib/sinatra/nice_easy_helpers.rb",
      "nice-n-easy.gemspec",
      "tasks/rdoc.rb",
@@ -36,7 +37,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/brianjlandau/nice-n-easy}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Sinatra HTML helpers that are nice-n-easy to use.}
   s.test_files = [
     "test/nice_easy_helpers_test.rb",
@@ -48,16 +49,16 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sinatra>, ["~> 0.9"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 2.3"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
     else
-      s.add_dependency(%q<sinatra>, ["~> 0.9"])
-      s.add_dependency(%q<activesupport>, ["~> 2.3"])
+      s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0"])
     end
   else
-    s.add_dependency(%q<sinatra>, ["~> 0.9"])
-    s.add_dependency(%q<activesupport>, ["~> 2.3"])
+    s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0"])
   end
 end
 

data/test/tag_matcher.rb

@@ -1,10 +1,15 @@
 require 'active_support'
 require 'rexml/document'
+require 'active_support'
+require 'active_support/hash_with_indifferent_access'
+require 'active_support/core_ext'
 require 'action_controller/vendor/html-scanner'
-require 'action_controller/assertions/selector_assertions'
+require 'action_controller/vendor/html-scanner/html/node'
+require 'action_controller/vendor/html-scanner/html/document'
+require 'action_dispatch/testing/assertions/selector'
 
 module TagMatchingAssertions
-  include ActionController::Assertions::SelectorAssertions
+  include ActionDispatch::Assertions::SelectorAssertions
   
   def assert_tag_in(*opts)
     target = opts.shift

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nice-n-easy
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Brian Landau
@@ -9,29 +15,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -04:00
+date: 2011-06-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.9"
-    version: 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.3"
-    version: 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id002
 description: A set of Sinatra HTML view helpers to make your life nicer and easier. Helpers for forms, links, and assets.
 email: brian.landau@viget.com
 executables: []
@@ -48,6 +63,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- deps.rip
 - lib/sinatra/nice_easy_helpers.rb
 - nice-n-easy.gemspec
 - tasks/rdoc.rb
@@ -67,21 +83,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Sinatra HTML helpers that are nice-n-easy to use.