disco 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb58ae5c2579ef03fc0089f9f9e0421cd38bd8996472bf04ef9383b601759e5a
-  data.tar.gz: 9bb8c5aa186ab1e6364d0ed446dc61e69a0f0ee730cee4c8367586dac69b666a
+  metadata.gz: ffa944ca55d7da5a4dc4cced181d013a9fdc0f1fbb76af6003ba3049bb299682
+  data.tar.gz: 64f389a3a93173b3d24cad85e5072b4d3f8965a729387a5845ed9c86098a9496
 SHA512:
-  metadata.gz: ecee89ddb2db25a9ba697ec637f16a2408079b8b3d7d287df0cfdb30d9b7c0a996d6cb38075766d7e3fecf529be6ad90187a1ec95d2d141076ecfe3e2236209a
-  data.tar.gz: 31d7259ac86779530b468392b611f0920b24682f8017e3b50f9a3ca41d30ad08454219881e26eae67d1add7a47d645f7a8b77d253ada4a3d0b5db0f5dbf5e33d
+  metadata.gz: f167237c7553d5a506467844d6acf860e81efca11da4e8facb8988cc994fbe70a52b38ff87b0d1157bcf9312b172c8794b49e6e8607748f77b129bcac26742d2
+  data.tar.gz: f5feab5c5d88dac8cc5a01cbab437110d0fe41c4fa98283464174d253996d8c8efa9dc92724f30bbae334c7fe2c7cb932b2b6335bd37f44aa645ef33fa7ec7ea

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.5.0 (2024-10-22)
+
+- Changed dataset directory to match XDG Base Directory Specification
+- Dropped support for marshal serialization
+- Dropped support for Ruby < 3.1 and Rails < 7
+
+## 0.4.2 (2024-06-24)
+
+- Removed dependency on `csv` gem for `load_movielens`
+
 ## 0.4.1 (2024-05-23)
 
 - Reduced memory for `item_recs` and `similar_users`

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2019-2022 Andrew Kane
+Copyright (c) 2019-2024 Andrew Kane
 
 MIT License
 

data/README.md

@@ -194,7 +194,7 @@ json = File.read("recommender.json")
 recommender = Disco::Recommender.load_json(json)
 ```
 
-Alternatively, you can store only the factors and use a library like [Neighbor](https://github.com/ankane/neighbor). See the [examples](https://github.com/ankane/neighbor/tree/master/examples).
+Alternatively, you can store only the factors and use a library like [Neighbor](https://github.com/ankane/neighbor). See the [examples](https://github.com/ankane/neighbor/tree/master/examples/disco).
 
 ## Algorithms
 

data/lib/disco/data.rb

@@ -1,23 +1,20 @@
 module Disco
   module Data
     def load_movielens
-      require "csv"
-
       item_path = download_file("ml-100k/u.item", "https://files.grouplens.org/datasets/movielens/ml-100k/u.item",
         file_hash: "553841ebc7de3a0fd0d6b62a204ea30c1e651aacfb2814c7a6584ac52f2c5701")
       data_path = download_file("ml-100k/u.data", "https://files.grouplens.org/datasets/movielens/ml-100k/u.data",
         file_hash: "06416e597f82b7342361e41163890c81036900f418ad91315590814211dca490")
 
-      # convert u.item to utf-8
-      movies_str = File.read(item_path).encode("UTF-8", "ISO-8859-1")
-
       movies = {}
-      CSV.parse(movies_str, col_sep: "|") do |row|
+      File.foreach(item_path) do |line|
+        row = line.encode("UTF-8", "ISO-8859-1").split("|")
         movies[row[0]] = row[1]
       end
 
       data = []
-      CSV.foreach(data_path, col_sep: "\t") do |row|
+      File.foreach(data_path) do |line|
+        row = line.split("\t")
         data << {
           user_id: row[0].to_i,
           item_id: movies[row[1]],
@@ -36,9 +33,8 @@ module Disco
       require "net/http"
       require "tmpdir"
 
-      # TODO handle this better
-      raise "No HOME" unless ENV["HOME"]
-      dest = "#{ENV["HOME"]}/.disco/#{fname}"
+      cache_home = ENV["XDG_CACHE_HOME"] || "#{ENV.fetch("HOME")}/.cache"
+      dest = "#{cache_home}/disco/#{fname}"
       FileUtils.mkdir_p(File.dirname(dest))
 
       return dest if File.exist?(dest)

data/lib/disco/model.rb

@@ -1,8 +1,8 @@
 module Disco
   module Model
     def has_recommended(name, class_name: nil)
-      if ActiveRecord::VERSION::MAJOR < 6
-        raise Disco::Error, "Requires Active Record 6+"
+      if ActiveRecord::VERSION::MAJOR < 7
+        raise Disco::Error, "Requires Active Record 7+"
       end
 
       class_name ||= name.to_s.singularize.camelize

data/lib/disco/recommender.rb

@@ -64,8 +64,8 @@ module Disco
       end
 
       if @top_items
-        @item_count = [0] * @item_map.size
-        @item_sum = [0.0] * @item_map.size
+        @item_count = Array.new(@item_map.size, 0)
+        @item_sum = Array.new(@item_map.size, 0.0)
         train_set.each do |v|
           i = @item_map[v[:item_id]]
           @item_count[i] += 1
@@ -431,61 +431,6 @@ module Disco
       end
     end
 
-    def marshal_dump
-      warn "[disco] Marshal serialization is deprecated - use JSON instead"
-
-      obj = {
-        implicit: @implicit,
-        user_map: @user_map,
-        item_map: @item_map,
-        rated: @rated,
-        global_mean: @global_mean,
-        user_factors: @user_factors,
-        item_factors: @item_factors,
-        factors: @factors,
-        epochs: @epochs,
-        verbose: @verbose
-      }
-
-      unless @implicit
-        obj[:min_rating] = @min_rating
-        obj[:max_rating] = @max_rating
-      end
-
-      if @top_items
-        obj[:item_count] = @item_count
-        obj[:item_sum] = @item_sum
-      end
-
-      obj
-    end
-
-    def marshal_load(obj)
-      warn "[disco] Marshal serialization is deprecated - use JSON instead"
-
-      @implicit = obj[:implicit]
-      @user_map = obj[:user_map]
-      @item_map = obj[:item_map]
-      @rated = obj[:rated]
-      @global_mean = obj[:global_mean]
-      @user_factors = obj[:user_factors]
-      @item_factors = obj[:item_factors]
-      @factors = obj[:factors]
-      @epochs = obj[:epochs]
-      @verbose = obj[:verbose]
-
-      unless @implicit
-        @min_rating = obj[:min_rating]
-        @max_rating = obj[:max_rating]
-      end
-
-      @top_items = obj.key?(:item_count)
-      if @top_items
-        @item_count = obj[:item_count]
-        @item_sum = obj[:item_sum]
-      end
-    end
-
     def json_load(obj)
       require "base64"
 

data/lib/disco/version.rb

@@ -1,3 +1,3 @@
 module Disco
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disco
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2024-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libmf
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: numo-narray
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
 description:
 email: andrew@ankane.org
 executables: []
@@ -69,14 +69,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Recommendations for Ruby and Rails using collaborative filtering