trasto 0.0.1 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fdba46e380e59bcaf304a7cc645cedbd7062466d
+  data.tar.gz: 9b21e91148b4ca8d3ac5291382406fc61cdc7056
+SHA512:
+  metadata.gz: 11862ebd7292a2595186f53c0f51f92e91a447d70ad4d5479d1dc4c5255e1d01c1631c0b4414fd4445f4a0c362d43920b7213dde15b33708818776ce7002bdc9
+  data.tar.gz: 993536f19629c433893116f6e05fe9bd5712161e4927fd27bba157e9357c4a02e4d1543ed286b1e7bc139ebe20e9f51316c10b69881ddca6ad939bbe4bb0801e

data/.gitignore

@@ -10,7 +10,7 @@ pickle-email-*.html
 .bundle
 .config
 .yardoc
-Gemfile.lock
+*emfile.lock
 InstalledFiles
 _yardoc
 coverage

data/.rubocop.yml

@@ -0,0 +1,5 @@
+LineLength:
+  Max: 132
+
+Documentation:
+  Enabled: false

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+cache: bundler
+
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+  - "2.1.2"
+
+gemfile:
+  - gemfiles/3.2.gemfile
+  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
+
+before_script:
+  - psql -c 'create database "trasto-test";' -U postgres

data/Appraisals

@@ -0,0 +1,14 @@
+appraise "3.2" do
+  gem "activerecord", "~> 3.2.19"
+  gem "activerecord-postgres-hstore"
+end
+
+appraise "4.0" do
+  gem "activerecord", "~> 4.0.0"
+end
+
+appraise "4.1" do
+  gem "activerecord", "~> 4.1.0"
+end
+
+# vim: set ft=ruby :

data/README.md

@@ -45,9 +45,13 @@ You can still use your accessors for `title_i18n` and `title_i18=` in forms, val
 
 Add this to your `Gemfile` if you use Bundler 1.1+:
 
-    gem 'traco'
+    gem 'trasto'
 
-Then run
+If you're using Rails 3, add the following gem:
+
+    gem 'activerecord-postgres-hstore'
+
+Hstore support comes out of the box in Rails 4. Then run
 
     bundle install
 
@@ -63,7 +67,7 @@ to install it.
 
 By [Morton Jonuschat](https://github.com/yabawock) under the MIT license:
 
->  Copyright (c) 2012 Morton Jonuschat
+>  Copyright (c) 2012-2014 Morton Jonuschat
 >
 >  Permission is hereby granted, free of charge, to any person obtaining a copy
 >  of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/gemfiles/3.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 3.2.19"
+gem "activerecord-postgres-hstore"
+
+gemspec :path => "../"

data/gemfiles/4.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.0.0"
+
+gemspec :path => "../"

data/gemfiles/4.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.1.0"
+
+gemspec :path => "../"

data/lib/trasto.rb

@@ -1,4 +1,4 @@
-require "trasto/version"
-require "trasto/translates"
-require "trasto/class_methods"
-require "trasto/instance_methods"
+require 'trasto/version'
+require 'trasto/translates'
+require 'trasto/class_methods'
+require 'trasto/instance_methods'

data/lib/trasto/class_methods.rb

@@ -1,6 +1,5 @@
 module Trasto
   module ClassMethods
-
     private
 
     def translates?(column)
@@ -8,8 +7,7 @@ module Trasto
     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/trasto/instance_methods.rb

@@ -1,11 +1,12 @@
 module Trasto
   module InstanceMethods
-
     private
 
     def read_localized_value(column)
+      return nil unless (column_value = send("#{column}_i18n"))
+
       locales_for_reading_column(column).each do |locale|
-        value = send("#{column}_i18n")[locale]
+        value = column_value[locale]
         return value if value.present?
       end
       nil
@@ -13,18 +14,17 @@ module Trasto
 
     def write_localized_value(column, value)
       translations = send("#{column}_i18n") || {}
-      send("#{column}_i18n=", translations.merge({I18n.locale => value}))
+      send("#{column}_i18n=", translations.merge(I18n.locale => value).with_indifferent_access)
     end
 
     def locales_for_reading_column(column)
-      send("#{column}_i18n").keys.sort_by { |locale|
-        case locale
-        when I18n.locale then "0"
-        when I18n.default_locale then "1"
+      send("#{column}_i18n").keys.sort_by do |locale|
+        case locale.to_sym
+        when I18n.locale then '0'
+        when I18n.default_locale then '1'
         else locale.to_s
         end
-      }
+      end
     end
-
   end
 end

data/lib/trasto/translates.rb

@@ -1,7 +1,6 @@
 module Trasto
   module Translates
     def translates(*columns)
-
       extend Trasto::ClassMethods
       include Trasto::InstanceMethods
 
@@ -14,16 +13,18 @@ module Trasto
 
       self.translatable_columns |= columns.map(&:to_sym)
 
-      columns.each do |column|
+      columns.each { |column| define_localized_attribute(column) }
+    end
 
-        define_method(column) do
-          read_localized_value(column)
-        end
+    private
 
-        define_method("#{column}=") do |value|
-          write_localized_value(column, value)
-        end
+    def define_localized_attribute(column)
+      define_method(column) do
+        read_localized_value(column)
+      end
 
+      define_method("#{column}=") do |value|
+        write_localized_value(column, value)
       end
     end
   end

data/lib/trasto/version.rb

@@ -1,3 +1,3 @@
 module Trasto
-  VERSION = "0.0.1"
+  VERSION = '0.1.0'
 end

data/spec/spec_helper.rb

@@ -11,22 +11,29 @@ end
 # Very much based on the test setup in
 # https://github.com/iain/translatable_columns/
 
-require "active_record"
-require "activerecord-postgres-hstore"
-require "activerecord-postgres-hstore/activerecord"
-require "app/post.rb"
+require 'active_record'
 
-ActiveRecord::Base.establish_connection :adapter => "postgresql", :database => "test"
+if ActiveRecord::VERSION::MAJOR == 3
+  require 'activerecord-postgres-hstore'
+  require 'activerecord-postgres-hstore/activerecord'
+end
+
+require 'app/post.rb'
+require 'pry'
+
+ActiveRecord::Base.establish_connection adapter: 'postgresql', database: 'trasto-test'
+
+I18n.enforce_available_locales ||= false
 
 silence_stream(STDOUT) do
-  ActiveRecord::Schema.define(:version => 0) do
-    execute "CREATE EXTENSION IF NOT EXISTS hstore"
+  ActiveRecord::Schema.define(version: 0) do
+    execute 'CREATE EXTENSION IF NOT EXISTS hstore'
 
-    create_table :posts, :force => true do |t|
+    create_table :posts, force: true do |t|
       t.hstore :title_i18n
       t.hstore :body_i18n
     end
   end
 end
 
-I18n.load_path << "spec/app/de.yml"
+I18n.load_path << 'spec/app/de.yml'

data/spec/trasto_spec.rb

@@ -1,87 +1,93 @@
-require "spec_helper"
-require "trasto"
+require 'spec_helper'
+require 'trasto'
 
-describe ActiveRecord::Base, ".translates" do
+describe ActiveRecord::Base, '.translates' do
 
-  it "should be available" do
-    Post.should respond_to :translates
+  it 'should be available' do
+    expect(Post).to respond_to :translates
   end
 
-  it "should add functionality" do
-    Post.new.should_not respond_to :title
+  it 'should add functionality' do
+    expect(Post.new).not_to respond_to :title
     Post.translates :title
-    Post.new.should respond_to :title
+    expect(Post.new).to respond_to :title
   end
 
-  it "should be possible to run more than once" do
-    Post.new.should_not respond_to :title, :body
+  it 'should be possible to run more than once' do
+    expect(Post.new).not_to respond_to :title, :body
     Post.translates :title
     Post.translates :body
-    Post.new.should respond_to :title, :body
+    expect(Post.new).to respond_to :title, :body
   end
 
-  it "inherits columns from the superclass" do
+  it 'inherits columns from the superclass' do
     Post.translates :title
     SubPost.translates :body
-    SubPost.new.should respond_to :title, :body
-    Post.new.should respond_to :title
-    Post.new.should_not respond_to :body
+    expect(SubPost.new).to respond_to :title, :body
+    expect(Post.new).to respond_to :title
+    expect(Post.new).not_to respond_to :body
   end
 
 end
 
-describe Post, ".translatable_columns" do
+describe Post, '.translatable_columns' do
 
   before do
     Post.translates :title
   end
 
-  it "should list the translatable columns" do
-    Post.translatable_columns.should == [ :title ]
+  it 'should list the translatable columns' do
+    expect(Post.translatable_columns).to eq([:title])
   end
 
 end
 
-describe Post, "#title" do
+describe Post, '#title' do
 
-  let(:post) { Post.new(:title_i18n => { :de => "Hallo", :en => "Hello", :sv => "Hej"} ) }
+  let(:post) { Post.new(title_i18n: { de: 'Hallo', en: 'Hello', sv: 'Hej' }) }
 
   before do
     Post.translates :title
     I18n.locale = :en
     I18n.default_locale = :de
+
+    post.title_i18n = post.title_i18n.with_indifferent_access
   end
 
-  it "should give the title in the current locale" do
-    post.title.should == "Hello"
+  it 'should give the title in the current locale' do
+    expect(post.title).to eq('Hello')
   end
 
-  it "should fall back to the default locale if locale has entry" do
+  it 'should fall back to the default locale if locale has entry' do
     I18n.locale = :ru
-    post.title.should == "Hallo"
+    expect(post.title).to eq('Hallo')
   end
 
-  it "should fall back to the default locale if blank" do
-    post.title_i18n[:en] = " "
-    post.title.should == "Hallo"
+  it 'should fall back to the default locale if blank' do
+    post.title_i18n['en'] = ' '
+    expect(post.title).to eq('Hallo')
   end
 
-  it "should fall back to any other locale if default locale is blank" do
-    post.title_i18n[:en] = " "
-    post.title_i18n[:de] = ""
-    post.title.should == "Hej"
+  it 'should fall back to any other locale if default locale is blank' do
+    post.title_i18n['en'] = ' '
+    post.title_i18n['de'] = ''
+    expect(post.title).to eq('Hej')
   end
 
-  it "should return nil if all are blank" do
-    post.title_i18n[:en] = " "
-    post.title_i18n[:de] = ""
-    post.title_i18n[:sv] = nil
-    post.title.should be_nil
+  it 'should return nil if all are blank' do
+    post.title_i18n['en'] = ' '
+    post.title_i18n['de'] = ''
+    post.title_i18n['sv'] = nil
+    expect(post.title).to be_nil
   end
 
+  it 'should return nil on a blank record' do
+    post.title_i18n = nil
+    expect(post.title).to be_nil
+  end
 end
 
-describe Post, "#title=" do
+describe Post, '#title=' do
 
   before do
     Post.translates :title
@@ -90,10 +96,10 @@ describe Post, "#title=" do
 
   let(:post) { Post.new }
 
-  it "should assign in the current locale" do
-    post.title = "Hallo"
-    post.title.should == "Hallo"
-    post.title_i18n[:de].should == "Hallo"
+  it 'should assign in the current locale' do
+    post.title = 'Hallo'
+    expect(post.title).to eq('Hallo')
+    expect(post.title_i18n['de']).to eq('Hallo')
   end
 
 end

data/trasto.gemspec

@@ -4,22 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'trasto/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "trasto"
+  gem.name          = 'trasto'
   gem.version       = Trasto::VERSION
-  gem.authors       = ["Morton Jonuschat"]
-  gem.email         = ["yabawock@gmail.com"]
-  gem.description   = %q{Translatable columns for Rails 3, directly stored in a postgres hstore in the model table.}
-  gem.summary       = %q{Make use of PostgreSQL hstore extension to store all column translations directly in the model table without adding tons of tables or columns}
-  gem.homepage      = "https://github.com/yabawock/trasto"
+  gem.authors       = ['Morton Jonuschat']
+  gem.email         = ['yabawock@gmail.com']
+  gem.description   = 'Translatable columns for Rails 3, directly stored in a postgres hstore in the model table.'
+  gem.summary       = 'Use PostgreSQL hstore to keep column translations in the model table without adding lots of tables/columns.'
+  gem.homepage      = 'https://github.com/yabawock/trasto'
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(/^bin\//).map { |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(/^(test|spec|features)\//)
+  gem.require_paths = ['lib']
 
-  gem.add_dependency              "pg",                           "~> 0.10"
-  gem.add_dependency              "activerecord-postgres-hstore", ">= 0.4.0"
+  gem.add_dependency 'pg',                        '~> 0.10'
 
-  gem.add_development_dependency  "rake",                         "~> 0.9.2"
-  gem.add_development_dependency  "rspec",                        "~> 2.11.0"
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec',         '~> 3.0'
+  gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'appraisal'
 end

metadata

@@ -1,80 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: trasto
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Morton Jonuschat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-26 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: activerecord-postgres-hstore
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '0'
 description: Translatable columns for Rails 3, directly stored in a postgres hstore
   in the model table.
 email:
@@ -83,11 +88,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/3.2.gemfile
+- gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
 - lib/trasto.rb
 - lib/trasto/class_methods.rb
 - lib/trasto/instance_methods.rb
@@ -100,29 +111,28 @@ files:
 - trasto.gemspec
 homepage: https://github.com/yabawock/trasto
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: Make use of PostgreSQL hstore extension to store all column translations
-  directly in the model table without adding tons of tables or columns
+specification_version: 4
+summary: Use PostgreSQL hstore to keep column translations in the model table without
+  adding lots of tables/columns.
 test_files:
 - spec/app/de.yml
 - spec/app/post.rb