trip_advisor 0.0.15 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37b68982a31da5d78d1dada2e1cbeea00866d469
-  data.tar.gz: c4f085998646ab79ab6bee99bbea4a8aba0463b4
+  metadata.gz: d203e663047d513bed41c728c4bce190b68027b6
+  data.tar.gz: 532c455e70d43ddafa6bd4cdf886ab1993a0f22c
 SHA512:
-  metadata.gz: 2a1ed3a13ab73984766aaf58df02f2922adddc3b8bc15f1e75db442e9bff0ac3ccc4a4a66e0dd24b8b3acb86826e2ab261391816dc20251d8678da6b76215eab
-  data.tar.gz: a574629b28a8d3dc9844c250c1eb8db074f2972604438f1444bf8e3867d2f5e67cf0d52452ee165cf039eb8084b772e4ecf276b19d0c176a5a90fde25cf722fe
+  metadata.gz: f436ed7eb98dfaced6f7ed0f722e50d2d8de56f723267f39bb8327dccba110e858d14827b18a818acf7b5d9c36e3be5ba98c9d9098fb006e38ecdb5a2aeed11a
+  data.tar.gz: ceaf49630fdd9161ab7938eb11c0216510f860003d134d14dee6f4d7746cbf03b00cdc885d630a4d4a154ed9a9b67a0fd96cb256d8a4b5f112b79a72ef3ac0f7

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    trip_advisor (0.0.15)
+    trip_advisor (0.0.21)
       addressable (~> 2.3.5)
-      cocoapods (~> 0.34.2)
+      cocoapods (~> 0.38.2)
       highline (~> 1.6.19)
       nokogiri (~> 1.6.0)
       oj (~> 2.1.6)
@@ -15,38 +15,41 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.21)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+    activesupport (4.2.4)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     addressable (2.3.6)
-    claide (0.7.0)
-    cocoapods (0.34.4)
-      activesupport (>= 3.2.15, < 4)
-      claide (~> 0.7.0)
-      cocoapods-core (= 0.34.4)
-      cocoapods-downloader (~> 0.7.2)
-      cocoapods-plugins (~> 0.3.1)
-      cocoapods-trunk (~> 0.3.1)
-      cocoapods-try (~> 0.4.1)
+    claide (0.9.1)
+    cocoapods (0.38.2)
+      activesupport (>= 3.2.15)
+      claide (~> 0.9.1)
+      cocoapods-core (= 0.38.2)
+      cocoapods-downloader (~> 0.9.1)
+      cocoapods-plugins (~> 0.4.2)
+      cocoapods-stats (~> 0.5.3)
+      cocoapods-trunk (~> 0.6.1)
+      cocoapods-try (~> 0.4.5)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      json_pure (~> 1.8)
+      molinillo (~> 0.3.1)
       nap (~> 0.8)
-      open4 (~> 1.3)
-      xcodeproj (~> 0.19.4)
-    cocoapods-core (0.34.4)
+      xcodeproj (~> 0.26.3)
+    cocoapods-core (0.38.2)
       activesupport (>= 3.2.15)
       fuzzy_match (~> 2.0.4)
-      json_pure (~> 1.8)
       nap (~> 0.8.0)
-    cocoapods-downloader (0.7.2)
-    cocoapods-plugins (0.3.2)
+    cocoapods-downloader (0.9.3)
+    cocoapods-plugins (0.4.2)
       nap
-    cocoapods-trunk (0.3.1)
-      json_pure (~> 1.8)
-      nap (>= 0.8)
+    cocoapods-stats (0.5.3)
+      nap (~> 0.8)
+    cocoapods-trunk (0.6.4)
+      nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
-    cocoapods-try (0.4.3)
+    cocoapods-try (0.4.5)
     colored (1.2)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
@@ -56,23 +59,20 @@ GEM
     fuzzy_match (2.0.4)
     highline (1.6.21)
     i18n (0.7.0)
-    json (1.8.2)
-    json_pure (1.8.2)
+    json (1.8.3)
     mime-types (1.25.1)
     mini_portile (0.6.2)
+    minitest (5.8.0)
+    molinillo (0.3.1)
     multi_json (1.10.1)
     nap (0.8.0)
     netrc (0.7.8)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     oj (2.1.7)
-    open4 (1.3.4)
     rake (10.4.2)
-    rdoc (4.2.0)
-      json (~> 1.4)
-    rest-client (1.6.8)
+    rest-client (1.6.9)
       mime-types (~> 1.16)
-      rdoc (>= 2.4.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -91,24 +91,28 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    thread_safe (0.3.5)
     tomdoc (0.2.5)
       colored
       ruby_parser (>= 2.0.4)
     twine (0.4.0)
       rubyzip (~> 0.9.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     webmock (1.13.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    xcodeproj (0.19.4)
-      activesupport (~> 3.0)
+    xcodeproj (0.26.3)
+      activesupport (>= 3)
+      claide (~> 0.9.1)
       colored (~> 1.2)
-    xcpretty (0.1.10)
+    xcpretty (0.1.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.7)
+  bundler (~> 1.10.6)
   excon (~> 0.26.0)
   rake
   rspec (~> 2.14.0)
@@ -116,3 +120,6 @@ DEPENDENCIES
   tomdoc (~> 0.2.5)
   trip_advisor!
   webmock (~> 1.13.0)
+
+BUNDLED WITH
+   1.10.6

data/lib/trip_advisor/build.rb

@@ -51,7 +51,7 @@ module TripAdvisor
       @path = path
       @repo = Rugged::Repository.new(path)
       @info = BuildInfo.new(repo)
-      @pod_repo = "tripadvisor"
+      @pod_repo = 'tripadvisor-mobile-ta-specs'
       @reporter = ConsoleReporter.new
       @version_prefix = 'v'
     end
@@ -140,7 +140,7 @@ module TripAdvisor
     end
 
     def push_podspec!
-      run("bundle exec pod repo push #{pod_repo} #{podspec_file}")
+      run("bundle exec pod repo push --use-libraries --allow-warnings #{pod_repo} #{podspec_file}")
     end
     
     def update_staging_area(files)

data/lib/trip_advisor/db_access.rb

@@ -0,0 +1,50 @@
+require 'pg'
+
+module TripAdvisor
+  class TranslationDBAccess
+
+    # Create the connection instance.
+  def connect
+    @conn = PG.connect(
+      :host => 'rivendell.tripadvisor.com',
+      :dbname => 'tripmaster',
+      :user => 'tripmaster_ro')
+  end
+
+  # Disconnect the back-end connection.
+    def disconnect
+      @conn.close
+    end
+
+  # Get translations for keys in array
+  def getTranslations(key_names)
+    queryString = "SELECT v.locale, k.name, v.value, k.status, k.note
+                   FROM t_translationkeys k
+                   INNER JOIN t_translationvalues v ON (k.id = v.translationid)
+                   WHERE k.name IN ('#{key_names.join("', '")}')
+                   ORDER BY v.locale DESC;"
+
+    @conn.exec(queryString) do |result|
+        result.each do |row|
+          yield row if block_given?
+        end
+    end
+  end
+
+  # Get translation for a single key
+  def getTranslation(key_name)
+    queryString = "SELECT v.locale, k.name, v.value, k.status, k.note
+                   FROM t_translationkeys k
+                   INNER JOIN t_translationvalues v ON (k.id = v.translationid)
+                   WHERE k.name = '#{key_name}'
+                   ORDER BY v.locale DESC;"
+
+    @conn.exec(queryString) do |result|
+        result.each do |row|
+          yield row if block_given?
+        end
+    end
+  end
+
+  end
+end

data/lib/trip_advisor/rake_tasks.rb

@@ -7,7 +7,7 @@ module TripAdvisor
 
     def initialize
       @platform = 'iOS Simulator'
-      @name = 'iPhone 5s'
+      @name = 'iPhone 6'
       @valid_schemes = []
     end
 
@@ -91,8 +91,8 @@ module TripAdvisor
       @namespace_name = namespace_name.is_a?(Hash) ? namespace_name.keys.first : namespace_name
       @prepare_dependency = namespace_name.is_a?(Hash) ? namespace_name.values.first : nil
       @schemes_dir = 'Tests/Schemes'
-      @ios_versions = %w{7.0 8.0}
-      @xctool_path = '/usr/local/bin/xctool'
+      @ios_versions = %w{8.4 9.0}
+      @xctool_path = 'xctool'
       @xcodebuild_path = 'xcodebuild'
       @runner = :xctool
       @settings = {}

data/lib/trip_advisor/strings_file.rb

@@ -4,11 +4,11 @@ require 'twine/stringsfile'
 module TripAdvisor
   class StringsFile
     attr_reader :path, :translations
-    
+
     def self.read(path)
       self.new.tap { |sf| sf.read(path) }
     end
-    
+
     def merge_translations(translations)
       translations.each do |translation|
         if twine_row = twine_row_for_key(translation['en'].to_s)
@@ -18,7 +18,17 @@ module TripAdvisor
         end
       end
     end
-    
+
+    def merge_translations_by_key(translations)
+      translations.each do |translation|
+        if twine_row = twine_row_for_key(translation.key)
+          update_twine_row_with_translation(twine_row, translation)
+        else
+          add_twine_row_for_translation_key(translation)
+        end
+      end
+    end
+
     def merge_translations_android(translations)
       translations.each do |translation|
         if twine_row = twine_row_for_key(translation.key)
@@ -28,31 +38,39 @@ module TripAdvisor
         end
       end
     end
-    
+
     def loaded?
       @twine_strings_file != nil
     end
-    
+
     def [](key)
       raise "Cannot access translations without reading a Strings file" unless loaded?
       translations.detect { |translation| translation.key == key.to_s }
     end
-        
+
     def read(path)
       @path = path
       @twine_strings_file = Twine::StringsFile.new
       @twine_strings_file.read(path)
       load_translations_from_twine
     end
-    
+
     def write(path = self.path)
       @twine_strings_file.write(path)
     end
-    
+
     def language_tags
       @twine_strings_file.language_codes
     end
 
+    def keys
+      @twine_strings_file.sections.map do |section|
+        section.rows.map do |row|
+          row.key
+        end
+      end
+    end
+
     private
     def load_translations_from_twine
       @translations = @twine_strings_file.sections.collect do |section|
@@ -65,26 +83,26 @@ module TripAdvisor
         end
       end.flatten
     end
-    
+
     # NOTE: For Android, the Twine files are keyed by Translation Tool key, _not_ English translation.
     # NOTE: The Twine files are keyed by English translation, _not_ Translation Tool key
     def twine_row_for_key(key)
-      @twine_strings_file.sections.each do |section|        
+      @twine_strings_file.sections.each do |section|
         if row = section.rows.detect { |row| row.key == key }
           return row
         end
       end
       nil
     end
-    
+
     def update_twine_row_with_translation(twine_row, translation)
       twine_row.comment = translation.note
-      translation.localizations.each do |localization|        
+      translation.localizations.each do |localization|
         @twine_strings_file.add_language_code(localization.locale_identifier)
         twine_row.translations[localization.locale_identifier] = localization.string
       end
     end
-    
+
     def add_twine_row_for_translation(translation)
       # We merge new rows into the first section
       section = @twine_strings_file.sections.first
@@ -96,7 +114,19 @@ module TripAdvisor
       end
       section.rows << row
     end
-        
+
+    def add_twine_row_for_translation_key(translation)
+      # We merge new rows into the first section
+      section = @twine_strings_file.sections.first
+      translation_tool_key = translation.key
+      raise "Cannot add Translation: No translation tool key." unless translation_tool_key
+      row = Twine::StringsRow.new(translation_tool_key).tap do |row|
+        row.tags = ["key:#{translation.key}"]
+        update_twine_row_with_translation(row, translation)
+      end
+      section.rows << row
+    end
+
     def add_twine_row_for_translation_android(translation)
       # We merge new rows into the first section
       section = @twine_strings_file.sections.first

data/lib/trip_advisor/translation_tool.rb

@@ -1,7 +1,9 @@
 require 'trip_advisor/translation'
 require 'rest-client'
 require 'nokogiri'
+require 'active_support'
 require "active_support/core_ext"
+require 'cgi'
 
 module TripAdvisor
   class TranslationTool
@@ -86,7 +88,7 @@ module TripAdvisor
     attr_accessor :username, :password, :locale
     
     def initialize(attributes = {})
-      attributes.each { |k, v| self.send("#{k}=", v) }
+      attributes.each { |k, v| self.send("#{k}=", CGI.escape(v)) }
       @locale ||= 'en'
     end
     

data/lib/trip_advisor/version.rb

@@ -1,3 +1,3 @@
 module TripAdvisor
-  VERSION = "0.0.15"
+  VERSION = "0.0.21"
 end

data/spec/api_spec.rb

@@ -13,7 +13,7 @@ describe TripAdvisor::API do
     end
 
     it "load all locales from the API" do
-      @api.get_locales.count.should == 46
+      @api.get_locales.count.should == 52
     end
   end
 

data/spec/builder_spec.rb

@@ -121,7 +121,7 @@ describe TripAdvisor::AdHocBuild do
 
   it "has a proper default for pod_repo" do
     build = TripAdvisor::AdHocBuild.new(@project_dir)
-    build.pod_repo.should == 'tripadvisor'
+    build.pod_repo.should == 'tripadvisor-mobile-ta-specs'
   end
 
   it "has a proper default for version_prefix" do
@@ -206,7 +206,7 @@ describe TripAdvisor::AdHocBuild do
 
     it "has a proper default for pod_repo" do
       build = TripAdvisor::ReleaseBuild.new(@project_dir, "1.0.1")
-      build.pod_repo.should == 'tripadvisor'
+      build.pod_repo.should == 'tripadvisor-mobile-ta-specs'
     end
     
     it "has a proper default for version_prefix" do

data/spec/fixtures/project.git/Podfile

@@ -1,6 +1,6 @@
 source 'https://github.com/CocoaPods/Specs.git'
 source 'http://gitlab01d.d.tripadvisor.com/mobile/ta-specs.git'
 
-platform :ios, 6.0
+platform :ios, 8.0
 
 pod 'Project', :path => '.'

data/spec/fixtures/project.git/Podfile.lock

@@ -6,9 +6,9 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   Project:
-    :path: .
+    :path: "."
 
 SPEC CHECKSUMS:
-  Project: 46cf48e698b54a340bb4cb5f2958995290cc1891
+  Project: 3c0fd4e89c0123163da1c10d9d3ef5fbc6682293
 
-COCOAPODS: 0.32.1
+COCOAPODS: 0.38.2