twinkle 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11aec611ab42595799ef8573c3c4531ddc4de266cc493f6e489259d14c0bb4be
-  data.tar.gz: 47e2fb84ddc979e4cd5c9389c578f71c28d4c080c8732ae5368638352b4bbaea
+  metadata.gz: c5b5dff3d492b803241ceaec6bc2bc6077c6417a380e6e820404d40d55afa51d
+  data.tar.gz: '0291795717e1e61e813d1fef69a5f59b4c4bbf62c57c5efae3ef0674a325d736'
 SHA512:
-  metadata.gz: 8459279d6a1ee5d1f4ad47df0da68948024ef60d95cdf86ded42ac77f54c636149de394dbb69fd23b78fe2f9764d7cea8f10dad066d3d159047de96ce222092b
-  data.tar.gz: adf1ab532210ac62d886c5a769c03d282aecef5bb25714bfa51af27293c1bc516f7c5dc483c5dcd984e90faea8c7895eea9705bc3cfbccc369ad2febc07e11f7
+  metadata.gz: 1a17c906e4d0c6a24bc6c0788fb0add3b7f592574e23b94ea2be004444c2245017d2af875931ff4da86b00a025bb5966f900a586bcd4ad30e09e5f73f7079f07
+  data.tar.gz: dd2b2eebaf6599917fb830739b8e67ff1990c8f2fe0cc7e5f194baec828334cab6eb67bc68a9f33c1ac6cb39cf299c8ed2158a5f8c98ccb6d192d6cf2c9eb1ae

data/README.md

@@ -63,6 +63,13 @@ end
 
 Pull requests welcome.
 
+## Testing
+
+```bash
+bin/rails db:test:prepare
+bin/test
+```
+
 ## Building the gem
 
 ```bash

data/app/controllers/twinkle/appcast_controller.rb

@@ -1,7 +1,7 @@
 module Twinkle
   class AppcastController < ApplicationController
     def show
-      @app = App.with_versions.find_by!(slug: params[:slug])
+      @app = App.includes(:versions).where(versions: { published: true }).find_by!(slug: params[:slug])
       Event.create(app: @app, **event_params)
       render layout: false, formats: :xml
     end

data/app/models/twinkle/version.rb

@@ -4,17 +4,27 @@ module Twinkle
   class Version < ApplicationRecord
     belongs_to :app, foreign_key: 'twinkle_app_id', class_name: 'Twinkle::App'
 
+    scope :published, -> { where(published: true) }
+
+    before_save :set_published_at
+
     validates :number, presence: true
-    validates :build, presence: true
+    validates :build, numericality: { only_integer: true, greater_than: 0 }
     validates :description, presence: true, if: -> { published }
     validates :binary_url, presence: true, if: -> { published }
     validates :length, presence: true, if: -> { published }
     validates :length, numericality: { only_integer: true, greater_than: 0 }, allow_blank: true
-
+    validates :phased_rollout_interval, numericality: { only_integer: true, greater_than: 0 }, allow_blank: true
 
     # validates that the binary_url is a valid URL
     validate :binary_url_is_url
 
+    # validates that the release_notes_link is a valid URL
+    validate :release_notes_link_is_url
+
+    # validates that the full_release_notes_link is a valid URL
+    validate :full_release_notes_link_is_url
+
     # validates that one of the two signatures is present
     validate :signature_present, if: -> { published }
 
@@ -22,12 +32,17 @@ module Twinkle
 
     def binary_url_is_url
       return true if binary_url.blank?
-      begin
-        uri = URI.parse(binary_url)
-        raise URI::InvalidURIError unless uri.is_a?(URI::HTTP) && uri.host.present?
-      rescue URI::InvalidURIError
-        errors.add(:binary_url, "is not a valid URL")
-      end
+      errors.add(:binary_url, "is not a valid URL") unless is_url?(binary_url)
+    end
+
+    def release_notes_link_is_url
+      return true if release_notes_link.blank?
+      errors.add(:release_notes_link, "is not a valid URL") unless is_url?(release_notes_link)
+    end
+
+    def full_release_notes_link_is_url
+      return true if full_release_notes_link.blank?
+      errors.add(:full_release_notes_link, "is not a valid URL") unless is_url?(full_release_notes_link)
     end
 
     def signature_present
@@ -35,5 +50,20 @@ module Twinkle
         errors.add(:base, "At least one of the two signatures must be present")
       end
     end
+
+    def is_url?(url)
+      uri = URI.parse(url)
+      uri.is_a?(URI::HTTP) && uri.host.present?
+    rescue URI::InvalidURIError
+      false
+    end
+
+    def set_published_at
+      if published && published_at.nil?
+        self.published_at = Time.now
+      elsif !published && published_at.present?
+        self.published_at = nil
+      end
+    end
   end
 end

data/app/views/twinkle/appcast/show.xml.erb

@@ -5,14 +5,54 @@
         <% @app.versions.each do |version| %>
             <item>
                 <title><%= version.number %></title>
-                <pubDate><%= version.inserted_at %></pubDate>
+                <pubDate><%= version.published_at.strftime("%a, %d %b %Y %H:%M:%S %z") %></pubDate>
                 <sparkle:version><%= version.build %></sparkle:version>
                 <sparkle:shortVersionString><%= version.number %></sparkle:shortVersionString>
+                <% if version.link.present? %>
+                <link><%= version.link %></link>
+                <% end %>
+                <% if version.channel.present? %>
+                <sparkle:channel><%= version.channel %></sparkle:channel>
+                <% end %>
+                <% if version.release_notes_link.present? %>
+                <sparkle:releaseNotesLink><%= version.release_notes_link %></sparkle:releaseNotesLink>
+                <% end %>
+                 <% if version.full_release_notes_link.present? %>
+                <sparkle:fullReleaseNotesLink><%= version.full_release_notes_link %></sparkle:fullReleaseNotesLink>
+                <% end %>
+                <% if version.min_system_version.present? %>
                 <sparkle:minimumSystemVersion><%= version.min_system_version %></sparkle:minimumSystemVersion>
+                <% end %>
+                <% if version.max_system_version.present? %>
+                <sparkle:maximumSystemVersion><%= version.max_system_version %></sparkle:maximumSystemVersion>
+                <% end %>
+                <% if version.minimum_auto_update_version.present? %>
+                <sparkle:minimumAutoupdateVersion><%= version.minimum_auto_update_version %></sparkle:minimumAutoupdateVersion>
+                <% end %>
+                <% if version.ignore_skipped_upgrades_below_version.present? %>
+                <sparkle:ignoreSkippedUpgradesBelowVersion><%= version.ignore_skipped_upgrades_below_version %></sparkle:ignoreSkippedUpgradesBelowVersion>
+                <% end %>
+                <% if version.informational_update_below_version.present? %>
+                <sparkle:informationalUpdate>
+                    <sparkle:belowVersion><%= version.informational_update_below_version %></sparkle:belowVersion>
+                </sparkle:informationalUpdate>
+                <% end %>
+                <% if version.critical %>
+                <% if version.sparkle_two %>
+                <sparkle:criticalUpdate<%= version.critical_version.present? ? raw(" sparkle:version=\"#{version.critical_version}\"") : "" %>></sparkle:criticalUpdate>
+                <% else %>
+                <sparkle:tags>
+                <sparkle:criticalUpdate></sparkle:criticalUpdate>
+                </sparkle:tags>
+                <% end %>
+                <% end %>
+                <% if version.phased_rollout_interval.present? %>
+                <sparkle:phasedRolloutInterval><%= version.phased_rollout_interval %></sparkle:phasedRolloutInterval>
+                <% end %>
                 <description>
                     <%= version.description %>
                 </description>
-                <enclosure url="<%= version.url %>" length="<%= version.length %>" type="application/octet-stream" sparkle:dsaSignature="<%= version.dsa_signature %>" sparkle:edSignature="<%= version.ed_signature %>"/>
+                <enclosure url="<%= version.binary_url %>" length="<%= version.length %>" type="application/octet-stream" sparkle:dsaSignature="<%= version.dsa_signature %>" sparkle:edSignature="<%= version.ed_signature %>"/>
             </item>
         <% end %>
     </channel>

data/db/migrate/20240626232135_add_fields_to_twinkle_versions.rb

@@ -0,0 +1,19 @@
+class AddFieldsToTwinkleVersions < ActiveRecord::Migration[7.1]
+  def change
+    add_column :twinkle_versions, :sparkle_two, :boolean, default: true
+    add_column :twinkle_versions, :link, :string
+    add_column :twinkle_versions, :min_system_version, :string
+    add_column :twinkle_versions, :max_system_version, :string
+    add_column :twinkle_versions, :minimum_auto_update_version, :string
+    add_column :twinkle_versions, :ignore_skipped_upgrades_below_version, :string
+    add_column :twinkle_versions, :informational_update_below_version, :string
+    add_column :twinkle_versions, :critical, :boolean, default: false
+    add_column :twinkle_versions, :critical_version, :string
+    add_column :twinkle_versions, :phased_rollout_interval, :integer
+    add_column :twinkle_versions, :channel, :string
+    add_column :twinkle_versions, :release_notes_link, :string
+    add_column :twinkle_versions, :full_release_notes_link, :string
+    add_column :twinkle_versions, :published_at, :datetime
+    change_column :twinkle_versions, :build, :integer, using: 'build::integer'
+  end
+end

data/lib/twinkle/version.rb

@@ -1,3 +1,3 @@
 module Twinkle
-  VERSION = "0.1.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twinkle
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tim Marks
@@ -58,6 +58,7 @@ files:
 - db/migrate/20240517234016_create_twinkle_summaries.rb
 - db/migrate/20240518000405_create_twinkle_datapoints.rb
 - db/migrate/20240530023848_add_published_to_twinkle_versions.rb
+- db/migrate/20240626232135_add_fields_to_twinkle_versions.rb
 - lib/tasks/twinkle_tasks.rake
 - lib/twinkle.rb
 - lib/twinkle/concerns/models/app.rb
@@ -86,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Twinkle is a Rails engine for hosting appcast and collecting anonymous sparkle-project