zmeygo_sync 0.2 → 0.21

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+test/tmp

data/Gemfile

@@ -2,3 +2,4 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in trclient.gemspec
 gem 'rest-client', :git => 'git://github.com/archiloque/rest-client.git'
+gem 'webmock'

data/Rakefile

@@ -1,2 +1,11 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'rake'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+task :default =>  :test do
+end

data/TODO

@@ -1,6 +1,5 @@
 Write tests to test 3 basic things this gem will do
-1. Hook into I18n.translate
-2. Gather cache
-3. Send cache (push method)
-4. Receive locale data (pull method)
+1. Gather cache
+2. Send cache (push method)
+3. Receive locale data (pull method)
 

data/lib/generators/zmeygo_sync/templates/script

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
-require 'zmeygo/command'
-Zmeygo::Command.new(ARGV).daemonize
+require 'zmeygo_sync/command'
+ZmeygoSync::Command.new(ARGV).daemonize

data/lib/zmeygo_sync/cache.rb

@@ -1,24 +1,22 @@
 # encoding: UTF-8
+require 'fileutils'
 
 module ZmeygoSync
-  # Cache is responsable to gather missing keys from I18n.t/I18n.translate
-  # calls and once in a while send them to server.
-  # Server where keys will be sent is configured in config file Zmeygo.config['server']
+  # Cache is responsable to gather missing keys from I18n.t/I18n.translate calls
   class Cache
     def initialize
-      @config = Zmeygo.config
+      @config = ZmeygoSync.config
       @missing_keys = {}
       @cache_file_path = "#{Rails.root}/tmp/zmeygo_sync_cache"
-    end
-
-    def get_cache_proj
-      proj = validate_config!
-      proj
+      dir = File.dirname(@cache_file_path)
+      unless File.exists?(dir)
+        FileUtils.mkdir_p(dir)
+      end
+      FileUtils.touch(@cache_file_path)
     end
 
     def get_cache
-      proj = validate_config!
-      @missing_keys[proj]
+      @missing_keys
     end
 
     def empty?
@@ -26,9 +24,8 @@ module ZmeygoSync
     end
 
     def add_to_cache(key)
-      proj = validate_config!
-      @missing_keys[proj] ||= {}
-      @missing_keys[proj][key] = true
+      @missing_keys ||= {}
+      @missing_keys[key] = true
       File.open(@cache_file_path,'w') do |f|
         f.write(Marshal.dump(@missing_keys))
       end
@@ -49,20 +46,10 @@ module ZmeygoSync
     end
 
     def clear_cache
-      proj = validate_config!
-      @missing_keys[proj].clear
+      @missing_keys.clear
       File.truncate(@cache_file_path,0)
     end
 
-    def validate_config!
-      proj = @config['project']
-      if proj.blank?
-        raise "Please provide default project name in"
-      end
-      @missing_keys[proj] ||= {}
-      proj
-    end
-
   end # Cache
 end # Zmeygo
 

data/lib/zmeygo_sync/client.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 require 'ya2yaml'
 
-module ZmeygoSyncSync
+module ZmeygoSync
   class Client
 
     attr_accessor :config, :options
 
     def  initialize(options={})
        self.options = options
-       self.config = ZmeygoSyncSync.config
+       self.config = ZmeygoSync.config
     end
 
     def push
@@ -16,7 +16,7 @@ module ZmeygoSyncSync
         puts "No cache" if options[:verbose]
         return
       end
-      url = "http://ZmeygoSync.com/api/pushmissing?api_token=#{config['api_token']}"
+      url = "http://zmeygo.com/api/pushmissing?api_token=#{config['api_token']}"
       keys = []
       hash = ZmeygoSync.load_cache
       puts "cache=#{hash}" if options[:verbose]
@@ -38,7 +38,8 @@ module ZmeygoSyncSync
         exit
       end
       if response.code == 200
-        reply = JSON.parse(response.body)
+        #reply = JSON.parse(response.body)
+        #do nothing on success
       elsif response.code == 401
         puts "Invalid api_token given."
       elsif response.code == 500
@@ -159,7 +160,7 @@ module ZmeygoSyncSync
     end
 
     def http_connect(path)
-      url = "#{config['server'] || 'http://ZmeygoSync.com'}/api/#{path}?api_token=#{config['api_token']}"
+      url = "#{config['server'] || 'http://zmeygo.com'}/api/#{path}?api_token=#{config['api_token']}"
       begin
         puts "GET #{url}" if options[:verbose]
         response = RestClient.get(url)

data/lib/zmeygo_sync/command.rb

@@ -2,7 +2,7 @@
 require 'daemons'
 require 'optparse'
 
-module ZmeygoSyncSync
+module ZmeygoSync
   class Command
 
     attr_accessor :options, :client
@@ -11,7 +11,7 @@ module ZmeygoSyncSync
        @options = {
         :verbose => false,
         :pid_dir => "#{Rails.root}/tmp/pids",
-        :sleep_delay => 10,
+        :sleep_delay => 60,
         :debug => false # when debug is false - it will daomonize, otherwise - it won't
       }
 
@@ -47,13 +47,21 @@ module ZmeygoSyncSync
       unless defined?(Rails)
         raise "This is not rails app???"
       end
+      step = 0
       loop do
         self.client.push
-        self.client.pull
+        # once in 5 minutes download locales from server
+        if step % 10 == 0
+          self.client.pull
+        end
+        step += 1
+        if step > 1_000
+          step = 0
+        end
         sleep(@options[:sleep_delay])
       end
     rescue => e
-      Rails.logger.fatal e
+   #   Rails.logger.fatal e
       STDERR.puts e.message
       exit 1
     end

data/lib/zmeygo_sync/configuration.rb

@@ -8,10 +8,10 @@ module ZmeygoSync
     attr_accessor :server, :api_token, :locale_dir, :project
 
     def initialize
-      conf_file = File.join(Rails.root,'config','zmeygo.yml')
+      conf_file = File.join(Rails.root,'config','zmeygo_sync.yml')
       conf_all = YAML.load_file(File.expand_path(conf_file))
       conf = conf_all[Rails.env]
-      conf['server'] = 'http://zmeygo.com'
+#      conf['server'] = 'http://zmeygo.com'
       self.api_token = conf['api_token']
       self.project = conf['project']
     end

data/lib/zmeygo_sync/constant.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 #
-module ZmeygoSync
-  class Constant
-    DEFAULT_CONFIG_FILE = "#{Rails.root}/config/zmeygo.yml"
-    CACHE_FILE = "#{Rails.root}/tmp/zmeygo_sync_cache"
-  end
-end
+# module ZmeygoSync
+#   class Constant
+#     DEFAULT_CONFIG_FILE = "#{Rails.root}/config/zmeygo.yml"
+#     CACHE_FILE = "#{Rails.root}/tmp/zmeygo_sync_cache"
+#   end
+# end

data/lib/zmeygo_sync/i18n_backend.rb

@@ -1,20 +1,20 @@
 # encoding: utf-8
 
-module ZmeygoSync
-  class I18nBackend
-
-    attr_accessor :client
-
-    def  initialize(options={})
-      @collection = {}
-      @options = options
-      Zmeygo.configure
-      self.client = Zmeygo::Client.new(options)
-    end
-
-    def translate(locale, key, options = {})
-      client.translate(nil,locale,key)
-    end
-  end
-end
+# module ZmeygoSync
+#   class I18nBackend
+#
+#     attr_accessor :client
+#
+#     def  initialize(options={})
+#       @collection = {}
+#       @options = options
+#       Zmeygo.configure
+#       self.client = Zmeygo::Client.new(options)
+#     end
+#
+#     def translate(locale, key, options = {})
+#       client.translate(nil,locale,key)
+#     end
+#   end
+# end
 

data/lib/zmeygo_sync/version.rb

@@ -1,3 +1,3 @@
 module ZmeygoSync
-  VERSION = "0.2"
+  VERSION = "0.21"
 end

data/test/ext_i18n_test.rb

@@ -1,31 +1,34 @@
 require File.join(File.dirname(__FILE__),'/test_helper')
-require File.join(File.dirname(__FILE__),'../lib/zmeygo')
+require File.join(File.dirname(__FILE__),'../lib/zmeygo_sync')
 
 class ExtI18nTest < Test::Unit::TestCase
   # check if i18n.t method indeed populates Zmeygo.missing_keys
+
+  include ZmeygoSync
+
   def setup
+    common_setup
+  end
 
+  def teardown
+    common_teardown
   end
+
   def test_assert_i18n_translate
-    Zmeygo.clear_cache
-    assert_equal 0, Zmeygo.get_cache.size
+    assert_equal 0, ZmeygoSync.get_cache.size
     I18n.t :key1
     I18n.t :key2
-    assert_equal 2, Zmeygo.get_cache.size
-    assert Zmeygo.get_cache.include?(:key1)
-    assert Zmeygo.get_cache.include?(:key2)
+    assert_equal 2, ZmeygoSync.get_cache.size
+    assert ZmeygoSync.get_cache.include?(:key1)
+    assert ZmeygoSync.get_cache.include?(:key2)
   end
 
-  # c
   def test_if_i18n_correctly_populates_cache
-    Zmeygo.clear_cache
-    assert_equal 0, Zmeygo.get_cache.size
+    assert_equal 0, ZmeygoSync.get_cache.size
     I18n.t :some_key
     I18n.t :other_key
     I18n.t 'text.signin'
-    cache =  Zmeygo.get_cache.clone
-    proj = Zmeygo.get_cache_proj
-    assert_equal Zmeygo.config['default_project'],proj
+    cache =  ZmeygoSync.get_cache.clone
     assert cache.include?(:some_key)
     assert cache.include?(:other_key)
     assert cache.include?('text.signin')

data/test/pull_test.rb

@@ -0,0 +1,28 @@
+require File.join(File.dirname(__FILE__),'/test_helper')
+require File.join(File.dirname(__FILE__),'../lib/zmeygo_sync')
+
+# Test push functionality
+class PushTest < Test::Unit::TestCase
+  # check if i18n.t method indeed populates Zmeygo.missing_keys
+
+  include ZmeygoSync
+
+  def setup
+    common_setup
+  end
+
+  def teardown
+    common_teardown
+  end
+
+  def test_if_pull_request_correct_link
+    response_body = {'message' => 'OK', 'data' => ''}.to_json
+    stub_request(:get, "http://zmeygo.com/api/available_locales/fake_proj").
+      with(:query => {:api_token => '1234'}).
+      to_return(:body => response_body, :status => 200 )
+    I18n.t :key1
+    command = Command.new(["start","-d"])
+    command.client.pull
+  end
+
+end

data/test/push_test.rb

@@ -0,0 +1,27 @@
+require File.join(File.dirname(__FILE__),'/test_helper')
+require File.join(File.dirname(__FILE__),'../lib/zmeygo_sync')
+
+# Test push functionality
+class PushTest < Test::Unit::TestCase
+  # check if i18n.t method indeed populates Zmeygo.missing_keys
+
+  include ZmeygoSync
+
+  def setup
+    common_setup
+  end
+
+  def teardown
+    common_teardown
+  end
+
+  def test_if_push_request_correct_link
+    stub_request(:post, "http://zmeygo.com/api/pushmissing").
+      with(:query => {:api_token => '1234'}).
+      to_return(:body => "OK", :status => 200 )
+    I18n.t :key1
+    command = Command.new(["start","-d"])
+    command.client.push
+  end
+
+end

data/test/test_helper.rb

@@ -1 +1,22 @@
+require 'mocha'
 require 'test/unit'
+require 'webmock/test_unit'
+require 'json'
+
+class Rails
+  def self.root
+    File.dirname(__FILE__)
+  end
+end
+
+def common_setup
+  Configuration.stubs(:new)
+  Logger.stubs(:new)
+  ZmeygoSync.stubs(:config).returns({'project' => 'fake_proj','api_token'=>'1234'})
+  ZmeygoSync.configure
+  ZmeygoSync.clear_cache
+end
+
+def common_teardown
+  ZmeygoSync.clear_cache
+end

metadata

@@ -2,7 +2,7 @@
 name: zmeygo_sync
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.2"
+  version: "0.21"
 platform: ruby
 authors: 
 - Eugen Ciur
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 +03:00
+date: 2011-10-18 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -44,6 +44,8 @@ files:
 - lib/zmeygo_sync/i18n_backend.rb
 - lib/zmeygo_sync/version.rb
 - test/ext_i18n_test.rb
+- test/pull_test.rb
+- test/push_test.rb
 - test/test_helper.rb
 - zmeygo_sync.gemspec
 has_rdoc: true