twinkle 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 745ebe3beb30463d26dc3801ec74938b03ae089d267586d90ff736872a5bcbca
-  data.tar.gz: 678c0fadd35d1798fd7f1f69fc1ba9d170f7f12c3b3099311d96a1fd56f7bae8
+  metadata.gz: 1a7a2c25498981d89895eafa384e47eeb0d920c9b98e50abf93fc2faf8582725
+  data.tar.gz: 01b7bd69a10e38ad01f737e22c5553530cccf9fc8273b413c599fb18bb4b1b6f
 SHA512:
-  metadata.gz: a80e569a9be8977f3447583de2e030ccf45341a25bc60a845b02766be74b7dadf19f4aa5314d6dcdd2f935d44efadf2c668ea5f43c55cc0ce7c10115bd3d14d3
-  data.tar.gz: a11ac6363d06444ef8aa07ca5173e8c1770ce44295ab89ca32505c0140565244b2a118a2bdac1ccccf546cd04d9ac1e8dea0040c33649691846bbad606c4de1c
+  metadata.gz: 7f782193eb3343bd4631acf821ad3a2fb0c8e43ee8019533689853d9b2830c26d88557c80f8e501bf8f30b020f285a82b88139dde986694b8fb43c301b7c1646
+  data.tar.gz: 4c7e5ec8d2e463ff47b60ac802c3e255a5665ac1b8056d7cc11d112df54f9bc8bf716b27267b44fa3ae399daa9ffc76bba75bcd20a3e5e3c73a99adca338727e

data/app/controllers/twinkle/appcast_controller.rb

@@ -1,7 +1,10 @@
 module Twinkle
   class AppcastController < ApplicationController
     def show
-      @app = App.includes(:versions).find_by!(slug: params[:slug])
+      @app = App.includes(:versions)
+        .where(versions: { published: true })
+        .order('versions.build DESC')
+        .find_by!(slug: params[:slug])
       Event.create(app: @app, **event_params)
       render layout: false, formats: :xml
     end
@@ -18,7 +21,8 @@ module Twinkle
         :cpusubtype,
         :ramMB,
         :osVersion,
-        :lang
+        :lang,
+        :model
       )
     end
   end

data/app/models/twinkle/event.rb

@@ -4,9 +4,10 @@ module Twinkle
 
     scope :created_between, -> (start_date, end_date) {where("created_at >= ? AND created_at <= ?", start_date, end_date )}
 
-    alias_attribute :app_version, :version
+    alias_attribute :appVersion, :version
     alias_attribute :cpuFreqMHz, :cpu_freq_mhz
     alias_attribute :osVersion, :os_version
+    alias_attribute :ramMB,      :ram_mb
 
     def self.fields
       attribute_names.select{ |name| !['id', 'twinkle_app_id', 'created_at', 'updated_at'].include?(name) }

data/app/models/twinkle/version.rb

@@ -4,6 +4,10 @@ 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, numericality: { only_integer: true, greater_than: 0 }
     validates :description, presence: true, if: -> { published }
@@ -47,12 +51,19 @@ module Twinkle
       end
     end
 
-    private
     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/lib/twinkle/version.rb

@@ -1,3 +1,3 @@
 module Twinkle
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twinkle
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Tim Marks