world-flags 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/world-flags.rb

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

data/lib/world_flags/rails/engine.rb

@@ -0,0 +1,19 @@
+module WorldFlags
+  module Rails
+    class Engine < ::Rails::Engine
+        
+    	initializer "setup for rails" do
+    		puts "WorldFlags engine loaded"
+    		WorldFlags::Rails::Engine.add_view_ext
+      end
+
+    	def self.add_view_ext
+    		ActionView::Base.send :include, WorldFlagsHelper
+    	end
+
+			def self.add_controller_ext
+      	# ActionController::Base.send(:include, UiControllerExtensions)
+      end	
+    end
+  end
+end

data/lib/world_flags/view_helper.rb

@@ -0,0 +1,41 @@
+module WorldFlags
+	module ViewHelper
+		def self.flag_sizes
+			[16, 32, 64]
+		end
+
+		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 = capture(&block)
+			content_tag :ul, content, :class => "f#{size}"
+		end
+		alias_method :flag_list, :flags_list
+
+		def flags flags_hash, display = false
+			flags_hash.inject("") do |res, element|
+				res << flag(element.first, element.last, display)
+			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, display = false
+			label = display ? name : '&nbsp;'
+			content_tag :li,  label.html_safe, :class => "flag #{code}", :'data-country' => name, :'data-cc' => code
+		end
+
+		def flag_title code, name, display = false
+			label = display ? name : '&nbsp;'
+			content_tag :li,  label.html_safe, :class => "flag #{code}", :title => name, :'data-cc' => code
+		end
+
+		def use_flags size = 16
+			stylesheet_link_tag "flags/flags#{size}"
+		end
+	end
+end

data/spec/spec_helper.rb

@@ -11,6 +11,8 @@ require 'action_view/template'
 require 'rspec'
 require 'world-flags'
 
+# WorldFlags::Rails::Engine.add_view_ext
+
 module ControllerTestHelpers
 
   def self.included(base)

data/spec/world_flags/locale_helper_spec.rb

@@ -0,0 +1 @@
+# TODO

data/spec/{world-flags_spec.rb → world_flags/view_helper_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe WorldFlagsHelper do
+describe WorldFlags::ViewHelper do
   include ControllerTestHelpers,
-          WorldFlagsHelper
+          WorldFlags::ViewHelper
 
   it "should be empty, with an empty block" do
     output = flags_list do

data/world-flags.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "world-flags"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -27,10 +27,11 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/world-flags.rb",
     "lib/world_flags/locale_helper.rb",
-    "lib/world_flags/rails_plugin/engine.rb",
-    "lib/world_flags/world_flags_helper.rb",
+    "lib/world_flags/rails/engine.rb",
+    "lib/world_flags/view_helper.rb",
     "spec/spec_helper.rb",
-    "spec/world-flags_spec.rb",
+    "spec/world_flags/locale_helper_spec.rb",
+    "spec/world_flags/view_helper_spec.rb",
     "vendor/assets/images/flags/flags16.png",
     "vendor/assets/images/flags/flags16_semi.png",
     "vendor/assets/images/flags/flags32.png",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world-flags
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70328223440720 !ruby/object:Gem::Requirement
+  requirement: &70338380156160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328223440720
+  version_requirements: *70338380156160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70328223454620 !ruby/object:Gem::Requirement
+  requirement: &70338380155620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70328223454620
+  version_requirements: *70338380155620
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70328223453240 !ruby/object:Gem::Requirement
+  requirement: &70338380155120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70328223453240
+  version_requirements: *70338380155120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70328223451300 !ruby/object:Gem::Requirement
+  requirement: &70338380154620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70328223451300
+  version_requirements: *70338380154620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70328223464260 !ruby/object:Gem::Requirement
+  requirement: &70338380154060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70328223464260
+  version_requirements: *70338380154060
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70328223461500 !ruby/object:Gem::Requirement
+  requirement: &70338380153520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70328223461500
+  version_requirements: *70338380153520
 description: Use world flag icons in your Rails app
 email: kmandrup@gmail.com
 executables: []
@@ -95,10 +95,11 @@ files:
 - VERSION
 - lib/world-flags.rb
 - lib/world_flags/locale_helper.rb
-- lib/world_flags/rails_plugin/engine.rb
-- lib/world_flags/world_flags_helper.rb
+- lib/world_flags/rails/engine.rb
+- lib/world_flags/view_helper.rb
 - spec/spec_helper.rb
-- spec/world-flags_spec.rb
+- spec/world_flags/locale_helper_spec.rb
+- spec/world_flags/view_helper_spec.rb
 - vendor/assets/images/flags/flags16.png
 - vendor/assets/images/flags/flags16_semi.png
 - vendor/assets/images/flags/flags32.png
@@ -131,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 690155774062235835
+      hash: -2167813305194718238
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/world_flags/rails_plugin/engine.rb

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

data/lib/world_flags/world_flags_helper.rb

@@ -1,39 +0,0 @@
-module WorldFlagsHelper
-	def self.flag_sizes
-		[16, 32, 64]
-	end
-
-	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 = capture(&block)
-		content_tag :ul, content, :class => "f#{size}"
-	end
-	alias_method :flag_list, :flags_list
-
-	def flags flags_hash, display = false
-		flags_hash.inject("") do |res, element|
-			res << flag(element.first, element.last, display)
-		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, display = false
-		label = display ? name : '&nbsp;'
-		content_tag :li,  label.html_safe, :class => "flag #{code}", :'data-country' => name, :'data-cc' => code
-	end
-
-	def flag_title code, name, display = false
-		label = display ? name : '&nbsp;'
-		content_tag :li,  label.html_safe, :class => "flag #{code}", :title => name, :'data-cc' => code
-	end
-
-	def use_flags size = 16
-		stylesheet_link_tag "flags/flags#{size}"
-	end
-end