phonelib 0.2.7 → 0.2.8

data/lib/phonelib/phone.rb

@@ -21,7 +21,12 @@ module Phonelib
       if @sanitized.empty?
         @analyzed_data = {}
       else
-        @national_number, @analyzed_data = analyze(@sanitized, country_data)
+        @analyzed_data = analyze(@sanitized, country_data)
+        if country
+          @national_number,= @analyzed_data[country][:national]
+        else
+          @national_number = @sanitized
+        end
       end
     end
 
@@ -62,7 +67,7 @@ module Phonelib
       @country ||= begin
         valid_countries.find do |iso2|
           @analyzed_data[iso2][Core::MAIN_COUNTRY_FOR_CODE] == 'true'
-        end || valid_countries.first
+        end || valid_countries.first || countries.first
       end
     end
 

data/lib/phonelib/phone_analyzer.rb

@@ -7,12 +7,14 @@ module Phonelib
     # analyze provided phone if it matches country data ang returns result of
     # analyze
     def analyze(phone, country_data)
+      all_data = {}
       country_data.each do |data|
         if country_match = phone_match_data?(phone, data)
-          return get_national_and_data(phone, data, country_match)
+
+          all_data.merge! get_national_and_data(phone, data, country_match)
         end
       end
-      [ '', {} ]
+      all_data
     end
 
     private
@@ -22,17 +24,18 @@ module Phonelib
     def get_national_and_data(phone, data, country_match)
       prefix_length = data[Core::COUNTRY_CODE].length
       prefix_length += country_match[1].length unless country_match[1].nil?
-      national = phone[prefix_length..-1]
-      data[:format] = get_number_format(national, data[Core::FORMATS])
-      data.merge! all_number_types(national, data[Core::TYPES])
-      [ national, { data[:id] => data } ]
+      result = data.select { |k, v| ![:types, :formats].include?(k) }
+      result[:national] = phone[prefix_length..-1]
+      result[:format] = get_number_format(result[:national], data[Core::FORMATS])
+      result.merge! all_number_types(result[:national], data[Core::TYPES])
+      { result[:id] => result }
     end
 
     # Check if sanitized phone match country data
     def phone_match_data?(phone, data)
       country_code = "#{data[Core::COUNTRY_CODE]}"
       inter_prefix = "(#{data[Core::INTERNATIONAL_PREFIX]})?"
-      if phone.match(/^#{inter_prefix}#{country_code}/)
+      if phone =~ /^#{inter_prefix}#{country_code}/
         _possible, valid = get_patterns(data[Core::TYPES], Core::GENERAL)
         phone.match /^#{inter_prefix}#{country_code}#{valid}$/
       end

data/lib/phonelib/version.rb

@@ -1,5 +1,5 @@
 # :nodoc:
 module Phonelib
   # :nodoc:
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 end

data/lib/tasks/phonelib_tasks.rake

@@ -1,5 +1,13 @@
 namespace :phonelib do
 
+  desc 'Create database for tests in Rails dummy application'
+  task :create_test_db do
+    exit unless defined? Rails
+    Rails.env = 'test'
+    load 'spec/dummy/Rakefile'
+    Rake::Task['db:setup'].invoke
+  end
+
   desc 'Import and reparse original data file from Google libphonenumber'
   task :import_data do
     require 'net/http'

metadata

@@ -1,98 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.2.7
-  prerelease: 
+  version: 0.2.8
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-context
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
-description: ! "    Google libphonenumber library was taken as a basis for\n    this
-  gem. Gem uses its data file for validations and number formatting.\n"
+        version: '0'
+description: |2
+      Google libphonenumber library was taken as a basis for
+      this gem. Gem uses its data file for validations and number formatting.
 email:
 - daddyzgm@gmail.com
 executables: []
@@ -101,151 +77,42 @@ extra_rdoc_files: []
 files:
 - data/phone_data.dat
 - data/PhoneNumberMetaData.xml
-- lib/validators/phone_validator.rb
-- lib/tasks/phonelib_tasks.rake
-- lib/phonelib/phone.rb
-- lib/phonelib/core.rb
+- lib/phonelib.rb
 - lib/phonelib/version.rb
 - lib/phonelib/phone_analyzer.rb
-- lib/phonelib.rb
+- lib/phonelib/phone.rb
+- lib/phonelib/core.rb
+- lib/validators/phone_validator.rb
+- lib/tasks/phonelib_tasks.rake
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-- test/phonelib_test.rb
-- test/dummy/config/database.yml
-- test/dummy/config/boot.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/application.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
-- test/dummy/db/schema.rb
-- test/dummy/db/development.sqlite3
-- test/dummy/db/test.sqlite3
-- test/dummy/db/migrate/20130121173847_create_phones.rb
-- test/dummy/db/migrate/20130122075331_add_possible_number_to_phone.rb
-- test/dummy/log/test.log
-- test/dummy/log/development.log
-- test/dummy/script/rails
-- test/dummy/config.ru
-- test/dummy/public/500.html
-- test/dummy/public/422.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/404.html
-- test/dummy/test/functional/phones_controller_test.rb
-- test/dummy/test/unit/phone_test.rb
-- test/dummy/test/unit/helpers/phones_helper_test.rb
-- test/dummy/test/fixtures/phones.yml
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/javascripts/phones.js
-- test/dummy/app/assets/stylesheets/phones.css
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/stylesheets/scaffold.css
-- test/dummy/app/models/phone.rb
-- test/dummy/app/controllers/phones_controller.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/phones/show.html.erb
-- test/dummy/app/views/phones/edit.html.erb
-- test/dummy/app/views/phones/index.html.erb
-- test/dummy/app/views/phones/new.html.erb
-- test/dummy/app/views/phones/_form.html.erb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/helpers/phones_helper.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/test_helper.rb
 homepage: https://github.com/daddyz/phonelib
 licenses:
 - MIT
-post_install_message: ! "    IMPORTANT NOTICE!\n    Phone types were changed from
-  camel case to snake case!\n    Example: \":tollFree\" changed to \":toll_free\".\n
-  \   Please update your app in case your are checking types!\n"
+metadata: {}
+post_install_message: |2
+      IMPORTANT NOTICE!
+      Phone types were changed from camel case to snake case!
+      Example: ":tollFree" changed to ":toll_free".
+      Please update your app in case your are checking types!
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -918241281939594392
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -918241281939594392
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Gem validates phone numbers with Google libphonenumber database
-test_files:
-- test/phonelib_test.rb
-- test/dummy/config/database.yml
-- test/dummy/config/boot.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/application.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
-- test/dummy/db/schema.rb
-- test/dummy/db/development.sqlite3
-- test/dummy/db/test.sqlite3
-- test/dummy/db/migrate/20130121173847_create_phones.rb
-- test/dummy/db/migrate/20130122075331_add_possible_number_to_phone.rb
-- test/dummy/log/test.log
-- test/dummy/log/development.log
-- test/dummy/script/rails
-- test/dummy/config.ru
-- test/dummy/public/500.html
-- test/dummy/public/422.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/404.html
-- test/dummy/test/functional/phones_controller_test.rb
-- test/dummy/test/unit/phone_test.rb
-- test/dummy/test/unit/helpers/phones_helper_test.rb
-- test/dummy/test/fixtures/phones.yml
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/javascripts/phones.js
-- test/dummy/app/assets/stylesheets/phones.css
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/stylesheets/scaffold.css
-- test/dummy/app/models/phone.rb
-- test/dummy/app/controllers/phones_controller.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/phones/show.html.erb
-- test/dummy/app/views/phones/edit.html.erb
-- test/dummy/app/views/phones/index.html.erb
-- test/dummy/app/views/phones/new.html.erb
-- test/dummy/app/views/phones/_form.html.erb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/helpers/phones_helper.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/test_helper.rb
+test_files: []

data/test/dummy/README.rdoc

@@ -1,261 +0,0 @@
-== Welcome to Rails
-
-Rails is a web-application framework that includes everything needed to create
-database-backed web applications according to the Model-View-Control pattern.
-
-This pattern splits the view (also called the presentation) into "dumb"
-templates that are primarily responsible for inserting pre-built data in between
-HTML tags. The model contains the "smart" domain objects (such as Account,
-Product, Person, Post) that holds all the business logic and knows how to
-persist themselves to a database. The controller handles the incoming requests
-(such as Save New Account, Update Product, Show Post) by manipulating the model
-and directing data to the view.
-
-In Rails, the model is handled by what's called an object-relational mapping
-layer entitled Active Record. This layer allows you to present the data from
-database rows as objects and embellish these data objects with business logic
-methods. You can read more about Active Record in
-link:files/vendor/rails/activerecord/README.html.
-
-The controller and view are handled by the Action Pack, which handles both
-layers by its two parts: Action View and Action Controller. These two layers
-are bundled in a single package due to their heavy interdependence. This is
-unlike the relationship between the Active Record and Action Pack that is much
-more separate. Each of these packages can be used independently outside of
-Rails. You can read more about Action Pack in
-link:files/vendor/rails/actionpack/README.html.
-
-
-== Getting Started
-
-1. At the command prompt, create a new Rails application:
-       <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
-
-2. Change directory to <tt>myapp</tt> and start the web server:
-       <tt>cd myapp; rails server</tt> (run with --help for options)
-
-3. Go to http://localhost:3000/ and you'll see:
-       "Welcome aboard: You're riding Ruby on Rails!"
-
-4. Follow the guidelines to start developing your application. You can find
-the following resources handy:
-
-* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
-* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
-
-
-== Debugging Rails
-
-Sometimes your application goes wrong. Fortunately there are a lot of tools that
-will help you debug it and get it back on the rails.
-
-First area to check is the application log files. Have "tail -f" commands
-running on the server.log and development.log. Rails will automatically display
-debugging and runtime information to these files. Debugging info will also be
-shown in the browser on requests from 127.0.0.1.
-
-You can also log your own messages directly into the log file from your code
-using the Ruby logger class from inside your controllers. Example:
-
-  class WeblogController < ActionController::Base
-    def destroy
-      @weblog = Weblog.find(params[:id])
-      @weblog.destroy
-      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
-    end
-  end
-
-The result will be a message in your log file along the lines of:
-
-  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
-
-More information on how to use the logger is at http://www.ruby-doc.org/core/
-
-Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
-several books available online as well:
-
-* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
-* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
-
-These two books will bring you up to speed on the Ruby language and also on
-programming in general.
-
-
-== Debugger
-
-Debugger support is available through the debugger command when you start your
-Mongrel or WEBrick server with --debugger. This means that you can break out of
-execution at any point in the code, investigate and change the model, and then,
-resume execution! You need to install ruby-debug to run the server in debugging
-mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
-
-  class WeblogController < ActionController::Base
-    def index
-      @posts = Post.all
-      debugger
-    end
-  end
-
-So the controller will accept the action, run the first line, then present you
-with a IRB prompt in the server window. Here you can do things like:
-
-  >> @posts.inspect
-  => "[#<Post:0x14a6be8
-          @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
-       #<Post:0x14a6620
-          @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
-  >> @posts.first.title = "hello from a debugger"
-  => "hello from a debugger"
-
-...and even better, you can examine how your runtime objects actually work:
-
-  >> f = @posts.first
-  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
-  >> f.
-  Display all 152 possibilities? (y or n)
-
-Finally, when you're ready to resume execution, you can enter "cont".
-
-
-== Console
-
-The console is a Ruby shell, which allows you to interact with your
-application's domain model. Here you'll have all parts of the application
-configured, just like it is when the application is running. You can inspect
-domain models, change values, and save to the database. Starting the script
-without arguments will launch it in the development environment.
-
-To start the console, run <tt>rails console</tt> from the application
-directory.
-
-Options:
-
-* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
-  made to the database.
-* Passing an environment name as an argument will load the corresponding
-  environment. Example: <tt>rails console production</tt>.
-
-To reload your controllers and models after launching the console run
-<tt>reload!</tt>
-
-More information about irb can be found at:
-link:http://www.rubycentral.org/pickaxe/irb.html
-
-
-== dbconsole
-
-You can go to the command line of your database directly through <tt>rails
-dbconsole</tt>. You would be connected to the database with the credentials
-defined in database.yml. Starting the script without arguments will connect you
-to the development database. Passing an argument will connect you to a different
-database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
-PostgreSQL and SQLite 3.
-
-== Description of Contents
-
-The default directory structure of a generated Ruby on Rails application:
-
-  |-- app
-  |   |-- assets
-  |       |-- images
-  |       |-- javascripts
-  |       `-- stylesheets
-  |   |-- controllers
-  |   |-- helpers
-  |   |-- mailers
-  |   |-- models
-  |   `-- views
-  |       `-- layouts
-  |-- config
-  |   |-- environments
-  |   |-- initializers
-  |   `-- locales
-  |-- db
-  |-- doc
-  |-- lib
-  |   `-- tasks
-  |-- log
-  |-- public
-  |-- script
-  |-- test
-  |   |-- fixtures
-  |   |-- functional
-  |   |-- integration
-  |   |-- performance
-  |   `-- unit
-  |-- tmp
-  |   |-- cache
-  |   |-- pids
-  |   |-- sessions
-  |   `-- sockets
-  `-- vendor
-      |-- assets
-          `-- stylesheets
-      `-- plugins
-
-app
-  Holds all the code that's specific to this particular application.
-
-app/assets
-  Contains subdirectories for images, stylesheets, and JavaScript files.
-
-app/controllers
-  Holds controllers that should be named like weblogs_controller.rb for
-  automated URL mapping. All controllers should descend from
-  ApplicationController which itself descends from ActionController::Base.
-
-app/models
-  Holds models that should be named like post.rb. Models descend from
-  ActiveRecord::Base by default.
-
-app/views
-  Holds the template files for the view that should be named like
-  weblogs/index.html.erb for the WeblogsController#index action. All views use
-  eRuby syntax by default.
-
-app/views/layouts
-  Holds the template files for layouts to be used with views. This models the
-  common header/footer method of wrapping views. In your views, define a layout
-  using the <tt>layout :default</tt> and create a file named default.html.erb.
-  Inside default.html.erb, call <% yield %> to render the view using this
-  layout.
-
-app/helpers
-  Holds view helpers that should be named like weblogs_helper.rb. These are
-  generated for you automatically when using generators for controllers.
-  Helpers can be used to wrap functionality for your views into methods.
-
-config
-  Configuration files for the Rails environment, the routing map, the database,
-  and other dependencies.
-
-db
-  Contains the database schema in schema.rb. db/migrate contains all the
-  sequence of Migrations for your schema.
-
-doc
-  This directory is where your application documentation will be stored when
-  generated using <tt>rake doc:app</tt>
-
-lib
-  Application specific libraries. Basically, any kind of custom code that
-  doesn't belong under controllers, models, or helpers. This directory is in
-  the load path.
-
-public
-  The directory available for the web server. Also contains the dispatchers and the
-  default HTML files. This should be set as the DOCUMENT_ROOT of your web
-  server.
-
-script
-  Helper scripts for automation and generation.
-
-test
-  Unit and functional tests along with fixtures. When using the rails generate
-  command, template test files will be generated for you and placed in this
-  directory.
-
-vendor
-  External libraries that the application depends on. Also includes the plugins
-  subdirectory. If the app has frozen rails, those gems also go here, under
-  vendor/rails/. This directory is in the load path.