tr8n 3.2.1 → 3.2.2

data/file

@@ -0,0 +1,94 @@
+#--# Copyright (c) 2010-2012 Michael Berkovich, tr8n.net## Permission is hereby granted, free of charge, to any person obtaining# a copy of this software and associated documentation files (the# "Software"), to deal in the Software without restriction, including# without limitation the rights to use, copy, modify, merge, publish,# distribute, sublicense, and/or sell copies of the Software, and to# permit persons to whom the Software is furnished to do so, subject to# the following conditions:## The above copyright notice and this permission notice shall be# included in all copies or substantial portions of the Software.## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.#++#-- Tr8n::ValueRule Schema Information## Table name: tr8n_language_rules##  id               INTEGER         not null, primary key#  language_id      integer         not null#  translator_id    integer         #  type             varchar(255)    #  definition       text            #  created_at       datetime        #  updated_at       datetime        ## Indexes##  index_tr8n_language_rules_on_language_id_and_translator_id    (language_id, translator_id) #  index_tr8n_language_rules_on_language_id                      (language_id) ##++class Tr8n::ValueRule < Tr8n::LanguageRule
+  
+  def self.description
+    "token object may have a value, which"
+  end
+  
+  def self.dependency
+    "value" 
+  end
+  
+  def self.dependant?(token)
+    token.name != Tr8n::Config.rules_engine[:viewing_user_token]
+  end
+
+  def self.suffixes
+    Tr8n::Config.rules_engine[:value_rule][:token_suffixes]
+  end
+
+  def self.default_rules_for(language = Tr8n::Config.current_language)
+    Tr8n::Config.default_value_rules(language.locale)
+  end
+  
+  def self.operator_options
+    [["starts with", "starts_with"], ["does not start with", "does_not_start_with"], 
+     ["ends in", "ends_in"], ["does not end in", "does_not_end_in"],
+     ["is", "is"], ["is not", "is_not"]]
+  end
+
+  def self.transformable?
+    false
+  end
+
+  def self.token_value(token)
+    return nil unless token and token.respond_to?(Tr8n::Config.rules_engine[:value_rule][:object_method])
+    token.send(Tr8n::Config.rules_engine[:value_rule][:object_method])
+  end
+
+  def evaluate(token)
+    token_value = self.class.token_value(token)
+    return false unless token_value
+
+    token_value = token_value.gsub(/<\/?[^>]*>/, "")
+    values = Tr8n::LanguageRule.sanitize_values(definition["value"])
+    
+    case definition["operator"]
+      when "starts_with" 
+        values.each do |value|
+          return true if token_value.to_s =~ /^#{value.to_s}/  
+        end
+        return false
+      when "does_not_start_with"         
+        values.each do |value|
+          return false if token_value.to_s =~ /^#{value.to_s}/  
+        end
+        return true
+      when "ends_in"
+        values.each do |value|
+          return true if token_value.to_s =~ /#{value.to_s}$/  
+        end
+        return false
+      when "does_not_end_in"         
+        values.each do |value|
+          return false if token_value.to_s =~ /#{value.to_s}$/  
+        end
+        return true
+      when "is"         
+        return values.include?(token_value)
+      when "is_not"        
+        return !values.include?(token_value)
+    end
+    
+    false
+  end
+
+  def to_hash
+    {:type => self.class.dependency, :operator => definition[:operator], :value => definition[:value]}
+  end
+
+  # used to describe a context of a given translation
+  def description
+    desc = ""
+    case definition["operator"]
+      when "starts_with" then desc << " starts with"
+      when "does_not_start_with" then desc << " does not start with"        
+      when "ends_in" then desc << " ends in"        
+      when "does_not_end_in" then desc << " does not end in"        
+      when "is" then desc << " is"        
+      when "is_not" then desc << " is not"        
+    end
+    desc << " <strong>'" << Tr8n::LanguageRule.humanize_values(definition["value"]) << "'</strong>"
+    desc.html_safe
+  end
+
+end

data/lib/tasks/dev.rake

@@ -0,0 +1,162 @@
+#--
+# Copyright (c) 2010-2012 Michael Berkovich, tr8n.net
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+namespace :dev do
+
+# <ActiveRecord::ConnectionAdapters::SQLiteColumn:0x007fdffc77bee0
+#  @coder=nil,
+#  @default=nil,
+#  @limit=nil,
+#  @name="id",
+#  @null=false,
+#  @precision=nil,
+#  @primary=true,
+#  @scale=nil,
+#  @sql_type="INTEGER",
+#  @type=:integer>
+
+# <struct ActiveRecord::ConnectionAdapters::IndexDefinition
+#  table="will_filter_filters",
+#  name="index_will_filter_filters_on_user_id",
+#  unique=false,
+#  columns=["user_id"],
+#  lengths=nil>
+
+  desc "Annotates tr8n models"
+  task :annotate => :environment do
+    Dir[File.expand_path("#{File.dirname(__FILE__)}/../../app/models/tr8n/*.rb")].sort.each do |file|
+      class_name = file[file.rindex('tr8n')..-1].gsub('.rb', '').camelcase
+      klass = class_name.constantize
+      lines = []
+      lines << "#--"
+      lines << "# Copyright (c) 2010-2012 Michael Berkovich, tr8n.net"
+      lines << "#"
+      lines << "# Permission is hereby granted, free of charge, to any person obtaining"
+      lines << "# a copy of this software and associated documentation files (the"
+      lines << "# \"Software\"), to deal in the Software without restriction, including"
+      lines << "# without limitation the rights to use, copy, modify, merge, publish,"
+      lines << "# distribute, sublicense, and/or sell copies of the Software, and to"
+      lines << "# permit persons to whom the Software is furnished to do so, subject to"
+      lines << "# the following conditions:"
+      lines << "#"
+      lines << "# The above copyright notice and this permission notice shall be"
+      lines << "# included in all copies or substantial portions of the Software."
+      lines << "#"
+      lines << "# THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,"
+      lines << "# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF"
+      lines << "# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND"
+      lines << "# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE"
+      lines << "# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION"
+      lines << "# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION"
+      lines << "# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+      lines << "#++"
+      lines << "#"
+      lines << "#-- #{class_name} Schema Information"
+      lines << "#"
+      lines << "# Table name: #{klass.table_name}"
+      lines << "#"
+
+      name_width = 0
+      type_width = 0
+      sql_type_width = 0
+
+      klass.columns.each do |column|
+        name_width = [column.name.to_s.length, name_width].max
+        type_width = [column.type.to_s.length, type_width].max
+        sql_type_width = [column.sql_type.to_s.length, sql_type_width].max
+      end
+
+      klass.columns.each do |column|
+        line = ["#  "]
+        line << column.name
+        line << (" " * (name_width - column.name.length + 4))
+        # line << column.type.to_s
+        # line << (" " * (type_width - column.type.to_s.length + 4))
+        line << column.sql_type
+        line << (" " * (sql_type_width - column.sql_type.to_s.length + 4))
+
+        meta = []
+        meta << "not null" if !column.null
+        meta << "primary key" if column.primary
+        meta << "default = #{column.default.to_s}" if column.default
+        line << meta.join(', ')
+
+        lines << line.join('')
+      end
+
+      lines << "#"
+      lines << "# Indexes"
+      lines << "#"
+
+      indexes = ActiveRecord::Base.connection.indexes(klass.table_name)
+
+      name_width = 0
+
+      indexes.each do |index|
+        name_width = [index.name.to_s.length, name_width].max
+      end
+
+      indexes.each do |index|
+        line = ["#  "]
+        line << index.name
+        line << (" " * (name_width - index.name.length + 4))
+        line << "(#{index.columns.join(', ')})"
+        line << " "
+        line << "UNIQUE" if index.unique
+        lines << line.join('')
+      end
+
+      lines << "#"
+      lines << "#++"
+
+      pp "Updating #{file}..."
+
+      model_file = File.open(file, "r+")
+      old_lines = model_file.readlines
+      model_file.close
+      
+      model_file = File.new(file, "w")
+      lines.each do |line|
+        model_file.write(line + "\r\n")
+      end
+
+      in_class = false
+      old_lines.each do |line|
+        in_class = true unless line.index("#") == 0
+
+        next unless in_class
+        model_file.write(line)
+      end
+      model_file.close      
+
+      # file_name = file[file.rindex('tr8n')+5..-1].gsub('.rb', '')
+      # path = File.expand_path("#{File.dirname(__FILE__)}/../../app") + "/data"
+      # FileUtils.mkdir_p(path) unless File.exist?(path)
+
+      # File.open("#{path}/#{file_name}.txt", 'w') do |f|
+      #   f.write(lines.join("\r\n"))
+      # end
+    end
+  end
+
+end

data/lib/tr8n/config.rb

@@ -234,6 +234,10 @@ module Tr8n
       config[:enable_key_caller_tracking]
     end
 
+    def self.enable_key_verification?
+      config[:enable_key_verification]
+    end
+
     def self.enable_google_suggestions?
       config[:enable_google_suggestions]
     end
@@ -812,4 +816,4 @@ module Tr8n
     end
     
   end
-end
+end

data/lib/tr8n/version.rb

@@ -23,5 +23,5 @@
 
 
 module Tr8n
-  VERSION = "3.2.1"
+  VERSION = "3.2.2"
 end

data/local/tr8n_server/config/tr8n/config.yml

@@ -19,7 +19,8 @@ defaults:
   enable_tr8n:                true      # enables the engine
   enable_key_source_tracking: false     # builds the site map sources - must be enabled for the API
   enable_key_caller_tracking: false     # tracks all calls to labels with their traces - for debugging only
-  
+  enable_key_verification:    false     # marks cached keys as verified, for cleanup
+
   enable_glossary_hints:      true      # shows glossary in the translator    
   enable_software_keyboard:   true      # shows the soft keyboard icon  
   enable_keyboard_shortcuts:  true      # adds some keyboard shortcuts like ctrl+shift+s

data/local/tr8n_server/db/schema.rb

@@ -260,7 +260,6 @@ ActiveRecord::Schema.define(:version => 20111026230545) do
   end
 
   add_index "tr8n_translation_keys", ["key"], :name => "index_tr8n_translation_keys_on_key", :unique => true
-  add_index "tr8n_translation_keys", ["synced_at"], :name => "index_tr8n_translation_keys_on_synced_at"
 
   create_table "tr8n_translation_source_languages", :force => true do |t|
     t.integer  "language_id"
@@ -305,7 +304,6 @@ ActiveRecord::Schema.define(:version => 20111026230545) do
   end
 
   add_index "tr8n_translations", ["created_at"], :name => "tr8n_trans_created_at"
-  add_index "tr8n_translations", ["synced_at"], :name => "index_tr8n_translations_on_synced_at"
   add_index "tr8n_translations", ["translation_key_id", "translator_id", "language_id"], :name => "tr8n_trans_key_id_translator_id_lang_id"
   add_index "tr8n_translations", ["translator_id"], :name => "r8n_trans_translator_id"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tr8n
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000Z
+date: 2012-04-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70337878416480 !ruby/object:Gem::Requirement
+  requirement: &70352669837360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70337878416480
+  version_requirements: *70352669837360
 - !ruby/object:Gem::Dependency
   name: will_filter
-  requirement: &70337878412140 !ruby/object:Gem::Requirement
+  requirement: &70352669862940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70337878412140
+  version_requirements: *70352669862940
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70337878408320 !ruby/object:Gem::Requirement
+  requirement: &70352669862460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337878408320
+  version_requirements: *70352669862460
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70337878401000 !ruby/object:Gem::Requirement
+  requirement: &70352669861980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337878401000
+  version_requirements: *70352669861980
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70337878395980 !ruby/object:Gem::Requirement
+  requirement: &70352669861500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337878395980
+  version_requirements: *70352669861500
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70337878393920 !ruby/object:Gem::Requirement
+  requirement: &70352669861020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337878393920
+  version_requirements: *70352669861020
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70337878391400 !ruby/object:Gem::Requirement
+  requirement: &70352669860540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337878391400
+  version_requirements: *70352669860540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70337878389580 !ruby/object:Gem::Requirement
+  requirement: &70352669860060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70337878389580
+  version_requirements: *70352669860060
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70337878387860 !ruby/object:Gem::Requirement
+  requirement: &70352669859580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337878387860
+  version_requirements: *70352669859580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70337878385780 !ruby/object:Gem::Requirement
+  requirement: &70352669859100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337878385780
+  version_requirements: *70352669859100
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70337878384260 !ruby/object:Gem::Requirement
+  requirement: &70352669858620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *70337878384260
+  version_requirements: *70352669858620
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70337878382360 !ruby/object:Gem::Requirement
+  requirement: &70352669858140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337878382360
+  version_requirements: *70352669858140
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70337878380220 !ruby/object:Gem::Requirement
+  requirement: &70352669857660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337878380220
+  version_requirements: *70352669857660
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70337878376900 !ruby/object:Gem::Requirement
+  requirement: &70352669857180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337878376900
+  version_requirements: *70352669857180
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70337878369000 !ruby/object:Gem::Requirement
+  requirement: &70352669856700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337878369000
+  version_requirements: *70352669856700
 - !ruby/object:Gem::Dependency
   name: steak
-  requirement: &70337878360940 !ruby/object:Gem::Requirement
+  requirement: &70352669856220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337878360940
+  version_requirements: *70352669856220
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70337878356320 !ruby/object:Gem::Requirement
+  requirement: &70352669855740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337878356320
+  version_requirements: *70352669855740
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70337895099260 !ruby/object:Gem::Requirement
+  requirement: &70352669855260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337895099260
+  version_requirements: *70352669855260
 - !ruby/object:Gem::Dependency
   name: memcache-client
-  requirement: &70337895098780 !ruby/object:Gem::Requirement
+  requirement: &70352669871140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,7 +219,7 @@ dependencies:
         version: 1.8.5
   type: :development
   prerelease: false
-  version_requirements: *70337895098780
+  version_requirements: *70352669871140
 description: Crowd-sourced translation and localization engine for Rails.
 email:
 - michael@tr8n.net
@@ -906,7 +906,7 @@ files:
 - app/views/tr8n/translator/index.html.erb
 - app/views/tr8n/translator/lb_report.html.erb
 - app/views/tr8n/translator/registration.html.erb
-- bin/tr8n.rb
+- bin/tr8n
 - config/routes.rb
 - db/migrate/20100405201417_create_tr8n_tables.rb
 - db/migrate/20111003194443_create_tr8n_sync_tables.rb
@@ -921,6 +921,7 @@ files:
 - doc/integration.doc
 - doc/integration.docx
 - doc/pixel client sdk.graffle
+- file
 - lib/generators/tr8n/templates/config/tr8n/config.yml
 - lib/generators/tr8n/templates/config/tr8n/data/ip_locations.csv
 - lib/generators/tr8n/templates/config/tr8n/rules/default_date_rules.yml
@@ -941,6 +942,7 @@ files:
 - lib/generators/tr8n/templates/layouts/tr8n.html.erb
 - lib/generators/tr8n/templates/layouts/tr8n_admin.html.erb
 - lib/generators/tr8n/tr8n_generator.rb
+- lib/tasks/dev.rake
 - lib/tasks/tr8n.rake
 - lib/tr8n.rb
 - lib/tr8n/active_dumper.rb
@@ -1129,7 +1131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1941493027539955602
+      hash: -4554087059962764980
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1138,7 +1140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1941493027539955602
+      hash: -4554087059962764980
 requirements: []
 rubyforge_project: tr8n
 rubygems_version: 1.8.10