countries_and_languages 0.1.2 → 0.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/Gemfile CHANGED
@@ -1,9 +1,7 @@
1
1
  source :rubygems
2
2
  gemspec
3
3
 
4
- group :dev do
5
- gem 'activesupport'
6
- gem 'actionpack'
7
- gem 'rake'
8
- gem 'rspec', '~>2'
9
- end
4
+ gem 'activesupport'
5
+ gem 'actionpack'
6
+ gem 'rake'
7
+ gem 'rspec', '~>2'
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- countries_and_languages (0.1.2)
4
+ countries_and_languages (0.1.3)
5
5
  i18n_data
6
6
 
7
7
  GEM
@@ -29,8 +29,8 @@ GEM
29
29
  erubis (2.7.0)
30
30
  hike (1.2.1)
31
31
  i18n (0.6.0)
32
- i18n_data (0.2.7)
33
- activesupport
32
+ i18n_data (0.2.8)
33
+ activesupport (>= 2.2)
34
34
  multi_json (1.0.3)
35
35
  rack (1.3.5)
36
36
  rack-cache (1.1)
data/Rakefile CHANGED
@@ -1,10 +1,10 @@
1
- require "bundler"
2
- Bundler::GemHelper.install_tasks
1
+ require 'bundler/gem_tasks'
3
2
 
4
3
  task :default do
5
4
  sh "rspec spec/"
6
5
  end
7
6
 
7
+ # extracted from https://github.com/grosser/project_template
8
8
  rule /^version:bump:.*/ do |t|
9
9
  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
10
10
  index = ['major', 'minor','patch'].index(t.name.split(':').last)
@@ -13,6 +13,8 @@ rule /^version:bump:.*/ do |t|
13
13
  version_file = File.read(file)
14
14
  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
15
15
  version_parts[index] = version_parts[index].to_i + 1
16
+ version_parts[2] = 0 if index < 2 # remove patch for minor
17
+ version_parts[1] = 0 if index < 1 # remove minor for major
16
18
  new_version = version_parts * '.'
17
19
  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
18
20
 
data/Readme.md CHANGED
@@ -16,30 +16,19 @@ Methods are available in views.
16
16
  If you have special needs like renaming countries or only displaying a subset,
17
17
  have a look at the code and overwrite as necessary.
18
18
 
19
- DEMO can be found in [Gettext example application](http://github.com/grosser/gettext_i18n_rails_example)
19
+ DEMO can be found in [Gettext example application](https://github.com/grosser/gettext_i18n_rails_example)
20
20
 
21
21
  Install
22
22
  =====
23
23
 
24
- As Gem
25
-
26
24
  gem install countries_and_languages
27
-
28
- # Gemfile
29
- gem 'countries_and_languages', :require => 'countries_and_languages/rails'
30
25
 
31
- As Rails Plugin
32
-
33
- rails plugin install git://github.com/grosser/countries_and_languages.git
34
-
35
26
  # Gemfile
36
- gem 'i18n_data'
37
-
27
+ gem 'countries_and_languages', :require => 'countries_and_languages/rails'
38
28
 
39
29
  Author
40
30
  ======
41
31
  [Michael Grosser](http://grosser.it)<br/>
42
32
  michael@grosser.it<br/>
43
- Hereby placed under public domain, do what you want, just do not hold me accountable...<br/>
44
- [![Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=grosser&url=https://github.com/grosser/countries_and_languages&title=countries_and_languages&language=en_US&tags=github&category=software)
33
+ License: MIT
45
34
  [![Build Status](https://secure.travis-ci.org/grosser/countries_and_languages.png)](http://travis-ci.org/grosser/countries_and_languages)
@@ -1,3 +1,3 @@
1
1
  module CountriesAndLanguages
2
- VERSION = '0.1.2'
2
+ VERSION = Version = '0.1.3'
3
3
  end
@@ -1,9 +1,9 @@
1
1
  # encoding: UTF-8
2
- require File.expand_path("spec_helper", File.dirname(__FILE__))
3
-
4
- include CountriesAndLanguages::Helpers
2
+ require "spec_helper"
5
3
 
6
4
  describe CountriesAndLanguages do
5
+ include CountriesAndLanguages::Helpers
6
+
7
7
  before do
8
8
  I18n.locale = :en
9
9
  end
data/spec/spec_helper.rb CHANGED
@@ -1,5 +1,5 @@
1
- require 'rubygems'
2
- $LOAD_PATH << 'lib'
3
1
  require 'active_support'
4
2
  require 'action_controller'
5
- require 'countries_and_languages/rails'
3
+
4
+ $LOAD_PATH << 'lib'
5
+ require 'countries_and_languages/rails'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: countries_and_languages
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-10-27 00:00:00.000000000 Z
12
+ date: 2012-06-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: i18n_data
16
- requirement: &72044050 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *72044050
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: '0'
25
30
  description:
26
31
  email: michael@grosser.it
27
32
  executables: []
@@ -34,7 +39,6 @@ files:
34
39
  - Rakefile
35
40
  - Readme.md
36
41
  - countries_and_languages.gemspec
37
- - init.rb
38
42
  - lib/countries_and_languages.rb
39
43
  - lib/countries_and_languages/rails.rb
40
44
  - lib/countries_and_languages/version.rb
@@ -54,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
54
58
  version: '0'
55
59
  segments:
56
60
  - 0
57
- hash: 242273745
61
+ hash: -1173514223833784579
58
62
  required_rubygems_version: !ruby/object:Gem::Requirement
59
63
  none: false
60
64
  requirements:
@@ -63,10 +67,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
63
67
  version: '0'
64
68
  segments:
65
69
  - 0
66
- hash: 242273745
70
+ hash: -1173514223833784579
67
71
  requirements: []
68
72
  rubyforge_project:
69
- rubygems_version: 1.8.10
73
+ rubygems_version: 1.8.24
70
74
  signing_key:
71
75
  specification_version: 3
72
76
  summary: Countries and languages in I18n.locale for select_tag or output in 85 languages
data/init.rb DELETED
@@ -1 +0,0 @@
1
- require 'countries_and_languages/rails'