feedable 0.9.1 → 0.9.2

data/lib/feedable.rb

@@ -33,7 +33,7 @@ def feedable(*args)
     tmp.offset_value = nil
 
     # add to unions
-    tmp.select_values = ["#{tmp.primary_key} as key", "#{tmp.feedable_col} as dtim", "'#{tmp.klass}' as type"]
+    tmp.select_values = ["#{tmp.primary_key} as keyfld", "#{tmp.feedable_col} as dtim", "'#{tmp.klass}' as type"]
     clauses.push tmp.to_sql
   end
 
@@ -55,12 +55,12 @@ def feedable(*args)
     q.offset_value = nil
 
     # collect ids
-    ids = all_ids.select{|x| x['type'] == q.klass.name}.collect{|x| x['key']}
+    ids = all_ids.select{|x| x['type'] == q.klass.name}.collect{|x| x['keyfld']}
     recs = q.find(ids)
 
     # attach to the output
     recs.each do |r|
-      idx = all_ids.index {|x| x['key'] == r.id && x['type'] == q.klass.name}
+      idx = all_ids.index {|x| x['keyfld'] == r.id && x['type'] == q.klass.name}
       all_recs[idx] = r
     end
   end

data/lib/feedable/version.rb

@@ -1,3 +1,3 @@
 module Feedable
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/test/dummy/log/test.log

@@ -1144,3 +1144,82 @@ Connecting to database specified by database.yml
    (0.0ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.4ms)  begin transaction
+  Fixture Delete (0.6ms)  DELETE FROM "alligators"
+  Fixture Insert (0.2ms)  INSERT INTO "alligators" ("name", "created_at", "updated_at", "id") VALUES ('James', '2012-01-01 00:00:00', '2012-01-01 00:00:00', 727736359)
+  Fixture Insert (0.1ms)  INSERT INTO "alligators" ("name", "created_at", "updated_at", "id") VALUES ('Spot', '2012-02-01 00:00:00', '2012-02-01 00:00:00', 845754783)
+  Fixture Insert (0.0ms)  INSERT INTO "alligators" ("name", "created_at", "updated_at", "id") VALUES ('Cameron', '2012-03-01 00:00:00', '2012-03-01 00:00:00', 91095304)
+  Fixture Delete (0.1ms)  DELETE FROM "posts"
+  Fixture Insert (0.1ms)  INSERT INTO "posts" ("title", "desc", "created_at", "updated_at", "id") VALUES ('The first post', 'this is the first thing', '2012-01-05 00:00:00', '2012-01-05 00:00:00', 277846598)
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("title", "desc", "created_at", "updated_at", "id") VALUES ('Post the second', 'in between them', '2012-02-05 00:00:00', '2012-02-05 00:00:00', 159828990)
+  Fixture Insert (0.1ms)  INSERT INTO "posts" ("title", "desc", "created_at", "updated_at", "id") VALUES ('Poster 3', 'and the last one', '2012-03-05 00:00:00', '2012-03-05 00:00:00', 1048705901)
+  Fixture Delete (0.1ms)  DELETE FROM "roosters"
+  Fixture Insert (0.1ms)  INSERT INTO "roosters" ("kind", "awesomeness", "created_at", "updated_at", "id") VALUES ('The first roostr', 4, '2012-01-10 00:00:00', '2012-01-10 00:00:00', 587110368)
+  Fixture Insert (0.0ms)  INSERT INTO "roosters" ("kind", "awesomeness", "created_at", "updated_at", "id") VALUES ('roostr the second', 100, '2012-02-10 00:00:00', '2012-02-10 00:00:00', 1006093928)
+  Fixture Insert (0.0ms)  INSERT INTO "roosters" ("kind", "awesomeness", "created_at", "updated_at", "id") VALUES ('roostr 3', 5, '2012-03-10 00:00:00', '2012-03-10 00:00:00', 217118453)
+  Fixture Delete (0.1ms)  DELETE FROM "trumpets"
+  Fixture Insert (0.1ms)  INSERT INTO "trumpets" ("brand", "loudness", "created_at", "updated_at", "id") VALUES ('yamaha', 'a bit', '2012-01-15 00:00:00', '2012-01-15 00:00:00', 587110368)
+  Fixture Insert (0.0ms)  INSERT INTO "trumpets" ("brand", "loudness", "created_at", "updated_at", "id") VALUES ('bach', 'earth shattering', '2012-02-15 00:00:00', '2012-02-15 00:00:00', 1006093928)
+  Fixture Insert (0.0ms)  INSERT INTO "trumpets" ("brand", "loudness", "created_at", "updated_at", "id") VALUES ('getzen', 'annoying', '2012-03-15 00:00:00', '2012-03-15 00:00:00', 217118453)
+   (0.9ms)  commit transaction
+   (0.0ms)  begin transaction
+  Rooster Load (0.3ms)  SELECT "roosters".* FROM "roosters" WHERE "roosters"."id" = ? LIMIT 1  [["id", 217118453]]
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (2.8ms)  INSERT INTO "alligators" ("created_at", "id", "name", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Fri, 14 Sep 2012 04:07:17 UTC +00:00], ["id", 217118453], ["name", nil], ["updated_at", Fri, 14 Sep 2012 04:07:17 UTC +00:00]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.3ms)  select * from (SELECT id as keyfld, created_at as dtim, 'Post' as type FROM "posts" UNION SELECT id as keyfld, created_at as dtim, 'Rooster' as type FROM "roosters" UNION SELECT id as keyfld, created_at as dtim, 'Alligator' as type FROM "alligators" ) order by dtim desc limit 3 offset 0
+  Post Load (0.1ms)  SELECT * FROM "posts" WHERE "posts"."id" = ? LIMIT 1  [["id", 1048705901]]
+  Rooster Load (0.1ms)  SELECT * FROM "roosters" WHERE "roosters"."id" = ? LIMIT 1  [["id", 217118453]]
+  Alligator Load (0.1ms)  SELECT * FROM "alligators" WHERE "alligators"."id" = ? LIMIT 1  [["id", 217118453]]
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."id" = ? LIMIT 1  [["id", 1048705901]]
+   (0.8ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.4ms)  select * from (SELECT id as keyfld, created_at as dtim, 'Post' as type FROM "posts" UNION SELECT id as keyfld, created_at as dtim, 'Rooster' as type FROM "roosters" UNION SELECT id as keyfld, created_at as dtim, 'Alligator' as type FROM "alligators" ) order by dtim desc limit 100 offset 0
+  Post Load (0.1ms)  SELECT * FROM "posts" WHERE "posts"."id" IN (1048705901, 159828990, 277846598)
+  Rooster Load (0.1ms)  SELECT * FROM "roosters" WHERE "roosters"."id" IN (217118453, 1006093928, 587110368)
+  Alligator Load (0.1ms)  SELECT * FROM "alligators" WHERE "alligators"."id" IN (91095304, 845754783, 727736359)
+  Rooster Load (0.0ms)  SELECT "roosters".* FROM "roosters" WHERE "roosters"."id" = ? LIMIT 1  [["id", 217118453]]
+  Post Load (0.0ms)  SELECT "posts".* FROM "posts" WHERE "posts"."id" = ? LIMIT 1  [["id", 1048705901]]
+  Alligator Load (0.1ms)  SELECT "alligators".* FROM "alligators" WHERE "alligators"."id" = ? LIMIT 1  [["id", 91095304]]
+  Rooster Load (0.0ms)  SELECT "roosters".* FROM "roosters" WHERE "roosters"."id" = ? LIMIT 1  [["id", 1006093928]]
+  Post Load (0.0ms)  SELECT "posts".* FROM "posts" WHERE "posts"."id" = ? LIMIT 1  [["id", 159828990]]
+  Alligator Load (0.0ms)  SELECT "alligators".* FROM "alligators" WHERE "alligators"."id" = ? LIMIT 1  [["id", 845754783]]
+  Rooster Load (0.0ms)  SELECT "roosters".* FROM "roosters" WHERE "roosters"."id" = ? LIMIT 1  [["id", 587110368]]
+  Post Load (0.0ms)  SELECT "posts".* FROM "posts" WHERE "posts"."id" = ? LIMIT 1  [["id", 277846598]]
+  Alligator Load (0.0ms)  SELECT "alligators".* FROM "alligators" WHERE "alligators"."id" = ? LIMIT 1  [["id", 727736359]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.3ms)  select * from (SELECT id as keyfld, created_at as dtim, 'Alligator' as type FROM "alligators" UNION SELECT id as keyfld, created_at as dtim, 'Post' as type FROM "posts" UNION SELECT id as keyfld, created_at as dtim, 'Rooster' as type FROM "roosters" ) order by dtim desc limit 5 offset 0
+  Alligator Load (0.0ms)  SELECT * FROM "alligators" WHERE "alligators"."id" = ? LIMIT 1  [["id", 91095304]]
+  Post Load (0.1ms)  SELECT * FROM "posts" WHERE "posts"."id" IN (1048705901, 159828990)
+  Rooster Load (0.1ms)  SELECT * FROM "roosters" WHERE "roosters"."id" IN (217118453, 1006093928)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.3ms)  select * from (SELECT id as keyfld, created_at as dtim, 'Alligator' as type FROM "alligators" UNION SELECT id as keyfld, created_at as dtim, 'Post' as type FROM "posts" UNION SELECT id as keyfld, created_at as dtim, 'Rooster' as type FROM "roosters" ) order by dtim desc limit 5 offset 2
+  Alligator Load (0.1ms)  SELECT * FROM "alligators" WHERE "alligators"."id" IN (91095304, 845754783)
+  Post Load (0.0ms)  SELECT * FROM "posts" WHERE "posts"."id" = ? LIMIT 1  [["id", 159828990]]
+  Rooster Load (0.1ms)  SELECT * FROM "roosters" WHERE "roosters"."id" IN (1006093928, 587110368)
+  Alligator Load (0.0ms)  SELECT "alligators".* FROM "alligators" WHERE "alligators"."id" = ? LIMIT 1  [["id", 91095304]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.3ms)  select * from (SELECT id as keyfld, created_at as dtim, 'Alligator' as type FROM "alligators" UNION SELECT id as keyfld, created_at as dtim, 'Post' as type FROM "posts" UNION SELECT id as keyfld, created_at as dtim, 'Rooster' as type FROM "roosters" ) order by dtim asc limit 100 offset 0
+  Alligator Load (0.1ms)  SELECT * FROM "alligators" WHERE "alligators"."id" IN (727736359, 845754783, 91095304)
+  Post Load (0.1ms)  SELECT * FROM "posts" WHERE "posts"."id" IN (277846598, 159828990, 1048705901)
+  Rooster Load (0.1ms)  SELECT * FROM "roosters" WHERE "roosters"."id" IN (587110368, 1006093928, 217118453)
+  Alligator Load (0.0ms)  SELECT "alligators".* FROM "alligators" WHERE "alligators"."id" = ? LIMIT 1  [["id", 727736359]]
+   (0.3ms)  select * from (SELECT id as keyfld, created_at as dtim, 'Alligator' as type FROM "alligators" UNION SELECT id as keyfld, created_at as dtim, 'Post' as type FROM "posts" UNION SELECT id as keyfld, created_at as dtim, 'Rooster' as type FROM "roosters" ) order by dtim desc limit 100 offset 0
+  Alligator Load (0.1ms)  SELECT * FROM "alligators" WHERE "alligators"."id" IN (91095304, 845754783, 727736359)
+  Post Load (0.1ms)  SELECT * FROM "posts" WHERE "posts"."id" IN (1048705901, 159828990, 277846598)
+  Rooster Load (0.1ms)  SELECT * FROM "roosters" WHERE "roosters"."id" IN (217118453, 1006093928, 587110368)
+  Rooster Load (0.0ms)  SELECT "roosters".* FROM "roosters" WHERE "roosters"."id" = ? LIMIT 1  [["id", 217118453]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.3ms)  select * from (SELECT id as keyfld, created_at as dtim, 'Post' as type FROM "posts" WHERE (title='Poster 3') UNION SELECT id as keyfld, created_at as dtim, 'Rooster' as type FROM "roosters" WHERE (kind='DNE') UNION SELECT id as keyfld, created_at as dtim, 'Alligator' as type FROM "alligators" WHERE (name is not null)) order by dtim desc limit 100 offset 0
+  Post Load (0.0ms)  SELECT "posts".* FROM "posts" WHERE "posts"."id" = ? LIMIT 1  [["id", 1048705901]]
+  Alligator Load (0.1ms)  SELECT "alligators".* FROM "alligators" WHERE "alligators"."id" IN (91095304, 845754783, 727736359)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feedable
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails