copy_tuner_client 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    copy_tuner_client (0.0.3)
+    copy_tuner_client (0.0.4)
       i18n (>= 0.5.0)
       json
 
@@ -123,8 +123,6 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
     term-ansicolor (1.0.6)
     thin (1.2.11)
       daemons (>= 1.0.9)
@@ -158,7 +156,7 @@ DEPENDENCIES
   rspec (~> 2.3)
   sham_rack
   sinatra
-  sqlite3-ruby
+  sqlite3
   thin
   turn
   webmock

data/copy_tuner_client.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 2.3'
   s.add_development_dependency 'sham_rack'
   s.add_development_dependency 'sinatra'
-  s.add_development_dependency 'sqlite3-ruby'
+  s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'thin'
   s.add_development_dependency 'webmock'
   s.add_development_dependency 'yard'

data/gemfiles/2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mat_aki/gem/copy-tuner-ruby-client
   specs:
-    copy_tuner_client (0.0.2)
+    copy_tuner_client (0.0.4)
       i18n (>= 0.5.0)
       json
 
@@ -73,8 +73,6 @@ GEM
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
     sqlite3 (1.3.7)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
     term-ansicolor (1.0.7)
     thin (1.5.0)
       daemons (>= 1.0.9)
@@ -103,7 +101,7 @@ DEPENDENCIES
   rspec (~> 2.3)
   sham_rack
   sinatra
-  sqlite3-ruby
+  sqlite3
   thin
   turn
   webmock

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mat_aki/gem/copy-tuner-ruby-client
   specs:
-    copy_tuner_client (0.0.2)
+    copy_tuner_client (0.0.4)
       i18n (>= 0.5.0)
       json
 
@@ -113,8 +113,6 @@ GEM
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
     sqlite3 (1.3.7)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
     term-ansicolor (1.0.7)
     thin (1.5.0)
       daemons (>= 1.0.9)
@@ -148,7 +146,7 @@ DEPENDENCIES
   rspec (~> 2.3)
   sham_rack
   sinatra
-  sqlite3-ruby
+  sqlite3
   thin
   turn
   webmock

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mat_aki/gem/copy-tuner-ruby-client
   specs:
-    copy_tuner_client (0.0.2)
+    copy_tuner_client (0.0.4)
       i18n (>= 0.5.0)
       json
 
@@ -144,8 +144,6 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
     term-ansicolor (1.0.7)
     thin (1.5.0)
       daemons (>= 1.0.9)
@@ -185,7 +183,7 @@ DEPENDENCIES
   sass-rails
   sham_rack
   sinatra
-  sqlite3-ruby
+  sqlite3
   thin
   turn
   uglifier

data/lib/copy_tuner_client/cache.rb

@@ -88,9 +88,13 @@ module CopyTunerClient
     end
 
     def flush
-      with_queued_changes do |queued|
+      res = with_queued_changes do |queued|
         client.upload queued
       end
+
+      @last_uploaded_at = Time.now.utc
+
+      res
     rescue ConnectionError => error
       logger.error error.message
     end
@@ -98,10 +102,14 @@ module CopyTunerClient
     def download
       @started = true
 
-      client.download do |downloaded_blurbs|
+      res = client.download do |downloaded_blurbs|
         downloaded_blurbs.reject! { |key, value| value == '' }
         lock { @blurbs = downloaded_blurbs }
       end
+
+      @last_downloaded_at = Time.now.utc
+
+      res
     rescue ConnectionError => error
       logger.error error.message
     ensure
@@ -114,6 +122,8 @@ module CopyTunerClient
       flush
     end
 
+    attr_reader :last_downloaded_at, :last_uploaded_at, :queued
+
     private
 
     attr_reader :client, :logger

data/lib/copy_tuner_client/request_sync.rb

@@ -1,13 +1,21 @@
+require 'rack'
+require 'rack/request'
+require 'rack/response'
+
+# ref) NewRelic gem https://github.com/newrelic/rpm/blob/master/lib/new_relic/rack/developer_mode.rb
+
 module CopyTunerClient
   # Rack middleware that synchronizes with CopyTuner during each request.
   #
   # This is injected into the Rails middleware stack in development environments.
   class RequestSync
+    VIEW_PATH = File.expand_path('../../../ui/views/', __FILE__)
+
     # @param app [Rack] the upstream app into whose responses to inject the editor
     # @param options [Hash]
     # @option options [Cache] :cache agent that should be flushed after each request
     def initialize(app, options)
-      @app  = app
+      @app = app
       @cache = options[:cache]
       @interval = options[:interval]
       @last_synced = options[:last_synced]
@@ -18,14 +26,91 @@ module CopyTunerClient
     # Invokes the upstream Rack application and flushes the cache after each
     # request.
     def call(env)
-      @cache.download unless asset_request?(env) or in_interval?
-      response = @app.call(env)
-      @cache.flush    unless asset_request?(env) or in_interval?
-      update_last_synced unless in_interval?
-      response
+      if /^\/copytuner/ =~ ::Rack::Request.new(env).path_info
+        dup._call(env, last_synced: @last_synced)
+      else
+        @cache.download unless asset_request?(env) or in_interval?
+        response = @app.call(env)
+        @cache.flush    unless asset_request?(env) or in_interval?
+        update_last_synced unless in_interval?
+        response
+      end
+    end
+
+    protected
+
+    def _call(env, vals = {})
+      @req = ::Rack::Request.new(env)
+
+      case @req.path_info
+      when /^\/copytuner\/?$/
+        index
+      when /sync/
+        sync
+      else
+        @app.call(env)
+      end
     end
 
     private
+
+    def index
+      @next_sync_at = next_sync_at
+      render :index
+    end
+
+    def sync
+      @cache.sync
+      ::Rack::Response.new{|r| r.redirect('/copytuner/')}.finish
+    end
+
+    def render(view, layout=true)
+      add_rack_array = true
+      if view.is_a? Hash
+        layout = false
+        if view[:object]
+          object = view[:object]
+        end
+
+        if view[:collection]
+          return view[:collection].map do |object|
+            render({:partial => view[:partial], :object => object})
+          end.join(' ')
+        end
+
+        if view[:partial]
+          add_rack_array = false
+          view = "_#{view[:partial]}"
+        end
+      end
+      binding = Proc.new {}.binding
+      if layout
+        body = render_with_layout(view) do
+          render_without_layout(view, binding)
+        end
+      else
+        body = render_without_layout(view, binding)
+      end
+      if add_rack_array
+        ::Rack::Response.new(body).finish
+      else
+        body
+      end
+    end
+
+    # You have to call this with a block - the contents returned from
+    # that block are interpolated into the layout
+    def render_with_layout(view)
+      body = ERB.new(File.read(File.join(VIEW_PATH, 'layouts/copytuner_default.html.erb')))
+      body.result(Proc.new {}.binding)
+    end
+
+    # you have to pass a binding to this (a proc) so that ERB can have
+    # access to helper functions and local variables
+    def render_without_layout(view, binding)
+      ERB.new(File.read(File.join(VIEW_PATH, 'copytuner', view.to_s + '.html.erb')), nil, nil, 'frobnitz').result(binding)
+    end
+
     def asset_request?(env)
       env['PATH_INFO'] =~ /^\/assets/
     end
@@ -33,7 +118,11 @@ module CopyTunerClient
     def in_interval?
       return false if @last_synced.nil?
       return false if @interval <= 0
-      @last_synced + @interval > Time.now.utc
+      next_sync_at > Time.now.utc
+    end
+
+    def next_sync_at
+      @last_synced + @interval if @last_synced and @interval
     end
 
     def update_last_synced

data/lib/copy_tuner_client/version.rb

@@ -1,6 +1,6 @@
 module CopyTunerClient
   # Client version
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 
   # API version being used to communicate with the server
   API_VERSION = '2.0'.freeze

data/ui/views/copytuner/index.html.erb

@@ -0,0 +1,35 @@
+<div class="row">
+  <div class="span12">
+    <dl>
+      <dt>最終ダウンロード時間</dt>
+      <dd>
+        <%= @cache.last_downloaded_at %>
+      </dd>
+      <dt>最終アップロード時間</dt>
+      <dd>
+        <%= @cache.last_uploaded_at %>
+      </dd>
+      <dt>次回同期時間</dt>
+      <dd>
+        <%= @next_sync_at %>
+      </dd>
+    </dl>
+  </div>
+</div>
+
+<div class="row">
+  <div class="span12">
+    <a href="/copytuner/sync" class="btn btn-primary">
+      翻訳データを同期する
+    </a>
+
+    <% unless @cache.queued.empty? %>
+      <h3>送信前翻訳キー</h3>
+      <ul>
+        <% @cache.queued.each do |key, value| %>
+          <li><%= key %></li>
+        <% end %>
+      </ul>
+    <% end %>
+  </div>
+</div>

data/ui/views/layouts/copytuner_default.html.erb

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/css/bootstrap-combined.min.css" rel="stylesheet">
+    <style type="text/css">
+      body { margin-top: 60px }
+    </style>
+    <title>CopyTuner Developer Mode</title>
+  </head>
+  <body>
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="/copytuner/">CopyTuner Developer Mode</a>
+        </div>
+      </div>
+    </div>
+    <div id='main' class='container'>
+      <%= yield %>
+    </div>
+    <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/js/bootstrap.min.js"></script>
+  </body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -204,7 +204,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -346,6 +346,8 @@ files:
 - spec/support/middleware_stack.rb
 - spec/support/writing_cache.rb
 - tmp/projects.json
+- ui/views/copytuner/index.html.erb
+- ui/views/layouts/copytuner_default.html.erb
 homepage: https://github.com/SonicGarden/copy-tuner-ruby-client
 licenses: []
 post_install_message: 
@@ -360,7 +362,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1018111501165444892
+      hash: 1986208387973179793
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -369,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1018111501165444892
+      hash: 1986208387973179793
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23