recommendify 0.3.0 → 0.3.1

data/README.md

@@ -152,13 +152,3 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-### todo
-
-+ implement CosineInputMatrix
-+ forbid ':' and '|' in item_ids
-+ recommendify::base no key part issue
-+ make max_row length configurable
-

data/ext/recommendify.c

@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <hiredis/hiredis.h>
 
-#include "version.h" 
+#include "version.h"
 #include "cc_item.h" 
 #include "jaccard.c" 
 #include "cosine.c" 
@@ -27,7 +27,11 @@ int main(int argc, char **argv){
   int batch_size = 200; /* FIXPAUL: make option */
   int maxItems = 50; /* FIXPAUL: make option */
   
-  
+  struct {
+    char  host[1024];
+    int   port;
+  } redis_addr;
+
   /* option parsing */
   if(argc < 2)
     return print_usage(argv[0]);
@@ -44,7 +48,7 @@ int main(int argc, char **argv){
   if(!similarityFunc){
     printf("invalid option: %s\n", argv[1]);
     return 1;
-  } else if(argc != 4){
+  } else if(argc < 4 || argc > 5){
     printf("wrong number of arguments\n");
     print_usage(argv[0]);
     return 1;
@@ -52,17 +56,35 @@ int main(int argc, char **argv){
 
   redisPrefix = argv[2];
   itemID = argv[3];
+  redis_addr.host[0] = 0;
+
+  /* configure redis location */
+  if(argc > 4){
+    char* has_port = strchr(argv[4], ':');
+    if(has_port){
+      strncpy(redis_addr.host, argv[4], strlen(argv[4]) - strlen(has_port));
+      redis_addr.host[strlen(argv[4]) - strlen(has_port)] = 0;
+      redis_addr.port = atoi(has_port + 1);
+    } else {
+      strncpy(redis_addr.host, argv[4], sizeof(redis_addr.host));
+    }
+  }
+
+  /* default redis location */
+  if(strlen(redis_addr.host) == 0)
+    strcpy(redis_addr.host, "localhost");
 
+  if(!redis_addr.port)
+    redis_addr.port = 6379;
 
   /* connect to redis */
   struct timeval timeout = { 1, 500000 }; 
-  c = redisConnectWithTimeout("127.0.0.2", 6379, timeout); 
+  c = redisConnectWithTimeout(redis_addr.host, redis_addr.port, timeout);
 
   if(c->err){
     printf("connection to redis failed: %s\n", c->errstr);
     return 1;
   }
- 
 
   /* get item count */
   reply = redisCommand(c,"HGET %s:items %s", redisPrefix, itemID);    

data/lib/recommendify/cc_matrix.rb

@@ -8,6 +8,7 @@ module Recommendify::CCMatrix
   end
 
   def add_set(set_id, item_ids)
+    # FIXPAUL: forbid | and : in item_ids
     item_ids.each do |item_id|
       item_count_incr(item_id)
     end
@@ -48,4 +49,4 @@ private
     Recommendify.redis.hget(redis_key(:items), key).to_i
   end
 
-end
+end

data/lib/recommendify/jaccard_input_matrix.rb

@@ -34,7 +34,7 @@ private
   end
 
   def run_native(item_id)
-    res = %x{#{native_path} --jaccard "#{redis_key}" "#{item_id}"}
+    res = %x{#{native_path} --jaccard "#{redis_key}" "#{item_id}" "#{redis_url}"}
     res.split("\n").map do |line|
       sim = line.match(/OUT: \(([^\)]*)\) \(([^\)]*)\)/)
       raise "error: #{res}" unless sim
@@ -51,4 +51,8 @@ private
     ::File.expand_path('../../../bin/recommendify', __FILE__)
   end
 
+  def redis_url
+    Recommendify.redis.client.location
+  end
+
 end

data/recommendify.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "recommendify"
-  s.version     = "0.3.0"
+  s.version     = "0.3.1"
   s.date        = Date.today.to_s
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Paul Asmuth"]

data/spec/jaccard_input_matrix_spec.rb

@@ -55,6 +55,20 @@ describe Recommendify::JaccardInputMatrix do
     res.should include ["fnord", 0.4]
   end
 
+  it "should call run_native when the native option was passed" do
+    matrix = Recommendify::JaccardInputMatrix.new(
+      :redis_prefix => "recommendify-test", 
+      :native => true,
+      :key => "mymatrix"
+    )
+    matrix.should_receive(:run_native).with("fnord").and_return(true)
+    matrix.similarities_for("fnord")
+  end
+
+  it "should return the correct redis url" do
+    @matrix.send(:redis_url).should == "127.0.0.1:6379"
+  end
+
 private
 
   def add_two_item_test_data!(matrix)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recommendify
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2012-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &71701010 !ruby/object:Gem::Requirement
+  requirement: &6965060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *71701010
+  version_requirements: *6965060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &71700770 !ruby/object:Gem::Requirement
+  requirement: &6964420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *71700770
+  version_requirements: *6964420
 description: Recommendify is a distributed, incremental item-based recommendation
   engine for binary input ratings. It's based on ruby and redis and uses an approach
   called "Collaborative Filtering"
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: ruby/redis based recommendation engine (collaborative filtering)
@@ -115,4 +115,3 @@ test_files:
 - spec/similarity_matrix_spec.rb
 - spec/sparse_matrix_spec.rb
 - spec/spec_helper.rb
-has_rdoc: