klaro-client 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c99d22b17ba2b1fec0e6d5a431e62bedb02975235412664aab41e7b820e4568
-  data.tar.gz: '08b2a568aa7a590fa5424399e02573c15af4809e64a71432c2b12283b0d8d0ad'
+  metadata.gz: '08aa3f977345513aca8d374ebe5e837d580bd95cf75da1bf555bd170858f3401'
+  data.tar.gz: 4ce2e6929c252660a35c13aa317ac8de7a4c715d4bf5b717119b61bb32a6929f
 SHA512:
-  metadata.gz: 7c31ae21e22413d7f6109fcc18ddce898101a440c98c69cab705c021444647116025a336e108a1caf2b19b7bc8e181f8177749a5e63f7754f9ac1608794a01bc
-  data.tar.gz: 48a49aa2448c7064696d79075b64e7a682caa33ea884287a957f4e5ed2a9f98b5506da9b3ff02063db71af6e2652d2c179270df1227c6d2d0fe5c501a9ad3770
+  metadata.gz: 01a6d53e1763a1b8e37b3777ab56bc2edd24cc28b4d6de447df8af75bc8c513bc45a9c7d9832e6fe942eff82d712b5aefad258a1035035b9f0d5e60a5e0f70cf
+  data.tar.gz: 27f1f1183ec289d2b2ae2b4ae6cfc0a1a14d7f42d1f31c7ee9a123291c4d320e11eee2c9d078019ddf1de65649636a180d3368695e8269c4ab5ebd9bd8925e92

data/lib/klaro/client.rb

@@ -11,6 +11,10 @@ module Klaro
       @request = RequestHandler.new(base_url)
     end
 
+    def absolute_url(url)
+      request.base_url + url
+    end
+
     def with_token(*args, &bl)
       request.with_token(*args, &bl)
     end
@@ -20,23 +24,23 @@ module Klaro
     end
 
     def dimension(code_or_id)
-      Dimension.dress(request.get("/api/dimensions/#{code_or_id}"))
+      Dimension.dress(request.get("/api/dimensions/#{code_or_id}"), self)
     end
 
     def dimensions
-      Dimensions.dress(request.get('/api/dimensions'))
+      Dimensions.dress(request.get('/api/dimensions'), self)
     end
 
     def board(location_or_id)
-      Board.dress(request.get("/api/boards/#{location_or_id}"))
+      Board.dress(request.get("/api/boards/#{location_or_id}"), self)
     end
 
     def board_stories(location_or_id)
-      Stories.dress(request.get("/api/boards/#{location_or_id}/stories/"))
+      Stories.dress(request.get("/api/boards/#{location_or_id}/stories/"), self)
     end
 
     def story(id_or_identifier)
-      Story.dress(request.get("/api/stories/#{id_or_identifier}"))
+      Story.dress(request.get("/api/stories/#{id_or_identifier}"), self)
     end
 
     def upload_image(image_path)

data/lib/klaro/client/resource.rb

@@ -2,16 +2,32 @@ module Klaro
   class Client
     class Resource < OpenStruct
 
-      class << self
-        alias :dress :new
+      def initialize(data, client)
+        super(data)
+        @client = client
       end
 
+      class << self
+
+        def symbolize_keys(data)
+          Hash[data.each_pair.map{|k,v|
+            [k.to_sym, v]
+          }]
+        end
+
+        def dress(data, client)
+          new(symbolize_keys(data), client)
+        end
+
+      end # class << self
+
     end # class Resource
     class Collection
       include Enumerable
 
-      def initialize(items)
+      def initialize(items, client)
         @items = items.map{|i| self.class.dress_one(i) }
+        @client = client
       end
 
       def each(*args, &bl)
@@ -26,7 +42,7 @@ module Klaro
         end
 
         def dress_one(item)
-          @item_class.dress(item)
+          @item_class.dress(item, @client)
         end
       end
 
@@ -34,6 +50,7 @@ module Klaro
   end # class Client
 end # module Klaro
 require_relative 'resource/story'
+require_relative 'resource/attachment'
 require_relative 'resource/stories'
 require_relative 'resource/dimension'
 require_relative 'resource/dimension_value'

data/lib/klaro/client/resource/attachment.rb

@@ -0,0 +1,15 @@
+module Klaro
+  class Client
+    class Attachment < Resource
+
+      def absUrl
+        @client.absolute_url(self.url)
+      end
+
+      def absThumbnailUrl
+        @client.absolute_url(self.thumbnailUrl)
+      end
+
+    end # class Attachment
+  end # class Client
+end # module Klaro

data/lib/klaro/client/resource/dimension.rb

@@ -4,7 +4,7 @@ module Klaro
 
       def values
         @values ||= super
-          .map{|v| DimensionValue.dress(v) }
+          .map{|v| DimensionValue.dress(v, @client) }
           .sort{|v1,v2| v1.ordering <=> v2.ordering }
       end
 

data/lib/klaro/client/resource/story.rb

@@ -15,6 +15,16 @@ module Klaro
       end
       alias :details :specification
 
+      def attachments
+        @attachments || super.map{|a| Attachment.dress(a, @client) }
+      end
+
+      def cover_attachment(force = false)
+        got = (self.attachments || []).find{|a| a[:isCover] }
+        got = (self.attachments || []).first if got.nil? and force
+        got
+      end
+
       def to_url(with_identifier = true)
         I18n.config.available_locales = [:en, :fr]
         url = I18n.transliterate(title.to_s)
@@ -25,14 +35,14 @@ module Klaro
 
       def download_and_relocate_attachments(root_path, target_folder, client)
         as = self.attachments.map do |attachment|
-          url = attachment["url"]
-          url += "?n=" + URI.encode_www_form_component(attachment["filename"]) unless url =~ /\?n=/
+          url = attachment.url
+          url += "?n=" + URI.encode_www_form_component(attachment.filename) unless url =~ /\?n=/
           path = handle_image(url, root_path, target_folder, client)
-          attachment.merge("url" => path)
+          attachment.merge(url => path)
         end
-        self.class.new(self.to_h.merge(
+        self.class.dress(self.to_h.merge(
           attachments: as
-        ))
+        ), @client)
       end
 
       def download_and_relocate_images(root_path, target_folder, client)
@@ -42,9 +52,9 @@ module Klaro
           image_relative_path = handle_image(url, root_path, target_folder, client)
           "![#{label}](#{image_relative_path})"
         end
-        self.class.new(self.to_h.merge(
+        self.class.dress(self.to_h.merge(
           specification: spec
-        ))
+        ), @client)
       end
 
     private

data/lib/klaro/client/version.rb

@@ -3,7 +3,7 @@ module Klaro
     module Version
       MAJOR = 0
       MINOR = 4
-      TINY  = 3
+      TINY  = 4
     end
     VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
   end # class Client

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klaro-client
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - enspirit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -127,6 +127,7 @@ files:
 - lib/klaro/client/errors.rb
 - lib/klaro/client/request_handler.rb
 - lib/klaro/client/resource.rb
+- lib/klaro/client/resource/attachment.rb
 - lib/klaro/client/resource/board.rb
 - lib/klaro/client/resource/dimension.rb
 - lib/klaro/client/resource/dimension_value.rb