fae-rails 2.0.0 → 2.1.0

data/lib/fae/version.rb

@@ -1,3 +1,3 @@
 module Fae
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/lib/generators/fae/base_generator.rb

@@ -9,6 +9,7 @@ module Fae
     @@attribute_names = []
     @@association_names = []
     @@attachments = []
+    @@graphql_attributes = []
     @@has_position = false
     @@display_field = ''
 
@@ -28,18 +29,21 @@ module Fae
             @@attributes_flat << "#{arg.name}:#{arg.type}"
           end
 
-          if arg.name['_id'] || arg.type.to_s == 'references'
-            @@association_names << arg.name.gsub('_id', '')
+          if is_association(arg)
+            @@association_names << arg.name.gsub(/_id$/, '')
           elsif !is_attachment(arg)
             @@attribute_names << arg.name
           end
           @@has_position = true if arg.name === 'position'
+
+          @@graphql_attributes << graphql_object(arg)
         end
 
         @@attributes_flat = @@attributes_flat.uniq.join(' ')
         @@association_names.uniq!
         @@attribute_names.uniq!
         @@attachments.uniq!
+        @@graphql_attributes.uniq!
       end
     end
 
@@ -74,7 +78,7 @@ module Fae
     end
 
     def add_route
-      inject_into_file "config/routes.rb", after: "namespace :#{options.namespace} do\n" do <<-RUBY
+      inject_into_file "config/routes.rb", after: "namespace :#{options.namespace} do\n", force: true do <<-RUBY
     resources :#{plural_file_name}
 RUBY
       end
@@ -148,6 +152,45 @@ RUBY
       inject_into_file 'app/models/concerns/fae/navigation_concern.rb', line, before: '# scaffold inject marker'
     end
 
+    def graphql_object(arg)
+      if is_association(arg)
+        assoc_name = arg.name.gsub(/_id$/, '')
+        assoc_type = "Types::#{assoc_name.classify}Type"
+        { attr: assoc_name.to_sym, type: assoc_type }
+      else
+        { attr: arg.name.to_sym, type: graphql_type(arg.type) }
+      end
+    end
+
+    def graphql_type(type)
+      case type.to_s
+      when 'integer'
+        'Integer'
+      when 'boolean'
+        'Boolean'
+      when 'image'
+        'Types::FaeImageType'
+      when 'file'
+        'Types::FaeFileType'
+      else
+        'String'
+      end
+    end
+
+    def generate_graphql_type
+      return unless uses_graphql
+      @graphql_attributes = @@graphql_attributes
+      template "graphql/graphql_type.rb", "app/graphql/types/#{file_name}_type.rb"
+    end
+
+    def uses_graphql
+      defined?(GraphQL)
+    end
+
+    def is_association(arg)
+      arg.name.end_with?('_id') || arg.type.to_s == 'references'
+    end
+
     def is_attachment(arg)
       [:image,:file].include?(arg.type)
     end

data/lib/generators/fae/nested_index_scaffold_generator.rb

@@ -5,6 +5,7 @@ module Fae
 
     def go
       generate_model
+      generate_graphql_type
       generate_nested_index_controller_file
       generate_view_files
       add_route

data/lib/generators/fae/nested_scaffold_generator.rb

@@ -6,6 +6,7 @@ module Fae
 
     def go
       generate_nested_model_file
+      generate_graphql_type
       generate_nested_controller_file
       generate_view_files
       add_route

data/lib/generators/fae/page_generator.rb

@@ -11,6 +11,7 @@ module Fae
       if attributes.present?
         attributes.each do |attr|
           @@attributes[attr.name.to_sym] = convert_attr_type(attr.type)
+          @@graphql_attributes << graphql_object(attr)
         end
       end
     end
@@ -18,6 +19,7 @@ module Fae
     def go
       generate_static_page_controller
       generate_static_page_model
+      generate_graphql_type
       generate_static_page_view
     end
 
@@ -37,6 +39,12 @@ module Fae
       template "models/pages_model.rb", "app/models/#{file_name}_page.rb"
     end
 
+    def generate_graphql_type
+      return unless uses_graphql
+      @graphql_attributes = @@graphql_attributes
+      template "graphql/graphql_page_type.rb", "app/graphql/types/#{file_name}_page_type.rb"
+    end
+
     def generate_static_page_view
       @attributes = @@attributes
       template "views/static_page_form.html.#{options.template}", "app/views/#{options.namespace}/content_blocks/#{file_name}.html.#{options.template}"

data/lib/generators/fae/scaffold_generator.rb

@@ -5,6 +5,7 @@ module Fae
 
     def go
       generate_model
+      generate_graphql_type
       generate_controller_file
       generate_view_files
       add_route

data/lib/generators/fae/templates/graphql/graphql_page_type.rb

@@ -0,0 +1,17 @@
+class Types::<%= class_name %>PageType < Types::BaseObject
+
+  graphql_name '<%= class_name %>Page'
+
+  field :title, String, null: false
+<% if @graphql_attributes.present? -%>
+<% @graphql_attributes.each do |graphql_object| -%>
+<% if graphql_object[:type]['Types::']  -%>
+  field :<%= graphql_object[:attr] %>, <%= graphql_object[:type] %>, null: true
+<% else -%>
+  field :<%= graphql_object[:attr] %>, <%= graphql_object[:type] %>,
+    null: true,
+    method: :<%= graphql_object[:attr] %>_content
+<% end -%>
+<% end -%>
+<% end -%>
+end

data/lib/generators/fae/templates/graphql/graphql_type.rb

@@ -0,0 +1,13 @@
+class Types::<%= class_name %>Type < Types::BaseObject
+
+  graphql_name '<%= class_name %>'
+
+  field :id, ID, null: false
+<% if @graphql_attributes.present? -%>
+<% @graphql_attributes.each do |graphql_object| -%>
+  field :<%= graphql_object[:attr] %>, <%= graphql_object[:type] %>, null: true
+<% end -%>
+<% end -%>
+  field :created_at, String, null: false
+  field :updated_at, String, null: false
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fae-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - FINE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.3
+        version: 4.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.3
+        version: 4.6.2
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -610,8 +610,10 @@ files:
 - config/initializers/kaminari_config.rb
 - config/initializers/simple_form.rb
 - config/initializers/time_formats.rb
+- config/locales/devise.cs.yml
 - config/locales/devise.en.yml
 - config/locales/devise.zh-CN.yml
+- config/locales/fae.cs.yml
 - config/locales/fae.en.yml
 - config/locales/fae.zh-CN.yml
 - config/locales/simple_form.en.yml
@@ -647,6 +649,8 @@ files:
 - lib/generators/fae/templates/controllers/nested_scaffold_controller.rb
 - lib/generators/fae/templates/controllers/scaffold_controller.rb
 - lib/generators/fae/templates/controllers/static_pages_controller.rb
+- lib/generators/fae/templates/graphql/graphql_page_type.rb
+- lib/generators/fae/templates/graphql/graphql_type.rb
 - lib/generators/fae/templates/initializers/fae.rb
 - lib/generators/fae/templates/initializers/fae_fine.rb
 - lib/generators/fae/templates/initializers/judge.rb
@@ -685,7 +689,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: CMS for Rails. For Reals.