listable 0.1.3 → 0.1.4

data/Gemfile

@@ -1,14 +1,19 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
-#   gem "activesupport", ">= 2.3.5"
+gem "activesupport", ">= 3.2"
+gem "activerecord", ">= 3.2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "test-unit", "~> 2.5.4"
   gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.2.3"
   gem "jeweler", "~> 1.8.4"
   gem "simplecov", ">= 0"
+  gem "sqlite3"
+  gem "pg"
+  gem "mysql2"
 end

data/Gemfile.lock

@@ -1,11 +1,21 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
+      builder (~> 3.0.0)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
     activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    arel (3.0.2)
     bourne (1.1.2)
       mocha (= 0.10.5)
+    builder (3.0.4)
     git (1.2.5)
     i18n (0.6.1)
     jeweler (1.8.4)
@@ -18,6 +28,8 @@ GEM
     mocha (0.10.5)
       metaclass (~> 0.0.1)
     multi_json (1.5.0)
+    mysql2 (0.3.11)
+    pg (0.14.1)
     rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
@@ -32,13 +44,22 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    sqlite3 (1.3.7)
+    test-unit (2.5.4)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (>= 3.2)
+  activesupport (>= 3.2)
   bundler (~> 1.2.3)
   jeweler (~> 1.8.4)
+  mysql2
+  pg
   rdoc (~> 3.12)
   shoulda
   simplecov
+  sqlite3
+  test-unit (~> 2.5.4)

data/Rakefile

@@ -34,14 +34,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-# require 'simplecov/rcovtask'
-# Rcov::RcovTask.new do |test|
-#   test.libs << 'test'
-#   test.pattern = 'test/**/test_*.rb'
-#   test.verbose = true
-#   test.rcov_opts << '--exclude "gems/*"'
-# end
-
 task :default => :test
 
 require 'rdoc/task'

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/listable.rb

@@ -38,13 +38,22 @@ module Listable
   end
 end
 
-class ActiveRecord::Base
-  include Listable
-  include Listable::Querying
+ActiveRecord::Base.send :include, Listable
+ActiveRecord::Base.send :include, Listable::Querying
+
+ActiveRecord::ConnectionAdapters::AbstractAdapter.send :include, Listable::ConnectionAdapters::SchemaStatements
+
+if defined?(Rails)
+  # Extending connection adapters when lazily loaded by Rails
+  require 'listable/railtie'
+else
+  require 'active_record/connection_adapters/sqlite_adapter'
+  require 'active_record/connection_adapters/postgresql_adapter'
+  require 'active_record/connection_adapters/mysql2_adapter'
+
+  # Extending connection adapters
+  ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:include, Listable::ConnectionAdapters::PostgreSQLExtensions)
+  ActiveRecord::ConnectionAdapters::SQLiteAdapter.send(:include, Listable::ConnectionAdapters::SQLiteExtensions)
+  ActiveRecord::ConnectionAdapters::Mysql2Adapter.send(:include, Listable::ConnectionAdapters::MySQLExtensions)
 end
-
-class ActiveRecord::ConnectionAdapters::AbstractAdapter
-  include Listable::ConnectionAdapters::SchemaStatements
-end
-
-
+      

data/lib/listable/railtie.rb

@@ -11,10 +11,6 @@ module Listable
           ActiveRecord::ConnectionAdapters::SQLiteAdapter.send(:include, Listable::ConnectionAdapters::SQLiteExtensions)
         end
 
-        if ActiveRecord::ConnectionAdapters.const_defined?(:MysqlAdapter)
-          ActiveRecord::ConnectionAdapters::MysqlAdapter.send(:include, Listable::ConnectionAdapters::MySQLExtensions)
-        end
-
         if ActiveRecord::ConnectionAdapters.const_defined?(:Mysql2Adapter)
           ActiveRecord::ConnectionAdapters::Mysql2Adapter.send(:include, Listable::ConnectionAdapters::MySQLExtensions)
         end

data/lib/listable/view_manager.rb

@@ -1,6 +1,5 @@
 module Listable
   class ViewManager
-    cattr_reader :listables
 
     class << self
       def prefixed_view_name(name)
@@ -11,6 +10,10 @@ module Listable
         'lstble_'  
       end
 
+      def listables
+        @@listables
+      end
+
       def add_listable(view_name, model_name, model_scope_name)
         @@listables ||= {}
         @@listables[view_name] ||= {}
@@ -22,6 +25,7 @@ module Listable
       end
 
       def create_views
+        return if listables.nil?
         ActiveRecord::Base.transaction do
           drop_views # First drop all listable views to get a fresh start
           listables.each do |view_name, query_info|

data/listable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "listable"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Johannes Baldursson"]
-  s.date = "2013-01-30"
+  s.date = "2013-02-03"
   s.description = "With listable you can consolidate fields from several models into one, backed up by a database view.\n                       It is perfect for e.g. a front page where you may want to display the most recent additions to your site in a joint list.\n                       By providing scopes for each model you wish to include in a view, Listable will automatically create the database view for you."
   s.email = "johannes.baldursson@gmail.com"
   s.extra_rdoc_files = [
@@ -31,37 +31,58 @@ Gem::Specification.new do |s|
     "lib/listable/view_manager.rb",
     "lib/tasks/listable.rake",
     "listable.gemspec",
+    "test/database.yml",
     "test/helper.rb",
+    "test/models.rb",
+    "test/schema.rb",
     "test/test_listable.rb"
   ]
   s.homepage = "http://github.com/baldursson/listable"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.19"
   s.summary = "Rails extension that makes it easy to list and query several models through a single view backed model."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.2"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.2"])
+      s.add_development_dependency(%q<test-unit>, ["~> 2.5.4"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.2.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<pg>, [">= 0"])
+      s.add_development_dependency(%q<mysql2>, [">= 0"])
     else
+      s.add_dependency(%q<activesupport>, [">= 3.2"])
+      s.add_dependency(%q<activerecord>, [">= 3.2"])
+      s.add_dependency(%q<test-unit>, ["~> 2.5.4"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.2.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<pg>, [">= 0"])
+      s.add_dependency(%q<mysql2>, [">= 0"])
     end
   else
+    s.add_dependency(%q<activesupport>, [">= 3.2"])
+    s.add_dependency(%q<activerecord>, [">= 3.2"])
+    s.add_dependency(%q<test-unit>, ["~> 2.5.4"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.2.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<pg>, [">= 0"])
+    s.add_dependency(%q<mysql2>, [">= 0"])
   end
 end
 

data/test/database.yml

@@ -0,0 +1,14 @@
+sqlite:
+  adapter: sqlite3
+  database: listable.sqlite3
+
+postgres:
+  adapter: postgresql
+  database: listable_test
+  encoding: unicode
+  host: localhost
+
+mysql:
+  adapter: mysql2
+  database: listable_test
+  encoding: utf8

data/test/helper.rb

@@ -1,5 +1,9 @@
+require 'simplecov'
+SimpleCov.start
+
 require 'rubygems'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -9,10 +13,34 @@ rescue Bundler::BundlerError => e
 end
 require 'test/unit'
 require 'shoulda'
+require 'active_record'
+require 'active_support'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'listable'
 
+
 class Test::Unit::TestCase
 end
+
+adapter = ENV["DB"] || "sqlite"
+config = YAML::load_file(File.dirname(__FILE__) + "/database.yml")[adapter]
+
+if ['postgres', 'mysql'].include? adapter
+  ActiveRecord::Base.establish_connection(config.merge('database' => nil))
+  ActiveRecord::Base.connection.create_database config['database']
+  ActiveRecord::Base.establish_connection(config)
+end
+
+ActiveRecord::Base.establish_connection(config)
+
+Test::Unit.at_exit do
+  if ['postgres', 'mysql'].include? adapter
+    ActiveRecord::Base.establish_connection(config.merge('database' => nil))
+    ActiveRecord::Base.connection.drop_database config['database']
+  end
+end
+
+load File.dirname(__FILE__) + "/schema.rb"
+load File.dirname(__FILE__) + "/models.rb"

data/test/models.rb

@@ -0,0 +1,49 @@
+class TopicalItems < ActiveRecord::Base
+  acts_as_listable_view
+end
+
+class Page < ActiveRecord::Base
+  listable_through :topical_items, :listables
+  scope :listables, select([:title, :body])
+end
+
+class Employee < ActiveRecord::Base
+  listable_through :topical_items, :listables
+  scope :listables, concat_select([:first_name, ' ', :last_name], :title).select(:biography)
+end
+
+class NewsArticle < ActiveRecord::Base
+  listable_through :topical_items, :listables
+  scope :listables, select_as(headline: 'title').select(:body)
+end
+
+# Seeding pages
+Page.create(title: "I'm serious as a heart attack",
+            body: "Well, the way they make shows is, they make one show.
+                   That show's called a pilot. Then they show that show to the people who make shows,
+                   and on the strength of that one show they decide if they're going to make more shows.
+                   Some pilots get picked and become television programs. Some don't, become nothing.
+                   She starred in one of the ones that became nothing.")
+
+Page.create(title: "Are you ready for the truth?",
+            body: "Look, just because I don't be givin' no man a foot massage don't make it right
+                   for Marsellus to throw Antwone into a glass motherfuckin' house, fuckin' up
+                   the way the nigger talks. Motherfucker do that shit to me, he better paralyze my ass,
+                   'cause I'll kill the motherfucker, know what I'm sayin'?")
+
+# Seeding employees
+Employee.create(first_name: 'Johannes',
+                last_name: 'Baldursson',
+                biography: "Normally, both your asses would be dead as fucking fried chicken,
+                            but you happen to pull this shit while I'm in a transitional period so
+                            I don't wanna kill you, I wanna help you. But I can't give you this case,
+                            it don't belong to me. Besides, I've already been through too much shit
+                            this morning over this case to hand it over to your dumb ass.")
+
+
+NewsArticle.create(headline: 'Is she dead, yes or no?',
+                   body: "Do you see any Teletubbies in here? Do you see a slender plastic tag clipped
+                          to my shirt with my name printed on it? Do you see a little Asian child with
+                          a blank expression on his face sitting outside on a mechanical helicopter that
+                          shakes when you put quarters in it? No? Well, that's what you see at a toy store.
+                          And you must think you're in a toy store, because you're here shopping for an infant named Jeb.")

data/test/schema.rb

@@ -0,0 +1,23 @@
+ActiveRecord::Schema.define do
+  self.verbose = false
+
+  create_table :pages, :force => true do |t|
+    t.string :title
+    t.text :body
+    t.timestamps
+  end
+
+  create_table :employees, :force => true do |t|
+    t.string :first_name
+    t.string :last_name
+    t.text :biography
+    t.timestamps
+  end
+
+  create_table :news_articles, :force => true do |t|
+    t.string :headline
+    t.text :body
+    t.timestamps
+  end
+
+end

data/test/test_listable.rb

@@ -1,7 +1,47 @@
 require 'helper'
 
 class TestListable < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+
+  context "a listable view model" do
+    def setup
+      Listable::ViewManager.create_views
+    end
+
+    def topical_items_count
+      TopicalItems.count
+    end
+
+    def listable_items_count
+      Page.listables.count + Employee.listables.count + NewsArticle.listables.count
+    end
+
+    should "have as many rows as the models it lists" do
+      assert_equal listable_items_count, topical_items_count
+    end
+
+    should "raise a read only exception when trying to write to" do
+      assert_raise(ActiveRecord::ReadOnlyRecord) do
+        TopicalItems.first.update_attribute(:title, 'New title')
+      end
+    end
   end
+
+  context "the query method concat_select" do
+    should "select arguments as a concatenated string" do
+      concatenated_name = Employee.concat_select([:first_name, ' ', :last_name], :full_name).first.full_name
+      assert_equal 'Johannes Baldursson', concatenated_name
+    end
+  end
+
+  context "the query method select_as" do
+    should "select fields as new names" do
+      renamed_selection = Employee.select_as(first_name: 'fname', last_name: 'lname').first
+      normal_selection = Employee.select([:first_name, :last_name]).first
+      renamed_values = [renamed_selection.fname, renamed_selection.lname]
+      normal_values = [normal_selection.first_name, normal_selection.last_name]
+
+      assert_equal normal_values, renamed_values
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: listable
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,59 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2152705160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152705160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2152704300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +85,15 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *2152704300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152702520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +101,15 @@ dependencies:
         version: 1.2.3
   type: :development
   prerelease: false
-  version_requirements: *2152702520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152701680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +117,31 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *2152701680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152700700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +149,44 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152700700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "With listable you can consolidate fields from several models into
   one, backed up by a database view.\n                       It is perfect for e.g.
   a front page where you may want to display the most recent additions to your site
@@ -93,7 +214,10 @@ files:
 - lib/listable/view_manager.rb
 - lib/tasks/listable.rake
 - listable.gemspec
+- test/database.yml
 - test/helper.rb
+- test/models.rb
+- test/schema.rb
 - test/test_listable.rb
 homepage: http://github.com/baldursson/listable
 licenses:
@@ -110,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1337354255169009245
+      hash: 1761110371856318284
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Rails extension that makes it easy to list and query several models through