ar-monocle 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e87742c40793bc87a080779df7810ce565acf4a
-  data.tar.gz: f660aa91f8e80cc8da97092da30a0e4e4ca4ac6b
+  metadata.gz: 526a9406fbfc24cd93f3c599076c3bf891ec1239
+  data.tar.gz: 953fc1ec3bafa1c8c516ee3c2cb0c0e3a04be615
 SHA512:
-  metadata.gz: 3a00f377c8500d1f45a2cf0986bb2dff9ca490c20cd244b51209365a97d24eeb940f1dcbd4392383fa754a7cf967ab6f50ef869a11d4e4d5542fd70ef4f0ec3e
-  data.tar.gz: 52aaa8db222c5519a4bd47eace5726768db6ff962f0f9f967c2cb9e9f10babbc320f48cb39f59e96025863213fce94e047e554d5624cc0dbbf7319f2206424e9
+  metadata.gz: 144cbbef782122cb73820116c47aa89bd32ae292ac3e82ea7ef89850d228d0aa61d4d2fbfbf86b2ad7bf81ecaa680eba1ec2d51d9b2f4561213595de918198d3
+  data.tar.gz: 2295282ecd7a50af58f8a4deae568168a68f900518c50e2afc6db37dc17cc9789e43f527da874f0ebe68f053a9f8132baaef7e221f9119be1ad386d706aeb754

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ar-monocle (0.1.0)
+    ar-monocle (0.1.2)
       activerecord (>= 4, < 6)
       activesupport (>= 4, < 6)
       rake
@@ -9,13 +9,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.0.0.1)
-      activesupport (= 5.0.0.1)
-    activerecord (5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
       arel (~> 7.0)
-    activesupport (5.0.0.1)
+    activesupport (5.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -26,7 +26,7 @@ GEM
     database_cleaner (1.5.3)
     diff-lcs (1.3)
     dotenv (2.2.0)
-    i18n (0.7.0)
+    i18n (0.8.1)
     metaclass (0.0.4)
     method_source (0.8.2)
     minitest (5.10.1)
@@ -55,7 +55,7 @@ GEM
     rspec-support (3.5.0)
     slop (3.6.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
 
 PLATFORMS

data/lib/monocle.rb

@@ -2,6 +2,7 @@
 require "active_support/core_ext/module/delegation"
 require 'active_record'
 
+require 'monocle/configuration'
 require 'monocle/railtie' if defined?(Rails)
 
 require "monocle/version"
@@ -13,71 +14,81 @@ require "monocle/bump_command"
 require "monocle/list_command"
 
 module Monocle
-  def self.list
-    @list ||= ListCommand.new.call
-  end
-
-  def self.drop(view_name)
-    fetch(view_name).drop
-  end
 
-  def self.create(view_name)
-    fetch(view_name).create
-  end
+  class << self
+    delegate :path_to_views, :logger, to: :configuration
 
-  def self.versions
-    Migration.versions
-  end
+    def list
+      @list ||= ListCommand.new.call
+    end
 
-  def self.migrate
-    logger.info "Starting materialized views migrations..."
-    list.each do |key, view|
-      logger.debug "Checking if #{key} is up to date..."
-      view.migrate
+    def drop(view_name)
+      fetch(view_name).drop
     end
-    logger.info "All done!"
-  end
 
-  def self.bump(view_name)
-    BumpCommand.new(fetch(view_name)).call
-  end
+    def create(view_name)
+      fetch(view_name).create
+    end
 
-  def self.refresh(view_name, concurrently: false)
-    fetch(view_name).refresh concurrently: concurrently
-  end
+    def versions
+      Migration.versions
+    end
 
-  def self.logger
-    # FIXME: This will need to be configurable
-    @logger ||= if defined?(Rails)
-      Rails.logger
-    else
-      Logger.new(STDOUT).tap do |logger|
-        logger.level = Logger::ERROR
+    def migrate
+      logger.info "Starting materialized views migrations..."
+      list.each do |key, view|
+        logger.debug "Checking if #{key} is up to date..."
+        view.migrate
       end
+      logger.info "All done!"
     end
-  end
 
-  def self.views_path
-    # FIXME: This will need to be configurable
-    @views_path ||= if defined?(Rails)
-      File.join Rails.root, "db/views"
-    else
-      File.join Monocle.root, "db/views"
+    def bump(view_name)
+      BumpCommand.new(fetch(view_name)).call
     end
-  end
 
-  def self.root
-    File.expand_path(File.dirname(__dir__))
-  end
+    def refresh(view_name, concurrently: false)
+      fetch(view_name).refresh concurrently: concurrently
+    end
 
-  protected
+    # Enables you to configure things in a block, i.e
+    # Monocle.configure do |config|
+    #   config.logger = MyLogger.new
+    #   config.path_to_views = "my/different/path/to/my/sql/files"
+    # end
+    def configure
+      yield configuration if block_given?
+    end
 
-  def self.fetch(view_name)
-    view_name = symbolize_name(view_name)
-    list.fetch(view_name)
-  end
+    def views_path
+      File.join(root, path_to_views)
+    end
+
+    def root
+      # Get the absolute path of the project who is using us
+      File.expand_path(Dir.pwd)
+    end
+
+    def gem_root
+      # Get the absolute path of our gem root
+      File.expand_path(File.dirname(__dir__))
+    end
 
-  def self.symbolize_name(name)
-    name.is_a?(String) ? name.to_sym : name
+    def fetch(view_name)
+      view_name = symbolize_name(view_name)
+      list.fetch(view_name)
+    end
+
+    protected
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+
+    def symbolize_name(name)
+      name.is_a?(String) ? name.to_sym : name
+    end
   end
+
 end

data/lib/monocle/configuration.rb

@@ -0,0 +1,16 @@
+module Monocle
+  class Configuration
+    attr_accessor :path_to_views, :logger
+
+    # Define a custom logger
+    def logger
+      @logger ||= (defined?(Rails) ? Rails.logger : Logger.new('monocle.log'))
+    end
+
+    # The relative path to where views are stored, relative to the root of the
+    # project
+    def path_to_views
+      @path_to_views ||= "db/views"
+    end
+  end
+end

data/lib/monocle/railtie.rb

@@ -1,11 +1,11 @@
 module Monocle
   class Railtie < Rails::Railtie
     rake_tasks do
-      load File.join(Monocle.root, "lib/tasks/monocle.rake")
+      load File.join(Monocle.gem_root, "lib/tasks/monocle.rake")
     end
 
     generators do
-      Dir[File.join(Monocle.root, "lib/monocle/generators/*.rb")].each { |f| require f }
+      Dir[File.join(Monocle.gem_root, "lib/monocle/generators/*.rb")].each { |f| require f }
     end
   end
 end

data/lib/monocle/version.rb

@@ -1,3 +1,3 @@
 module Monocle
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/lib/monocle/view.rb

@@ -40,6 +40,19 @@ module Monocle
       Migration.find_or_create_by version: slug
       dependants.each &:create
       true
+    rescue ActiveRecord::StatementInvalid => e
+      # We may have another new view coming that this view depend on
+      # if the relation name is included on our list of views, we create
+      # that first and then retry
+      if e.message =~ /PG::UndefinedTable/ &&
+         e.message.scan(/relation \"(\w+)\" does not exist/) &&
+         list.keys.include?($1.to_sym)
+         warn "Can't create #{name} because it depends on #{$1}, creating that first..."
+         list.fetch($1.to_sym).create
+         retry
+      else
+        fail e
+      end
     end
 
     def migrate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar-monocle
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Leonardo Bighetti
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,6 +178,7 @@ files:
 - bin/setup
 - lib/monocle.rb
 - lib/monocle/bump_command.rb
+- lib/monocle/configuration.rb
 - lib/monocle/generators/install_generator.rb
 - lib/monocle/generators/matview_generator.rb
 - lib/monocle/generators/view_generator.rb