sinatra-helpers 0.1.1 → 0.2.0

data/.gitignore

@@ -19,3 +19,6 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+/.yardoc
+/doc
+/.rvmrc

data/README.markdown

@@ -0,0 +1,58 @@
+Sinatra Helpers: a common collection of useful utilities
+--------------------------------------------------------
+
+Bare minimum, close to the metal helpers for your average sinatra application.
+Read the full documentation at [http://labs.sinefunc.com/sinatra-helpers/doc](http://labs.sinefunc.com/sinatra-helpers/doc).
+
+Defines...
+----------
+
+    # from a Sinatra context point of view...
+    set :default_year_loffset, -60 
+    set :default_year_uoffset, 0
+    set :default_month_names, Date::MONTHNAMES
+
+    set :default_currency_unit, '$'
+    set :default_currency_precision, 2
+    set :default_currency_separator, ','
+
+Examples
+--------
+    
+    # what are helpers for if you don't have `h` ^_^
+    =h "<Bar>"
+    
+    %select(name='country')
+      != country_choices
+
+    %select(name='birthday[month'])
+      != month_choices
+    
+    %select(name='birthday[day]')
+      != day_choices
+
+    %select(name='birthday[year'])
+      != year_choices
+    
+    %select(name="categories")
+      != select_options [['First', 1], ['Second', 2]]
+    
+    = currency(100)
+    -# displays $ 100.00
+
+    = percentage(100)
+    -# displays 100.00%
+
+    # If you have an ohm model which you want to present the errors of:
+    # (this is taken from the reddit-clone courtesy of citrusbyte)
+    
+    # This should be put in your HAML file
+
+    - errors_on @user do |e|
+      - e.on [:email, :not_present] "You must supply an email address"
+      - e.on [:password, :not_present] "A password is required"
+      - e.on [:password, :not_confirmed] "You must confirm your password"
+
+### Copyright
+
+Copyright (c) 2010 Cyril David. See LICENSE for details.

data/Rakefile

@@ -10,7 +10,13 @@ begin
     gem.email = "cyx.ucron@gmail.com"
     gem.homepage = "http://github.com/sinefunc/sinatra-helpers"
     gem.authors = ["Cyril David"]
+    gem.add_dependency "sinatra", ">= 1.0"
     gem.add_development_dependency "contest", ">= 0"
+    gem.add_development_dependency "mocha", ">= 0"
+    gem.add_development_dependency "rack-test", ">= 0"
+    gem.add_development_dependency "nokogiri", ">= 0"
+    gem.add_development_dependency "ohm", ">= 0"
+    gem.add_development_dependency "haml", ">= 0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/sinatra/helpers.rb

@@ -1,32 +1,163 @@
 require 'date'
+require 'sinatra/base'
 require 'sinatra/helpers/compat-1.8.6'
 
 module Sinatra
   module Helpers
+    VERSION = "0.2.0"
+
     autoload :HamlErrorPresenter, "sinatra/helpers/haml_error_presenter"
     autoload :Country,            "sinatra/helpers/country"
+    
+    # @private Sinatra extension writing style.
+    # @see http://www.sinatrarb.com/extensions.html#setting_options_and_other_extension_setup
+    def self.registered(app)
+      app.set :default_year_loffset, -60 
+      app.set :default_year_uoffset, 0
+      app.set :default_month_names, Date::MONTHNAMES
+
+      app.set :default_currency_unit, '$'
+      app.set :default_currency_precision, 2
+      app.set :default_currency_separator, ','
+    end
+  
+    # Returns an HTML sanitized string.
+    def h(str)
+      Rack::Utils.escape_html(str)
+    end
 
+    # Returns an array of pairs i.e.
+    #   
+    # - ["Afghanistan", "AF"]
+    # - ...
+    # - ["United States", "US"]
+    # - ...
+    # - ["Zimbabwe", "ZW"]
+    #
+    # @return [Array] the array of name, code pairs.
     def country_choices
       Country.to_select
     end
-
-    def month_choices
-      Date::MONTHNAMES.map.
-        with_index { |month, idx| ["%d - %s" % [idx, month], idx] }.
+  
+    # Returns an array of pairs i.e.
+    #
+    # - [1, 1]
+    # - [2, 2]
+    # - ...
+    # - [31, 31]
+    #
+    # @return [Array] the array of day, day pairs.
+    def day_choices
+      days = (1..31).to_a
+      days.zip(days)
+    end
+    
+    # Returns an array of pairs i.e.
+    # - ['January', 1]
+    # - ['February', 2]
+    # - ...
+    # - ['December', 12]
+    #
+    # You may pass in Date::ABBR_MONTHNAMES if you want the shortened month names.
+    #
+    # @param  [Array] month_names (defaults to Date::MONTHNAMES) an array with the
+    #                 first element being nil, element 1 being January, etc.
+    # @return [Array] the array of month name, month pairs.
+    def month_choices(month_names = settings.default_month_names)
+      month_names.map.
+        with_index { |month, idx| [month, idx] }.
         tap        { |arr| arr.shift }
     end
-
-    def year_choices(loffset = -20, uoffset = +20)
+    
+    # Returns an array of pairs i.e.
+    # - [2005, 2005]
+    # - [2006, 2006]
+    # - ...
+    # - [2010, 2010]
+    #
+    # @example
+    #   
+    #   year_choices # assuming it's now 2010
+    #   # => [[1950, 1950], ..., [2010, 2010]]
+    #
+    #   # we can pass in options
+    #   year_choices(0, 6) # like for credit card options
+    #   # => [[2010, 2010], ..., [2016, 2016]]
+    #  
+    #   # also we can override settings at the app level
+    #   set :default_year_loffset, 0
+    #   set :default_year_uoffset, 6
+    #   year_choices
+    #   # => [[2010, 2010], ..., [2016, 2016]]
+    #
+    # @param [Fixnum] loffset (defaults to -60) The lower offset relative to the current year.
+    #                 If it's 2010 now, passing in -5 here will start the year
+    #                 list at 2005 for example.
+    # @param [Fixnum] uoffset (defaults to 0) The upper offset relative to the 
+    #                 current year. If it's 2010 now, passing in 5 or +5 here 
+    #                 will end the year list at 2015 for example.
+    # @return [Array] the array of year, year pairs.
+    def year_choices(loffset = settings.default_year_loffset, uoffset = settings.default_year_uoffset)
       years = ((Date.today.year + loffset)..(Date.today.year + uoffset)).to_a
       years.zip(years)
     end
+  
+    # Accepts a list of pairs and produces option tags.
+    #
+    # @example
+    #
+    #   select_options([['One', 1], ['Two', 2]])
+    #   select_options([['One', 1], ['Two', 2]], 1)
+    #   select_options([['One', 1], ['Two', 2]], 1, '- Choose -')
+    #
+    #   # using it with the provided date helpers...
+    #   select_options year_choices, 2010 # select 2010 as default
+    #   select_options month_choices, 5 # select May as default
+    #   select_options day_choices, 25 # select the 25th as default
+    #
+    # @param [Array] pairs a collection of label, value tuples.
+    # @param [Object] current the current value of this select.
+    # @param [#to_s] prompt a default prompt to place at the beginning
+    #                of the list.
+    def select_options(pairs, current = nil, prompt = nil)
+      pairs.unshift([prompt, '']) if prompt
 
-    def select_options(pairs, current)
       pairs.map { |label, value|
         tag(:option, label, :value => value, :selected => (current == value))
       }.join("\n")
     end
-
+    
+    # Presents errors on your form. Takes the explicit approach and assumes
+    # that for every form you have, the copy for the errors are important,
+    # instead of producing canned responses.
+    #
+    # Allows you to do the following in your haml view:
+    # 
+    # @example
+    #   
+    #   - errors_on @user do |e|
+    #     - e.on [:email, :not_present], "We need your email address."
+    #     - e.on [:password, :not_present], "You must specify a password."
+    #
+    #   # produces the following:
+    #   # <div class="errors">
+    #   #   <ul>
+    #   #     <li>We need your email address</li>
+    #   #     <li>You must specify a password.</li>
+    #   #   </ul>
+    #   # </div>
+    #
+    # @param [#errors] object An object responding to #errors. This validation
+    #                  also checks for the presence of a #full_messages method
+    #                  in the errors object for compatibility with ActiveRecord
+    #                  style objects.
+    # @param [Hash] options a hash of HTML attributes to place on the
+    #               containing div.
+    # @option options [#to_s] :class (defaults to errors) The css class to put 
+    #                                in the div.
+    # @yield [Sinatra::Helpers::HamlErrorPresenter] an object responding to #on.
+    #
+    # @see Sinatra::Helpers::HamlErrorPresenter#on
     def errors_on(object, options = { :class => 'errors' }, &block)
       return if object.errors.empty?
 
@@ -44,15 +175,81 @@ module Sinatra
         end
       end
     end
- 
+  
+    # Formats a number into a currency display. Uses the following settings:
+    #
+    # - settings.default_currency_unit      (defaults to '$')
+    # - settings.default_currency_precision (defaults to 2)
+    # - settings.default_currenty_separator (defaults to ',')
+    #
+    # @example
+    #
+    #   currency(100) == "$ 100.00"
+    #   # => true
+    #
+    #   currency(100, :unit => "&pound;") == "&pound; 100.00"
+    #   # => true
+    #
+    #   currency(100, :precision => 0) == "$ 100"
+    #   => # true
+    #
+    #   # somewhere in your sinatra context after registering Sinatra::Helpers
+    #   set :default_currency_unit, '&pound;'
+    #   set :default_currency_precision, 3
+    #   set :default_currency_separator, ' '
+    #
+    #   currency(100) == "&pound; 100.000"
+    #   # => true
+    #
+    # @param [Numeric] number the number you wish to display as a currency.
+    # @param [Hash] opts the various options available.
+    # @option opts [#to_s] :unit (defaults to '$')
+    # @option opts [Fixnum] :precision (defaults to 2)
+    # @option opts [#to_s] :separator (defaults to ',')
+    # @return [String] the formatted string based on `number`.
+    # @return [nil] if given nil or an empty string.
+    def currency(number, opts = {})
+      return if number.to_s.empty?
+
+      unit      = opts[:unit]      || settings.default_currency_unit
+      precision = opts[:precision] || settings.default_currency_precision
+      separator = opts[:separator] || settings.default_currency_separator
+
+      ret = "%s %.#{ Integer(precision) }f" % [unit, number]
+      parts = ret.split('.')
+      parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{separator}")
+      parts.join('.')
+    end
+  
+    # Show the percentage representation of a numeric value.
+    #
+    # @example
+    #   percentage(100) == "100.00%"
+    #   percentage(100, 0) == "100%"
+    #
+    # @param [Numeric] number A numeric value
+    # @param [Fixnum]  precision (defaults to 2) Number of decimals to show.
+    # @return [String] the number displayed as a percentage
+    # @return [nil]    given a nil value or an empty string.
+    def percentage(number, precision = 2)
+      return if number.to_s.empty?
+
+      ret = "%02.#{ precision }f%" % number
+      ret.gsub(/\.0*%$/, '%')
+    end
+
   protected
     def tag(tag, content, atts = {})
-      tag_atts = atts.inject("") { |a, (k, v)| 
-        a << ('%s="%s"' % [k, v]) if v
+      tag_atts = atts.inject([]) { |a, (k, v)| 
+        a << (' %s="%s"' % [k, escape_attr(v)]) if v
         a
-      }
+      }.join('')
+
+      %(<#{ tag }#{ tag_atts }>#{h content}</#{ tag }>)
+    end
 
-      %(<#{ tag } #{ tag_atts }>#{ content }</#{ tag }>)
+    def escape_attr(str)
+      str.to_s.gsub("'", "&#39;").gsub('"', "&quot;")
     end
   end
 

data/lib/sinatra/helpers/compat-1.8.6.rb

@@ -1,8 +1,9 @@
 # Taken from ohm
 
 unless "".respond_to?(:lines)
+  # @private 1.8.6 compatibility only
   class String
-
+    # @private
     # This version of String#lines is almost fully compatible with that
     # of Ruby 1.9. If a zero-length record separator is supplied in Ruby
     # 1.9, the string is split into paragraphs delimited by multiple
@@ -17,11 +18,13 @@ unless "".respond_to?(:lines)
 end
 
 unless respond_to?(:tap)
+  # @private 1.8.6 compatibility only
   class Object
+    # @private no need to explain. Standard ruby 1.9 stuff.
+    # @see http://ruby-doc.org/ruby-1.9/classes/Object.html#M000239
     def tap
       yield(self)
       self
     end
   end
 end
-

data/lib/sinatra/helpers/country.rb

@@ -2,10 +2,11 @@
 
 module Sinatra
   module Helpers
-    class Country
-      LOOKUP = {
+    # A simple module containing all countries as of 2010.
+    module Country
+      @all = {
         :AF => "Afghanistan",
-        :AX => "Aland Islands",
+        :AX => "Åland Islands",
         :AL => "Albania",
         :DZ => "Algeria",
         :AS => "American Samoa",
@@ -30,22 +31,19 @@ module Sinatra
         :BJ => "Benin",
         :BM => "Bermuda",
         :BT => "Bhutan",
-        :BO => "Bolivia",
+        :BO => "Bolivia, Plurinational State of",
         :BA => "Bosnia and Herzegovina",
         :BW => "Botswana",
         :BV => "Bouvet Island",
         :BR => "Brazil",
-        :BQ => "British Antarctic Territory",
         :IO => "British Indian Ocean Territory",
-        :VG => "British Virgin Islands",
-        :BN => "Brunei",
+        :BN => "Brunei Darussalam",
         :BG => "Bulgaria",
         :BF => "Burkina Faso",
         :BI => "Burundi",
         :KH => "Cambodia",
         :CM => "Cameroon",
         :CA => "Canada",
-        :CT => "Canton and Enderbury Islands",
         :CV => "Cape Verde",
         :KY => "Cayman Islands",
         :CF => "Central African Republic",
@@ -53,13 +51,14 @@ module Sinatra
         :CL => "Chile",
         :CN => "China",
         :CX => "Christmas Island",
-        :CC => "Cocos Islands",
+        :CC => "Cocos (Keeling) Islands",
         :CO => "Colombia",
         :KM => "Comoros",
-        :CG => "Congo - Brazzaville",
-        :CD => "Congo - Kinshasa",
+        :CG => "Congo",
+        :CD => "Congo, the Democratic Republic of the",
         :CK => "Cook Islands",
         :CR => "Costa Rica",
+        :CI => "CÔte D'ivoire",
         :HR => "Croatia",
         :CU => "Cuba",
         :CY => "Cyprus",
@@ -68,9 +67,6 @@ module Sinatra
         :DJ => "Djibouti",
         :DM => "Dominica",
         :DO => "Dominican Republic",
-        :NQ => "Dronning Maud Land",
-        :DD => "East Germany",
-        :TL => "East Timor",
         :EC => "Ecuador",
         :EG => "Egypt",
         :SV => "El Salvador",
@@ -78,8 +74,7 @@ module Sinatra
         :ER => "Eritrea",
         :EE => "Estonia",
         :ET => "Ethiopia",
-        :QU => "European Union",
-        :FK => "Falkland Islands",
+        :FK => "Falkland Islands (Malvinas)",
         :FO => "Faroe Islands",
         :FJ => "Fiji",
         :FI => "Finland",
@@ -87,7 +82,6 @@ module Sinatra
         :GF => "French Guiana",
         :PF => "French Polynesia",
         :TF => "French Southern Territories",
-        :FQ => "French Southern and Antarctic Territories",
         :GA => "Gabon",
         :GM => "Gambia",
         :GE => "Georgia",
@@ -102,44 +96,45 @@ module Sinatra
         :GT => "Guatemala",
         :GG => "Guernsey",
         :GN => "Guinea",
-        :GW => "Guinea-Bissau",
+        :GW => "Guinea-bissau",
         :GY => "Guyana",
         :HT => "Haiti",
-        :HM => "Heard Island and McDonald Islands",
+        :HM => "Heard Island and Mcdonald Islands",
+        :VA => "Holy See (Vatican City State)",
         :HN => "Honduras",
         :HK => "Hong Kong",
         :HU => "Hungary",
         :IS => "Iceland",
         :IN => "India",
         :ID => "Indonesia",
-        :IR => "Iran",
+        :IR => "Iran, Islamic Republic of",
         :IQ => "Iraq",
         :IE => "Ireland",
         :IM => "Isle of Man",
         :IL => "Israel",
         :IT => "Italy",
-        :CI => "Ivory Coast",
         :JM => "Jamaica",
         :JP => "Japan",
         :JE => "Jersey",
-        :JT => "Johnston Island",
         :JO => "Jordan",
         :KZ => "Kazakhstan",
         :KE => "Kenya",
         :KI => "Kiribati",
+        :KP => "Korea, Democratic People's Republic of",
+        :KR => "Korea, Republic of",
         :KW => "Kuwait",
         :KG => "Kyrgyzstan",
-        :LA => "Laos",
+        :LA => "Lao People's Democratic Republic",
         :LV => "Latvia",
         :LB => "Lebanon",
         :LS => "Lesotho",
         :LR => "Liberia",
-        :LY => "Libya",
+        :LY => "Libyan Arab Jamahiriya",
         :LI => "Liechtenstein",
         :LT => "Lithuania",
         :LU => "Luxembourg",
-        :MO => "Macau",
-        :MK => "Macedonia",
+        :MO => "Macao",
+        :MK => "Macedonia, the Former Yugoslav Republic of",
         :MG => "Madagascar",
         :MW => "Malawi",
         :MY => "Malaysia",
@@ -151,11 +146,9 @@ module Sinatra
         :MR => "Mauritania",
         :MU => "Mauritius",
         :YT => "Mayotte",
-        :FX => "Metropolitan France",
         :MX => "Mexico",
-        :FM => "Micronesia",
-        :MI => "Midway Islands",
-        :MD => "Moldova",
+        :FM => "Micronesia, Federated States of",
+        :MD => "Moldova, Republic of",
         :MC => "Monaco",
         :MN => "Mongolia",
         :ME => "Montenegro",
@@ -168,7 +161,6 @@ module Sinatra
         :NP => "Nepal",
         :NL => "Netherlands",
         :AN => "Netherlands Antilles",
-        :NT => "Neutral Zone",
         :NC => "New Caledonia",
         :NZ => "New Zealand",
         :NI => "Nicaragua",
@@ -176,21 +168,15 @@ module Sinatra
         :NG => "Nigeria",
         :NU => "Niue",
         :NF => "Norfolk Island",
-        :KP => "North Korea",
-        :VD => "North Vietnam",
         :MP => "Northern Mariana Islands",
         :NO => "Norway",
         :OM => "Oman",
-        :QO => "Outlying Oceania",
-        :PC => "Pacific Islands Trust Territory",
         :PK => "Pakistan",
         :PW => "Palau",
-        :PS => "Palestinian Territory",
+        :PS => "Palestinian Territory, Occupied",
         :PA => "Panama",
-        :PZ => "Panama Canal Zone",
         :PG => "Papua New Guinea",
         :PY => "Paraguay",
-        :YD => "People's Democratic Republic of Yemen",
         :PE => "Peru",
         :PH => "Philippines",
         :PN => "Pitcairn",
@@ -198,12 +184,12 @@ module Sinatra
         :PT => "Portugal",
         :PR => "Puerto Rico",
         :QA => "Qatar",
-        :RE => "Reunion",
+        :RE => "RÉunion",
         :RO => "Romania",
-        :RU => "Russia",
+        :RU => "Russian Federation",
         :RW => "Rwanda",
-        :BL => "Saint Barthélemy",
-        :SH => "Saint Helena",
+        :BL => "Saint BarthÉlemy",
+        :SH => "Saint Helena, Ascension and Tristan Da Cunha",
         :KN => "Saint Kitts and Nevis",
         :LC => "Saint Lucia",
         :MF => "Saint Martin",
@@ -215,7 +201,6 @@ module Sinatra
         :SA => "Saudi Arabia",
         :SN => "Senegal",
         :RS => "Serbia",
-        :CS => "Serbia and Montenegro",
         :SC => "Seychelles",
         :SL => "Sierra Leone",
         :SG => "Singapore",
@@ -225,7 +210,6 @@ module Sinatra
         :SO => "Somalia",
         :ZA => "South Africa",
         :GS => "South Georgia and the South Sandwich Islands",
-        :KR => "South Korea",
         :ES => "Spain",
         :LK => "Sri Lanka",
         :SD => "Sudan",
@@ -234,11 +218,12 @@ module Sinatra
         :SZ => "Swaziland",
         :SE => "Sweden",
         :CH => "Switzerland",
-        :SY => "Syria",
-        :TW => "Taiwan",
+        :SY => "Syrian Arab Republic",
+        :TW => "Taiwan, Province of China",
         :TJ => "Tajikistan",
-        :TZ => "Tanzania",
+        :TZ => "Tanzania, United Republic of",
         :TH => "Thailand",
+        :TL => "Timor-leste",
         :TG => "Togo",
         :TK => "Tokelau",
         :TO => "Tonga",
@@ -248,23 +233,20 @@ module Sinatra
         :TM => "Turkmenistan",
         :TC => "Turks and Caicos Islands",
         :TV => "Tuvalu",
-        :PU => "U.S. Miscellaneous Pacific Islands",
-        :VI => "U.S. Virgin Islands",
         :UG => "Uganda",
         :UA => "Ukraine",
-        :SU => "Union of Soviet Socialist Republics",
         :AE => "United Arab Emirates",
         :GB => "United Kingdom",
         :US => "United States",
         :UM => "United States Minor Outlying Islands",
-        :ZZ => "Unknown or Invalid Region",
         :UY => "Uruguay",
         :UZ => "Uzbekistan",
         :VU => "Vanuatu",
-        :VA => "Vatican",
-        :VE => "Venezuela",
-        :VN => "Vietnam",
-        :WK => "Wake Island",
+        :VA => "Vatican City State",
+        :VE => "Venezuela, Bolivarian Republic of",
+        :VN => "Viet Nam",
+        :VG => "Virgin Islands, British",
+        :VI => "Virgin Islands, U.S.",
         :WF => "Wallis and Futuna",
         :EH => "Western Sahara",
         :YE => "Yemen",
@@ -272,18 +254,50 @@ module Sinatra
         :ZW => "Zimbabwe"
       }
       
-      def self.random_code
-        @to_a ||= LOOKUP.to_a
-        @to_a[rand(@to_a.size)].first
+      # @example
+      #   
+      #   p Country.to_select
+      #   [["Afghanistan", "AF"], ["Åland Islands", "AX"], ["Albania", "AL"], 
+      #   ["Algeria", "DZ"], ["American Samoa", "AS"], ... ["Zimbabwe", "ZW"]]
+      #
+      # @return [Array] a collection of pairs with the first element being 
+      #                 country name and the last element being the code.
+      #
+      # @see Sinatra::Helpers#country_choices
+      def to_select
+        all.map { |code, name| [name, code.to_s] }
       end
-
-      def self.to_select
-        LOOKUP.map { |code, name| [name, code] }
+      
+      # Retrieves the country name given a country code.
+      # @example
+      #   
+      #   Sinatra::Helpers::Country["US"] == "United States"
+      #   # => true
+      #
+      #   Sinatra::Helpers::Country[:US] == "United States"
+      #   # => true
+      #
+      # @param [#to_sym] code The country code in 2 letter all caps format.
+      # @return [String] The corresponding country name given the code.
+      # @return [nil] nil if no matching country code.
+      def [](code)
+        all[code.to_sym]  if not code.to_s.empty?
       end
-
-      def self.[](code)
-        LOOKUP[code.to_sym]  if not code.to_s.empty?
+      
+      # For use with seeding dummy data.
+      # @return [Symbol] a randomized country code.
+      def random
+        all.keys.shuffle.first
       end
+      
+      # Gives all countries in a Hash.
+      #
+      # @return [Hash] the code => name pairs of all countries.
+      def all
+        @all
+      end
+
+      module_function :all, :to_select, :[], :random
     end
   end
 end

data/lib/sinatra/helpers/haml_error_presenter.rb

@@ -1,7 +1,6 @@
 module Sinatra
   module Helpers
-    # Taken from http://github.com/citrusbyte/reddit-clone
-    # Credit goes to citrusbyte.
+    # @see http://github.com/citrusbyte/reddit-clone
     class HamlErrorPresenter < Ohm::Validations::Presenter
       def on(error, message = (block_given? ? @context.capture_haml { yield } : raise(ArgumentError)))
         handle(error) do

data/sinatra-helpers.gemspec

@@ -5,22 +5,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-helpers}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]
-  s.date = %q{2010-05-06}
+  s.date = %q{2010-05-27}
   s.description = %q{Includes month_choices, year_choices, country_choices}
   s.email = %q{cyx.ucron@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.markdown"
   ]
   s.files = [
     ".document",
      ".gitignore",
      "LICENSE",
-     "README.rdoc",
+     "README.markdown",
      "Rakefile",
      "VERSION",
      "lib/sinatra/helpers.rb",
@@ -28,7 +28,9 @@ Gem::Specification.new do |s|
      "lib/sinatra/helpers/country.rb",
      "lib/sinatra/helpers/haml_error_presenter.rb",
      "sinatra-helpers.gemspec",
-     "test/helper.rb"
+     "test/helper.rb",
+     "test/test_country.rb",
+     "test/test_sinatra_helpers.rb"
   ]
   s.homepage = %q{http://github.com/sinefunc/sinatra-helpers}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -36,7 +38,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Some generic helpers for the view layer}
   s.test_files = [
-    "test/helper.rb"
+    "test/helper.rb",
+     "test/test_country.rb",
+     "test/test_sinatra_helpers.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -44,12 +48,30 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sinatra>, [">= 1.0"])
       s.add_development_dependency(%q<contest>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
+      s.add_development_dependency(%q<nokogiri>, [">= 0"])
+      s.add_development_dependency(%q<ohm>, [">= 0"])
+      s.add_development_dependency(%q<haml>, [">= 0"])
     else
+      s.add_dependency(%q<sinatra>, [">= 1.0"])
       s.add_dependency(%q<contest>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
+      s.add_dependency(%q<ohm>, [">= 0"])
+      s.add_dependency(%q<haml>, [">= 0"])
     end
   else
+    s.add_dependency(%q<sinatra>, [">= 1.0"])
     s.add_dependency(%q<contest>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<ohm>, [">= 0"])
+    s.add_dependency(%q<haml>, [">= 0"])
   end
 end
 

data/test/helper.rb

@@ -1,10 +1,15 @@
 require 'rubygems'
 require 'test/unit'
 require 'contest'
+require 'mocha'
+require 'rack/test'
+require 'nokogiri'
+require 'ohm'
+require 'haml'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'sinatra-helpers'
+require 'sinatra/helpers'
 
 class Test::Unit::TestCase
 end

data/test/test_country.rb

@@ -0,0 +1,29 @@
+require "helper"
+
+class CountryTest < Test::Unit::TestCase
+  include Sinatra::Helpers
+
+  test "241 countries" do
+    assert_equal 246, Country.to_select.length  
+  end
+
+  test "has a matching name for all keys" do
+    Country.all.each do |code, name|
+      assert_equal name, Country[code]
+      assert_equal name, Country[code.to_s]
+    end
+  end
+
+  test "random returns a valid code" do
+    246.times {
+      assert Country[Country.random]
+    }
+  end
+
+  test "finding a country with wrong parameters" do
+    assert_nil Country[""]
+    assert_nil Country[nil]
+    assert_nil Country[:XX]
+    assert_nil Country["XX"]
+  end
+end

data/test/test_sinatra_helpers.rb

@@ -0,0 +1,298 @@
+require "helper"
+
+class SintatraHelpersTest < Test::Unit::TestCase
+  include Sinatra::Helpers
+  
+  attr :settings
+  
+  test "h" do
+    assert_equal "&lt;Foo&gt;", h("<Foo>")
+    assert_equal "&lt;Foo bar=&#39;baz&#39;&gt;", h("<Foo bar='baz'>")
+    assert_equal "&lt;Foo bar=&quot;baz&quot;&gt;", h("<Foo bar=\"baz\">")
+  end
+
+  test "country_choices returns Country.to_select" do
+    assert_equal Country.to_select, country_choices  
+  end
+  
+  test "day_choices returns 1 to 31" do
+    assert_equal 31, day_choices.size
+    assert_equal [1, 1], day_choices.first
+    assert_equal [31, 31], day_choices.last
+
+    day_choices.each do |label, value|
+      assert_equal label, value
+    end
+  end
+  
+  describe "month choices" do
+    setup do
+      @settings = stub("Settings", :default_month_names => Date::MONTHNAMES)
+    end
+    
+    test "by default" do
+      assert_equal ["January",   1], month_choices[0]
+      assert_equal ["February",  2], month_choices[1]
+      assert_equal ["March",     3], month_choices[2]
+      assert_equal ["April",     4], month_choices[3]
+      assert_equal ["May",       5], month_choices[4]
+      assert_equal ["June",      6], month_choices[5]
+      assert_equal ["July",      7], month_choices[6]
+      assert_equal ["August",    8], month_choices[7]
+      assert_equal ["September", 9], month_choices[8]
+      assert_equal ["October",  10], month_choices[9]
+      assert_equal ["November", 11], month_choices[10]
+      assert_equal ["December", 12], month_choices[11]
+    end
+
+    test "given Date::ABBR_MONTHNAMES" do
+      month_choices = month_choices(Date::ABBR_MONTHNAMES)
+
+      assert_equal ["Jan",  1], month_choices[0]
+      assert_equal ["Feb",  2], month_choices[1]
+      assert_equal ["Mar",  3], month_choices[2]
+      assert_equal ["Apr",  4], month_choices[3]
+      assert_equal ["May",  5], month_choices[4]
+      assert_equal ["Jun",  6], month_choices[5]
+      assert_equal ["Jul",  7], month_choices[6]
+      assert_equal ["Aug",  8], month_choices[7]
+      assert_equal ["Sep",  9], month_choices[8]
+      assert_equal ["Oct", 10], month_choices[9]
+      assert_equal ["Nov", 11], month_choices[10]
+      assert_equal ["Dec", 12], month_choices[11]
+    end
+    
+    test "when changing settings.default_month_names" do
+      settings.expects(:default_month_names).at_least_once.returns(Date::ABBR_MONTHNAMES)
+
+      assert_equal ["Jan",  1], month_choices[0]
+      assert_equal ["Feb",  2], month_choices[1]
+      assert_equal ["Nov", 11], month_choices[10]
+      assert_equal ["Dec", 12], month_choices[11]
+    end
+  end
+
+  describe "year choices" do
+    setup do
+      @settings = stub("Settings", :default_year_loffset => -60,
+                                   :default_year_uoffset => 0)
+    end
+    
+    test "by default" do
+      assert_equal 61, year_choices.size
+      year_choices.each do |label, value|
+        assert_equal label, value
+      end
+    end
+
+    test "allows to pass in a lower upper offset" do
+      assert_equal 1, year_choices(0, 0).size
+      assert_equal [Date.today.year, Date.today.year], year_choices(0, 0).first
+      
+      Date.expects(:today).at_least_once.returns(Date.new(2010, 5, 5))
+      assert_equal [2005, 2005], year_choices(-5).first
+      assert_equal [2015, 2015], year_choices(0, 5).last
+    end
+
+    test "allows to customize via global settings" do
+      settings.expects(:default_year_loffset).at_least_once.returns(0)
+      settings.expects(:default_year_uoffset).at_least_once.returns(6)
+
+      expected = (2010..2016).to_a
+      expected = expected.zip(expected)
+
+      assert_equal expected, year_choices
+    end
+  end
+
+  context "in a real sinatra app" do
+    class App < Sinatra::Base
+      register Sinatra::Helpers
+
+      get '/years' do
+        year_choices.to_s
+      end
+
+      get '/months' do
+        month_choices.to_s
+      end
+    end
+
+    include Rack::Test::Methods
+
+    def app
+      App.new
+    end
+
+    test "returns the expected years" do
+      get '/years'
+      
+      settings.stubs(:default_year_loffset).returns(-60)
+      settings.stubs(:default_year_uoffset).returns(0)
+
+      assert_equal year_choices.to_s, last_response.body
+    end
+
+    test "returns the expected months" do
+      get '/months'
+
+      settings.stubs(:default_month_names).returns(Date::MONTHNAMES)
+      assert_equal month_choices.to_s, last_response.body
+    end
+  end
+
+  describe "select_options" do
+    test "displays the pairs" do
+      html = select_options([['One', 1], ['Two', 2]])
+      doc  = Nokogiri(%(<body>#{html}</body>))
+
+      assert_equal 'One', doc.search('option[value="1"]').text
+      assert_equal 'Two', doc.search('option[value="2"]').text
+    end
+
+    test "marks option as selected" do
+      html = select_options([['One', 1], ['Two', 2]], 1)
+      doc  = Nokogiri(%(<body>#{html}</body>))
+
+      assert_equal 'One', doc.search('option[value="1"][selected]').text
+      assert_equal 'Two', doc.search('option[value="2"]').text
+    end
+
+    test "produces a prompt properly" do
+      html = select_options([['One', 1], ['Two', 2]], 1, "- Choose -")
+      doc  = Nokogiri(%(<body>#{html}</body>))
+    
+      assert_equal '- Choose -', doc.search('option[value=""]').text
+      assert_equal 'One', doc.search('option[value="1"][selected]').text
+      assert_equal 'Two', doc.search('option[value="2"]').text
+    end
+  end
+
+  describe "tag" do
+    test "the basic no attr case" do
+      assert_equal '<div>Foobar</div>', tag('div', 'Foobar')
+    end
+
+    test "one attr case" do
+      assert_equal '<div class="baz">Foobar</div>', 
+        tag('div', 'Foobar', :class => 'baz')
+    end
+
+    test "many attrs case" do
+      assert_equal '<div class="baz bar" style="display:none">Foobar</div>', 
+        tag('div', 'Foobar', :class => 'baz bar', :style => 'display:none')
+    end
+
+    test "funky attrs case" do
+      assert_equal '<div class="baz &#39;bar&#39;" ' +
+                   'style="display:&quot;none&quot;">Foobar</div>', 
+        tag('div', 'Foobar', :class => "baz 'bar'", :style => 'display:"none"')
+    end
+  end
+
+  describe "errors_on" do
+    include Rack::Test::Methods
+
+    class App < Sinatra::Base
+      FORM = (<<-FORM).gsub(/^ {6}/, '')
+      - errors_on @post do |e|
+        - e.on [:email, :not_present], "Email is required."
+        - e.on [:name, :not_present], "Name is required."
+      FORM
+
+      register Sinatra::Helpers
+
+      class Post < Ohm::Model
+        attribute :email
+        attribute :name
+
+        def validate
+          assert_present :email
+          assert_present :name
+        end
+      end
+
+      get '/form' do
+        @post = Post.new
+        @post.valid?
+
+        haml FORM
+      end
+    end
+
+    def app
+      App.new
+    end
+
+    test "produces proper errors" do
+      get '/form'
+    
+      doc = Nokogiri(last_response.body)
+
+      assert_equal 1, doc.search('div.errors').length
+
+      assert_equal 'Email is required.', 
+        doc.search('div.errors > ul > li:first-child').text
+
+      assert_equal 'Name is required.',
+        doc.search('div.errors > ul > li:last-child').text
+    end
+  end
+
+  describe "currency" do
+    setup do
+      settings.stubs(:default_currency_unit).returns('$')
+      settings.stubs(:default_currency_precision).returns(2)
+      settings.stubs(:default_currency_separator).returns(',')
+    end
+    
+    test "nil" do
+      assert_nil currency(nil)
+    end
+
+    test "defaults" do
+      assert_equal "$ 10.00", currency(10)
+    end
+
+    test "with custom unit, precision" do
+      assert_equal "&pound; 10.0", currency(10, :unit => "&pound;", :precision => 1)
+    end
+
+    test "with 0 precision" do
+      assert_equal "$ 10", currency(10, :precision => 0)
+    end
+
+    test "separators" do
+      assert_equal "$ 100.00", currency(100)
+      assert_equal "$ 1,000.00", currency(1_000)
+      assert_equal "$ 10,000.00", currency(10_000)
+      assert_equal "$ 100,000.00", currency(100_000)
+      assert_equal "$ 1,000,000.00", currency(1_000_000)
+    end
+
+    test "specified defaults" do
+      settings.stubs(:default_currency_unit).returns('P')
+      settings.stubs(:default_currency_precision).returns(3)
+      settings.stubs(:default_currency_separator).returns(' ')
+
+      assert_equal "P 100.000", currency(100)
+      assert_equal "P 1 000.000", currency(1_000)
+      assert_equal "P 10 000.000", currency(10_000)
+    end
+  end
+
+  describe "percentage" do
+    test "nil" do
+      assert_nil percentage(nil)
+    end
+
+    test "various percentages" do
+      assert_equal '0.01%', percentage(0.01)
+      assert_equal '0.10%', percentage(0.10)
+      assert_equal '1%', percentage(1.00)
+      assert_equal '10.01%', percentage(10.01)
+      assert_equal '99.99%', percentage(99.99)
+      assert_equal '100%', percentage(100)
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Cyril David
@@ -14,13 +14,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 +08:00
+date: 2010-05-27 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: contest
+  name: sinatra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: contest
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -28,7 +41,67 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: ohm
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: Includes month_choices, year_choices, country_choices
 email: cyx.ucron@gmail.com
 executables: []
@@ -37,12 +110,12 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.markdown
 files: 
 - .document
 - .gitignore
 - LICENSE
-- README.rdoc
+- README.markdown
 - Rakefile
 - VERSION
 - lib/sinatra/helpers.rb
@@ -51,6 +124,8 @@ files:
 - lib/sinatra/helpers/haml_error_presenter.rb
 - sinatra-helpers.gemspec
 - test/helper.rb
+- test/test_country.rb
+- test/test_sinatra_helpers.rb
 has_rdoc: true
 homepage: http://github.com/sinefunc/sinatra-helpers
 licenses: []
@@ -83,3 +158,5 @@ specification_version: 3
 summary: Some generic helpers for the view layer
 test_files: 
 - test/helper.rb
+- test/test_country.rb
+- test/test_sinatra_helpers.rb

data/README.rdoc

@@ -1,38 +0,0 @@
-= sinatra-helpers
-
-Bare minimum, close to the metal helpers for your average sinatra application.
-
-== Examples
-    
-    %select(name='card[month'])
-      != month_choices
-
-    %select(name='card[year'])
-      != year_choices
-  
-    %select(name='address[country]')
-      != country_choices
-  
-    # If you have an ohm model which you want to present the errors of:
-    # (this is taken from the reddit-clone courtesy of citrusbyte)
-    
-    # This should be put in your HAML file
-
-    - errors_on @user do |e|
-      - e.on [:email, :not_present] "You must supply an email address"
-      - e.on [:password, :not_present] "A password is required"
-      - e.on [:password, :not_confirmed] "You must confirm your password"
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* 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.
-  (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.
-
-== Copyright
-
-Copyright (c) 2010 Cyril David. See LICENSE for details.