hearthside-marginalia 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d3649cd1ba78b13ce9933a9cf69fc4d2217b3be13c0e6b69b990acd6e3e55a2
-  data.tar.gz: 5be51a1c11be6da3221a4af535f225bdb0e3e91448c599b950470ef5894269ad
+  metadata.gz: 14c7ff324f7b80a8c952fb664f59bbdd40df805150fef4a7bb99295fbd46a9c4
+  data.tar.gz: d2591c9ec246923e0a4395015ba132acc65d6b73bba85e74d60c98e34c3bad51
 SHA512:
-  metadata.gz: 5a65a0aea0a77bd6baf05c98200aff53e80da965ee511361b779f6d8db2692a9afa42130268365cd1a625327e8deb3ce8817a2c1f1891e21926b6834aedfd8bb
-  data.tar.gz: 84c546a05844033ecbad41ca73499a6d995f4381a001720e047233ea3510ed52540911d9af0c30c5518905b6f2efa7d813113ae3155a7ea1679f69a6b0495ca1
+  metadata.gz: bafefb3a1996354fbc23e51927dd99927dcd70714471711f48bf65239cf9f2f3bedcb0e40f05e25c448f9cc8991450a567d03c23471cd4412f2e2368c7a44955
+  data.tar.gz: 50d7bb0dbc6b374768149c35cb6b2b0e11019ccfc3fb20dc987fdc33419b905b2ef45b19a074136841cc1a3b6a8cadb8fbb82385580cba39dcfca0f66ecfb8b6

data/app/models/marginalia/book.rb

@@ -2,7 +2,7 @@ class Marginalia::Book < Marginalia::ApplicationRecord
   # has_many :author_contributions, class_name: Marginalia::Contribution.name
   # has_many :authors, class_name: Marginalia::Person.name, through: :author_contributions
   # has_many :highlights
-  has_many :updates
+  has_many :updates, -> { order(created_at: :asc, progress: :asc) }
   # has_many :genres
 
   validates :title, presence: true
@@ -12,11 +12,19 @@ class Marginalia::Book < Marginalia::ApplicationRecord
   enum format: [:hardcover, :paperback, :ebook, :audio].to_h { [_1, _1.to_s] }
 
   def progress
-    case format.to_sym
+    case format&.to_sym
     when :audio
-      updates.order(:created_at).last.progress.to_f / minutes.to_f
+      if minutes.to_f == 0.0
+        100
+      else
+        updates.last.progress.to_f / minutes.to_f
+      end
     else
-      updates.order(:created_at).last.progress.to_f / pages.to_f
+      if pages.to_f == 0.0
+        100
+      else
+        updates.last.progress.to_f / pages.to_f
+      end
     end
   end
 end

data/db/migrate/20230111033154_create_marginalia_books.rb

@@ -3,14 +3,16 @@ class CreateMarginaliaBooks < ActiveRecord::Migration[7.0]
     create_table :marginalia_books do |t|
       t.string :title
       t.string :format
-      t.string :asin
-      t.string :isbn
+      t.string :asin, index: { unique: true }
+      t.string :isbn, index: { unique: true }
       t.date :published_on
+      t.date :last_completed_on
       t.integer :pages
       t.integer :minutes
       t.integer :rating
-      t.integer :read_count
       t.text :review
+      t.string :cover_url
+      t.boolean :library
 
       t.timestamps
     end

data/db/migrate/20230111034357_create_marginalia_updates.rb

@@ -7,5 +7,6 @@ class CreateMarginaliaUpdates < ActiveRecord::Migration[7.0]
 
       t.timestamps
     end
+    add_index :marginalia_updates, [:book_id, :progress, :created_at], unique: true
   end
 end

data/lib/marginalia/version.rb

@@ -1,3 +1,3 @@
 module Marginalia
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hearthside-marginalia
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Caleb Hearth
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Reading tracking for Hearthside