spectacles 0.2.0 → 0.3.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 273aac137fa2b8244bfe33650a911ef10b8086e2
-  data.tar.gz: 01bf02d0644540ad31c6196effb248deeaf57940
+  metadata.gz: 777bc0650701d2eb93cc11a22223182c281f1cca
+  data.tar.gz: ec7b5d312864bad0a7d704d6d299f43528c0c0d9
 SHA512:
-  metadata.gz: ca36ebb76457fe731712fc45f7dcf5408cdad8c67020a2cbab36fa2f45e6a31c13cbc71fcacb71dc8556d2f5d206c58b9689f6a7a2d7c8e0794673abde91b472
-  data.tar.gz: 49c690ad0b1ca67184346d8a1cd8f4b154bb857aa2971d1a6b79335fae2fc4449ed3a31ee19062fc474032a9ccec07de6db6eb8ad45cf70627430e892a4a051c
+  metadata.gz: 0ed610ac85d55c42ae2b1e41cd7ce887dacbb1785774bad2ce355f7ce1bed80a79de92cfaa3cb34fd00ff1e60f2a5c299624be28411ed62817d382c13d6ed0c9
+  data.tar.gz: 2adeacea766bb60432eeea04e7c976c06a16eaae039e4005d0f301bae90122dab4d2b3c552cb81ef52aba33cc896e32b0f90b5add1b5b77a1f2fa6ea9548e08f

data/Gemfile

@@ -3,6 +3,19 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in spectacles.gemspec
 gemspec
 
-group :test do 
+platforms :jruby do
+  gem "activerecord-jdbcmysql-adapter"
+  gem "activerecord-jdbcpostgresql-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
+platforms :ruby do
+  gem "mysql"
+  gem "mysql2"
+  gem "pg"
+  gem "sqlite3"
+end
+
+group :test do
   gem 'simplecov', :require => false
 end

data/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2012 Adam Hutchison, Brandon Dewitt
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+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.

data/Rakefile

@@ -2,8 +2,8 @@ require "bundler/gem_tasks"
 require 'rake/testtask'
 
 namespace :test do
-  adapters = [:mysql, :mysql2, :postgresql, :sqlite]
-  task :all => [:spectacles] + adapters
+  adapters = [ :mysql, :mysql2, :postgresql, :sqlite, :sqlite3 ]
+  task :all => [ :spectacles ] + adapters
 
   adapters.each do |adapter|
     Rake::TestTask.new(adapter) do |t|
@@ -13,7 +13,7 @@ namespace :test do
       t.verbose = true
     end
   end
-  
+
   Rake::TestTask.new(:spectacles) do |t|
     t.libs.push "lib"
     t.libs.push "specs"

data/lib/spectacles.rb

@@ -1,19 +1,3 @@
-# (The MIT License)
-#
-# Copyright (c) 2012 Adam Hutchison, http://github.com/liveh2o
-# Copyright (c) 2012 Brandon Dewitt, http://abrandoned.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'),
-# to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-#
-# 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.
-
 require 'active_record'
 require 'active_support/core_ext'
 require 'spectacles/schema_statements'
@@ -39,11 +23,11 @@ module Spectacles
 end
 
 ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
-  alias_method(:_spectacles_orig_inherited, :inherited) if method_defined?(:inherited)
+  alias_method(:_spectacles_original_inherited, :inherited) if method_defined?(:inherited)
 
   def self.inherited(klass)
     ::Spectacles::load_adapters
-    _spectacles_orig_inherited if method_defined?(:_spectacles_orig_inherited)
+    _spectacles_orig_inherited if method_defined?(:_spectacles_original_inherited)
   end
 end
 

data/lib/spectacles/schema_statements.rb

@@ -1,7 +1,7 @@
 require 'spectacles/schema_statements/abstract_adapter'
 
 module Spectacles
-  SUPPORTED_ADAPTERS = %w( Mysql Mysql2 PostgreSQL SQLServer SQLite )
+  SUPPORTED_ADAPTERS = %w( Mysql Mysql2 PostgreSQL SQLServer SQLite SQLite3 )
 
   def self.load_adapters
     SUPPORTED_ADAPTERS.each do |db|
@@ -10,7 +10,7 @@ module Spectacles
       if ActiveRecord::ConnectionAdapters.const_defined?(adapter_class)
         require "spectacles/schema_statements/#{db.downcase}_adapter"
         ActiveRecord::ConnectionAdapters.const_get(adapter_class).class_eval do
-          include Spectacles::SchemaStatements.const_get(adapter_class) 
+          include Spectacles::SchemaStatements.const_get(adapter_class)
         end
       end
     end

data/lib/spectacles/schema_statements/abstract_adapter.rb

@@ -1,12 +1,19 @@
 module Spectacles
   module SchemaStatements
     module AbstractAdapter
-      def create_view(view_name, build_query = nil)
+      def create_view(view_name, *args)
+        options = args.extract_options!
+        build_query = args.shift
+
         raise "#{self.class} requires a query or block" if build_query.nil? && !block_given?
 
         build_query = yield if block_given?
         build_query = build_query.to_sql if build_query.respond_to?(:to_sql)
 
+        if options[:force] && view_exists?(view_name)
+          drop_view(view_name)
+        end
+
         query = create_view_statement(view_name, build_query)
         execute(query)
       end
@@ -15,7 +22,7 @@ module Spectacles
         query = "CREATE VIEW ? AS #{create_query}"
         query_array = [query, view_name.to_s]
 
-        #return ActiveRecord::Base.__send__(:sanitize_sql_array, query_array)  
+        #return ActiveRecord::Base.__send__(:sanitize_sql_array, query_array)
         "CREATE VIEW #{view_name} AS #{create_query}"
       end
 
@@ -28,10 +35,14 @@ module Spectacles
         query = "DROP VIEW IF EXISTS ? "
         query_array = [query, view_name.to_s]
 
-        #return ActiveRecord::Base.__send__(:sanitize_sql_array, query_array)  
+        #return ActiveRecord::Base.__send__(:sanitize_sql_array, query_array)
         "DROP VIEW IF EXISTS #{view_name} "
       end
 
+      def view_exists?(name)
+        return views.include?(name.to_s)
+      end
+
       def views
         raise "Override view for your db adapter in #{self.class}"
       end

data/lib/spectacles/schema_statements/sqlite3_adapter.rb

@@ -0,0 +1,33 @@
+require 'spectacles/schema_statements/abstract_adapter'
+
+module Spectacles
+  module SchemaStatements
+    module SQLite3Adapter
+      include Spectacles::SchemaStatements::AbstractAdapter
+
+      def generate_view_query(*columns)
+        sql = <<-SQL
+          SELECT #{columns.join(',')}
+          FROM sqlite_master
+          WHERE type = 'view'
+        SQL
+      end
+
+      def views #:nodoc:
+        sql = generate_view_query(:name)
+
+        exec_query(sql, "SCHEMA").map do |row|
+          row['name']
+        end
+      end
+
+      def view_build_query(table_name)
+        sql = generate_view_query(:sql)
+        sql << " AND name = #{quote_table_name(table_name)}"
+
+        row = exec_query(sql, "SCHEMA").first
+        row['sql'].gsub(/CREATE VIEW .*? AS/i, "")
+      end
+    end
+  end
+end

data/lib/spectacles/version.rb

@@ -1,3 +1,3 @@
 module Spectacles
-  VERSION = "0.2.0"
+  VERSION = "0.3.0.pre"
 end

data/lib/spectacles/view.rb

@@ -1,9 +1,11 @@
 module Spectacles
   class View < ActiveRecord::Base
     self.abstract_class = true
-    
+
     def readonly?
       true
     end
   end
+
+  ::ActiveSupport.run_load_hooks(:spectacles, View)
 end

data/specs/adapters/sqlite3_adapter_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe "Spectacles::SchemaStatements::SQLite3Adapter" do
+  File.delete(File.expand_path(File.dirname(__FILE__) + "/../test.db")) rescue nil
+
+  ActiveRecord::Base.establish_connection(
+    :adapter => "sqlite3",
+    :database => "specs/test.db"
+  )
+  load_schema
+
+  it_behaves_like "an adapter", "SQLite3Adapter"
+  it_behaves_like "a view model"
+end

data/specs/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'simplecov'
-SimpleCov.start do 
+SimpleCov.start do
   add_filter "/specs"
 end
 

data/specs/support/schema_statement_examples.rb

@@ -49,11 +49,11 @@ shared_examples_for "an adapter" do |adapter|
 
     describe "view_name" do
       it "takes a symbol as the view_name" do 
-        shared_base.create_view(view_name.to_sym, Product.scoped).must_match(/#{view_name}/)
+        shared_base.create_view(view_name.to_sym, Product.all).must_match(/#{view_name}/)
       end
 
       it "takes a string as the view_name" do 
-        shared_base.create_view(view_name.to_s, Product.scoped).must_match(/#{view_name}/)
+        shared_base.create_view(view_name.to_s, Product.all).must_match(/#{view_name}/)
       end
     end
 
@@ -64,15 +64,15 @@ shared_examples_for "an adapter" do |adapter|
       end
 
       it "uses an Arel::Relation if passed" do 
-        select_statement = Product.scoped.to_sql
-        shared_base.create_view(view_name, Product.scoped).must_match(/#{Regexp.escape(select_statement)}/)
+        select_statement = Product.all.to_sql
+        shared_base.create_view(view_name, Product.all).must_match(/#{Regexp.escape(select_statement)}/)
       end
     end
 
     describe "block" do 
       it "can use an Arel::Relation from the yield" do 
-        select_statement = Product.scoped.to_sql
-        shared_base.create_view(view_name) { Product.scoped }.must_match(/#{Regexp.escape(select_statement)}/)
+        select_statement = Product.all.to_sql
+        shared_base.create_view(view_name) { Product.all }.must_match(/#{Regexp.escape(select_statement)}/)
       end
 
       it "can use a String from the yield" do 

data/specs/support/view_examples.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 shared_examples_for "a view model" do
-  ActiveRecord::Base.connection.create_view(:new_product_users) do 
+  ActiveRecord::Base.connection.create_view(:new_product_users) do
     "SELECT name AS product_name, first_name AS username FROM
     products JOIN users ON users.id = products.user_id"
   end
@@ -9,7 +9,7 @@ shared_examples_for "a view model" do
   class NewProductUser < Spectacles::View
     scope :duck_lovers, where(:product_name => 'Rubber Duck')
   end
-  
+
   describe "Spectacles::View" do
     describe "inherited class" do
       it "can has scopes" do
@@ -18,9 +18,9 @@ shared_examples_for "a view model" do
         @john = User.create(:first_name => 'John', :last_name => 'Doe')
         @john.products.create(:name => 'Rubber Duck', :value => 10)
 
-        NewProductUser.duck_lovers.first.username.must_be @john.first_name
+        NewProductUser.duck_lovers.load.first.username.must_be @john.first_name
       end
-      
+
       describe "an instance" do
         it "is readonly" do
           NewProductUser.new.readonly?.must_be true

data/spectacles.gemspec

@@ -20,25 +20,12 @@ Gem::Specification.new do |gem|
   ##
   # Dependencies
   #
-  gem.add_dependency "activerecord"
-  gem.add_dependency "activesupport"
+  gem.add_dependency "activerecord", ">= 3.2.0"
+  gem.add_dependency "activesupport", ">= 3.2.0"
 
   ##
   # Development dependencies
   #
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest"
-
-  if defined?(JRUBY_VERSION)
-    gem.add_development_dependency "activerecord-jdbcmysql-adapter"
-    gem.add_development_dependency "activerecord-jdbcpostgresql-adapter"
-    gem.add_development_dependency "activerecord-jdbcsqlite3-adapter"
-    
-    gem.platform = Gem::Platform.new('java')
-  else
-    gem.add_development_dependency "mysql"
-    gem.add_development_dependency "mysql2"
-    gem.add_development_dependency "pg"
-    gem.add_development_dependency "sqlite3"
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spectacles
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0.pre
 platform: ruby
 authors:
 - Adam Hutchison, Brandon Dewitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,62 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Still working out some of the kinks. Almost ready for Prime Time(TM).
   If you decide to use it and have problems, please report them at github.com/liveh2o/spectactles/issues
 email:
@@ -132,6 +76,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE
 - Rakefile
 - Readme.rdoc
 - lib/spectacles.rb
@@ -143,6 +88,7 @@ files:
 - lib/spectacles/schema_statements/mysql2_adapter.rb
 - lib/spectacles/schema_statements/mysql_adapter.rb
 - lib/spectacles/schema_statements/postgresql_adapter.rb
+- lib/spectacles/schema_statements/sqlite3_adapter.rb
 - lib/spectacles/schema_statements/sqlite_adapter.rb
 - lib/spectacles/schema_statements/sqlserver_adapter.rb
 - lib/spectacles/version.rb
@@ -150,6 +96,7 @@ files:
 - specs/adapters/mysql2_adapter_spec.rb
 - specs/adapters/mysql_adapter_spec.rb
 - specs/adapters/postgresql_adapter_spec.rb
+- specs/adapters/sqlite3_adapter_spec.rb
 - specs/adapters/sqlite_adapter_spec.rb
 - specs/spec_helper.rb
 - specs/spectacles/schema_statements/abstract_adapter_spec.rb
@@ -173,12 +120,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Spectacles (derived from RailsSQLViews) adds database view functionality