activerecord-database-views 0.0.1.pre2 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTc2MzdlM2NhM2RlM2NmZWJjMDAwZWMwYzA0NzRmMjA1ZjlhMjRmZQ==
+    YmUzNjA2OTc4NGVmMDg3MmQwMDQ5YWYzOGFiZGJlZjRiYjcwNzRhMg==
   data.tar.gz: !binary |-
-    MGMxY2QxNDA0MGJkYTkzYmQ0ODk4YWE0ZTkyMmVmMjQ3MWUzOTc0OQ==
+    ZmJmMDk3MGZhZWFkYjAzYzdlNzlmNDkxMzU1OWY4ODU5MjEyMmI0Yg==
 SHA512:
   metadata.gz: !binary |-
-    MDhmNjQ2N2MyMGUzMTNkYzU3YzkyMDQ1ZDE2M2I4Yzc3YTk1NjQwZDk3NGYx
-    ODljZTJhZGIwZDNmNDRkZTQ2NGE5M2Q0M2VjNGFmZDRkNjNkOWYxOTEwNzE1
-    ZjM0NWQ0NTcxOGU3OWIzNmZiMDdhYzlkZjNiMWQwYjZmOTRmMGE=
+    YTAxZDQ0ZjUwYmIxYmM0MDJlOTI3NTliYzY3YTg3NzEyZjQwZjMwZWZjNGFj
+    NDllZWEyYzhiYmFhNmE4NmUzMWU3ZmY1OTZmYmM5YmRhYjY4YWU2ZTZjZmQ1
+    ODM4ZjA1OTJmOWQwYWMxNDIyNzFlZGYzNThiM2Y3NmY2NDBhOTc=
   data.tar.gz: !binary |-
-    YzlhMjdjZWYxZjFkY2ZlMTBiOWI2MTRmODE2Y2JjNzAwYWJiMDYyYjM4Nzk4
-    ZDllYzI4ZGVkMmYwNTA3ZjkwNmEwMTE4YjgzOTc1ODRmNThkZWYyZWFjNTBj
-    NTBhMzIwM2MzOTU1NjY1MjBkY2E0NTJjYzRjOTUxMmJhYTM5MTQ=
+    YWJmMmJiZDA1ZDcwY2E5ZGRlYmU2MjBkZWVmMmMzZjRiZDE5MTdjNmY5NTky
+    ZmIyYWFlYjRmMzExOWU2YTU4MTFlYmEwMGRiMzliZjg2ZTc3ZmFlMzBjODMy
+    MmUzMjAwMjg2NTBlOTg1ZmE2YmNkN2I3NzNiNGY1YmRjNzI4ZDY=

data/lib/activerecord-database-views.rb

@@ -1,136 +1,20 @@
-class ActiveRecord::Base
-  MISSING_RELATION_REGEX = /relation \"(.*)\" does not exist/
-  class << self
+require 'activerecord-database-views/view'
+require 'activerecord-database-views/view_collection'
 
-    #===========================================
-    #============= Functions ===================
-    #===========================================
-
-    def reload_functions!
-      drop_functions!
-      load_functions!
-    end
-
-    def without_functions(&block)
-      drop_functions!
-      block.call
-      load_functions!
-    end
-
-    def drop_functions!
-      init_functions
-      @functions_to_load.keys.each do |function_name|
-        path = @functions_to_load[function_name]
-        sql = File.read(path)
-        function_name = sql.match(/FUNCTION (.*) RETURNS/)[1]
-        connection.execute("DROP FUNCTION IF EXISTS #{function_name} CASCADE;")
-      end
-    end
-
-    def load_functions!
-      init_functions
-      while @functions_to_load.present?
-        function_name = @functions_to_load.keys.first
-        load_function(function_name)
-      end
-    end
-
-    private
-
-    def load_function(function_name)
-      path = @functions_to_load[function_name]
-      Rails.logger.info "\nLOADING VIEW: #{function_name} (#{path}) \n#{'-' * 100}"
-      sql = File.read(path)
-      connection.execute(sql)
-      @functions_to_load.delete(function_name)
-      Rails.logger.info "\nFUNCTION LOADED SUCCESSFULLY"
-    end
-
-    def init_functions
-      @functions_to_load = Dir.glob("db/functions/**/*.sql").inject({}) do |acc, path|
-        acc[File.basename(path, '.sql')] = Rails.root.join(path); acc
-      end
-    end
-
-    #=======================================
-    #============= Views ===================
-    #=======================================
-
-    public
-
-    def reload_views!
-      reload_functions!
-      drop_views!
-      load_views!
-    end
-
-    def without_views(&block)
-      drop_views!
-      block.call
-      load_views!
-    end
-
-    def drop_views!
-      init_views
-      @views_to_load.keys.each do |view_name|
-        connection.execute("DROP VIEW IF EXISTS #{view_name} CASCADE;")
-      end
-    end
-
-    #This is weird, but some views were imported as tables during one import...
-    def drop_views_as_tables!
-      init_views
-      @views_to_load.keys.each do |view_name|
-        begin
-          connection.execute("DROP TABLE IF EXISTS #{view_name} CASCADE;")
-        rescue ActiveRecord::StatementInvalid => exc
-          if exc.message[%{"#{view_name}" is not a table}]
-            connection.execute("DROP VIEW IF EXISTS #{view_name} CASCADE;")
-          else
-            raise exc
-          end
-        end
-      end
-    end
-
-    def load_views!
-      init_views
-      while @views_to_load.present?
-        view_name = @views_to_load.keys.first
-        load_view(view_name)
-      end
-    end
-
-    private
-
-    def load_view(view_name)
-      begin
-        path = @views_to_load[view_name]
-
-        Rails.logger.info "\nLOADING VIEW: #{view_name} (#{path}) \n#{'-' * 100}"
-        sql = File.read(path)
-        Rails.logger.info("\n\n #{sql}")
-
-        connection.execute("CREATE OR REPLACE VIEW #{view_name} AS #{sql};")
-        Rails.logger.info "\nVIEW LOADED SUCCESSFULLY"
+module ActiveRecord::DatabaseViews
+  def self.views
+    ViewCollection.new
+  end
 
-        @views_to_load.delete(view_name)
-      rescue ActiveRecord::StatementInvalid => exc
-        related_view_name = exc.message.scan(MISSING_RELATION_REGEX).flatten.first
-        if @views_to_load[related_view_name].present?
-          load_view(related_view_name)
-          retry
-        else
-          raise exc
-        end
-      end
-    end
+  def self.without
+    views.drop!
+    yield if block_given?
+    views.load!
+  end
 
-    def init_views
-      @views_to_load = Dir.glob("db/views/**/*.sql").inject({}) do |acc, path|
-        acc[File.basename(path, '.sql')] = Rails.root.join(path); acc
-      end
+  def self.reload!
+    ActiveRecord::Base.transaction do
+      without
     end
-
   end
 end

data/lib/activerecord-database-views/version.rb

@@ -1,7 +1,7 @@
 module Activerecord
   module Database
     module Views
-      VERSION = "0.0.1.pre2"
+      VERSION = "0.1.0"
     end
   end
 end

data/lib/activerecord-database-views/view.rb

@@ -0,0 +1,35 @@
+module ActiveRecord::DatabaseViews
+  class View
+    attr_reader :path
+
+    def initialize(path)
+      @path = path
+    end
+
+    def drop!
+      call_sql!("DROP VIEW IF EXISTS #{name} CASCADE;")
+    end
+
+    def load!
+      call_sql!("CREATE OR REPLACE VIEW #{name} AS #{sql};")
+    end
+
+    def name
+      File.basename(path, '.sql')
+    end
+
+    private
+
+    def full_path
+      Rails.root.join(path)
+    end
+
+    def sql
+      File.read(full_path)
+    end
+
+    def call_sql!(sql)
+      ActiveRecord::Base.connection.execute(sql)
+    end
+  end
+end

data/lib/activerecord-database-views/view_collection.rb

@@ -0,0 +1,52 @@
+module ActiveRecord::DatabaseViews
+  class ViewCollection
+    MISSING_RELATION_REGEX = /relation \"(.*)\" does not exist/
+
+    include Enumerable
+
+    attr_reader :views
+
+    def initialize
+      @views = view_paths.map { |path| View.new(path) }
+    end
+
+    def drop!
+      views.each(&:drop!)
+    end
+
+    def each
+      views.each { |view| yield view }
+    end
+
+    def load!
+      while views.present?
+        load_view(views.first)
+      end
+    end
+
+    private
+
+    def load_view(view)
+      begin
+        view.load! and views.delete(view)
+      rescue ActiveRecord::StatementInvalid => exc
+        if (related_view = retrieve_related_view(exc))
+          load_view(related_view)
+          retry
+        else
+          raise exc
+        end
+      end
+    end
+
+    def retrieve_related_view(exception)
+      related_view_name = exception.message.scan(MISSING_RELATION_REGEX).flatten.first
+      return false if related_view_name.blank?
+      find { |view| view.name == related_view_name }
+    end
+
+    def view_paths
+      Dir.glob("db/views/**/*.sql")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-database-views
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre2
+  version: 0.1.0
 platform: ruby
 authors:
 - stevo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies: []
 description: Facilitates storing and reloading of DB views within Rails applications
 email:
@@ -19,6 +19,8 @@ extra_rdoc_files: []
 files:
 - lib/activerecord-database-views.rb
 - lib/activerecord-database-views/version.rb
+- lib/activerecord-database-views/view.rb
+- lib/activerecord-database-views/view_collection.rb
 homepage: https://github.com/stevo/activerecord-database-views
 licenses: []
 metadata: {}
@@ -33,9 +35,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: ! '[none]'
 rubygems_version: 2.1.10