rails-i18nterface 0.2.4 → 0.2.5

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/0PMwId9157j93ZuEBNCPa71HO-BWiCNHuiZtCkqHovk.cache

@@ -0,0 +1 @@
+"%Hl��/H5mU�[��I K�s�~)�i����

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/172YbT7Y9QCTtQpYWCn3GiUa1XYF30IZjymEsgPF2r4.cache

@@ -0,0 +1 @@
+"%��$eBzz�q�q��p:	��D�Iz�Q�t�%�

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/1RE9Nc-99pz5dq3J_WTniU9ihuoYrOprEnGvyXAa5cY.cache

@@ -0,0 +1 @@
+"%	&�}ۺ5l��K,RAF,��U�m���hA�

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/1vT4QnCK-tMzI13mEL_FMuTrb5BgAdA3XBhVxNv4-r8.cache

@@ -0,0 +1 @@
+I"
�/home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/application.js?type=application/javascript&id=ca3a7e749f47da8215a7af8a18b4a2f8ae3dd77dabe2c0d8d53fbd4efbbb7217:ET

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/3l6G7l7GutWzjmS7bo548k2NQXCbu3FuG0RCqtNuUL8.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash{I"environment-version:ETTI"environment-paths;TTI"Lprocessors:type=application/javascript&file_type=application/javascript;TTI"pfile-digest:///home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/application.js;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"jfile-digest:///home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/ender.js;TTI"ifile-digest:///home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/base.js;TTI";file-digest://app/assets/javascripts/rails_i18nterface;TTI"Afile-digest://app/assets/javascripts/rails_i18nterface/ender;TTI";file-digest://app/assets/stylesheets/rails_i18nterface;TTI"Afile-digest://app/assets/stylesheets/rails_i18nterface/ender;TTI"\file-digest:///home/mose/projects/rails-i18nterface/app/assets/images/rails_i18nterface;TTI"bfile-digest:///home/mose/projects/rails-i18nterface/app/assets/images/rails_i18nterface/ender;TTI"afile-digest:///home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface;TTI"gfile-digest:///home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/ender;TTI"@file-digest://app/assets/javascripts/rails_i18nterface/base;TTI"@file-digest://app/assets/stylesheets/rails_i18nterface/base;TTI"afile-digest:///home/mose/projects/rails-i18nterface/app/assets/images/rails_i18nterface/base;TTI"ffile-digest:///home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/base;TT

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/4vXT_Tqow4flv0JjTjeIZO4MHOerMmqrPSyHiyf3SYE.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash{I"environment-version:ETTI"environment-paths;TTI"0processors:type=text/css&file_type=text/css;TTI"qfile-digest:///home/mose/projects/rails-i18nterface/app/assets/stylesheets/rails_i18nterface/application.css;TTI">processors:type=text/css&file_type=text/css&pipeline=self;TTI"afile-digest:///home/mose/projects/rails-i18nterface/app/assets/stylesheets/rails_i18nterface;TT

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/7Ki489aXvXh1c80Q1MzMtZpbfnotMDd6A3yHY-HEecw.cache

@@ -0,0 +1 @@
+"%��B�����șo�$'�A�d��L���xR�U

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/9kyHNOVXEDTe7kg34AKp3C9rb7GbxRKGQYV0smgM01I.cache

@@ -0,0 +1 @@
+I"
�/home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/base.js?type=application/javascript&pipeline=self&id=0e24e105e05d47978596535199ade26a05f6f721cd0e9bf76895824db8df0251:ET

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/DgOE4dVOvx7Kg6yuTxyUSupElQF47xWnXtMcz2TXBaw.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash{	I"environment-version:ETTI"environment-paths;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"ifile-digest:///home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/base.js;TT

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/FZqMgA_zpqV7sBthUsaF-loYETVrVCEtlxczLF730GY.cache

@@ -0,0 +1 @@
+I"
�/home/mose/projects/rails-i18nterface/app/assets/stylesheets/rails_i18nterface/application.css?type=text/css&id=b6cba33efb2835dbb344633979db7cd0105fe0e6cf2d3e125a4eac2c0db2255e:ET

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/M-S52Jney4p15fjNRm25zSHatM5QqthKsrEU_Q7GTVA.cache

@@ -0,0 +1 @@
+I"
�/home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/ender.js?type=application/javascript&pipeline=self&id=a9740c285b53359e30411a2ee1f51fb3bf188aff8eebacde8de233d02a3b7e2f:ET

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/PaP9vMCDQ63NoJWLaM8fSu0YeRy-eLKbArpgNOm8Z_4.cache

@@ -0,0 +1 @@
+I"
�/home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/application.js?type=application/javascript&pipeline=self&id=4e30a07808cb3134b85e36db6db8f1853e9acc7957aee14c53196bf9fe0860ba:ET

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/UHhQ3Te4YSyiy1iqqTRt4nt2dyXqSXxkwAkjepufrsY.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash{I"environment-version:ETTI"environment-paths;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"pfile-digest:///home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/application.js;TTI";file-digest://app/assets/javascripts/rails_i18nterface;TTI"Afile-digest://app/assets/javascripts/rails_i18nterface/ender;TTI";file-digest://app/assets/stylesheets/rails_i18nterface;TTI"Afile-digest://app/assets/stylesheets/rails_i18nterface/ender;TTI"\file-digest:///home/mose/projects/rails-i18nterface/app/assets/images/rails_i18nterface;TTI"bfile-digest:///home/mose/projects/rails-i18nterface/app/assets/images/rails_i18nterface/ender;TTI"afile-digest:///home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface;TTI"gfile-digest:///home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/ender;TTI"jfile-digest:///home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/ender.js;TTI"@file-digest://app/assets/javascripts/rails_i18nterface/base;TTI"@file-digest://app/assets/stylesheets/rails_i18nterface/base;TTI"afile-digest:///home/mose/projects/rails-i18nterface/app/assets/images/rails_i18nterface/base;TTI"ffile-digest:///home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/base;TTI"ifile-digest:///home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/base.js;TT

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/VOKFuKrh87uBuA6qI4LzN8vVjP5mXjzL0j-iaq5sNNg.cache

@@ -0,0 +1,2 @@
+"%k7
+|>}�q�F���ϼSZk�ʯȄ�숺

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/gaOEShTR6QyHBz9Pv5Ylz1vVWcNP7Dz2DRcuDIl52cs.cache

@@ -0,0 +1,3 @@
+[o:Set:
+@hash{
+I"environment-version:ETTI"environment-paths;TTI">processors:type=text/css&file_type=text/css&pipeline=self;TTI"qfile-digest:///home/mose/projects/rails-i18nterface/app/assets/stylesheets/rails_i18nterface/application.css;TTI"afile-digest:///home/mose/projects/rails-i18nterface/app/assets/stylesheets/rails_i18nterface;TT

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/mr2V_uFvIXsHQ7VrC70TymoM9CO0RMKHzQgBkn3deHw.cache

@@ -0,0 +1 @@
+"%��Rm�v�S3.��O�L���ڹc�ƕq�=_j�

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/oQxOm6wUSyQ0jKnI8eKFRJLgEQ-dFvxofYtnbn-haqA.cache

@@ -0,0 +1 @@
+I"
�/home/mose/projects/rails-i18nterface/app/assets/stylesheets/rails_i18nterface/application.css?type=text/css&pipeline=self&id=a404df2f972b01180a1b326f0a9aeaebf33288a077ff894c4e7f5ec3c3ede9d6:ET

data/spec/internal/tmp/cache/assets/test/sprockets/v3.0/v6huIOApjM-My2aA3RhSsO6U2my-O0Ht7A0lo0YKqPI.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash{	I"environment-version:ETTI"environment-paths;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"jfile-digest:///home/mose/projects/rails-i18nterface/app/assets/javascripts/rails_i18nterface/ender.js;TT

data/spec/internal/tmp/translation_strings

@@ -1 +1,2 @@
-C:-ActiveSupport::HashWithIndifferentAccess{I"article.key1:EF[I"app/models/article.rb;FI"article.key2;F[I"app/models/article.rb;FI"article.key3;F[I"app/models/article.rb;FI"article.key4.zero;F[I"app/models/article.rb;FI"article.key4.one;F[@I"article.key4.other;F[@I"article.key5;F[I"app/models/article.rb;FI"article.key6.zero;F[I"app/models/article.rb;FI"article.key6.one;F[@I"article.key6.other;F[@I"category_erb.key1;F[I"&app/views/categories/category.erb;FI"category_html_erb.key1;F[I"+app/views/categories/category.html.erb;FI"category_rhtml.key1;F[I"(app/views/categories/category.rhtml;FI"
+C:-ActiveSupport::HashWithIndifferentAccess{I"
+title:EF[I".app/controllers/application_controller.rb;FI"article.key1;F[I"app/models/article.rb;FI"article.key2;F[I"app/models/article.rb;FI"article.key3;F[I"app/models/article.rb;FI"article.key4.zero;F[I"app/models/article.rb;FI"article.key4.one;F[@I"article.key4.other;F[@I"article.key5;F[I"app/models/article.rb;FI"article.key6.zero;F[I"app/models/article.rb;FI"article.key6.one;F[@I"article.key6.other;F[@I"symbol_key;F[I"app/models/article.rb;FI"category_html_erb.key1;F[I"+app/views/categories/category.html.erb;FI"category_rhtml.key1;F[I"(app/views/categories/category.rhtml;FI"

data/spec/lib/cache_spec.rb

@@ -5,43 +5,46 @@ require 'spec_helper'
 describe RailsI18nterface::Cache do
   include RailsI18nterface::Cache
 
-  before :each do
-    @cachefile = File.expand_path(File.join('..', 'files', 'cache_test'), __FILE__)
-  end
+  let(:cachefile) { File.expand_path(File.join('..', 'files', 'cache_test'), __FILE__) }
 
-  after :each do
-    FileUtils.rm @cachefile if File.exists? @cachefile
-  end
+  after { FileUtils.rm cachefile if File.exists? cachefile }
 
-  it 'stores cache of an object' do
-    a = { a: 'a' }
-    cache_save a, @cachefile
-    File.exists?(@cachefile).should be_true
+  describe '.save' do
+    let(:a) { { a: 'a' } }
+    before { cache_save a, cachefile }
+    it 'stores cache of an object' do
+      expect(File.exists? cachefile).to be_truthy
+    end
   end
 
-  it 'reads cache from marshalled file' do
-    a = { a: 'a' }
-    cache_save a, @cachefile
-    b = cache_load @cachefile
-    b.should == a
-  end
+  describe '.load' do
+    context 'reads cache from marshalled file' do
+      let(:a) { { a: 'a' } }
+      let(:b) { cache_load cachefile }
+      before { cache_save a, cachefile }
+      it { expect(b).to eq a }
+    end
 
-  it 'creates the cache if not present' do
-    b = cache_load @cachefile do
-      20
+    context 'when the cache if not present' do
+      before { 
+        @b = cache_load cachefile do
+          20
+        end
+      }
+      it { expect(@b).to be 20 }
+      it { expect(File.exists? cachefile).to be_truthy }
     end
-    File.exists?(@cachefile).should be_true
-    b.should == 20
-  end
 
-  it 'creates the cache if not present, using an argument' do
-    b = cache_load @cachefile, 'something' do |options|
-      options
+    context 'when the cache if not present, using an argument' do
+      before {
+        @b = cache_load cachefile, 'something' do |options| 
+          options
+        end
+      }
+      it { expect(@b).to eq 'something' }
+      it { expect(File.exists? cachefile).to be_truthy }
     end
-    File.exists?(@cachefile).should be_true
-    b.should == 'something'
   end
 
 
-
-end
+end

data/spec/lib/keys_spec.rb

@@ -3,16 +3,13 @@
 require 'spec_helper'
 
 describe RailsI18nterface::Keys do
-
   include RailsI18nterface::Utils
 
-  before(:each) do
-    @root_dir = File.expand_path(File.join('..', '..', '..', 'spec', 'internal'), __FILE__)
-    @keys = RailsI18nterface::Keys.new(@root_dir, :sv, :no)
-  end
+  let(:root_dir) { File.expand_path(File.join('..', '..', '..', 'spec', 'internal'), __FILE__) }
+  let(:keys) { RailsI18nterface::Keys.new(root_dir, :sv, :no) }
 
-  it 'extracts keys from I18n lookups in .rb, .html.erb, and .rhtml files' do
-    @keys.files.keys.map(&:to_s).sort.should == [
+  describe '.files' do
+    let(:expected) { [
       'activerecord.attributes.article.active',
       'activerecord.attributes.article.body',
       'activerecord.attributes.article.created_at',
@@ -33,86 +30,100 @@ describe RailsI18nterface::Keys do
       'article.key6.one',
       'article.key6.other',
       'article.key6.zero',
-      'category_erb.key1',
       'category_html_erb.key1',
       'category_rhtml.key1',
-      'js.alert'
-    ]
+      'js.alert',
+      'symbol_key',
+      'title'
+    ] }
+    it 'extracts keys from I18n lookups in .rb, .html.erb, and .rhtml files' do
+      expect(keys.files.keys.sort).to eq expected
+    end
+  end
+
+  describe "sorts by keys" do
+    #before { allow(keys).to receive(:lookup).with('en', 'article.key6.zero').and_return('xxx') }
+    it { expect(keys.sort_keys.last).to eq 'title' }
   end
 
-  it 'return a hash with I18n keys and file lists' do
-    @keys.files[:'article.key3'].should == ['app/models/article.rb']
+  describe "sorts by translation" do
+    it { expect(keys.sort_keys('text').last).to eq 'time.pm' }
   end
 
-  it 'reloads the translatable strings' do
-    size = @keys.all_keys.size
-    @keys.reload(@root_dir).size.should == size
+  describe 'return a hash with I18n keys and file lists' do
+    it { expect(keys.files[:'article.key3']).to eq ['app/models/article.rb'] }
+  end
+
+  describe 'reloads the translatable strings' do
+    let(:size) { keys.all_keys.size }
+    it { expect(keys.reload(root_dir).size).to be size }
   end
 
   describe 'i18n_keys' do
-    before(:each) do
+    before do
       I18n.backend.send(:init_translations) unless I18n.backend.initialized?
     end
 
-    it 'should return all keys in the I18n backend translations hash' do
-      I18n.backend.should_receive(:translations).and_return(translations)
-      @keys.i18n_keys(:en).should == ['articles.new.page_title', 'categories.flash.created', 'empty', 'home.about']
+    describe 'should return all keys in the I18n backend translations hash' do
+      before { allow(I18n.backend).to receive(:translations).and_return(translations) }
+      it { expect(keys.i18n_keys :en).to eq ['articles.new.page_title', 'categories.flash.created', 'empty', 'home.about'] }
     end
 
     describe 'untranslated_keys' do
-      before(:each) do
-        I18n.backend.stub!(:translations).and_return(translations)
-      end
+      let(:expected) {
+        {
+          sv: ['articles.new.page_title', 'categories.flash.created', 'empty'],
+          no: ['articles.new.page_title', 'categories.flash.created', 'empty', 'home.about']
+        }
+      }
+      before { allow(I18n.backend).to receive(:translations).and_return(translations) }
 
       it 'should return a hash with keys with missing translations in each locale' do
-        @keys.untranslated_keys.should == {
-          :sv => ['articles.new.page_title', 'categories.flash.created', 'empty'],
-          :no => ['articles.new.page_title', 'categories.flash.created', 'empty', 'home.about']
-        }
+        expect(keys.untranslated_keys).to eq expected
       end
     end
 
     describe 'missing_keys' do
-      before(:each) do
-        @file_path = File.join(@root_dir, 'config', 'locales', 'en.yml')
-        yaml = RailsI18nterface::Yamlfile.new(@root_dir, :en)
+      let(:file_path) { File.join(root_dir, 'config', 'locales', 'en.yml') }
+      before do
+        yaml = RailsI18nterface::Yamlfile.new(root_dir, :en)
         yaml.write({
-          :en => {
-            :home => {
-              :page_title => false,
-              :intro => {
-                :one => 'intro one',
-                :other => 'intro other'
+          en: {
+            home: {
+              page_title: false,
+              intro: {
+                one: 'intro one',
+                other: 'intro other'
               }
             }
           }
         })
+        allow(keys).to receive(:files).and_return({
+          :'home.page_title' => 'app/views/home/index.rhtml',
+          :'home.intro' => 'app/views/home/index.rhtml',
+          :'home.signup' => 'app/views/home/_signup.rhtml',
+          :'about.index.page_title' => 'app/views/about/index.rhtml'          
+        })
       end
 
       after(:each) do
-        FileUtils.rm(@file_path) if File.exists? @file_path
+        FileUtils.rm(file_path) if File.exists? file_path
       end
 
       it 'should return a hash with keys that are not in the locale file' do
-        @keys.stub!(:files).and_return({
-          :'home.page_title' => 'app/views/home/index.rhtml',
-          :'home.intro' => 'app/views/home/index.rhtml',
-          :'home.signup' => 'app/views/home/_signup.rhtml',
-          :'about.index.page_title' => 'app/views/about/index.rhtml'
-        })
-        @keys.missing_keys.size.should == 24
+        expect(keys.missing_keys.sort[0]).to eq "activerecord.attributes.article.active"
       end
     end
 
 
     describe 'translated_locales' do
-      before(:each) do
-        I18n.stub!(:default_locale).and_return(:en)
-        I18n.stub!(:available_locales).and_return([:sv, :no, :en, :root])
+      before do
+        allow(I18n).to receive(:default_locale).and_return(:en)
+        allow(I18n).to receive(:available_locales).and_return([:sv, :no, :en, :root])
       end
 
       it 'returns all avaiable except :root and the default' do
-        RailsI18nterface::Keys.translated_locales.should == [:sv, :no]
+        expect(RailsI18nterface::Keys.translated_locales).to eq [:sv, :no]
       end
     end
 
@@ -125,25 +136,25 @@ describe RailsI18nterface::Keys do
 
     def translations
       {
-        :en => {
-          :home => {
-            :about => 'This site is about making money'
+        en: {
+          home: {
+            about: 'This site is about making money'
           },
-          :articles => {
-           :new => {
-             :page_title => 'New Article'
+          articles: {
+           new: {
+             page_title: 'New Article'
             }
           },
-          :categories => {
-            :flash => {
-             :created => 'Category created'
+          categories: {
+            flash: {
+             created: 'Category created'
             }
           },
-          :empty => nil
+          empty: nil
         },
-        :sv => {
-          :home => {
-            :about => false
+        sv: {
+          home: {
+            about: false
           }
         }
       }
@@ -161,14 +172,14 @@ describe RailsI18nterface::Keys do
 
   def deep_hash
     {
-      :pressrelease => {
-        :label => {
-          :one => 'Pressmeddelande',
-          :other => 'Pressmeddelanden'
+      pressrelease: {
+        label: {
+          one: 'Pressmeddelande',
+          other: 'Pressmeddelanden'
         }
       },
-      :article => 'Artikel',
-      :category => ''
+      article: 'Artikel',
+      category: ''
     }
   end
 

data/spec/lib/sourcefiles_spec.rb

@@ -4,70 +4,73 @@ require 'spec_helper'
 
 describe RailsI18nterface::Sourcefiles do
 
-  before :each do
-    @root_dir = File.expand_path(File.join('..', '..', '..', 'spec', 'internal'), __FILE__)
-    @cache_file = File.join(@root_dir, 'tmp', 'translation_strings')
-    FileUtils.rm @cache_file if File.exists? @cache_file
-  end
+  let(:root_dir) { File.expand_path(File.join('..', '..', '..', 'spec', 'internal'), __FILE__) }
+  let(:cache_file) { File.join(root_dir, 'tmp', 'translation_strings') }
 
-  it 'grabs field from schema.rb' do
-    expected = {
-      'activerecord.models.article'=>['db/schema.rb'],
-      'activerecord.attributes.article.title'=>['db/schema.rb'],
-      'activerecord.attributes.article.body'=>['db/schema.rb'],
-      'activerecord.attributes.article.created_at'=>['db/schema.rb'],
-      'activerecord.attributes.article.updated_at'=>['db/schema.rb'],
-      'activerecord.attributes.article.active'=>['db/schema.rb'],
-      'activerecord.models.topic'=>['db/schema.rb'],
-      'activerecord.attributes.topic.title'=>['db/schema.rb'],
-      'activerecord.attributes.topic.created_at'=>['db/schema.rb'],
-      'activerecord.attributes.topic.updated_at'=>['db/schema.rb']
-    }
-    hash = RailsI18nterface::Sourcefiles.extract_activerecords(@root_dir)
-    hash.should == expected
-  end
+  after { FileUtils.rm cache_file if File.exists? cache_file}
 
-  it 'extracts translatable string from code source' do
-    x = RailsI18nterface::Sourcefiles.load_files(@root_dir)
-    File.exists?(@cache_file).should be_true
-    x.size.should == 24
+  describe '.hash' do
+    let(:expected) { {
+      'activerecord.models.article' => ['db/schema.rb'],
+      'activerecord.attributes.article.title' => ['db/schema.rb'],
+      'activerecord.attributes.article.body' => ['db/schema.rb'],
+      'activerecord.attributes.article.created_at' => ['db/schema.rb'],
+      'activerecord.attributes.article.updated_at' => ['db/schema.rb'],
+      'activerecord.attributes.article.active' => ['db/schema.rb'],
+      'activerecord.models.topic' => ['db/schema.rb'],
+      'activerecord.attributes.topic.title' => ['db/schema.rb'],
+      'activerecord.attributes.topic.created_at' => ['db/schema.rb'],
+      'activerecord.attributes.topic.updated_at' => ['db/schema.rb']
+    } }
+    let(:hash) { RailsI18nterface::Sourcefiles.extract_activerecords(root_dir) }
+    it 'grabs field from schema.rb' do
+      expect(hash).to eq expected
+    end
   end
 
-  it 'populates from plural form when a :count is passed as param' do
-    file = File.join(@root_dir, 'app/models/article.rb')
-    keys = RailsI18nterface::Sourcefiles.populate_keys(@root_dir, file)
-    keys[:"article.key3.zero"].should == nil
-    keys[:"article.key4.zero"].should == ["app/models/article.rb"]
-    keys[:"article.key4.one"].should == ["app/models/article.rb"]
-    keys[:"article.key4.other"].should == ["app/models/article.rb"]
+  describe '.allfiles' do
+    before { @allfiles = RailsI18nterface::Sourcefiles.load_files(root_dir) }
+    it 'extracts translatable string from code source' do
+      expect(File.exists? cache_file).to be_truthy
+      expect(@allfiles['title']).to eq ['app/controllers/application_controller.rb']
+    end
   end
 
-  it 'populates from plural form when a :count => is passed as param' do
-    file = File.join(@root_dir, 'app/models/article.rb')
-    keys = RailsI18nterface::Sourcefiles.populate_keys(@root_dir, file)
-    keys[:"article.key6.zero"].should == ["app/models/article.rb"]
-    keys[:"article.key6.one"].should == ["app/models/article.rb"]
-    keys[:"article.key6.other"].should == ["app/models/article.rb"]
+  describe '.keys' do
+    let(:file) { File.join(root_dir, 'app/models/article.rb') }
+    let(:keys) { RailsI18nterface::Sourcefiles.populate_keys(root_dir, file) }
+    it 'populates from plural form when a :count is passed as param' do
+      expect(keys[:'article.key3.zero']).to be_nil
+      expect(keys[:'article.key4.zero']).to eq ['app/models/article.rb']
+      expect(keys[:'article.key4.one']).to eq ['app/models/article.rb']
+      expect(keys[:'article.key4.other']).to eq ['app/models/article.rb']
+    end
+    it 'populates from plural form when a :count => is passed as param' do
+      expect(keys[:'article.key6.zero']).to eq ['app/models/article.rb']
+      expect(keys[:'article.key6.one']).to eq ['app/models/article.rb']
+      expect(keys[:'article.key6.other']).to eq ['app/models/article.rb']
+    end
   end
 
   describe 'refreshing' do
-    before :each do
-      RailsI18nterface::Sourcefiles.load_files(@root_dir)
-      @testfile = File.join(@root_dir,'app','views','test.html.erb')
+    let(:testfile) { File.join(root_dir, 'app', 'views', 'test.html.erb') }
+    
+    before do
+      RailsI18nterface::Sourcefiles.load_files(root_dir)
+      File.open(File.join(root_dir, 'app', 'views', 'test.html.erb'),'w') do |f|
+        f.puts "<%= t('something') %>"
+      end
+      @allfiles = RailsI18nterface::Sourcefiles.refresh(root_dir)
     end
 
-    after :each do
-      FileUtils.rm @testfile if File.exists? @testfile
-      FileUtils.rm @cache_file if File.exists? @cache_file
+    after do
+      FileUtils.rm testfile if File.exists? testfile
+      FileUtils.rm cache_file if File.exists? cache_file
     end
 
     it 'refreshes translatable strings cache' do
-      File.open(File.join(@root_dir,'app','views','test.html.erb'),'w') do |f|
-        f.puts "<%= t('something') %>"
-      end
-      y = RailsI18nterface::Sourcefiles.refresh(@root_dir)
-      y.size.should == 25
+      expect(@allfiles['something']).to eq ['app/views/test.html.erb']
     end
   end
 
-end
+end