bit_core 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46eb715d2ebf8df84b3bc19c1ef113babf53121d
-  data.tar.gz: c5a4d7697a0154726c0bbcf72f5c3a8b01298678
+  metadata.gz: 6fc8f82c0070900575127dc85046ca7f02923e25
+  data.tar.gz: ebb2257d29c38e76d1aa06bb9b817ecbb57fd2c8
 SHA512:
-  metadata.gz: 89d19c7babf025ead3e89f0bfecf6e7e671c6e4f9fbf65e9967ae058fc54df1f6a6013ca350b0aeb447d8b62cd7c6f086c77011792baa840b8c860540bc76f2a
-  data.tar.gz: 70096b801ceb598d0a9044d015f6b298216cb09f1c74ed3b7b067c334a5aa5fbaff00e7a0e1dde36ab7c346f2a99146cda372fc95769a37b96cfc8809943bb86
+  metadata.gz: 2a35f2bf37f8c18ed4de50b112387bf390ddc06eb689d87862495e3a46c3dad6274c3d43b2171aba55e0995054097f577df2a12472a38db31b19c859c72dc262
+  data.tar.gz: c3244449083c1ae2e35cb270ee68d16a4514e5819bd722d76a37e0883ec6733eb1670be51f6debc067d59569f1bd23d22718bffb644082bc08b7204ab43ec101

data/Rakefile

@@ -18,4 +18,4 @@ require "rspec/core/rake_task"
 desc "Run all specs in spec directory (excluding plugin specs)"
 RSpec::Core::RakeTask.new(:spec => "app:db:test:prepare")
 
-task :default => :spec
+task default: :spec

data/app/models/bit_core/slide.rb

@@ -12,15 +12,6 @@ module BitCore
     validates :position, numericality: { greater_than_or_equal_to: 1 }
     validates :position, uniqueness: { scope: :bit_core_slideshow_id }
 
-    def self.update_positions(ids)
-      transaction do
-        connection.execute "SET CONSTRAINTS bit_core_slide_position DEFERRED"
-        ids.each_with_index do |id, index|
-          where(id: id).update_all(position: index + 1)
-        end
-      end
-    end
-
     def render_body
       return "" if body.nil?
 

data/app/models/bit_core/slideshow.rb

@@ -7,10 +7,40 @@ module BitCore
              foreign_key: :bit_core_slideshow_id,
              dependent: :destroy,
              inverse_of: :slideshow
-    has_one :content_provider, as: :source_content, inverse_of: :source_content
+    has_one :content_provider,
+            as: :source_content,
+            inverse_of: :source_content,
+            dependent: :nullify
 
     validates :title, presence: true
 
     accepts_nested_attributes_for :slides
+
+    def add(slide_params)
+      slide = slides.build(slide_params)
+      slide.position = slides.count + 1
+
+      slide
+    end
+
+    def remove(slide)
+      return false unless slide.destroy
+
+      (slide.position + 1..slides.last.position).each do |pos|
+        slides.find_by_position(pos).update(position: pos - 1)
+      end
+
+      true
+    end
+
+    def sort(ordered_ids)
+      self.class.transaction do
+        self.class.connection.execute "SET CONSTRAINTS " \
+                                      "bit_core_slide_position DEFERRED"
+        ordered_ids.each_with_index do |id, idx|
+          slides.find(id).update_attribute(:position, idx + 1)
+        end
+      end
+    end
   end
 end

data/lib/bit_core/version.rb

@@ -1,4 +1,4 @@
 # nodoc
 module BitCore
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/dummy/config/database.yml

@@ -58,6 +58,7 @@ development:
 test:
   <<: *default
   database: dummy_test
+  username: postgres
 
 # As with config/secrets.yml, you never want to store sensitive information,
 # like your database password, in your source code. If your source code is