flayyer 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9dbded84120524d80d4557e283de7a9b604b8ac71ffe5eb1b6ea9b1bfe941e2
-  data.tar.gz: 788f7261bee24d9bcafd14ec8e428781ab33881b985d4ccf8fee1e64ef2a5c1d
+  metadata.gz: 9f3cd5589505248711256b44531dfe472c9fb2678e58bc74f8737de32d8bc0b7
+  data.tar.gz: 96d4cfbdf0fe2ebfcfea5bed7e5ebc6f7a4f66aaf1ded19620bea0df0a273b04
 SHA512:
-  metadata.gz: 75f6618085b5293e593a471deca9701eb56cffd7bb7fe5df7e24eca383f4d9c6cd1a5cf850f46e7e2453771f387e7c477028a3d801f51d86a73f5565960b8452
-  data.tar.gz: '08cca67e8244fb0b5198b5447aa204f612da10f151d23a0eecfa5f8cec66b5b456f0409180694d054c9a26992d8d86b0b8b3766192fddec6fc76a84f3b668cb6'
+  metadata.gz: e5152bc7884de73a23808fea60f29daa2aa2f25d639b3ceb0d46ac6857d3d0522dbcb9e195a58159d15fcf98860490a34c577f94041f6e0745e55d3a3b943461
+  data.tar.gz: 47f36829fe4ead59e35d1581b42e9444768dd834463a06e37fb9dc754303e501e73c3003b9f21a70e0975792f8ab5146b597ec0833374728c0e058c116427dc9

data/.github/workflows/ruby.yml

@@ -16,17 +16,20 @@ on:
 jobs:
   test:
 
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-18.04, macos-latest]
+        ruby: [2.5, 2.6, 2.7]
+    runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Install dependencies
       run: bundle install
     - name: Run tests

data/Gemfile.lock

@@ -1,26 +1,26 @@
 PATH
   remote: .
   specs:
-    flayyer (1.1.0)
+    flayyer (1.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.4.4)
     rake (12.3.3)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -45,7 +45,7 @@ url = flayyer.href
 # > https://flayyer.io/v2/tenant/deck/template.jpeg?__v=1596906866&title=Hello+world%21
 ```
 
-Variables can be complex arrays and hashes. 
+Variables can be complex arrays and hashes.
 
 ```ruby
 flayyer = Flayyer::FlayyerURL.create do |f|
@@ -56,6 +56,9 @@ flayyer = Flayyer::FlayyerURL.create do |f|
           { text: 'Apples', count: 14 },
       ],
   }
+  f.meta = {
+    id: 'slug-or-id', # To identify the resource in our analytics report
+  }
 end
 ```
 

data/lib/flayyer.rb

@@ -5,25 +5,40 @@ module Flayyer
   class Error < StandardError; end
 
   class FlayyerURL
-    attr_accessor :version, :tenant, :deck, :template, :extension, :variables
+    attr_accessor :version, :tenant, :deck, :template, :extension, :variables, :meta
 
     def self.create(&block)
       self.new(&block)
     end
 
-    def initialize(tenant = nil, deck = nil, template = nil, version = nil, extension = 'jpeg', variables = {})
+    def initialize(tenant = nil, deck = nil, template = nil, version = nil, extension = 'jpeg', variables = {}, meta = {})
       @tenant = tenant
       @deck = deck
       @template = template
       @version = version
       @extension = extension
       @variables = variables
+      @meta = meta
       yield(self) if block_given?
     end
 
     def querystring
+      # Allow accesing the keys of @meta with symbols and strings
+      # https://stackoverflow.com/a/10786575
+      @meta.default_proc = proc do |h, k|
+        case k
+          when String then sym = k.to_sym; h[sym] if h.key?(sym)
+          when Symbol then str = k.to_s; h[str] if h.key?(str)
+        end
+     end
+
       defaults = {
-        __v: Time.now.to_i, # This forces crawlers to refresh the image
+        __v: @meta[:v] || Time.now.to_i, # This forces crawlers to refresh the image
+        __id: @meta[:id] || nil,
+        _w: @meta[:width] || nil,
+        _h: @meta[:height] || nil,
+        _res: @meta[:resolution] || nil,
+        _ua: @meta[:agent] || nil,
       }
       result = FlayyerHash.new(@variables.nil? ? defaults : defaults.merge(@variables))
       result.to_query
@@ -57,6 +72,8 @@ module Flayyer
         v = Hash[v.each_with_index.to_a.map(&:reverse)] if v.is_a?(Array)
         if v.is_a?(Hash)
           h.merge!(FlayyerHash.new(v).to_query_hash(new_key))
+        elsif v.nil?
+          # skip null values
         else
           h[new_key] = v
         end

data/lib/flayyer/version.rb

@@ -1,3 +1,3 @@
 module Flayyer
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flayyer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Patricio López Juri
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies: []
 description: FLAYYER.com helper classes and methods
 email: