marty 1.0.26 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f67ebcac657138d046558974f9c05235794069e1
-  data.tar.gz: b79df0fe2a75a6a24e696a337db8799f2fbf57e1
+  metadata.gz: 32549066e0c8789c2965387c0a5351ae672f454d
+  data.tar.gz: e6cf959267b704fb809bb145c58ff38723b863eb
 SHA512:
-  metadata.gz: 804a7e3bb93f704897fd7773854487ab711a58c8f827acec33bc5a67eb9d2a4a54d33cd74277bbf115222541903ad9eac9bfe51e36933d83443bd501421699b8
-  data.tar.gz: e1637663e777a1fb8a2329446b7dc52a33ab79c26dd0830002a6da10b77b8872b9046dae5d053a052c478227fe403142a92ac9462d72621c80f4da2ae26a8633
+  metadata.gz: af5710ceabc29629e4261e8fd3fda9ac7f350b7e609ddefe1c347106fee24a6988399b9bc3a5e430e09b81adbfd5ce5b1ad6e9b97d0ea3467ba714ca5f112c4a
+  data.tar.gz: ffe61d68b9c660770436a74ed835db71648a95c89143f0b15e7d8bc5ed92178af27af64bc32c16c678079a241042e25d305abba3146e518589d7034c13a9b571

data/README.md

@@ -15,7 +15,8 @@ support for role-based authorization.
 The Marty framework provides several rake tasks to manage its database tables
 and delorean scripts.
 
-To create the correct migrations for a Marty-based applications:
+To create the correct migrations for a Marty-based application (see below for
+getting the internal dummy application to work):
 
 ```
 $ rake marty:install:migrations
@@ -50,7 +51,7 @@ To delete scripts:
 $ rake marty:delete_scripts
 ```
 
-# Testing
+# Dummy Application & Testing
 
 Make sure that extjs is installed (or symbolically linked) in the
 dummy app at spec/dummy/public.
@@ -63,16 +64,30 @@ You can use the example file by doing:
 $ cp spec/dummy/config/database.yml.example spec/dummy/config/database.yml
 ```
 
+To initialize the dummy application for a demo run:
+
+```bash
+$ bundle install
+$ bundle exec rake db:create db:migrate db:seed app:marty:load_scripts
+$ cd spec/dummy
+$ rails s
+```
+
+The marty dummy app should now be accessible in your browser:
+`localhost:3000`
+
+You can log in using `marty` as both user and password.
+
 To create the test database in prepartion to run your tests:
 
 ```bash
-$ RAILS_ENV=test rake db:create db:migrate
+$ RAILS_ENV=test bundle exec rake db:create
 ```
 
 Then to run the tests:
 
 ```bash
-$ rspec
+$ bundle exec rspec
 ```
 
 # History & Status

data/app/components/marty/extras/layout.rb

@@ -75,7 +75,8 @@ module Layout
   end
 
   def enum_setter(name)
-    lambda {|r, v| r.send("#{name}=", v == '---' || v.empty? ? nil : v)}
+    lambda {|r, v| r.send("#{name}=", v.nil? || v.empty? || v == '---' ?
+                                        nil : v)}
   end
 
   ######################################################################

data/app/models/marty/data_grid.rb

@@ -261,8 +261,12 @@ class Marty::DataGrid < Marty::Base
   # not expected to be called from Delorean.
   cached_delorean_fn :find_class_instance, sig: 3 do
     |pt, klass, v|
-    # FIXME: very hacky -- hard-coded name
-    Marty::DataConversion.find_row(klass, {"name" => v}, pt)
+    if Marty::PgEnum === klass
+      StringEnum.new(v)
+    else
+      # FIXME: very hacky -- hard-coded name
+      Marty::DataConversion.find_row(klass, {"name" => v}, pt)
+    end
   end
 
   def lookup_grid_distinct_entry(pt, h, visited=nil, follow=true,

data/app/models/marty/pg_enum.rb

@@ -14,11 +14,19 @@ module Marty::PgEnum
   end
 
   GET_ALL_SIG = [0, 0]
+  LOOKUP_SIG = [1, 1]
+  FIND_BY_NAME_SIG = [1, 1]
   def self.extended(base)
     base.class_eval do
       const_set :GET_ALL_SIG, Marty::PgEnum::GET_ALL_SIG
+      const_set :LOOKUP_SIG, Marty::PgEnum::LOOKUP_SIG
+      const_set :FIND_BY_NAME_SIG, Marty::PgEnum::FIND_BY_NAME_SIG
     end
   end
 
+  def seed
+  end
+
   alias_method :find_by_name, :[]
+  alias_method :lookup, :[]
 end

data/lib/marty/migrations.rb

@@ -249,6 +249,17 @@ OUT
     end
   end
 
+  # some migrations attempt to get the id using the model.
+  # after enumification models have no notion of numeric id
+  # we have to get it from the database
+  def get_old_enum_id(klass, name)
+    ActiveRecord::Base.
+               connection.execute(<<-SQL).to_a.first.try{|v| v['id']}
+      select id from #{klass.table_name} where name =
+         #{ActiveRecord::Base.sanitize(name)}
+    SQL
+  end
+
   private
   def fk_opts(from, to, column)
     name = "fk_#{from}_#{to}_#{column}"
@@ -278,7 +289,17 @@ OUT
     "unique_#{klass.table_name}"
   end
 
+  # if the database does not agree with the model regarding columns,
+  # get the actual column name
   def get_attrs(klass)
-    (Mcfly.mcfly_uniqueness(klass) + ['obsoleted_dt']).uniq
+    cols = (Mcfly.mcfly_uniqueness(klass) + ['obsoleted_dt']).uniq.map(&:to_s)
+    act_cols = klass.column_names
+    use_cols = cols.map do |col|
+      col_id = col + '_id'
+      act_cols.include?(col) ? col :
+        act_cols.include?(col_id) ? col_id :
+          (raise "problem adding index for #{klass}: "\
+                 "cols = #{cols}, act_cols = #{act_cols}")
+    end.map(&:to_sym)
   end
 end

data/lib/marty/version.rb

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

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require 'marty_rspec'
 
 Dummy::Application.initialize!
 
+ActiveRecord::Migrator.migrate File.expand_path("../../db/migrate/", __FILE__)
 ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
 
 Dir[Rails.root.join("../support/**/*.rb")].each { |f| require f }

metadata

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