marty 1.0.25 → 1.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5118b11e2b94fade41047bae2dec32b1a3bcd15a
-  data.tar.gz: c022e1c2d19cdb84ca5403fc7898ebfeececaa88
+  metadata.gz: f67ebcac657138d046558974f9c05235794069e1
+  data.tar.gz: b79df0fe2a75a6a24e696a337db8799f2fbf57e1
 SHA512:
-  metadata.gz: 51e55d9a99ddce93de589b4873005c337b7ad8343659d1b8771b65a2146b2da68fc5757668eb05a420b06d45f866c61f635932e57f7ca4f06e798d08d5154f98
-  data.tar.gz: d097e901de04b56b8b073fb3e9459c952e7108f54261869c1e6501a56b4c473ef32793f4eae4deccf485f44ff92fcab6da79961af1737e8b69cf37a292da1029
+  metadata.gz: 804a7e3bb93f704897fd7773854487ab711a58c8f827acec33bc5a67eb9d2a4a54d33cd74277bbf115222541903ad9eac9bfe51e36933d83443bd501421699b8
+  data.tar.gz: e1637663e777a1fb8a2329446b7dc52a33ab79c26dd0830002a6da10b77b8872b9046dae5d053a052c478227fe403142a92ac9462d72621c80f4da2ae26a8633

data/app/models/marty/pg_enum.rb

@@ -1,11 +1,23 @@
 module Marty::PgEnum
+
   def [](index)
     index = index.to_s
 
     raise "no such #{self.name}: '#{index}'" unless
       self::VALUES.include?(index)
 
-    index
+    StringEnum.new(index)
+  end
+
+  def get_all
+    self::VALUES.map { |v| StringEnum.new(v) }
+  end
+
+  GET_ALL_SIG = [0, 0]
+  def self.extended(base)
+    base.class_eval do
+      const_set :GET_ALL_SIG, Marty::PgEnum::GET_ALL_SIG
+    end
   end
 
   alias_method :find_by_name, :[]

data/lib/marty/data_exporter.rb

@@ -80,10 +80,16 @@ class Marty::DataExporter
     end
   end
 
+  def self.get_attrs_in_order(klass, attrs)
+    return attrs unless klass.const_defined?(:EXPORT_ORDER)
+    klass::EXPORT_ORDER.select { |attr| attrs.include?(attr) }
+  end
+
   def self.export_attrs(klass, obj, attrs=nil, exclude_attrs=[])
     col_types = Marty::DataConversion.col_types(klass)
 
-    attr_list = (attrs || col_types.keys).map(&:to_s) - exclude_attrs
+    attr_list_raw = (attrs || col_types.keys).map(&:to_s) - exclude_attrs
+    attr_list = get_attrs_in_order(klass, attr_list_raw)
 
     attr_list.map do
       |c|
@@ -111,7 +117,8 @@ class Marty::DataExporter
   def self.export_headers(klass, attrs=nil, exclude_attrs=[])
     col_types = Marty::DataConversion.col_types(klass)
 
-    attr_list = (attrs || col_types.keys).map(&:to_s) - exclude_attrs
+    attr_list_raw = (attrs || col_types.keys).map(&:to_s) - exclude_attrs
+    attr_list = get_attrs_in_order(klass, attr_list_raw)
 
     attr_list.map do
       |c|

data/lib/marty/monkey.rb

@@ -10,7 +10,8 @@ class Delorean::BaseModule::BaseClass
     alias_method :old_get_attr, :_get_attr
 
     def _get_attr(obj, attr, _e)
-      if Marty::Enum === obj && !obj.respond_to?(attr)
+      if (Marty::Enum === obj ||
+          Marty::PgEnum === obj) && !obj.respond_to?(attr)
         obj[attr]
       else
         old_get_attr(obj, attr, _e)
@@ -114,6 +115,7 @@ class String
   def in_time_zone(zone = ::Time.zone)
     self == 'infinity' ? self : old_in_time_zone(zone)
   end
+
 end
 
 ######################################################################
@@ -197,6 +199,18 @@ module Netzke::Basepack::DataAdapters
   end
 end
 
+class StringEnum < String
+  include Delorean::Model
+  def name
+    self
+  end
+  def id
+    self
+  end
+  delorean_instance_method :name
+  delorean_instance_method :id
+end
+
 ######################################################################
 
 # Add pg_enum migration support -- FIXME: this doesn't belong here
@@ -209,5 +223,14 @@ module ActiveRecord
         column_names.each { |name| column(name, name.to_s.pluralize, options) }
       end
     end
+    module PostgreSQL
+      module OID
+        class Enum < Type::Value
+          def type_cast_from_database(value)
+            value && StringEnum.new(value)
+          end
+        end
+      end
+    end
   end
 end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.25"
+  VERSION = "1.0.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.25
+  version: 1.0.26
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg