Merge pull request #30 from crashtech/general-fixes

General fixes

Author: Carlos

lib/torque/postgresql/adapter/database_statements.rb

@@ -90,26 +90,32 @@ def torque_load_additional_types(oids = nil)
 
         # Gets a list of user defined types.
         # You can even choose the +category+ filter
-        def user_defined_types(category = nil)
-          category_condition = "AND     typtype = '#{category}'" unless category.nil?
+        def user_defined_types(*categories)
+          category_condition = categories.present? \
+            ? "AND t.typtype IN ('#{categories.join("', '")}')" \
+            : "AND t.typtype NOT IN ('b', 'd')"
+
           select_all(<<-SQL, 'SCHEMA').rows.to_h
-            SELECT      t.typname AS name,
-                        CASE t.typtype
-                        WHEN 'e' THEN 'enum'
-                        END AS type
-            FROM        pg_type t
-            LEFT JOIN   pg_catalog.pg_namespace n ON n.oid = t.typnamespace
-            WHERE       n.nspname NOT IN ('pg_catalog', 'information_schema')
-            #{category_condition}
-            AND     NOT EXISTS(
-                      SELECT 1 FROM pg_catalog.pg_type el
-                        WHERE el.oid = t.typelem AND el.typarray = t.oid
-                      )
-            AND     (t.typrelid = 0 OR (
-                      SELECT c.relkind = 'c' FROM pg_catalog.pg_class c
-                        WHERE c.oid = t.typrelid
-                      ))
-            ORDER BY    t.typtype DESC
+            SELECT t.typname AS name,
+                   CASE t.typtype
+                     WHEN 'e' THEN 'enum'
+                     END     AS type
+            FROM pg_type t
+                   LEFT JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace
+            WHERE n.nspname NOT IN ('pg_catalog', 'information_schema')
+              #{category_condition}
+              AND NOT EXISTS(
+                SELECT 1
+                FROM pg_catalog.pg_type el
+                WHERE el.oid = t.typelem
+                  AND el.typarray = t.oid
+              )
+              AND (t.typrelid = 0 OR (
+              SELECT c.relkind = 'c'
+              FROM pg_catalog.pg_class c
+              WHERE c.oid = t.typrelid
+            ))
+            ORDER BY t.typtype DESC
           SQL
         end
 

lib/torque/postgresql/attributes/builder/enum.rb

@@ -4,7 +4,7 @@ module Attributes
       module Builder
         class Enum
 
-          attr_accessor :klass, :attribute, :subtype, :options, :values
+          attr_accessor :klass, :attribute, :subtype, :options, :values, :enum_module
 
           # Start a new builder of methods for composite values on
           # ActiveRecord::Base
@@ -74,9 +74,14 @@ def conflicting?
 
           # Create all methods needed
           def build
+            @enum_module = Module.new
+
             plural
             text
             all_values
+
+            klass.include enum_module
+            klass.extend enum_module::ClassMethods
           end
 
           private
@@ -98,7 +103,8 @@ def dangerous?(method_name, class_method = false)
             def plural
               attr = attribute
               enum_klass = subtype.klass
-              klass.singleton_class.module_eval do
+              enum_module.const_set('ClassMethods', Module.new)
+              enum_module::ClassMethods.module_eval do
                 # def self.statuses() statuses end
                 define_method(attr.pluralize) do
                   enum_klass.values
@@ -113,7 +119,7 @@ def plural
 
                 # def self.statuses_options() statuses_texts.zip(statuses) end
                 define_method(attr.pluralize + '_options') do
-                  enum_klass.values
+                  public_send(attr.pluralize + '_texts').zip(enum_klass.values)
                 end
               end
             end
@@ -122,7 +128,7 @@ def plural
             # the model scope
             def text
               attr = attribute
-              klass.module_eval do
+              enum_module.module_eval do
                 # def status_text() status.text('status', self) end
                 define_method("#{attr}_text") { send(attr).text(attr, self) }
               end
@@ -133,10 +139,11 @@ def text
             def all_values
               attr = attribute
               vals = values_methods
-              klass.module_eval do
+              model_klass = klass
+              enum_module.module_eval do
                 vals.each do |val, list|
                   # scope :disabled, -> { where(status: 'disabled') }
-                  scope list[0], -> { where(attr => val) }
+                  model_klass.scope list[0], -> { where(attr => val) }
 
                   # def disabled? status.disabled? end
                   define_method(list[1]) { send(attr).public_send("#{val}?") }

lib/torque/postgresql/inheritance.rb

@@ -39,6 +39,8 @@ def inheritance_merged_attributes
 
         # Check if the model's table depends on any inheritance
         def physically_inherited?
+          return false unless connected?
+
           @physically_inherited ||= connection.schema_cache.dependencies(
             defined?(@table_name) ? @table_name : decorated_table_name,
           ).present?

lib/torque/postgresql/schema_dumper.rb

@@ -59,14 +59,11 @@ def tables(stream) # :nodoc:
 
         # Dump user defined types like enum
         def user_defined_types(stream)
-          types = @connection.user_defined_types
+          types = @connection.user_defined_types('e')
           return unless types.any?
 
           stream.puts "  # These are user-defined types used on this database"
-          types.each do |name, type|
-            raise StandardError, "User-defined type '#{name}' cannot be dumped!" if type.blank?
-            send(type.to_sym, name, stream)
-          end
+          types.each { |name, type| send(type.to_sym, name, stream) }
           stream.puts
         rescue => e
           stream.puts "# Could not dump user-defined types because of following #{e.class}"

lib/torque/postgresql/version.rb

@@ -1,5 +1,5 @@
 module Torque
   module PostgreSQL
-    VERSION = '0.2.14'
+    VERSION = '0.2.15'
   end
 end

spec/tests/enum_spec.rb

@@ -513,6 +513,24 @@
       expect { type_map.decorate!(AText, :conflict) }.to raise_error(ArgumentError, /already exists in/)
     end
 
+    context 'on inherited classes' do
+      it 'has all enum methods' do
+        klass = ActivityBook
+        instance = klass.new
+
+        expect(klass).to    respond_to(:kinds)
+        expect(klass).to    respond_to(:kinds_texts)
+        expect(klass).to    respond_to(:kinds_options)
+        expect(instance).to respond_to(:kind_text)
+
+        klass.kinds.each do |value|
+          expect(klass).to    respond_to(value)
+          expect(instance).to respond_to(value + '?')
+          expect(instance).to respond_to(value + '!')
+        end
+      end
+    end
+
     context 'without autoload' do
       subject { Author }
       let(:instance) { FactoryGirl.build(:author) }