globalize3_helpers 0.2.1 → 0.2.2

data/Gemfile

@@ -1,16 +1,12 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-  gem "activesupport", ">= 2.3.5"
-  gem "activerecord"
-  gem "globalize3"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
+gem "activesupport"
+gem "globalize3"
+
 group :development do
-  gem "shoulda", ">= 0"
+  gem "shoulda"
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.1.4"
+  gem "bundler"
   gem "jeweler", "~> 1.8.3"
   gem "rcov", "0.9.11"
 end

data/Gemfile.lock

@@ -1,29 +1,29 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.3)
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-    activerecord (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.6)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.3)
     erubis (2.7.0)
     git (1.2.5)
     globalize3 (0.2.0)
@@ -31,14 +31,14 @@ GEM
       activerecord (>= 3.0.0)
       paper_trail (~> 2)
     hike (1.2.1)
-    i18n (0.6.0)
-    jeweler (1.8.3)
+    i18n (0.6.1)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
     journey (1.0.4)
-    json (1.7.3)
+    json (1.7.5)
     multi_json (1.3.6)
     paper_trail (2.6.3)
       activerecord (~> 3.0)
@@ -48,11 +48,11 @@ GEM
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    railties (3.2.6)
-      actionpack (= 3.2.6)
-      activesupport (= 3.2.6)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -61,16 +61,17 @@ GEM
     rcov (0.9.11)
     rdoc (3.12)
       json (~> 1.4)
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0.0)
-      shoulda-matchers (~> 1.0.0)
+    shoulda (3.3.0)
+      shoulda-context (~> 1.0)
+      shoulda-matchers (~> 1.4)
     shoulda-context (1.0.0)
-    shoulda-matchers (1.0.0)
+    shoulda-matchers (1.4.0)
+      activesupport (>= 3.0.0)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.15.3)
+    thor (0.16.0)
     tilt (1.3.3)
     tzinfo (0.3.33)
 
@@ -78,9 +79,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord
-  activesupport (>= 2.3.5)
-  bundler (~> 1.1.4)
+  activesupport
+  bundler
   globalize3
   jeweler (~> 1.8.3)
   rcov (= 0.9.11)

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/globalize3_helpers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "globalize3_helpers"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lefteris Georgatos"]
-  s.date = "2012-06-22"
+  s.date = "2012-10-06"
   s.description = "Use globalize3 helpers in your views. Forked from https://github.com/fidel/batch_translations "
   s.email = "lefteris.georgatos@gmail.com"
   s.extra_rdoc_files = [
@@ -24,45 +24,40 @@ Gem::Specification.new do |s|
     "globalize3_helpers.gemspec",
     "lib/globalize3_helpers.rb",
     "lib/helpers/helper.rb",
-    "lib/models/model.rb",
-    "test/helper.rb",
-    "test/test_globalize3_helpers.rb"
+    "lib/models/model.rb"
   ]
   s.homepage = "http://github.com/ryudo1987/globalize3_helpers"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.19"
+  s.rubygems_version = "1.8.24"
   s.summary = "This is the batch translation plugin for globalize3"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<globalize3>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.4"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<rcov>, ["= 0.9.11"])
     else
-      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<globalize3>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.1.4"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<rcov>, ["= 0.9.11"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<globalize3>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.1.4"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<rcov>, ["= 0.9.11"])
   end

data/lib/helpers/helper.rb

@@ -1,40 +1,25 @@
-module ActionView
-  module Helpers
-    class FormBuilder
-
-      def globalize_fields_for_locales(locales = [], *args, &proc)
-        raise ArgumentError, "Missing block" unless block_given?
-        globalize_fields_for(locales.first.to_s, *args, &proc) if locales.count <= 1
-        translations_fields = []
-
-        locales.each do |locale|
-          @index = @index ? @index + 1 : 1
-          object_name = "#{@object_name}[translations_attributes][#{@index}]"
-          object = @object.translations.find_by_locale locale.to_s
-          @template.concat @template.hidden_field_tag("#{object_name}[id]", object ? object.id : "")
-          @template.concat @template.hidden_field_tag("#{object_name}[locale]", locale)
-          if @template.respond_to? :simple_fields_for
-            @template.concat @template.simple_fields_for(object_name, object, *args, &proc)
-          else
-            @template.concat @template.fields_for(object_name, object, *args, &proc)
-          end
-        end
-      end
-
-      def globalize_fields_for_locale(locale, *args, &proc)
-        raise ArgumentError, "Missing block" unless block_given?
-        @index = @index ? @index + 1 : 1
-        object_name = "#{@object_name}[translations_attributes][#{@index}]"
-        object = @object.translations.find_by_locale locale.to_s
-        @template.concat @template.hidden_field_tag("#{object_name}[id]", object ? object.id : "")
-        @template.concat @template.hidden_field_tag("#{object_name}[locale]", locale)
-        if @template.respond_to? :simple_fields_for
-          @template.simple_fields_for(object_name, object, *args, &proc)
-        else
-          @template.fields_for(object_name, object, *args, &proc)
-        end
-      end
-
+module ActionView::Helpers::FormBuilder
+  
+  def globalize_fields_for_locale(locale, *args, &proc)
+    raise ArgumentError, "Missing block" unless block_given?
+    @index = @index ? @index + 1 : 1
+    object_name = "#{@object_name}[translations_attributes][#{@index}]"
+    object = @object.translations.find_by_locale(locale.to_s) || @object.translations.new(:locale => locale)
+    @template.concat(@template.hidden_field_tag("#{object_name}[id]", object.id)) unless object.new_record?
+    @template.concat(@template.hidden_field_tag("#{object_name}[locale]", locale))
+    if @template.respond_to? :simple_fields_for
+      @template.concat @template.simple_fields_for(object_name, object, *args, &proc)
+    else
+      @template.concat @template.fields_for(object_name, object, *args, &proc)
     end
   end
-end
+  
+  alias_method :globalize_fields_for_locale, :globalize_fields_for_locales
+    
+  def globalize_fields_for_locales(locales = [], *args, &proc)
+    locales.each do |locale|
+      super(locale, *args, &proc)
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize3_helpers
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,26 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.5
-- !ruby/object:Gem::Dependency
-  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -96,17 +80,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -155,8 +139,6 @@ files:
 - lib/globalize3_helpers.rb
 - lib/helpers/helper.rb
 - lib/models/model.rb
-- test/helper.rb
-- test/test_globalize3_helpers.rb
 homepage: http://github.com/ryudo1987/globalize3_helpers
 licenses:
 - MIT
@@ -172,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3014833519551113926
+      hash: -1751990795049683241
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This is the batch translation plugin for globalize3

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'globalize3_helpers'
-
-class Test::Unit::TestCase
-end

data/test/test_globalize3_helpers.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestGlobalize3Helpers < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end