phonelib 0.2.0 → 0.2.1

data/lib/phonelib/core.rb

@@ -5,9 +5,18 @@ module Phonelib
     @@phone_data = nil
 
     # default country for parsing variable setting
-    mattr_accessor :default_country
     @@default_country = nil
 
+    # getter method for default_country variable
+    def default_country
+      @@default_country
+    end
+
+    # setter method for default_country variable
+    def default_country=(country)
+      @@default_country = country
+    end
+    
     # gem constants definition
     # constants for phone types
 
@@ -118,13 +127,11 @@ module Phonelib
 
     # method checks if passed phone number is valid for provided country
     def valid_for_country?(phone_number, country)
-      country = country.to_s.upcase
       parse(phone_number, country).valid_for_country?(country)
     end
 
     # method checks if passed phone number is invalid for provided country
     def invalid_for_country?(phone_number, country)
-      country = country.to_s.upcase
       parse(phone_number, country).invalid_for_country?(country)
     end
 

data/lib/phonelib/phone.rb

@@ -96,6 +96,7 @@ module Phonelib
     # * +country+ - ISO code of country (2 letters) like 'US', 'us' or :us for United States
     #
     def valid_for_country?(country)
+      country = country.to_s.upcase
       @analyzed_data.select {|iso2, data| country == iso2 &&
           data[:valid].any? }.any?
     end

data/lib/phonelib/version.rb

@@ -1,4 +1,4 @@
 module Phonelib
   # :nodoc:
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/dummy/log/development.log

@@ -1,31 +1,19 @@
 Connecting to database specified by database.yml
-   (0.1ms)  select sqlite_version(*)
-   (7.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (2.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-Migrating to CreatePhones (20130121173847)
-   (0.1ms)  begin transaction
-   (0.8ms)  CREATE TABLE "phones" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "number" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
-   (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20130121173847')
-   (4.1ms)  commit transaction
-Migrating to AddPossibleNumberToPhone (20130122075331)
-   (0.1ms)  begin transaction
-   (0.6ms)  ALTER TABLE "phones" ADD "possible_number" varchar(255)
-   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20130122075331')
-   (2.7ms)  commit transaction
-   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.9ms)  select sqlite_version(*)
+   (6.8ms)  CREATE TABLE "phones" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "number" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL, "possible_number" varchar(255)) 
+   (1.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.6ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (3.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130122075331')
+   (1.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130121173847')
+   (0.7ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
 Connecting to database specified by database.yml
-   (0.7ms)  select sqlite_version(*)
-   (5.1ms)  DROP TABLE "phones"
-   (3.3ms)  CREATE TABLE "phones" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "number" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL, "possible_number" varchar(255)) 
-   (0.2ms)  SELECT version FROM "schema_migrations"
-   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-Connecting to database specified by database.yml
-   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-   (0.3ms)  select sqlite_version(*)
-   (5.1ms)  CREATE TABLE "phones" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "number" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL, "possible_number" varchar(255)) 
-   (2.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (3.4ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.6ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.1ms)  select sqlite_version(*)
+   (3.7ms)  CREATE TABLE "phones" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "number" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL, "possible_number" varchar(255)) 
+   (1.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
    (0.1ms)  SELECT version FROM "schema_migrations"
-   (2.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130122075331')
-   (3.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130121173847')
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130122075331')
+   (4.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130121173847')
+Connecting to database specified by database.yml