traco 0.2.1 → 0.2.3

data/.rvmrc

@@ -1 +1 @@
-rvm ruby-1.9.3-p0 --create
+rvm ruby-1.9.3-p194-falcon@traco --create

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.8.7

data/README.markdown

@@ -1,5 +1,7 @@
 # Traco
 
+[![Build Status](https://secure.travis-ci.org/barsoom/traco.png)](http://travis-ci.org/barsoom/traco)
+
 Translatable columns for Rails 3, stored in the model table itself.
 
 Inspired by Iain Hecker's [translatable_columns](https://github.com/iain/translatable_columns/).
@@ -76,6 +78,7 @@ to install it.
     bundle
     rake # or guard
 
+
 <!-- Keeping this a hidden brain dump for now.
 
 ## TODO
@@ -93,6 +96,7 @@ Possible improvements to make:
 
 -->
 
+
 ## Credits and license
 
 By [Barsoom](http://barsoom.se) under the MIT license:

data/lib/traco/class_methods.rb

@@ -1,20 +1,19 @@
 module Traco
   module ClassMethods
-
     def locales_for_column(column)
       column_names.grep(/\A#{column}_([a-z]{2})\z/) {
         $1.to_sym
       }.sort_by { |locale|
         if locale == I18n.default_locale
-         :"0"
+         "0"
         else
-          locale
+          locale.to_s
         end
       }
     end
 
-    def human_attribute_name(attribute, options={})
-      default = super(attribute, options.merge(default: ""))
+    def human_attribute_name(attribute, options = {})
+      default = super(attribute, options.merge(:default => ""))
       if default.blank? && attribute.to_s.match(/\A(\w+)_([a-z]{2})\z/)
         column, locale = $1, $2.to_sym
         if translates?(column)
@@ -31,8 +30,7 @@ module Traco
     end
 
     def locale_name(locale)
-      I18n.t(locale, scope: :"i18n.languages", default: locale.to_s.upcase)
+      I18n.t(locale, :scope => :"i18n.languages", :default => locale.to_s.upcase)
     end
-
   end
 end

data/lib/traco/instance_methods.rb

@@ -5,25 +5,24 @@ module Traco
 
     def read_localized_value(column)
       locales_for_reading_column(column).each do |locale|
-        value = public_send("#{column}_#{locale}")
+        value = send("#{column}_#{locale}")
         return value if value.present?
       end
       nil
     end
 
     def write_localized_value(column, value)
-      public_send("#{column}_#{I18n.locale}=", value)
+      send("#{column}_#{I18n.locale}=", value)
     end
 
     def locales_for_reading_column(column)
       self.class.locales_for_column(column).sort_by { |locale|
         case locale
-        when I18n.locale then :"0"
-        when I18n.default_locale then :"1"
-        else locale
+        when I18n.locale then "0"
+        when I18n.default_locale then "1"
+        else locale.to_s
         end
       }
     end
-
   end
 end

data/lib/traco/translates.rb

@@ -1,29 +1,42 @@
 module Traco
   module Translates
     def translates(*columns)
+      set_up_once
+      store_as_translatable_columns columns.map(&:to_sym)
 
-      extend Traco::ClassMethods
-      include Traco::InstanceMethods
-
-      # Don't overwrite values if running multiple times in the same class
-      # or in different classes of an inheritance chain.
-      unless respond_to?(:translatable_columns)
-        class_attribute :translatable_columns
-        self.translatable_columns = []
+      columns.each do |column|
+        define_localized_reader column
+        define_localized_writer column
       end
+    end
 
-      self.translatable_columns |= columns.map(&:to_sym)
+    private
 
-      columns.each do |column|
+    # Don't overwrite values if running multiple times in the same
+    # class or in different classes of an inheritance chain.
+    def set_up_once
+      return if respond_to?(:translatable_columns)
+
+      extend Traco::ClassMethods
+      include Traco::InstanceMethods
 
-        define_method(column) do
-          read_localized_value(column)
-        end
+      class_attribute :translatable_columns
+      self.translatable_columns = []
+    end
 
-        define_method("#{column}=") do |value|
-          write_localized_value(column, value)
-        end
+    def store_as_translatable_columns(columns)
+      self.translatable_columns |= columns
+    end
+
+    def define_localized_reader(column)
+      define_method(column) do
+        read_localized_value(column)
+      end
+    end
 
+    def define_localized_writer(column)
+      define_method("#{column}=") do |value|
+        write_localized_value(column, value)
       end
     end
   end

data/lib/traco/version.rb

@@ -1,3 +1,3 @@
 module Traco
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/spec/spec_helper.rb

@@ -18,11 +18,11 @@ end
 require "active_record"
 require "app/post.rb"
 
-ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
 
 silence_stream(STDOUT) do
-  ActiveRecord::Schema.define(version: 0) do
-    create_table :posts, force: true do |t|
+  ActiveRecord::Schema.define(:version => 0) do
+    create_table :posts, :force => true do |t|
       t.string :title_sv, :title_en, :title_fi
       t.string :body_sv, :body_en, :body_fi
     end

data/spec/traco_spec.rb

@@ -59,7 +59,7 @@ end
 
 describe Post, "#title" do
 
-  let(:post) { Post.new(title_sv: "Hej", title_en: "Halloa", title_fi: "Moi moi") }
+  let(:post) { Post.new(:title_sv => "Hej", :title_en => "Halloa", :title_fi => "Moi moi") }
 
   before do
     Post.translates :title
@@ -113,7 +113,7 @@ describe Post, "#title=" do
 
   it "should raise if locale has no column" do
     I18n.locale = :ru
-    -> {
+    lambda {
       post.title = "Privet"
     }.should raise_error(NoMethodError, /title_ru/)
   end
@@ -150,11 +150,11 @@ describe Post, ".human_attribute_name" do
   # ActiveModel::Errors#full_messages passes in an ugly default.
 
   it "should not yield to passed-in defaults" do
-    Post.human_attribute_name(:title_en, default: "Title en").should == "Titel (engelska)"
+    Post.human_attribute_name(:title_en, :default => "Title en").should == "Titel (engelska)"
   end
 
   it "should pass through defaults" do
-    Post.human_attribute_name(:body_sv, default: "Boday").should == "Boday"
+    Post.human_attribute_name(:body_sv, :default => "Boday").should == "Boday"
   end
 
 end

data/traco.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "sqlite3"
 
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-rspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traco
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70306548594400 !ruby/object:Gem::Requirement
+  requirement: &70300030903820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306548594400
+  version_requirements: *70300030903820
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70306548593980 !ruby/object:Gem::Requirement
+  requirement: &70300030903360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306548593980
+  version_requirements: *70300030903360
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70300030902900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70300030902900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70306548593520 !ruby/object:Gem::Requirement
+  requirement: &70300030902460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306548593520
+  version_requirements: *70300030902460
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70306548593100 !ruby/object:Gem::Requirement
+  requirement: &70300030901980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306548593100
+  version_requirements: *70300030901980
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70306548592680 !ruby/object:Gem::Requirement
+  requirement: &70300030901500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306548592680
+  version_requirements: *70300030901500
 description: 
 email:
 - henrik@barsoom.se
@@ -75,6 +86,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Guardfile
 - README.markdown
@@ -118,3 +130,4 @@ test_files:
 - spec/app/sv.yml
 - spec/spec_helper.rb
 - spec/traco_spec.rb
+has_rdoc: