apiotics 0.1.131 → 0.1.132

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba329df1f7ecad86738a145027ba22658a7348ec
-  data.tar.gz: fc00edf2ea5343e6852cde3b68c5f86fe14d6e1e
+  metadata.gz: 46e1b36cd4cc414f0ef60c0ff60e0ffdb95ee298
+  data.tar.gz: ebf48d1a5f115d71305fc7805cd0250ff4815d60
 SHA512:
-  metadata.gz: 0d5efdd67ea532046364c4874f65c22a487489df46eb12201ddc4c54f8f8fac1a575aa174ae8235d2671c993cdb8dbd9aacc8d90c46c147eb951c386f81804ed
-  data.tar.gz: 4b3d43796771da851cac0fd815c13f21b6abcc5e8d35f44bc88afca48438b1103fb6be565d8e4125aa31a2508f903b921445e58dca522e35e1d7e3689a804ec8
+  metadata.gz: 5738927b681863a85ae3a2b6c8143754e087fc6a5018f3c8d7977e4262274826c72b48931d0c247a36abe19b99554a3b7273e89109ee31ec1597e6bd204a832c
+  data.tar.gz: f0a289811afc7a0aea42f5d9984a71df47db617587ac00f6a362e925d8b9b350a50ba0e05c263e2cf8128df72034bee9385c4d390f16da82e172c9e3e3eef392

data/lib/apiotics/version.rb

@@ -1,3 +1,3 @@
 module Apiotics
-  VERSION = '0.1.131'
+  VERSION = '0.1.132'
 end

data/lib/generators/apiotics/create_model/create_model_generator.rb

@@ -1,5 +1,8 @@
 module Apiotics
   class CreateModelGenerator < Rails::Generators::Base
+    
+    require 'json'
+    
     source_root File.expand_path('../templates', __FILE__)
     argument :parent, :type => :string
     argument :name, :type => :string
@@ -15,6 +18,12 @@ module Apiotics
         template "create_module_model_table.rb.erb", "db/migrate/#{date_string}_create_#{plural_name}.rb"
       end
       template "apiotics_module_model.rb.erb", "app/models/#{module_file_name}/#{module_file_name}.rb"
+      @c[:attributes].each do |k,v| 
+        unless v[:values] == "" || v[:values] == nil
+          j = JSON.parse(v[:values])
+          @c[:attributes][k][:values] = j
+        end
+      end
       template "apiotics_model.rb.erb", "app/models/#{module_file_name}/#{file_name}.rb"
       unless Apiotics.configuration.local_logging == false
         if portal == "true"

data/lib/generators/apiotics/create_model/templates/apiotics_model.rb.erb

@@ -8,7 +8,7 @@ module <%= module_name %>
     attr_accessor :skip_extract
     after_commit :extract, unless: :skip_extract
     after_commit :channel_push
-    <% unless @c == nil %><% @c[:attributes].each do |k,v| %><% unless v[:values] == "" || v[:values] == nil %>validates :<%= k.downcase.gsub(" ", "_").underscore %>, inclusion: { in: %w(<%= v[:values].join(" ") %>,
+    <% unless @c == nil %><% @c[:attributes].each do |k,v| %><% unless v[:values] == "" || v[:values] == nil %>validates :<%= k.downcase.gsub(" ", "_").underscore %>, inclusion: { in: %w(<%= v[:values].join(" ") %>),
     message: "%{value} is not a valid <%= k %>" }<% end %><% unless v[:range] == "" || v[:range] == nil %>
     validates :<%= k.gsub(" ", "_").underscore %>, inclusion: { in: <%= v[:range] %>,
     message: "%{value} is not within the range <%= v[:range] %>" }<% end %><% if v[:type] == "enum" %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiotics
 version: !ruby/object:Gem::Version
-  version: 0.1.131
+  version: 0.1.132
 platform: ruby
 authors:
 - MicroArx Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails