gluby-tk 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88bdbec6a3b26aeaaedbef372b27927afbae8b4f
-  data.tar.gz: 2192394b9cefcc9e37d9528e7a97ba2ce89218bc
+  metadata.gz: 0bb8abeea6ca07743b1abcce319ec97bdca8c423
+  data.tar.gz: 830041b5858c07fe90681e9751b13808dfa007e5
 SHA512:
-  metadata.gz: f026a3bee2456fb7e92ae94f22836d83264400b88f79c663c261617aed073bc1c7ada621e3d9c521e1cab624c1f2f65daa6678b608e22cad783f63a93e2fe51c
-  data.tar.gz: fce9719f976b68e9df469b248874ef173c0f84d7ec01fdf26692f439b61cdf5544365089762fb2a84313120e9f0a3ca76b84023b4723b5b7dd476c2ffcfc6fe3
+  metadata.gz: aee4b78a8a6aa2ede1f6983b4a94b5ab50aa623a1e390ea463ec6ab68159084a241f2fc49c5e281ab5bc5b4d8df0a8d88b5132abb3977c460a79254b3d894a02
+  data.tar.gz: c12de13b272b6adf3dc6a3b83856b86bf7fc44c390f04dfbc485f51a882777b1b01004f35302ff515969d4444174025d88720c0a6fc443e26547fa3b7c9a61ce

data/lib/core_ext/string.rb

@@ -1,5 +1,5 @@
 class String
-  DISALLOWED_CHARACTERS = "[\-\s\.\,\?\'\"\:\;\\\/]"
+  DISALLOWED_CHARACTERS = /[\-\_\s.,?\'\":\/;\\]/
 
   def humanize
     gsub(DISALLOWED_CHARACTERS, " ").split(" ").map(&:capitalize).join("")
@@ -7,12 +7,28 @@ class String
 
   def underscore
     u = ""
-    sanitize.split("").each_with_index do |c, i|; if i > 0 && c == c.upcase; u += " "; end; u += c.downcase; end;
-    u.gsub(" ", "_")
+    chars = sanitize.split("")
+    unless chars.count == 0
+      while chars.first.match(DISALLOWED_CHARACTERS)
+        chars.delete_at(0)
+      end
+
+      while chars.last.match(DISALLOWED_CHARACTERS)
+        chars.delete_at(chars.count - 1)
+      end
+    end
+
+    chars.each_with_index do |c, i|
+      if c.match(/[A-Za-z]/) && i > 0 && c == c.upcase
+        u += " "
+      end
+      u += c.downcase
+    end
+    u.gsub(/\s/, "_")
   end
 
   def sanitize
-    gsub(DISALLOWED_CHARACTERS, "_")
+    gsub(/_{2,}/, "_").gsub(DISALLOWED_CHARACTERS, "_")
   end
 
 end

data/lib/gluby-tk/generator.rb

@@ -3,6 +3,23 @@ require 'pp'
 
 module GlubyTK
   class Generator
+    DIRECTORIES = [
+      "assets",
+      "assets/images",
+      "interface",
+      "src",
+      "src/model",
+      "src/view",
+      "src/controller"
+    ]
+
+    TEMPLATES = [
+      {:name => "main.rb", :path => ""},
+      {:name => "includes.rb", :path => "src"},
+      {:name => "application.rb", :path => "src"},
+      {:name => "ApplicationWindow.glade", :path => "interface"}
+    ]
+
     def self.create app_name
       if File.exist?(app_name)
         puts "#{app_name} already exists!"
@@ -10,51 +27,31 @@ module GlubyTK
       end
 
       root = "#{Dir.pwd}/#{app_name}"
-      directories = [
-        "assets",
-        "assets/images",
-        "interface",
-        "src",
-        "src/model",
-        "src/view",
-        "src/controller"
-      ]
+
+      module_name = "#{app_name.underscore}"
+
+      app_id = module_name.humanize.downcase
 
       # Create root directory
       Dir.mkdir "#{Dir.pwd}/#{app_name}"
 
+      # Create gluby-tkrc file
+      File.open("#{root}/.gluby-tkrc", "w+") { |file|
+        file.write(module_name)
+      } 
+
       # Create sub-directories
-      directories.each do |dir|
+      DIRECTORIES.each do |dir|
         Dir.mkdir "#{root}/#{dir}"
       end
 
-      # Create includes file
-      File.open("#{root}/src/includes.rb", "w+") { |file| 
-        file.write(get_template_contents("includes.rb.template"))
-      }
+      # Generate files from templates      
+      TEMPLATES.each do |template|
+        File.open("#{root}/#{template[:path]}/#{template[:name]}", "w+") { |file|
+          file.write(get_template_contents("#{template[:name]}.template").gsub("gluby-tk_app_id", app_id))
+        }
+      end
       
-      # Create app entry point
-      module_name = "#{app_name.underscore}"
-      app_id = module_name.humanize.downcase
-
-      main_file = "#{root}/#{module_name}.rb"
-      File.open(main_file, "w+") { |file| 
-        file.write(get_template_contents("boot.rb.template"))
-      }
-      File.open("#{root}/.gluby-tkrc", "w+") { |file|
-        file.write(module_name)
-      }
-
-      # Create Application
-      File.open("#{root}/src/application.rb", "w+") { |file|
-        file.write(get_template_contents("application.rb.template").gsub("gluby-tk_app_id", app_id))
-      }
-
-      # Make initial application window
-      File.open("#{root}/interface/ApplicationWindow.glade", "w+") { |file|
-        file.write(get_template_contents("ApplicationWindow.glade.template"))
-      }
-
       rebuild(root, true)
     end
 

data/lib/gluby-tk/version.rb

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

data/templates/ApplicationWindow.glade.template

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
   <template class="ApplicationWindow" parent="GtkApplicationWindow">
     <property name="can_focus">False</property>
     <property name="window_position">center</property>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gluby-tk
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - i2097i
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: gtk3
   requirement: !ruby/object:Gem::Requirement
@@ -95,8 +109,8 @@ files:
 - lib/gluby-tk/version.rb
 - templates/ApplicationWindow.glade.template
 - templates/application.rb.template
-- templates/boot.rb.template
 - templates/includes.rb.template
+- templates/main.rb.template
 homepage: https://github.com/i2097i/gluby-tk
 licenses:
 - MIT
@@ -117,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby+GTK+Glade