rails-i18nterface 0.1.4 → 0.1.5

data/lib/rails-i18nterface/sourcefiles.rb

@@ -3,10 +3,11 @@ module RailsI18nterface
 
     def self.extract_files
       i18n_lookup_pattern = /\b(?:I18n\.t|I18n\.translate|t)(?:\s|\():?(?:'|")(\.?[a-z0-9_\.]+)(?:'|")/
+      f = {}
       self.files_to_scan.inject(HashWithIndifferentAccess.new) do |files, file|
-        files.merge! self.populate_keys(file, i18n_lookup_pattern)
+        f = files.merge! self.populate_keys(file, i18n_lookup_pattern)
       end
-      files.merge! self.extract_activerecords
+      f.merge self.extract_activerecords
     end
 
     def self.populate_keys(file, pattern)
@@ -41,7 +42,7 @@ module RailsI18nterface
         matchdata = regex.match(File.read(schema))
         while matchdata != nil
           model = matchdata[1]
-          files["activerecord.models.#{model}"] = 'db/schema.rb'
+          files["activerecord.models.#{model}"] = ['db/schema.rb']
           files.merge!(self.extract_attributes(model,matchdata[2]))
           matchdata = regex.match(matchdata.post_match)
         end
@@ -55,7 +56,7 @@ module RailsI18nterface
       matchdata = regex.match(txt)
       while matchdata != nil
         attribute = matchdata[1]
-        files["activerecord.attributes.#{model}.#{attribute}"] = 'db/schema.rb'
+        files["activerecord.attributes.#{model}.#{attribute}"] = ['db/schema.rb']
         matchdata = regex.match(matchdata.post_match)
       end
       files

data/lib/rails-i18nterface/version.rb

@@ -1,3 +1,3 @@
 module RailsI18nterface
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/internal/log/test.log

@@ -736,3 +736,87 @@ Migrating to CreateTranslations (20110921112044)
    (0.9ms)  CREATE TABLE "translations" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "locale" varchar(255), "key" varchar(255), "value" text, "interpolations" text, "is_proc" boolean DEFAULT 'f', "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
    (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110921112044')
    (108.7ms)  commit transaction
+Connecting to database specified by database.yml
+   (2.0ms)  select sqlite_version(*)
+   (125.2ms)  CREATE TABLE "article" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "body" varchar(255), "created_at" datetime, "updated_at" datetime, "active" boolean DEFAULT 't') 
+   (115.7ms)  CREATE TABLE "topics" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "created_at" datetime, "updated_at" datetime) 
+   (107.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (108.5ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (4.9ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateTranslations (20110921112044)
+   (0.1ms)  begin transaction
+   (0.3ms)  CREATE TABLE "translations" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "locale" varchar(255), "key" varchar(255), "value" text, "interpolations" text, "is_proc" boolean DEFAULT 'f', "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110921112044')
+   (111.1ms)  commit transaction
+Connecting to database specified by database.yml
+   (1.8ms)  select sqlite_version(*)
+   (113.6ms)  CREATE TABLE "article" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "body" varchar(255), "created_at" datetime, "updated_at" datetime, "active" boolean DEFAULT 't') 
+   (97.4ms)  CREATE TABLE "topics" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "created_at" datetime, "updated_at" datetime) 
+   (107.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (126.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (5.0ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateTranslations (20110921112044)
+   (0.1ms)  begin transaction
+   (0.9ms)  CREATE TABLE "translations" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "locale" varchar(255), "key" varchar(255), "value" text, "interpolations" text, "is_proc" boolean DEFAULT 'f', "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110921112044')
+   (123.5ms)  commit transaction
+Connecting to database specified by database.yml
+   (1.9ms)  select sqlite_version(*)
+   (128.4ms)  CREATE TABLE "article" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "body" varchar(255), "created_at" datetime, "updated_at" datetime, "active" boolean DEFAULT 't') 
+   (107.8ms)  CREATE TABLE "topics" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "created_at" datetime, "updated_at" datetime) 
+   (98.9ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (99.5ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (5.4ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateTranslations (20110921112044)
+   (0.1ms)  begin transaction
+   (0.7ms)  CREATE TABLE "translations" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "locale" varchar(255), "key" varchar(255), "value" text, "interpolations" text, "is_proc" boolean DEFAULT 'f', "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110921112044')
+   (100.6ms)  commit transaction
+Connecting to database specified by database.yml
+   (1.8ms)  select sqlite_version(*)
+   (117.4ms)  CREATE TABLE "article" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "body" varchar(255), "created_at" datetime, "updated_at" datetime, "active" boolean DEFAULT 't') 
+   (91.1ms)  CREATE TABLE "topics" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "created_at" datetime, "updated_at" datetime) 
+   (90.7ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (108.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (5.0ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateTranslations (20110921112044)
+   (0.1ms)  begin transaction
+   (0.9ms)  CREATE TABLE "translations" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "locale" varchar(255), "key" varchar(255), "value" text, "interpolations" text, "is_proc" boolean DEFAULT 'f', "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110921112044')
+   (116.3ms)  commit transaction
+Connecting to database specified by database.yml
+   (1.8ms)  select sqlite_version(*)
+   (139.9ms)  CREATE TABLE "article" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "body" varchar(255), "created_at" datetime, "updated_at" datetime, "active" boolean DEFAULT 't') 
+   (113.8ms)  CREATE TABLE "topics" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "created_at" datetime, "updated_at" datetime) 
+   (107.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (116.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (5.0ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateTranslations (20110921112044)
+   (0.1ms)  begin transaction
+   (0.9ms)  CREATE TABLE "translations" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "locale" varchar(255), "key" varchar(255), "value" text, "interpolations" text, "is_proc" boolean DEFAULT 'f', "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110921112044')
+   (108.4ms)  commit transaction
+Connecting to database specified by database.yml
+   (1.8ms)  select sqlite_version(*)
+   (102.1ms)  CREATE TABLE "article" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "body" varchar(255), "created_at" datetime, "updated_at" datetime, "active" boolean DEFAULT 't') 
+   (97.4ms)  CREATE TABLE "topics" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "created_at" datetime, "updated_at" datetime) 
+   (98.9ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (116.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (5.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateTranslations (20110921112044)
+   (0.1ms)  begin transaction
+   (0.9ms)  CREATE TABLE "translations" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "locale" varchar(255), "key" varchar(255), "value" text, "interpolations" text, "is_proc" boolean DEFAULT 'f', "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110921112044')
+   (125.0ms)  commit transaction
+Connecting to database specified by database.yml
+   (1.9ms)  select sqlite_version(*)
+   (131.5ms)  CREATE TABLE "article" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "body" varchar(255), "created_at" datetime, "updated_at" datetime, "active" boolean DEFAULT 't') 
+   (105.6ms)  CREATE TABLE "topics" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "created_at" datetime, "updated_at" datetime) 
+   (115.6ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (116.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (3.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateTranslations (20110921112044)
+   (0.0ms)  begin transaction
+   (0.3ms)  CREATE TABLE "translations" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "locale" varchar(255), "key" varchar(255), "value" text, "interpolations" text, "is_proc" boolean DEFAULT 'f', "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110921112044')
+   (107.3ms)  commit transaction

data/spec/lib/keys_spec.rb

@@ -9,8 +9,27 @@ describe RailsI18nterface::Keys do
 
   describe "to_a" do
     it "extracts keys from I18n lookups in .rb, .html.erb, and .rhtml files" do
-      @keys.to_a.map(&:to_s).sort.should == ['article.key1', 'article.key2', 'article.key3', 'article.key4', 'article.key5',
-        'category_erb.key1', 'category_html_erb.key1', 'category_rhtml.key1', 'js.alert']
+      @keys.to_a.map(&:to_s).sort.should == [
+        "activerecord.attributes.article.active",
+        "activerecord.attributes.article.body",
+        "activerecord.attributes.article.created_at",
+        "activerecord.attributes.article.title",
+        "activerecord.attributes.article.updated_at",
+        "activerecord.attributes.topics.created_at",
+        "activerecord.attributes.topics.title",
+        "activerecord.attributes.topics.updated_at",
+        "activerecord.models.article",
+        "activerecord.models.topics",
+        "article.key1",
+        "article.key2",
+        "article.key3",
+        "article.key4",
+        "article.key5",
+        "category_erb.key1",
+        "category_html_erb.key1",
+        "category_rhtml.key1",
+        "js.alert"
+      ]
     end
   end
 

data/spec/lib/sourcefiles_spec.rb

@@ -4,16 +4,16 @@ describe RailsI18nterface::Sourcefiles do
 
   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.topics"=>"db/schema.rb",
-      "activerecord.attributes.topics.title"=>"db/schema.rb",
-      "activerecord.attributes.topics.created_at"=>"db/schema.rb",
-      "activerecord.attributes.topics.updated_at"=>"db/schema.rb"
+      "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.topics"=>["db/schema.rb"],
+      "activerecord.attributes.topics.title"=>["db/schema.rb"],
+      "activerecord.attributes.topics.created_at"=>["db/schema.rb"],
+      "activerecord.attributes.topics.updated_at"=>["db/schema.rb"]
     }
 
     hash = RailsI18nterface::Sourcefiles.extract_activerecords

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-i18nterface
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors: