stbaldricks 5.0.3 → 5.1.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23976dc281df1111a3e7d98405d1b405f4802d95a7b23e07e33d66a0c9a2570c
-  data.tar.gz: 56b3e56ed91b0433bec7d17ede2a5dd493d5bdb618b382755aca682ab85ce0e3
+  metadata.gz: ed6e53fa5a27b5c313045729b05b5d600eac2ef8aab6bb53f07ebab429124861
+  data.tar.gz: 3ba8c2e6aaa698129cdabb4cae7eb80438e1417d3bdc6180c836c2e441a98c2c
 SHA512:
-  metadata.gz: 09e84c3c3c386df7796c02f05b9e257d24d29084902fc800b69b3bcfa150e34ff7c68dc388055208433588a22d14c50337669837d1456bcc1a78ae642d74c9f9
-  data.tar.gz: 9a2567682683edfe8c7869866f74f61d7f07bfc6aae3a477e8393ede28c03e950785225eb33333304bd870433037c46e0834849bbb47174ec7973c1993ecf793
+  metadata.gz: 90adb75ae3e1201de0154fd0bf0e1d92c75a98f98f79101aa83cf990cb64b65b55a183fda57013742ea04ecc2f52c6566fa334119e62a98e6392f1fee0c75e9f
+  data.tar.gz: 58efc424916e7e77adf2cf9530797334884dede156aad4ecb1d00131454b6fb0905c024a6d3582c7407bc4f69e659ed5ec85fc677935549b156cf6418eebffb8

data/lib/stbaldricks/entities/lib/base.rb

@@ -89,11 +89,8 @@ module SBF
               data.merge!(attribute_symbol => attribute.dirty_data(true))
             end
           elsif attribute.is_a?(Array)
-            entities = attribute.all? { |e| e.is_a?(BaseEntity) } ? attribute : false
-            next unless entities
-            dirty_data_hashes = entities.map { |e| e.dirty_data(true) }.reject(&:empty?)
-            next if dirty_data_hashes.empty?
-            data.merge!(attribute_symbol => dirty_data_hashes)
+            next unless attribute.all? { |e| e.is_a?(BaseEntity) } && attribute.any? { |e| !e.dirty_data(true).empty? }
+            data.merge!(attribute_symbol => attribute)
           end
         end
 

data/lib/stbaldricks/entities/page.rb

@@ -44,6 +44,39 @@ module SBF
       def draft_content
         content.select { |x| x.is_draft == true }
       end
+
+      def editor_content
+        published_content.map do |published|
+          draft_content.find { |d| published.id == d.id } || published
+        end
+      end
+
+      def lock_expired?(ttl = 300)
+        locked_at.nil? || Time.now >= Time.parse(locked_at) + ttl
+      end
+
+      def add_draft_sections(sections)
+        sections.each do |cid, data|
+          #convert symbol to integer
+          cid = cid.to_s.to_i
+
+          content = published_content.find { |c| c.id == cid }
+          update_draft_content_section(content, data, cid) unless content.nil?
+        end
+      end
+
+      private
+
+      def update_draft_content_section(content, data, cid)
+        # update or create draft version of content
+        draft = draft_content.find { |d| d.id == cid }
+        if draft.nil?
+          self.content << SBF::Client::Page::Content.new(content.to_hash.merge(is_draft: true, title: data[:title], text: data[:text]))
+        else
+          draft.title = data[:title]
+          draft.text = data[:text]
+        end
+      end
     end
   end
 end

data/lib/stbaldricks/version.rb

@@ -1,5 +1,5 @@
 module SBF
   module Client
-    VERSION = '5.0.3'
+    VERSION = '5.1.0.alpha.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stbaldricks
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.1.0.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2018-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -227,9 +227,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6