bridge_cache 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0021ee15201847e000463cbb0f01317c18f4ae7d
-  data.tar.gz: cad79a26fdf26d6ad4611ed98df2cef68a03ca03
+  metadata.gz: 07fea4f39114b3ebd89681fc161b102aa38084e8
+  data.tar.gz: 7470148ae9f315a9d8934ac876a5cc4fe9e51b14
 SHA512:
-  metadata.gz: a7d048f5fc7198f0cfd2f218417d01bb7756eec2e47e120b555ea56d9ba4fde693c1c4aa0906254c60d169a186b2d751ed60877e0d03526449ad2f9b1d0e81f3
-  data.tar.gz: 55eab320a444fe1807dbffa48108a2ac5631707d0463f8dd6498f7a0400aad73a1a52f8aaa28e13400514f401ad347aa1311e1efc567b10b96bbce18cf7a53d8
+  metadata.gz: ac00747411dd23c9ca6393957f932f69e991e99458550c1b83360732ec5a20d3150d932a75d3fe787d28de0f39d00be3ae408bc90888292fc6e26dc50f41312a
+  data.tar.gz: 04c3008fe94fb312df966f72c28bc539d43a84854cd81b5f756e89b2fc0cedfdec000227ebe9d8e6beea5d507c24b959de0db7b1eaca2fa1896e748140e50704

data/app/models/bridge_cache/course_template.rb

@@ -1,14 +1,11 @@
 module BridgeCache
   class CourseTemplate < ActiveRecord::Base
+    extend BridgeCache::Data::BridgeModel
 
     belongs_to :user, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::User'
     belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
     belongs_to :sub_account, foreign_key: :sub_account_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
     has_many :enrollments, foreign_key: :course_template_id, primary_key: :bridge_id, class_name: 'BridgeCache::Enrollment'
 
-    def self.import_from_csv(file_path)
-      BridgeCache::Plugins::CSVDump::dump_to_table(self, file_path)
-    end
-
   end
 end

data/app/models/bridge_cache/custom_field.rb

@@ -1,11 +1,8 @@
 module BridgeCache
   class CustomField < ActiveRecord::Base
+    extend BridgeCache::Data::BridgeModel
 
     belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
 
-    def self.import_from_csv(file_path)
-      BridgeCache::Plugins::CSVDump::dump_to_table(self, file_path)
-    end
-
   end
 end

data/app/models/bridge_cache/domain.rb

@@ -1,5 +1,6 @@
 module BridgeCache
   class Domain < ActiveRecord::Base
+    extend BridgeCache::Data::BridgeModel
 
     has_many :domain_children, primary_key: 'bridge_id', foreign_key: 'parent_id', class_name: 'BridgeCache::Domain'
     belongs_to :domain_parent, primary_key: 'bridge_id', foreign_key: 'parent_id', class_name: 'BridgeCache::Domain'
@@ -14,9 +15,5 @@ module BridgeCache
 
     serialize :config
 
-    def self.import_from_csv(file_path)
-      BridgeCache::Plugins::CSVDump::dump_to_table(self, file_path)
-    end
-
   end
 end

data/app/models/bridge_cache/enrollment.rb

@@ -1,12 +1,9 @@
 module BridgeCache
   class Enrollment < ActiveRecord::Base
+    extend BridgeCache::Data::BridgeModel
 
     belongs_to :user, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::User'
     belongs_to :course_template, foreign_key: :course_template_id, primary_key: :bridge_id, class_name: 'BridgeCache::CourseTemplate'
 
-    def self.import_from_csv(file_path)
-      BridgeCache::Plugins::CSVDump::dump_to_table(self, file_path)
-    end
-
   end
 end

data/app/models/bridge_cache/grant.rb

@@ -1,12 +1,9 @@
 module BridgeCache
   class Grant < ActiveRecord::Base
+    extend BridgeCache::Data::BridgeModel
 
     belongs_to :user, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::User'
     belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
 
-    def self.import_from_csv(file_path)
-      BridgeCache::Plugins::CSVDump::dump_to_table(self, file_path)
-    end
-
   end
 end

data/app/models/bridge_cache/group.rb

@@ -1,13 +1,11 @@
 module BridgeCache
   class Group < ActiveRecord::Base
+    extend BridgeCache::Data::BridgeModel
+
     self.inheritance_column = nil
 
     belongs_to :user, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::User'
     has_many :program_group_enrollments, foreign_key: :group_id, primary_key: :bridge_id, class_name: 'BridgeCache::ProgramGroupEnrollment'
 
-    def self.import_from_csv(file_path)
-      BridgeCache::Plugins::CSVDump::dump_to_table(self, file_path)
-    end
-
   end
 end

data/app/models/bridge_cache/program.rb

@@ -1,5 +1,6 @@
 module BridgeCache
   class Program < ActiveRecord::Base
+    extend BridgeCache::Data::BridgeModel
 
     belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
     belongs_to :sub_account, foreign_key: :sub_account_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
@@ -7,9 +8,5 @@ module BridgeCache
     has_many :program_enrollments, foreign_key: :program_id, primary_key: :bridge_id, class_name: 'BridgeCache::ProgramEnrollment'
     has_many :program_group_enrollments, foreign_key: :program_id, primary_key: :bridge_id, class_name: 'BridgeCache::ProgramGroupEnrollment'
 
-    def self.import_from_csv(file_path)
-      BridgeCache::Plugins::CSVDump::dump_to_table(self, file_path)
-    end
-
   end
 end

data/app/models/bridge_cache/program_enrollment.rb

@@ -1,12 +1,9 @@
 module BridgeCache
   class ProgramEnrollment < ActiveRecord::Base
+    extend BridgeCache::Data::BridgeModel
 
     belongs_to :user, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::User'
     belongs_to :program, foreign_key: :program_id, primary_key: :bridge_id, class_name: 'BridgeCache::Program'
 
-    def self.import_from_csv(file_path)
-      BridgeCache::Plugins::CSVDump::dump_to_table(self, file_path)
-    end
-
   end
 end

data/app/models/bridge_cache/program_group_enrollment.rb

@@ -1,12 +1,9 @@
 module BridgeCache
   class ProgramGroupEnrollment < ActiveRecord::Base
+    extend BridgeCache::Data::BridgeModel
 
     belongs_to :group, foreign_key: :group_id, primary_key: :bridge_id, class_name: 'BridgeCache::Group'
     belongs_to :program, foreign_key: :program_id, primary_key: :bridge_id, class_name: 'BridgeCache::Program'
 
-    def self.import_from_csv(file_path)
-      BridgeCache::Plugins::CSVDump::dump_to_table(self, file_path)
-    end
-
   end
 end

data/app/models/bridge_cache/program_item.rb

@@ -1,11 +1,8 @@
 module BridgeCache
   class ProgramItem < ActiveRecord::Base
+    extend BridgeCache::Data::BridgeModel
 
     belongs_to :program, foreign_key: :program_id, primary_key: :bridge_id, class_name: 'BridgeCache::Program'
 
-    def self.import_from_csv(file_path)
-      BridgeCache::Plugins::CSVDump::dump_to_table(self, file_path)
-    end
-
   end
 end

data/app/models/bridge_cache/tag.rb

@@ -1,11 +1,8 @@
 module BridgeCache
   class Tag < ActiveRecord::Base
+    extend BridgeCache::Data::BridgeModel
 
     has_many :taggings, foreign_key: :tag_id, primary_key: :bridge_id, class_name: 'BridgeCache::Tagging'
 
-    def self.import_from_csv(file_path)
-      BridgeCache::Plugins::CSVDump::dump_to_table(self, file_path)
-    end
-
   end
 end

data/app/models/bridge_cache/tagging.rb

@@ -1,11 +1,9 @@
 module BridgeCache
   class Tagging < ActiveRecord::Base
+    extend BridgeCache::Data::BridgeModel
+
     belongs_to :tag, foreign_key: :tag_id, primary_key: :bridge_id, class_name: 'BridgeCache::Tag'
     belongs_to :user, foreign_key: :tagger_id, primary_key: :bridge_id, class_name: 'BridgeCache::User'
 
-    def self.import_from_csv(file_path)
-      BridgeCache::Plugins::CSVDump::dump_to_table(self, file_path)
-    end
-
   end
 end

data/app/models/bridge_cache/user.rb

@@ -1,5 +1,6 @@
 module BridgeCache
   class User < ActiveRecord::Base
+    extend BridgeCache::Data::BridgeModel
 
     belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
     belongs_to :sub_account, foreign_key: :sub_account_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
@@ -12,9 +13,5 @@ module BridgeCache
 
     serialize :config
 
-    def self.import_from_csv(file_path)
-      BridgeCache::Plugins::CSVDump::dump_to_table(self, file_path)
-    end
-
   end
 end

data/lib/bridge_cache/data/bridge_model.rb

@@ -0,0 +1,11 @@
+module BridgeCache::Data
+  module BridgeModel
+    def import_from_csv(file_path)
+      BridgeCache::Plugins::CSVDump::dump_to_table(self, file_path)
+    end
+
+    def create_from_csv_row(row)
+      BridgeCache::Plugins::CSVDump::dump_row(self, row)
+    end
+  end
+end

data/lib/bridge_cache/plugins/csv_dump.rb

@@ -13,9 +13,8 @@ module BridgeCache::Plugins
         total += 1
       end
       CSV.foreach(file_path, headers: true) do |row|
-        row = self.remove_bad_columns(clazz, row)
         if count < MAX_ROW_INTERVAL
-          rows << clazz.new(BridgeCache::Plugins::DataTransform::set_bridge_id(row).to_h)
+          rows << initialze_row(clazz, row)
         end
         if count % MAX_ROW_INTERVAL == 0 || count == total
           dump_rows(clazz, rows)
@@ -26,8 +25,23 @@ module BridgeCache::Plugins
       end
     end
 
+    def self.dump_row(clazz, row)
+      instance = initialze_row(clazz, row)
+      dump_rows([instance])
+    end
+
+    private
+
+    def self.initialze_row(clazz, row)
+      instance = clazz.find_or_create_by(bridge_id: row['id'])
+      instance.assign_attributes(remove_bad_columns(clazz, BridgeCache::Plugins::DataTransform::set_bridge_id(row).to_h))
+      instance
+    end
+
     def self.dump_rows(clazz, rows)
-      rows.each {|row| row.save!}
+      rows.each do |row|
+        row.save! if row.changed?
+      end
     end
 
     def self.remove_bad_columns(clazz, row)

data/lib/bridge_cache/version.rb

@@ -1,3 +1,3 @@
 module BridgeCache
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bridge_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - jshaffer
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A mountable engine for bridge data storage
 email:
 - jshaffer@instructure.com
@@ -179,6 +193,7 @@ files:
 - db/migrate/20170518211754_create_bridge_cache_taggings.rb
 - db/migrate/20170518211817_create_bridge_cache_course_templates.rb
 - lib/bridge_cache.rb
+- lib/bridge_cache/data/bridge_model.rb
 - lib/bridge_cache/engine.rb
 - lib/bridge_cache/plugins/csv_dump.rb
 - lib/bridge_cache/plugins/data_transform.rb