world-flags 0.1.1 → 0.1.2

data/README.textile

@@ -4,11 +4,15 @@ Includes css files for size 16 and 32 pixels and have all the worlds' flags.
 
 h2. Configuration
 
-In you asset application config:
+In you asset application.css manifest file:
 
-require flags/flags16
+*/
+ *= require_self
+ *= require_tree .
+ *= require flags/flags32
+*/
 
-h2. Example usage:
+h2. Alternative config
 
 Note that the ruby examples uses HAML syntax
 
@@ -20,6 +24,12 @@ or using a helper
 
 = use_flags(16)
 
+Alternatively for the 32 width flags
+
+= use_flags 32
+
+h2. Rendering
+
 Flags will be rendered in HTML as:
 
 <pre>
@@ -33,14 +43,86 @@ Flags will be rendered in HTML as:
 
 The countries corresponding to the codes can be found at "http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2":http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
 
+h2. Use
+
 You can also use built in helper methods:
 
-= flags_list 16 do
+= flag_list 16 do
 	= flags :ar => 'Argentina', :en => 'England'
 
 Alternatively
 
 = flags_list 32 do
-	= flag :ar, 'Argentina'
+	= flag(:ar, 'Argentina') + flag(:en, 'England')
+
+For use with tooltips (see example below):
+
+= flags_list 32 do
+	= flags_title(:ar => 'Argentina', :br => 'Brazil') + flag_title(:en, 'England')
+
+The flag_title will render the following list item:
+
+<li class="flag ar" title="Argentina">&nbsp;</li>
+
+The &nbsp; is needed in order for the background (flag icon) to have something to be displayed against.
+
+h2. Nice effects
+
+CSS config:
+
+ul.f32 {
+	list-style-type: none;
+	padding: 0;
+	margin-left: 0;
+
+	li.flag {
+		float:left;
+		padding-bottom: 10px;
+		padding-right: 32px;
+		cursor: pointer;
+	}
+}
+
+#languages {
+	float: right;
+}
+
+p.clear { 
+	clear:both; 
+}
+
+.tooltip {
+  display:none;
+  background: white;
+  border: 1px solid black;
+  font-size:14px;
+  font-weight: bold;
+  text-align: center;
+  height:16px;
+  width:120px;
+  padding:10px;
+  color: black;
+}
+
+Tooltip script:
+
+http://jquerytools.org/demos/tooltip/index.html
+
+$("li.flag[title]").tooltip()
+
+Layout file:
+
+%body
+	.main
+		= link_to "Sign un", new_user_session_path
+		= link_to "Sign up", new_user_registration_path
+
+		#languages
+			%ul.f32
+				%li.flag.ar{:title => 'Argentina'}
+					&nbsp;
+				%li.flag.en{:title => 'England'}
+					&nbsp;
+		%p.clear
+		= yield
 
-See "the cheese wiki":http://www.cheesewiki.com/ for an example

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/world-flags.rb

@@ -1,5 +1,5 @@
 require "world_flags/world_flags_helper"
 require "rails"
-require 'rails_plugin/engine'
+require 'world_flags/rails_plugin/engine'
 
 ActionView::Base.send :include, WorldFlagsHelper

data/lib/{rails_plugin → world_flags/rails_plugin}/engine.rb

@@ -1,6 +1,7 @@
 module WorldFlags
   module Rails
     class Engine < ::Rails::Engine
+    	puts "WorldFlags engine loaded"    	
     end
   end
 end

data/lib/world_flags/world_flags_helper.rb

@@ -6,8 +6,10 @@ module WorldFlagsHelper
 	def flags_list size = 16, &block
 		raise "Missing block" unless block_given?
 		raise "Supported sizes are only #{WorldFlagsHelper.flag_sizes}" unless WorldFlagsHelper.flag_sizes.include?(size.to_i)
-		content_tag :ul, yield, :class => "f#{size}"
+		content = capture(&block)
+		content_tag :ul, content, :class => "f#{size}"
 	end
+	alias_method :flag_list, :flags_list
 
 	def flags flags_hash
 		flags_hash.inject("") do |res, element|
@@ -15,11 +17,21 @@ module WorldFlagsHelper
 		end.html_safe
 	end
 
+	def flags_title flags_hash
+		flags_hash.inject("") do |res, element|
+			res << flag_title(element.first, element.last)
+		end.html_safe
+	end
+
 	def flag code, name
 		content_tag :li,  name.html_safe, :class => "flag #{code}"
 	end
 
+	def flag_title code, name
+		content_tag :li,  '&nbsp;'.html_safe, :class => "flag #{code}", :title => name
+	end
+
 	def use_flags size = 16
-		stylesheet_link_tag "flags#{size}"
+		stylesheet_link_tag "flags/flags#{size}"
 	end
 end

data/spec/world-flags_spec.rb

@@ -10,6 +10,12 @@ describe WorldFlagsHelper do
     output.should == "<ul class=\"f16\"></ul>"
   end
 
+  it "should work with alias :flag_list" do
+    output = flag_list do
+    end
+    output.should == "<ul class=\"f16\"></ul>"
+  end
+
   it "should set size to 16 or 32" do
     lambda do flags_list(8) { }    	
     end.should raise_error
@@ -28,6 +34,18 @@ describe WorldFlagsHelper do
     output.should == "<ul class=\"f32\"><li class=\"flag ar\">Argentina</li><li class=\"flag en\">England</li></ul>"
   end
 
+  it "should list flags" do
+    output = flag_title :ar, 'Argentina'
+    output.should == "<li class=\"flag ar\" title=\"Argentina\">&nbsp;</li>"
+  end
+
+  it "should list flags" do
+    output = flags_list 32 do
+    	flags_title :ar => 'Argentina'
+    end
+    output.should == "<ul class=\"f32\"><li class=\"flag ar\" title=\"Argentina\">&nbsp;</li></ul>"
+  end
+
   it "should list flags combined" do
     output = flags_list 32 do
     	[flags(:ar => 'Argentina', :en => 'England'), flag(:br, 'Brazil')].join.html_safe 

data/vendor/assets/stylesheets/flags/{flags16.css → flags16.css.erb}

@@ -1,4 +1,4 @@
-.f16 .flag{background:url(/images/flags/flags16.png) no-repeat;}
+.f16 .flag{background:url(<%= asset_path 'flags/flags16.png' %>) no-repeat;}
 .f16 ._African_Union(OAS){background-position:0 -0px;}
 .f16 ._Arab_League{background-position:0 -16px;}
 .f16 ._ASEAN{background-position:0 -32px;}

data/vendor/assets/stylesheets/flags/{flags16.scss → flags16.css.scss.erb}

@@ -1,6 +1,6 @@
 .f16 {
 
-    .flag{background:url(/images/flags/flags16.png) no-repeat;}
+    .flag{background:url(<%= asset_path 'flags/flags16.png' %>) no-repeat;}
 
     ._African_Union(OAS){background-position:0 -0px;}
     ._Arab_League{background-position:0 -16px;}

data/vendor/assets/stylesheets/flags/{flags32.css → flags32.css.erb}

@@ -1,4 +1,4 @@
-.f32 .flag{background:url(/images/flags/flags32.png) no-repeat;}
+.f32 .flag{background:url(<%= asset_path 'flags/flags32.png' %>) no-repeat;}
 .f32 ._African_Union(OAS){background-position:0 -0px;}
 .f32 ._Arab_League{background-position:0 -32px;}
 .f32 ._ASEAN{background-position:0 -64px;}

data/vendor/assets/stylesheets/flags/{flags32.scss → flags32.css.scss.erb}

@@ -1,6 +1,6 @@
 .f32 {
 
-    .flag{background:url(/images/flags/flags32.png) no-repeat;}
+    .flag{background:url(<%= asset_path 'flags/flags32.png' %>) no-repeat;}
 
     ._African_Union(OAS){background-position:0 -0px;}
     ._Arab_League{background-position:0 -32px;}

data/world-flags.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "world-flags"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -25,17 +25,17 @@ Gem::Specification.new do |s|
     "README.textile",
     "Rakefile",
     "VERSION",
-    "lib/rails_plugin/engine.rb",
     "lib/world-flags.rb",
+    "lib/world_flags/rails_plugin/engine.rb",
     "lib/world_flags/world_flags_helper.rb",
     "spec/spec_helper.rb",
     "spec/world-flags_spec.rb",
     "vendor/assets/images/flags/flags16.png",
     "vendor/assets/images/flags/flags32.png",
-    "vendor/assets/stylesheets/flags/flags16.css",
-    "vendor/assets/stylesheets/flags/flags16.scss",
-    "vendor/assets/stylesheets/flags/flags32.css",
-    "vendor/assets/stylesheets/flags/flags32.scss",
+    "vendor/assets/stylesheets/flags/flags16.css.erb",
+    "vendor/assets/stylesheets/flags/flags16.css.scss.erb",
+    "vendor/assets/stylesheets/flags/flags32.css.erb",
+    "vendor/assets/stylesheets/flags/flags32.css.scss.erb",
     "world-flags.gemspec"
   ]
   s.homepage = "http://github.com/kristianmandrup/world-flags"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world-flags
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70365288406560 !ruby/object:Gem::Requirement
+  requirement: &70254344812800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70365288406560
+  version_requirements: *70254344812800
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70365288427120 !ruby/object:Gem::Requirement
+  requirement: &70254344823820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70365288427120
+  version_requirements: *70254344823820
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70365288425660 !ruby/object:Gem::Requirement
+  requirement: &70254344822400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70365288425660
+  version_requirements: *70254344822400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70365288423940 !ruby/object:Gem::Requirement
+  requirement: &70254344820480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70365288423940
+  version_requirements: *70254344820480
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70365288421960 !ruby/object:Gem::Requirement
+  requirement: &70254344819120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70365288421960
+  version_requirements: *70254344819120
 description: Use world flag icons in your Rails app
 email: kmandrup@gmail.com
 executables: []
@@ -82,17 +82,17 @@ files:
 - README.textile
 - Rakefile
 - VERSION
-- lib/rails_plugin/engine.rb
 - lib/world-flags.rb
+- lib/world_flags/rails_plugin/engine.rb
 - lib/world_flags/world_flags_helper.rb
 - spec/spec_helper.rb
 - spec/world-flags_spec.rb
 - vendor/assets/images/flags/flags16.png
 - vendor/assets/images/flags/flags32.png
-- vendor/assets/stylesheets/flags/flags16.css
-- vendor/assets/stylesheets/flags/flags16.scss
-- vendor/assets/stylesheets/flags/flags32.css
-- vendor/assets/stylesheets/flags/flags32.scss
+- vendor/assets/stylesheets/flags/flags16.css.erb
+- vendor/assets/stylesheets/flags/flags16.css.scss.erb
+- vendor/assets/stylesheets/flags/flags32.css.erb
+- vendor/assets/stylesheets/flags/flags32.css.scss.erb
 - world-flags.gemspec
 homepage: http://github.com/kristianmandrup/world-flags
 licenses:
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4338299657571122949
+      hash: 1179484573373061656
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: