trekyll 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09789f5453e5d4d496e9c9a68820e4586375cdfe'
-  data.tar.gz: 156b3ed3a50f16f2ebec2028aecf87c9a1881ce3
+  metadata.gz: 943e9309aa462c9c9421eec588ac5cf964eac7f4
+  data.tar.gz: 1ad1b597edd5e38230c1e07f14710fa3532ecf9f
 SHA512:
-  metadata.gz: f7ee1c3767cb4443220923df42d768ed56711d45db29781f37bd49760d37cc79420bdf88d64b1762fd730a5a54d82078c52912f7eda8d0d0d9a41051de6504c9
-  data.tar.gz: 16351a0adcd07d3d1741a4baf2d377fb553bcd142602ec4eaa139d6147406796842fae2fd4ee855a6fecbf563e0b24ed0309a6404ec70f0ffff6105099d06715
+  metadata.gz: 115f5d2cbe801db9c83ecbb621137631f0a0f1b266b464ca9941063c8fa2c8ac5f3a22a11d072eea4ee82f170c042fa82ab2ff5246c54874fe75d25ad90608aa
+  data.tar.gz: 7753f8023ffecd5a8b30b07abda23928136920acc7234d79c13021425d7666b3109ff6401300f56a0b01562cc35395f27408995495d976cd37b8fb093cf0c561

data/README.md

@@ -2,7 +2,7 @@
 
 Welcome to Trekyll. Trekyll is Jekyll plugin which enables you to use Trello board as CMS backend.
 
-*Note: Currently tested with Jekyll 3.6.0 and custom Jekyll themes
+*Note: Currently tested with Jekyll 3.8.4 and custom Jekyll themes
 
 ## Installation:
 
@@ -14,7 +14,7 @@ Copy this code and save it as "Gemfile":
 source "https://rubygems.org"
 ruby RUBY_VERSION
 
-gem "jekyll", "3.6.0"
+gem "jekyll", "3.8.4"
 
 group :jekyll_plugins do
    gem "jekyll-feed", "~> 0.6"

data/lib/trekyll/customfieldsmanager.rb

@@ -0,0 +1,75 @@
+require 'trello'
+
+# @board_custom_fields are JSON "customFields" | trello-api board.custom_fields
+#
+# @card_field_values are JSON cards: "customFieldItems" | trello-api card.custom_field_items
+#
+# @lyt is layout expectation eg. page, post
+#
+module Trekyll
+    class CustomFieldsManager
+
+        def initialize
+        end
+
+        def get_fields_and_layout(board_custom_fields, card_field_values, lyt)
+            fields_list = ""
+            layout = lyt
+            fields_list = board_custom_fields.map do |field|
+
+                            f_type = field.type
+                            val = ""
+                            # if field type is list
+                            if f_type == 'list'
+
+                                if field.name == 'layout'
+                                    card_field_values.each do |cf|
+                                        if cf.custom_field_id == field.id and cf.option_id != nil
+                                            el = field.custom_field_options.find {|element| element.id == cf.option_id}
+                                            layout = el.value["text"]
+                                        end
+                                    end
+                                else
+
+                                    card_field_values.each do |cf|
+                                        if cf.custom_field_id == field.id and cf.option_id != nil
+                                            el = field.custom_field_options.find {|element| element.id == cf.option_id}
+                                            val = el.value["text"]
+                                        end
+                                    end
+                                end
+
+
+                                # return value if not layout
+                                ### empty layout: "" jekyll 3.8.4 bugfix
+                                if field.name != 'layout'
+                                    "#{field.name}: \"#{val}\""
+                                else
+                                    ""
+                                end
+
+                            # if field type checkbox
+                            elsif f_type == 'checkbox'
+                                card_field_values.each do |cf|
+                                    if cf.custom_field_id == field.id and cf.value != nil
+                                        val = cf.value["checked"]
+                                    end
+                                end
+                                "#{field.name}: \"#{val}\""
+
+                            # if field type text, number, date
+                            else
+                                card_field_values.each do |cf|
+                                    if cf.custom_field_id == field.id and cf.value != nil
+                                        val = cf.value[f_type.to_s]
+                                    end
+                                end
+                                "#{field.name}: \"#{val}\""
+                            end
+
+                        end
+            return fields_list , layout
+        end
+
+    end
+end

data/lib/trekyll/trello_get.rb

@@ -6,6 +6,7 @@ require_relative 'configurator'
 require_relative 'navigation_manager'
 require_relative 'core_ext/string'
 require_relative 'filemanager'
+require_relative 'customfieldsmanager'
 
 module Trekyll
     def self.start_trekyll
@@ -27,6 +28,8 @@ module Trekyll
             config.member_token = init_config.token
         end
 
+        #Custom Fields Plugin Manager
+        cfm = CustomFieldsManager.new
 
         # Test trello connection
         user = Trello::Member.find("mucicnenad")
@@ -50,14 +53,9 @@ module Trekyll
         lists = board.lists
         board_custom_fields = ""
 
-        # Get board plugin fields
-        unless board.plugin_data.nil? then
-            plugins = board.plugin_data
-            plugins.each do |plugin|
-                plugin.value.map {|k,fields|
-                    board_custom_fields = fields
-                }
-            end
+        # Get board custom fields
+        unless board.custom_fields.nil? then
+            board_custom_fields = board.custom_fields
         end
 
         counter = 1
@@ -109,47 +107,15 @@ module Trekyll
                     puts "Page cover image:  #{cover_image_url} " if cover_image_url != ""
                 end
 
-
-                # TODO: Create Module for Custom Fields: #
-                # get_board_fields(board)                #
-                # get_card_fields(board_fields, card)    #
-                # get_card_layout(board_fields, card)    #
                 #                                        #
-                # Get card plugin custom fields values (Hash)
-                card_field_values = ""
-                unless card.plugin_data.nil? then
-                    card_plugin = card.plugin_data
-                    card_plugin.each do |plugin|
-                        plugin.value.map {|k,v| card_field_values = v}
-                    end
-                end
+                # cfm.get_fields_and_layout(board_fields, card_fields, layout)   #
+                #                                        #
 
                 # Custom fields for printing in .md file
                 custom_fields = ""
                 layout = "page"
-                unless card.plugin_data.nil? then
-                    custom_fields = board_custom_fields.map do |field|
-                        # if field type is: text, number, checkbox, date
-                        if (0..3) === field["t"]
-                          "#{field["n"]}: \"#{card_field_values[field["id"]]}\""
-                        # if field type is: dropdown list
-                        elsif field["t"] === 4
-                            # if field name is layout set layout variable
-                            if field["n"] == "layout"
-                                drpdwn_id = card_field_values[field["id"]]
-                                hash_with_val = field["o"].find {|element| element["id"] === drpdwn_id}
-                                if hash_with_val != nil
-                                    layout = hash_with_val["value"]
-                                    next
-                                end
-
-                            else
-                                drpdwn_id = card_field_values[field["id"]]
-                                hash_with_val = field["o"].find {|element| element["id"] === drpdwn_id}
-                                "#{field["n"]}: \"#{hash_with_val["value"]}\"" if hash_with_val != nil
-                            end
-                        end
-                    end
+                unless card.custom_field_items.nil? then
+                    custom_fields, layout = cfm.get_fields_and_layout(board_custom_fields, card.custom_field_items, layout)
                 end
 
                 # Write data to a file
@@ -291,46 +257,12 @@ module Trekyll
 
                 end
 
-                # TODO: Create Module for Custom Fields: #
-                # get_board_fields(board)                #
-                # get_card_fields(board_fields, card)    #
-                # get_card_layout(board_fields, card)    #
-                #                                        #
-                # Get card plugin custom fields values (Hash)
-                card_field_values = ""
-                unless card.plugin_data.nil? then
-                    card_plugin = card.plugin_data
-                    card_plugin.each do |plugin|
-                        plugin.value.map {|k,v| card_field_values = v}
-                    end
-                end
 
                 # Custom fields for printing in .md file
                 custom_fields = ""
                 layout = "post"
-                unless card.plugin_data.nil? then
-                    custom_fields = board_custom_fields.map do |field|
-                        # if field type is: text, number, checkbox, date
-                        if (0..3) === field["t"]
-                          "#{field["n"]}: \"#{card_field_values[field["id"]]}\""
-                        # if field type is: dropdown list
-                        elsif field["t"] === 4
-                            # if field name is layout set layout variable
-                            if field["n"] == "layout"
-                                drpdwn_id = card_field_values[field["id"]]
-                                hash_with_val = field["o"].find {|element| element["id"] === drpdwn_id}
-                                if hash_with_val != nil
-                                    layout = hash_with_val["value"]
-                                    next
-                                end
-
-                            else
-                                drpdwn_id = card_field_values[field["id"]]
-                                hash_with_val = field["o"].find {|element| element["id"] === drpdwn_id}
-                                "#{field["n"]}: \"#{hash_with_val["value"]}\"" if hash_with_val != nil
-                            end
-                        end
-                    end
+                unless card.custom_field_items.nil? then
+                    custom_fields, layout = cfm.get_fields_and_layout(board_custom_fields, card.custom_field_items, layout)
                 end
 
                 #get widget selector from card content and replace with liquid

data/lib/trekyll/version.rb

@@ -1,3 +1,3 @@
 module Trekyll
-  VERSION = "0.2.1".freeze
+  VERSION = "0.3.1".freeze
 end

data/trekyll.gemspec

@@ -31,8 +31,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # TO DO: Set ruby-trello to my github (until the changes get in 2.1.0 v)
-  spec.add_runtime_dependency "trelloapi",">= 0.0.0"
-  # spec.add_runtime_dependency "ruby-trello",">= 2.0.0"
+  # spec.add_runtime_dependency "trelloapi",">= 0.0.0"
+  spec.add_runtime_dependency "ruby-trello",">= 2.1.0"
   spec.add_runtime_dependency "indentation", "~> 0.1.1"
 
   # spec.add_development_dependency "bundler", "~> 1.14"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: trekyll
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Canic Interactive
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2018-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: trelloapi
+  name: ruby-trello
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: indentation
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +63,7 @@ files:
 - lib/trekyll.rb
 - lib/trekyll/configurator.rb
 - lib/trekyll/core_ext/string.rb
+- lib/trekyll/customfieldsmanager.rb
 - lib/trekyll/filemanager.rb
 - lib/trekyll/initializator.rb
 - lib/trekyll/navigation_manager.rb