express_translate 1.0.8 → 1.0.9

data/README.md

@@ -1,5 +1,6 @@
 Express Translate
 =====
+I18n Translation Interface for end user in Rails app
 
   ```bash
    __                               _____                     _       _       
@@ -19,92 +20,86 @@ Express Translate
 
 =====
 
-##Installation
+## Installation
 ### 1. Gemfile
 ```bash
-gem 'express_translate', '~> 1.0.8'
+gem 'express_translate', '~> 1.0.9'
 ```
  
 ### 2. Setup
 Run on terminal.
-```bash
-gem install express_translate
-```
 
-```bash
-bundle install
-```
+```gem install express_translate```
+
+```bundle install```
 
 ### 3. Install
 Open terminal and run:
 
-```bash
-rails g express_translate:install
- ``` 
-  
-##Using
+```rails g express_translate:install```
+
+## Using
 ### Run
 Start Redis Server
+``redis-server``
+
+###Basic usage
+You can see login page at: ``/express_translate/login``
+
+Login with account:
 ```bash
-redis-server
+username: "username"
+password: "password"
 ```
 
-### Modify accounts
+###Advanced usage
+#### Modify accounts
 
-Account list config in "/config/express_translate.yml".
+Account list config in ``/config/express_translate.yml``.
 You can add account:
 ```bash
 account: 
   - 
-    username: "abc_name"
-    password: "abc_pass"
+    username: "your_username"
+    password: "your_password"
 ```
 
 You need reset account for modified
-```bash
-rails g express_translate:reset_account
-```
-Or goto url
-```bash
-  http://you_domain/express_translate/reset/account
 
-  * e.g: http://localhost:3000/express_translate/reset/account
-```
+**``http://you_domain/express_translate/reset/account``**
 
-### Seed
-```bash
-rails g express_translate:seed
-```
+#### Seed data
 
-### Reset data
-```bash
-rails g express_translate:reset
-```
+``rails g express_translate:seed``
 
-### Login page
-You can see login page at:
-  http://you_domain/express_translate/login
+#### Reset data
+``rails g express_translate:reset``
 
-  * e.g: http://localhost:3000/express_translate/login
-  
-### Packages management
-You can see at: 
-  http://you_domain/express_translate
+#### i18next
+Add script to header page
+``<script src="http://you_domain/express_translate/i18n/package_id"></script>``
+Note: 
+* you_domain: e.g ``localhost:3000``
+* package_id: is a package id.
 
-  * e.g: http://localhost:3000/express_translate
-  
-Note: You can see before login. Account for login in config file ("/config/express_translate.yml").
-  
-##Support
+## Support
 
-### Files
-#### Import
-  * CSV file
-  * YML file
+### Import files
+* CSV file
+* YML file
 
-#### Export
-  * CSV file
+### Export files
+* CSV file
 
 ### Application
-Backend for Ruby on Rails
-<!-- Get data with json (for Javascript) => Development -->
+* Backend for Ruby on Rails
+* Frontend (Single Page Application) with I18next (can you see more info: http://i18next.com)
+
+## Contributing to formnestic
+ 
+- Contribution, Suggestion and Issues are very much appreciated :). Please also fork and send your pull request!
+- Make sure to add tests for it when sending for pull requests. This is important so I don't break it in a future version unintentionally.
+
+## Copyright
+
+Copyright (c) 2014 Karl, released under the MIT license

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/app/controllers/express_translate/ajax/languages_controller.rb

@@ -42,10 +42,7 @@ class ExpressTranslate::Ajax::LanguagesController < ActionController::Base
     if check['success'] == true
       @selects = YAML.load_file("#{ExpressTranslate.root}/config/languages.yml")
       @origin = Language.get_origin(params[:packages])
-      @origin_keys = []
-      LanguageDetail.info(@origin).all.each do |item|
-        @origin_keys.push(item["code"])
-      end
+      @origin_keys = LanguageDetail.info(@origin).all.collect{|x| x['code']}
       @languages = Package.find(params[:packages])['language']
       @max = @origin.nil? ? 1 : LanguageDetail.info(@origin).all.count
       @LanguageDetail = LanguageDetail

data/app/controllers/express_translate/base_controller.rb

@@ -3,12 +3,14 @@ class ExpressTranslate::BaseController < ActionController::Base
 
   # Check login status by cookie
   def check_authentication
-    token_store = getCookie(request.headers["HTTP_COOKIE"], "token")
+    token_store = Utils.getCookie(request.headers["HTTP_COOKIE"], "token")
     return (token_store.present? and Account.find_by_token(token_store).present?)
   end
-  
+end
+
+class Utils
   # Get cookie form header action
-  def getCookie(string, key)
+  def self.getCookie(string, key)
     if string.present?
       string.split(";").each do |cookie|
         cookie.strip!
@@ -20,4 +22,6 @@ class ExpressTranslate::BaseController < ActionController::Base
     end
     return ""
   end
-end
+end
+
+# Utils.get_cookie("token=value; token2=value2", key).should == "value1,value2"

data/app/views/layouts/express_translate/translate.html.erb

@@ -4,7 +4,6 @@
   <title>Express Translate</title>
   <%= stylesheet_link_tag    "express_translate/application", :media => "all" %>  
   <%= javascript_include_tag "express_translate/application" %>
-  <script src="http://localhost:3000/express_translate/i18n/be"></script>
   <%= csrf_meta_tags %>
 </head>
 <body id="express_translate">

data/express_translate.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "express_translate"
-  s.version = "1.0.8"
+  s.version = "1.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Karl"]

data/lib/express_translate/database_management.rb

@@ -4,7 +4,7 @@ module ExpressTranslate
     require 'redis'
     
     def self.redis
-      @redis = Redis.new(host: ExpressTranslate.config["connect"]["host"], port: ExpressTranslate.config["connect"]["port"], db: ExpressTranslate.config["connect"]["db"])
+      @redis ||= Redis.new(host: ExpressTranslate.config["connect"]["host"], port: ExpressTranslate.config["connect"]["port"], db: ExpressTranslate.config["connect"]["db"])
     end
     
     def self.set(key, obj)
@@ -27,4 +27,4 @@ module ExpressTranslate
       end
     end
   end
-end
+end

data/lib/generators/express_translate/install_generator.rb

@@ -16,6 +16,7 @@ module ExpressTranslate
     # Seed data for redis database
     def seeds_data
       ExpressTranslate.seeds
+      Account.reset
     end
   end
 end

data/spec/controllers/ajax/codes_controller_spec.rb

@@ -1,4 +1,4 @@
 require 'spec_helper'
-describe ExpressTranslate::Ajax::CodesController do
+describe 'ExpressTranslate::Ajax::CodesController' do
   
 end

data/spec/controllers/options_controller_spec.rb

@@ -1,4 +1,4 @@
 require 'spec_helper'
 describe ExpressTranslate::OptionsController do
 
-end
+end

data/spec/spec_helper.rb

@@ -27,4 +27,21 @@ include ExpressTranslate
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
   # Rails.env = "test"
+  
+  Redis.stub(:new).and_return({})
+  Redis.class_eval do
+    @memory_redis = {}
+    alias_method :original_set, :set
+    def set(key, obj)
+      @memory_redis[key] = obj.to_json
+    end
+
+    def get(key)
+      @memory_redis[key]
+    end
+
+    def del(key)
+      @memory_redis.delete(:key)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_translate
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -409,7 +409,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4525537380864736496
+      hash: 2191332962475855690
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: