Extract ipaddresses to external repository

Signed-off-by: Shin-ichiro OGAWA <rust.stnard+git@gmail.com>

.gitignore

@@ -4,3 +4,4 @@ pkg
 .bundle
 Gemfile
 Gemfile.lock
+vendor

lib/jpmobile.rb

@@ -28,17 +28,6 @@ module Mobile
 
     autoload :Display,        'jpmobile/mobile/display'
 
-    module IpAddresses
-      autoload :AbstractIpAddresses, 'jpmobile/mobile/ip_addresses/abstract_ip_addresses'
-      autoload :Docomo,              'jpmobile/mobile/ip_addresses/docomo'
-      autoload :Au,                  'jpmobile/mobile/ip_addresses/au'
-      autoload :Softbank,            'jpmobile/mobile/ip_addresses/softbank'
-      autoload :Vodafone,            'jpmobile/mobile/ip_addresses/softbank'
-      autoload :Willcom,             'jpmobile/mobile/ip_addresses/willcom'
-      autoload :Ddipocket,           'jpmobile/mobile/ip_addresses/willcom'
-      autoload :Emobile,             'jpmobile/mobile/ip_addresses/emobile'
-    end
-
     DEFAULT_CARRIERS = %w(Docomo Au Softbank Vodafone Emobile Willcom Ddipocket Iphone Android WindowsPhone)
 
     def self.carriers

lib/tasks/jpmobile_tasks.rake

@@ -4,6 +4,15 @@
 #   # Task goes here
 # end
 
+def check_ip_addresses
+  ip_address_dir = File.join(File.dirname(__FILE__), "../../vendor/jpmobile-ipaddresses/")
+
+  unless File.exists?(File.join(ip_address_dir, "lib/jpmobile/mobile/ip_addresses/abstract_ip_addresses.rb"))
+    FileUtils.mkdir_p(ip_address_dir)
+    system "git clone git://github.com/jpmobile/jpmobile-ipaddresses.git #{ip_address_dir}"
+  end
+end
+
 begin
   require 'rspec/core/rake_task'
 
@@ -57,6 +66,17 @@ namespace :test do
         FileUtils.cp_r(file, plugin_path)
       end
 
+      # setup jpmobile-ipaddresses
+      begin
+        plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile-ipaddresses')
+        FileUtils.mkdir_p(plugin_path)
+        FileList["vendor/jpmobile-ipaddresses/*"].exclude("test").each do |file|
+          FileUtils.cp_r(file, plugin_path)
+        end
+      rescue LoadError
+        puts "IP Address test requires jpmobile-ipaddresses module"
+      end
+
       # setup tests
       FileList["test/rails/overrides/*"].each do |file|
         FileUtils.cp_r(file, rails_root)

spec/rack_helper.rb

@@ -5,6 +5,11 @@
 require 'jpmobile'
 require 'jpmobile/rack'
 require 'pp' # for debug
+begin
+  require File.dirname(__FILE__)+'/../vendor/jpmobile-ipaddresses/lib/jpmobile-ipaddresses'
+rescue LoadError
+  puts "IP Address test requires jpmobile-ipaddresses module"
+end
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods

spec/spec_helper.rb

@@ -8,6 +8,11 @@
   require 'action_mailer'
   require 'initializer'
   require dir+'/../lib/jpmobile'
+  # begin
+    require dir+'/../vendor/jpmobile-ipaddresses/lib/jpmobile-ipaddresses'
+  # rescue LoadError
+  #   puts "IP Address test requires jpmobile-ipaddresses module"
+  # end
 
   # set (dummy) RAILS_ROOT
   RAILS_ROOT=dir+"/.."

spec/unit/spec_helper.rb

@@ -2,3 +2,8 @@
 require 'rspec'
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib')))
 require 'jpmobile'
+begin
+  require File.dirname(__FILE__)+'/../../vendor/jpmobile-ipaddresses/lib/jpmobile-ipaddresses'
+rescue LoadError
+  puts "[NOTICE] IP Address test requires jpmobile-ipaddresses module"
+end