gluby-tk 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bb8abeea6ca07743b1abcce319ec97bdca8c423
-  data.tar.gz: 830041b5858c07fe90681e9751b13808dfa007e5
+  metadata.gz: df814d914256418a1371666ceccd4e4df8fb5317
+  data.tar.gz: 46f945053c302840b0ed4d3815ecf82712b4e733
 SHA512:
-  metadata.gz: aee4b78a8a6aa2ede1f6983b4a94b5ab50aa623a1e390ea463ec6ab68159084a241f2fc49c5e281ab5bc5b4d8df0a8d88b5132abb3977c460a79254b3d894a02
-  data.tar.gz: c12de13b272b6adf3dc6a3b83856b86bf7fc44c390f04dfbc485f51a882777b1b01004f35302ff515969d4444174025d88720c0a6fc443e26547fa3b7c9a61ce
+  metadata.gz: bff13c27d15fe3bbf8f35dd5a1fbf217e7083d76d009964c1e7c7a4ececf775ff1d263a2ca58616de41ca44c625550994086b5e615d31b0819fcc8fe913d757d
+  data.tar.gz: 61b20596daf636c1c709d4a0d511cdb8bded7184bb88bac869388a256e9b05c9e9d6aff7b026d6576dd866a452987a1c24d8d920ff0e3fa08aafc5245f270af6

data/bin/gluby

@@ -19,7 +19,7 @@ require "wannabe_bool"
 #   GlubyTK.hi
 # end
 
-puts "No commands specified - exiting now..." and exit(0) if ARGV.empty?
+puts "No command specified - exiting now..." and exit(0) if ARGV.empty?
 
 if ARGV[0] == "new"
   if ARGV[1].nil? || ARGV[1].strip.empty?

data/lib/gluby-tk/generator.rb

@@ -8,9 +8,7 @@ module GlubyTK
       "assets/images",
       "interface",
       "src",
-      "src/model",
-      "src/view",
-      "src/controller"
+      "src/gluby"
     ]
 
     TEMPLATES = [
@@ -70,9 +68,7 @@ module GlubyTK
         gresource_file_contents += "<gresource prefix=\"/app/#{current_app_name(root)}\">"
         gresource_file_contents += "<file preprocess=\"xml-stripblanks\">#{File.basename(filename)}</file>"
         gresource_file_contents += "</gresource>"
-        if generate_ruby_classes
-          generate_ruby_class_for_document(File.basename(filename), File.read(filename), root)
-        end
+        generate_ruby_class_for_document(File.basename(filename), File.read(filename), root, generate_ruby_classes)
       }
       gresource_file_contents += "</gresources>\n"
 
@@ -81,7 +77,7 @@ module GlubyTK
       }
     end
 
-    def self.generate_ruby_class_for_document(file_name, file_contents, root)
+    def self.generate_ruby_class_for_document(file_name, file_contents, root, generate_ruby_classes)
       doc = Nokogiri::XML(file_contents)
       
       if doc.css("template").first.nil?
@@ -96,21 +92,47 @@ module GlubyTK
       
       parent = parent.gsub("Gtk","")
 
-      class_file_contents = [
-        "class #{class_name} < Gtk::#{parent}",
+      base_file_name = "#{file_name.gsub(File.extname(file_name), "").underscore}"
+
+      gluby_file_dir = "#{root}/src/gluby"
+      gluby_file_path = "#{gluby_file_dir}/gluby_#{base_file_name}.rb"
+      gluby_class_file_contents = [
+        "class #{class_name.underscore.humanize} < Gtk::#{parent}",
         "\ttype_register",
         "\tclass << self",
         "\t\tdef init",
         "\t\t\tset_template(:resource => '/app/#{current_app_name(root)}/#{file_name}')",
-        "\t\t\t#{doc.css("[id]").map{|e| e.attributes["id"].value }.to_s}.each{|child_id| bind_template_child(child_id)}",
+        "\t\t\t#{doc.css("[id]").map{|e| e.attributes["id"].value.to_sym }.select{|e| e != class_name.to_sym }}.each{|child_id| bind_template_child(child_id)}",
         "\t\tend",
         "\tend",
         "end"
       ].join("\n")
 
-      new_file_path = "#{root}/src/view/#{file_name.gsub(File.extname(file_name), "").underscore}.rb"
-      File.open(new_file_path, "w+") { |file|
-        file.write class_file_contents
+      File.open(gluby_file_path, "w+") { |file|
+        file.write gluby_class_file_contents
+      }
+
+      if generate_ruby_classes
+        file_path = "#{root}/src/#{base_file_name}.rb"
+        class_file_contents = [
+          "class #{class_name.underscore.humanize}",
+          "\tdef initialize(args = nil)",
+          "\t\tsuper(args)",
+          "\tend",
+          "end",
+        ].join("\n")
+
+        File.open(file_path, "w+") { |file|
+          file.write class_file_contents
+        }
+      end
+
+      File.open("#{gluby_file_dir}/gluby_includes.rb", "a+") { |file|
+        contents = file.read
+        g_req = "require 'gluby_#{base_file_name}'"
+        req = "require '#{base_file_name}'"
+        file.write("#{g_req}\n") if contents.match(g_req).nil?
+        file.write("#{req}\n") if contents.match(req).nil?
       }
     end
 

data/lib/gluby-tk/version.rb

@@ -1,3 +1,3 @@
 module GlubyTK
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/templates/application.rb.template

@@ -1,6 +1,7 @@
 class Application < Gtk::Application
   def initialize
     super('app.gluby-tk_app_id', :handles_open)
+    GLib.set_application_name('gluby-tk_app_id')
     signal_connect 'activate' do |application|
       @window = ApplicationWindow.new(:application => application)
       @window.present

data/templates/includes.rb.template

@@ -1,11 +1,15 @@
 # Search paths
-$: << 'src/model/'
-$: << 'src/view/'
-$: << 'src/controller/'
-$: << 'src/helpers/'
+$: << 'src/gluby/'
 
 # Dependencies
 require 'fileutils'
 require 'gtk3'
-require 'application_window'
+
+# Include all auto-generated gluby helpers - do not remove
+require 'gluby_includes'
+
+# User Defined - Require any custom files here
+# ...
+
+# Application
 require 'application'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gluby-tk
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - i2097i
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-01 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler