nppes 0.2 → 0.3.3.4

data/lib/nppes/update_pack/data.rb

@@ -16,24 +16,34 @@ module Nppes
 
         npi = Nppes::NpIdentifier.where(npi: @fields[0]).first_or_initialize
 
-        required_fields.fields.each_pair { |k, v| npi.send("#{k}=", @fields[v]) }
+        required_fields.fields.each_pair { |k, v| npi.send("#{k}=", prepare_value(@fields, v)) }
 
         # for submodels
-        #required_fields.relations.each_pair do |k, v|
-        #  v.each do |entity|
-        #    relation = npi.send(k).new
-        #    entity.each_pair {|name, num| relation.send("#{name}=", @fields[num])}
-        #  end
-        #end
-
-        #for submodel
-        #required_fields.relations.each_pair do |k, v|
-        #  relation = npi.send(k).new
-        #  entity.each_pair {|name, num| relation.send("#{name}=", @fields[num])}
-        #end
+        required_fields.relations.each_pair do |k, v|
+          v.each do |entity|
+            relation = npi.send(k).new
+            entity.each_pair {|name, num| relation.send("#{name}=", prepare_value(@fields, num))}
+            unless relation.valid?
+              npi.send(k).delete(relation)
+              break
+            end
+          end
+        end
 
-        npi.save!
+        npi.save if npi.valid?
       end
+
+      protected
+        def prepare_value(fields, variants)
+          if variants.is_a? String
+            variants
+          elsif variants.is_a? Array
+            variant = variants.detect {|v| fields[v].present? }
+            variant ? fields[variant] : ''
+          else
+            fields[variants]
+          end
+        end
     end
   end
 end

data/lib/nppes/update_pack/header.rb

@@ -43,7 +43,8 @@ module Nppes
       #"Provider Business Practice Location Address Country Code (If outside U.S.)"
       #"Provider Business Practice Location Address Telephone Number"
       #"Provider Business Practice Location Address Fax Number"
-      #"Provider Enumeration Date"	"Last Update Date"
+      #"Provider Enumeration Date"
+      #"Last Update Date"
       #
       #"NPI Deactivation Reason Code"
       #"NPI Deactivation Date"

data/lib/nppes/update_pack/pack.rb

@@ -68,6 +68,8 @@ module Nppes
           begin
             proceed(prepare_file(update.file_link))
           rescue
+            Nppes.logger.error $!
+            Nppes.logger.error $@
             update.update_attribute(:done, false)
           else
             update.update_attribute(:done, true)

data/lib/nppes/update_pack/required_fields.rb

@@ -33,54 +33,53 @@ module Nppes
           npi_reactivation_date: 40,
           entity_type_code: 1,
 
-          last_name: 5,
-          first_name: 6,
-          middle_name: 7,
+          last_name: [5, 42],
+          first_name: [6, 43],
+          middle_name: [7, 44],
           prefix: 8,
           suffix: 9,
           last_update_date: 37,
           gender_code: 41,
-
-          #first_business_practice_address: 28,
-          #second_business_practice_address: 29,
-          #
-          #business_practice_city: 30,
-          #business_practice_state: 31,
-          #business_practice_postal_code: 32,
-          #business_practice_phone: 34,
-          #
-          #
-          #first_business_mailing_address: 20,
-          #second_business_mailing_address: 21,
-          #
-          #business_mailing_city: 22,
-          #business_mailing_state: 23,
-          #business_mailing_postal_code: 24,
-          #business_mailing_phone: 26,
-          #
-          #official_last_name: 42,
-          #official_first_name: 43,
-          #official_middle_name: 44,
-          #official_phone: 46
       }
 
       self.relations = {
+        np_addresses:
+          [
+            {
+                address_type: 'official',
+                address1: 28,
+                address2: 29,
+
+                city: 30,
+                state: 31,
+                country: 33,
+                zip: 32,
+                phone: [34, 46]
+            },
+            {
+                address_type: 'mailing',
+                address1: 20,
+                address2: 21,
+
+                city: 22,
+                state: 23,
+                country: 25,
+                zip: 24,
+                phone: 26
+            }
+          ],
+
         np_licenses:
-          (0..14).each_with_object({}) do |i, ret|
-            ret.update(
+          (0..14).each_with_object([]) do |i, ret|
+            ret <<
+            {
                 taxonomy_code: 47 + (i * 4),
                 license_number: 48 + (i * 4),
                 license_number_state_code: 49 + (i * 4),
-                healhcare_taxonomy_switch: 50 + (i * 4)
-            )
+                healthcare_taxonomy_switch: 50 + (i * 4)
+            }
           end
       }
-
-      #class << self
-      #  def proceed(header)
-      #
-      #  end
-      #end
     end
   end
 end

data/lib/nppes/version.rb

@@ -1,3 +1,3 @@
 module Nppes
-  VERSION = '0.2'
+  VERSION = '0.3.3.4'
 end

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: nppes
 version: !ruby/object:Gem::Version
-  version: '0.2'
-  prerelease: 
+  version: 0.3.3.4
 platform: ruby
 authors:
 - Jenua Boiko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   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: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   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'
 description: ''
@@ -119,9 +106,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/generators/active_record/base_npi_data.rb
-- lib/generators/active_record/license.rb
-- lib/generators/active_record/update_check.rb
+- lib/generators/active_record/add_license_table.rb
+- lib/generators/active_record/add_nppes_table.rb
+- lib/generators/active_record/add_provider_address_table.rb
+- lib/generators/active_record/add_update_check_table.rb
 - lib/generators/nppes/install_generator.rb
 - lib/generators/templates/delayed_jobs.rb
 - lib/generators/templates/nppes.rb
@@ -131,13 +119,15 @@ files:
 - lib/nppes/jobs/searcher_job.rb
 - lib/nppes/jobs/updater_job.rb
 - lib/nppes/models.rb
-- lib/nppes/np_identifier.rb
-- lib/nppes/np_license.rb
-- lib/nppes/np_update_check.rb
+- lib/nppes/models/np_address.rb
+- lib/nppes/models/np_identifier.rb
+- lib/nppes/models/np_license.rb
+- lib/nppes/models/np_update_check.rb
 - lib/nppes/railtie.rb
 - lib/nppes/tasks/nppes.rake
 - lib/nppes/update_pack.rb
 - lib/nppes/update_pack/base.rb
+- lib/nppes/update_pack/code_values.rb
 - lib/nppes/update_pack/data.rb
 - lib/nppes/update_pack/header.rb
 - lib/nppes/update_pack/pack.rb
@@ -150,33 +140,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 219354401
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 219354401
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ''
 test_files:
 - spec/delayed_jobs_spec.rb

data/lib/generators/active_record/license.rb

@@ -1,20 +0,0 @@
-class AddLicenseTable < ActiveRecord::Migration
-  def self.up
-    create_table :np_licenses do |t|
-      t.integer :np_identifier_id
-
-      (1..15).each do |i|
-        t.string   "taxonomy_code_#{i}",              :limit => 10
-        t.string   "license_number_#{i}",             :limit => 10
-        t.string   "license_number_state_code_#{i}",  :limit => 2
-        t.string   "healthcare_taxonomy_switch_#{i}", :limit => 1
-      end
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :np_licenses
-  end
-end

data/lib/nppes/np_identifier.rb

@@ -1,8 +0,0 @@
-module Nppes
-  class NpIdentifier < ActiveRecord::Base
-    #has_one :np_license
-
-    #self.table_name = 'email_templates'
-
-  end
-end

data/lib/nppes/np_license.rb

@@ -1,5 +0,0 @@
-module Nppes
-  class NpLicense < ActiveRecord::Base
-    belongs_to :np_identifier
-  end
-end