interpreter 0.0.4 → 0.0.5

data/Rakefile

@@ -1,11 +1,11 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-task :default => "test:all"
+task :default => :test
 
 namespace :test do
   desc "Run all cucumber features"
-  task :all do
+  task :cukes do
     system "cucumber test/dummy/features"
   end
 
@@ -14,3 +14,12 @@ namespace :test do
     system "rake test:prepare -f test/dummy/Rakefile"
   end
 end
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end

data/app/controllers/interpreter/translations_controller.rb

@@ -2,17 +2,11 @@ class Interpreter::TranslationsController < ApplicationController
   layout "translations"
 
   def index
-    @categories = InterpreterTranslation.categories
-    if params[:category]
-      @translations = InterpreterTranslation.find_like_key("en.#{params[:category]}.*")
-    else
-      @translations = InterpreterTranslation.all
-    end
+    @translations = InterpreterTranslation.all
   end
 
   def search
-    @categories = InterpreterTranslation.categories
-    @translations = InterpreterTranslation.find_like_key params[:query]
+    @translations = InterpreterTranslation.find_all_by_value_like params[:query]
     @search_notice = "#{@translations.length} translation#{'s' if @translations.length > 1} found."
     render :action => :index
   end
@@ -21,16 +15,8 @@ class Interpreter::TranslationsController < ApplicationController
     @translation = InterpreterTranslation.new
   end
 
-  def show
-    @key = params[:id].gsub('-','.')
-    @translations = InterpreterTranslation.find_all_by_key(@key)
-  end
-
   def create
-    @translation = InterpreterTranslation.new
-    @translation.locale = params[:interpreter_translation][:locale]
-    @translation.key = params[:interpreter_translation][:key]
-    @translation.value = params[:interpreter_translation][:value]
+    @translation = InterpreterTranslation.new params[:interpreter_translation]
     if @translation.save
       redirect_to interpreter_translations_url, :notice => "Translation added."
     else
@@ -38,9 +24,28 @@ class Interpreter::TranslationsController < ApplicationController
     end
   end
 
+  def edit
+    @translation = InterpreterTranslation.find_by_key(params[:id].gsub('-','.'))
+  end
+
+  def update
+    @translation = InterpreterTranslation.find_by_key(parse_id(params[:id]))
+    @translation.update_attributes(params[:interpreter_translation])
+    if @translation.save
+      redirect_to interpreter_translations_url, :notice => "Translation updated."
+    else
+      render :action => :edit
+    end
+  end
+
   def destroy
     count = InterpreterTranslation.destroy(params[:id].gsub('-','.'))
-    redirect_to :back, :notice => "#{count} translation#{'s' if count > 1} destroyed."
+    redirect_to :back, :notice => "Translation destroyed."
   end
 
+  protected
+
+  def parse_id id
+    id.gsub('-','.')
+  end
 end

data/app/models/interpreter_translation.rb

@@ -1,9 +1,4 @@
-class InterpreterTranslation < Interpreter::Base
-  attributes :locale, :key, :value
-
-  validates :locale, :presence => true
-  validates :key, :presence => true
-  validates :value, :presence => true
+class InterpreterTranslation < Interpreter::Translation
 
   def human_name
     "Translation"

data/app/views/interpreter/shared/_css.html.haml

@@ -1,25 +1,14 @@
 :css
-  div#translations .key{
-    float:left;
-    width:400px;
+  table#translations{
+    width:100%;
     overflow:hidden;
-    padding-left:10px;
   }
 
-  div#translations .value{
-    float:left;
-    overflow:hidden;
-    padding-left:10px;
+  table#translations td{
+    padding:0px;
+    margin:0px;
   }
 
-  div#translations .links{
-    float:right;
-    padding-bottom:10px;
-  }
-  div.translation{
-    overflow: auto;
-    width: 100%
-  }
-  div.translation:hover{
+  tr.translation:hover{
     background:#eee;
   }

data/app/views/interpreter/translations/_form.html.haml

@@ -1,16 +1,13 @@
 = form_for @translation do |f|
   = render :partial => 'errors', :locals => {:object => @translation}
-  .field
-    = f.label :locale
-    %br
-    = f.text_field :locale
   .field
     = f.label :key
     %br
     = f.text_field :key
-  .field
-    = f.label :value
-    %br
-    = f.text_field :value
+  - InterpreterTranslation.available_locales.each do |locale|
+    .field
+      = f.label locale
+      %br
+      = f.text_field locale
   .actions
     = f.submit "Save"

data/app/views/interpreter/translations/edit.html.haml

@@ -0,0 +1,6 @@
+%h1= link_to 'Translations', interpreter_translations_url
+
+%h2 Edit Translation
+= render :partial => "form"
+
+= link_to "Cancel", interpreter_translations_path

data/app/views/interpreter/translations/index.html.haml

@@ -9,20 +9,18 @@
     .actions
       = submit_tag "Search"
 
-%h3 Categories
-#categories
-  - @categories.each do |c|
-    = link_to c.capitalize, category_interpreter_translations_path(c)
-
 %p= link_to "New Translation", new_interpreter_translation_path
 
-#translations
-  - @translations.each do |t|
-    .translation{:id => t.id}
-      .key= t.id
-      .value= t.value
-      .links
-        = link_to 'Show', interpreter_translation_path(t.key.gsub('.','-'))
-        = link_to 'Remove', interpreter_translation_path(t.key.gsub('.','-')), :method => :delete
-
-%p= link_to "New Translation", new_interpreter_translation_path
+%table#translations{:cellpadding => 0, :cellspacing => 0}
+  %thead
+    %tr
+      - InterpreterTranslation.available_locales.each do |locale|
+        %td= locale
+  %tbody
+    - @translations.each do |t|
+      %tr.translation{:id => t.key}
+        - InterpreterTranslation.available_locales.each do |locale|
+          %td.locale= t.send(locale)
+        %td.links
+          = link_to 'Edit', edit_interpreter_translation_path(t)
+          = link_to 'Remove', interpreter_translation_path(t), :method => :delete

data/app/views/interpreter/translations/new.html.haml

@@ -1,3 +1,5 @@
+%h1= link_to 'Translations', interpreter_translations_url
+
 %h2 Add Translation
 = render :partial => "form"
 

data/config/routes.rb

@@ -3,7 +3,6 @@ Rails.application.routes.draw do
     resources :translations do
       collection do
         post 'search'
-        get '/group/:category' => 'translations#index', :as => 'category'
       end
     end
   end

data/lib/interpreter.rb

@@ -1,5 +1,6 @@
 module Interpreter
   autoload :Base, "interpreter/base"
+  autoload :Translation, "interpreter/translation"
 
   mattr_reader :backend
   @@backend = nil

data/lib/interpreter/base.rb

@@ -16,6 +16,12 @@ class Interpreter::Base
     self._attributes += names
   end
 
+  def self.locales(*names)
+    attr_accessor *names
+    define_attribute_methods names
+    self._attributes += names
+  end
+
   def attributes
     self._attributes.inject({}) do |hash, attr|
       hash[attr.to_s] = send(attr)
@@ -24,80 +30,11 @@ class Interpreter::Base
   end
 
   def persisted?
-    if id?
-      Interpreter.backend.get(id).nil? ? false : true
-    else
-      false
-    end
-  end
-
-  def id
-    locale + '.' + key
-  end
-
-  def id?
-    locale? and key?
-  end
-
-  def save
-    if self.valid?
-      Interpreter.backend.set("#{locale}.#{key}", value)
-    else
-      return false
-    end
-  end
-
-  def ==(other)
-    self.locale == other.locale and self.key == other.key and self.value == other.value
-  end
-
-  def self.all
-    collection = []
-    Interpreter.backend.keys.each do |k|
-      obj = find_by_key(k)
-      if obj and obj.valid?# and obj.child_keys.empty?
-        collection << obj
-      end
-    end
-    collection.sort{|a, b| a.key <=> b.key}
-  end
-
-  def self.find_all_by_key key
-    result = {}
-    Interpreter.backend.keys("*.#{key}").map{|k| find_by_key(k)}.compact.each do |t|
-      result[t.locale] = t.value
-    end
-    return result
-  end
-
-  def self.find_by_key full_key
-    locale = full_key.split('.')[0]
-    key = full_key.gsub("#{locale}.",'')
-    obj = self.new
-    obj.locale = locale
-    obj.key = key
-    obj.value = Interpreter.backend.get(full_key)
-    obj.valid? ? obj : nil
-  end
-
-  def self.find_like_key str
-    Interpreter.backend.keys("*#{str}*").map{|k| find_by_key(k)}.compact.sort{|a, b| a.locale <=> b.locale}
-  end
-
-  def child_keys
-    Interpreter.backend.keys("#{id}.*")
-  end
-
-  def self.destroy key
-    Interpreter.backend.keys("*.#{key}").sum{|k| Interpreter.backend.del(k)}
-  end
-
-  def self.categories
-    Interpreter.backend.keys.map{|k| k.split('.')[1]}.uniq
+    false
   end
 
-  def self.available_locales
-    Interpreter.locales
+  def new_record?
+    !persisted?
   end
 
   protected

data/lib/interpreter/translation.rb

@@ -0,0 +1,104 @@
+class Interpreter::Translation < Interpreter::Base
+  attributes :key
+  locales *Interpreter.locales
+
+  validates :key, :presence => true
+
+  def initialize options={}
+    self.key = options[:key]
+    self.class.available_locales.each do |locale|
+      self.send("#{locale}=", options[locale])
+    end
+  end
+
+  def persisted?
+    if key?
+      Interpreter.backend.keys("??.#{key}").present?
+    else
+      super
+    end
+  end
+
+  def id
+    self.key.gsub('.','-')
+  end
+
+  def save
+    if self.valid?
+      self.class.available_locales.each do |locale|
+        value = self.send(locale)
+        Interpreter.backend.set("#{locale}.#{key}", value.to_json) unless value.nil?
+      end
+    else
+      return false
+    end
+  end
+
+  def update_attributes options={}
+    self.key = options[:key]
+    self.class.available_locales.each do |locale|
+      self.send("#{locale}=", options[locale])
+    end
+  end
+
+  def ==(other)
+    self.key == other.key
+  end
+
+  def self.all
+    result = []
+    Interpreter.backend.keys("??.*").each do |full_key|
+      key, locale, value = parse_key(full_key)
+
+      obj = result.select{|r| r.key == key }.first || self.new
+      obj.send("#{locale}=", value)
+      obj.send('key=', key)
+      result << obj
+    end
+    return result.uniq
+  end
+
+  def self.find_by_key key
+    collection = Interpreter.backend.keys("??.#{key}")
+    if collection.present?
+      obj = self.new
+      obj.send('key=', key)
+      collection.each do |full_key|
+        key, locale, value = parse_key(full_key)
+        obj.send("#{locale}=", value)
+      end
+      return obj
+    else
+      return nil
+    end
+  end
+
+  def self.find_all_by_value_like str
+    keys = []
+    Interpreter.backend.keys.each do |full_key|
+      if Interpreter.backend.get(full_key).downcase.include?(str.downcase)
+        keys << parse_key(full_key).first
+      end
+    end
+    keys.map{|k| find_by_key k}
+  end
+
+  def self.destroy key
+    Interpreter.backend.keys("??.#{key}").sum{|k| Interpreter.backend.del(k)}
+  end
+
+  def self.available_locales
+    Interpreter.locales
+  end
+
+  protected
+
+  def self.parse_key full_key
+    arr = full_key.split('.')
+    locale = arr.shift
+    key = arr.join('.')
+    value = Interpreter.backend.get(full_key)
+    value = ActiveSupport::JSON.decode(value) unless value.nil?
+    return [key, locale, value]
+  end
+end

data/lib/interpreter/version.rb

@@ -1,3 +1,3 @@
 module Interpreter
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/compliance_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class ComplianceTest < ActiveSupport::TestCase
+  include ActiveModel::Lint::Tests
+  def setup
+    @model = InterpreterTranslation.new
+  end
+end

data/test/dummy/config/environment.rb

@@ -1,5 +1,7 @@
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 
+TRANSLATIONS_BACKEND = Redis.new(:db => 9)
+
 # Initialize the rails application
 Dummy::Application.initialize!

data/test/dummy/config/initializers/interpreter.rb

@@ -1,4 +1,4 @@
 Interpreter.setup do |config|
-  config.backend = Redis.new(:db => 9)
-  config.locales = [:en, :pt, :sp]
+  config.backend = TRANSLATIONS_BACKEND
+  config.locales = [:en, :pt, :es]
 end

data/test/dummy/features/manage_translations.feature

@@ -5,39 +5,52 @@ Feature: Manage translations
 
   Scenario: Add new translation
     Given I am on the new interpreter translation page
-    When I fill in "Locale" with "locale 1"
-      And I fill in "Key" with "key 1"
-      And I fill in "Value" with "value 1"
+    When I fill in "Key" with "key1"
+      And I fill in "En" with "value1"
+      And I fill in "Pt" with "value2"
+      And I fill in "Es" with "value3"
       And I press "Save"
     Then I should see "Translation added."
-      And I should see "locale 1"
-      And I should see "key 1"
-      And I should see "value 1"
+      And I should see "value1"
+      And I should see "value2"
+      And I should see "value3"
 
   Scenario: Edit translation
-    Given a translation is present with key: hello, value: hello and locale: en
-    When I go to the new interpreter translation page
-      And I fill in "Key" with "hello"
-      And I fill in "Value" with "hello again"
-      And I fill in "Locale" with "en"
+    Given a translation is present with key: "hello", en: "hello", pt: "hey" and es: "hoola"
+      And I am on the interpreter translations page
+    When I follow "Edit" within "#hello"
+      And I fill in "En" with "hello again"
+      And I fill in "Pt" with "Hey there"
       And I press "Save"
-    Then I should see "hello"
+    Then I should see "Translation updated."
       And I should see "hello again"
+      And I should see "Hey there"
 
   Scenario: Remove translation
-    Given a translation is present with key: hello, value: hello and locale: en
+    Given a translation is present with key: "hello", en: "hello", pt: "hey" and es: "hoola"
     When I go to the interpreter translations page
-    Then I should see "hello"
+    Then I should see "hello" within "#translations"
       And I should see "Remove"
     When I follow "Remove"
-    Then I should not see "hello"
-      And I should see "1 translation destroyed."
+    Then I should not see "hello" within "#translations"
+      And I should see "Translation destroyed."
       And I should be on the interpreter translations page
 
   Scenario: Search translations
-    Given a translation is present with key: hello, value: hello and locale: en
+    Given a translation is present with key: "hello", en: "hello", pt: "hey" and es: "hoola"
     When I go to the interpreter translations page
       And I fill in "query" with "hello" within "#search_translations"
       And I press "Search"
     Then I should see "hello" within "#translations"
       And I should see "1 translation found."
+
+  Scenario: View all translations for each key on home page
+    Given a translation is present with key: "key1", en: "hello1", pt: "hey1" and es: "hoola1"
+      And a translation is present with key: "key2", en: "hello2", pt: "hey2" and es: "hoola2"
+    When I go to the interpreter translations page
+    Then I should see "hello1" within "#key1"
+      And I should see "hey1" within "#key1"
+      And I should see "hoola1" within "#key1"
+      And I should see "hello2" within "#key2"
+      And I should see "hey2" within "#key2"
+      And I should see "hoola2" within "#key2"

data/test/dummy/features/step_definitions/translation_steps.rb

@@ -13,10 +13,8 @@ Then /^I should see the following translations:$/ do |expected_translations_tabl
   expected_translations_table.diff!(tableish('table tr', 'td,th'))
 end
 
-Given /^a translation is present with key: (.+), value: (.+) and locale: (.+)$/ do |key, value, locale|
-  i = InterpreterTranslation.new
-  i.locale = locale
-  i.key = key
-  i.value = value
+Given /^a translation is present with key: "([^"]*)", en: "([^"]*)", pt: "([^"]*)" and es: "([^"]*)"$/ do |key, en, pt, es|
+  i = InterpreterTranslation.new(:key => key, :en => en, :pt => pt, :es => es)
   i.save
 end
+

data/test/dummy/features/support/hooks.rb

@@ -0,0 +1,4 @@
+# Make sure we flush redis database
+After do
+  TRANSLATIONS_BACKEND.flushdb
+end

data/test/dummy/lib/tasks/test.rake

@@ -1,7 +1,7 @@
 namespace :test do
   desc "Run all cucumber features"
   task :prepare do
-    system "bundle update"
+    system "bundle install"
     Rake::Task["db:create"].invoke
     Rake::Task["db:migrate"].invoke
     Rake::Task["db:test:prepare"].invoke

data/test/test_helper.rb

@@ -0,0 +1,22 @@
+# Configure Rails Envinronment
+ENV["RAILS_ENV"] = "test"
+
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require "rails/test_help"
+
+ActionMailer::Base.delivery_method = :test
+ActionMailer::Base.perform_deliveries = true
+ActionMailer::Base.default_url_options[:host] = "test.com"
+
+Rails.backtrace_cleaner.remove_silencers!
+
+# Configure capybara for integration testing
+require "capybara/rails"
+Capybara.default_driver   = :rack_test
+Capybara.default_selector = :css
+
+# Run any available migration
+ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
+
+# Load support files
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

metadata

@@ -2,7 +2,7 @@
 name: interpreter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jagdeep Singh
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 +05:30
+date: 2011-05-21 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,15 +56,17 @@ files:
 - app/views/interpreter/shared/_css.html.haml
 - app/views/interpreter/translations/_errors.html.haml
 - app/views/interpreter/translations/_form.html.haml
+- app/views/interpreter/translations/edit.html.haml
 - app/views/interpreter/translations/index.html.haml
 - app/views/interpreter/translations/new.html.haml
-- app/views/interpreter/translations/show.html.haml
 - app/views/layouts/translations.html.haml
 - config/routes.rb
 - interpreter.gemspec
 - lib/interpreter.rb
 - lib/interpreter/base.rb
+- lib/interpreter/translation.rb
 - lib/interpreter/version.rb
+- test/compliance_test.rb
 - test/dummy/.gitignore
 - test/dummy/Gemfile
 - test/dummy/Rakefile
@@ -97,6 +99,7 @@ files:
 - test/dummy/features/step_definitions/web_steps.rb
 - test/dummy/features/support/env.rb
 - test/dummy/features/support/factory_girl.rb
+- test/dummy/features/support/hooks.rb
 - test/dummy/features/support/paths.rb
 - test/dummy/features/support/pickle.rb
 - test/dummy/features/support/selectors.rb
@@ -117,6 +120,7 @@ files:
 - test/dummy/script/cucumber
 - test/dummy/script/rails
 - test/dummy/vendor/plugins/.gitkeep
+- test/test_helper.rb
 has_rdoc: true
 homepage: https://github.com/jagdeep/interpreter
 licenses: []
@@ -146,6 +150,7 @@ signing_key:
 specification_version: 3
 summary: Provides an interface for managing translations
 test_files: 
+- test/compliance_test.rb
 - test/dummy/.gitignore
 - test/dummy/Gemfile
 - test/dummy/Rakefile
@@ -178,6 +183,7 @@ test_files:
 - test/dummy/features/step_definitions/web_steps.rb
 - test/dummy/features/support/env.rb
 - test/dummy/features/support/factory_girl.rb
+- test/dummy/features/support/hooks.rb
 - test/dummy/features/support/paths.rb
 - test/dummy/features/support/pickle.rb
 - test/dummy/features/support/selectors.rb
@@ -198,3 +204,4 @@ test_files:
 - test/dummy/script/cucumber
 - test/dummy/script/rails
 - test/dummy/vendor/plugins/.gitkeep
+- test/test_helper.rb

data/app/views/interpreter/translations/show.html.haml

@@ -1,9 +0,0 @@
-%h1 View Translations
-
-%h2= @key
-
-#translations
-  - InterpreterTranslation.available_locales.each do |locale|
-    .translation
-      .locale= locale
-      .value= @translations[locale.to_s]