codgen 0.0.3 → 0.0.4

data/codgen.gemspec

@@ -22,6 +22,7 @@ If you find bugs or bad error messages be sure to log an issue on GitHub."
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 1.9.2"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
@@ -31,4 +32,5 @@ If you find bugs or bad error messages be sure to log an issue on GitHub."
   spec.add_runtime_dependency "json"
   spec.add_runtime_dependency "activerecord"
   spec.add_runtime_dependency 'rubyzip'
+  spec.add_runtime_dependency 'handlebars'
 end

data/lib/codgen/auto_style.rb

@@ -23,10 +23,10 @@ module Codgen
       end
 
       add_props.each do |key, value|
-        add_property_group(json_object, key, value, AutoStyle.method(:to_camel), '!camelCase')
-        add_property_group(json_object, key, value, AutoStyle.method(:to_cap_camel), '!CapCamel')
-        add_property_group(json_object, key, value, AutoStyle.method(:to_underscore), '!underscored')
-        add_property_group(json_object, key, value, AutoStyle.method(:to_camel), '!CAPS_UNDERSCORE')
+        add_property_group(json_object, key, value, AutoStyle.method(:to_camel), '?camelCase')
+        add_property_group(json_object, key, value, AutoStyle.method(:to_cap_camel), '?CapCamel')
+        add_property_group(json_object, key, value, AutoStyle.method(:to_underscore), '?underscored')
+        add_property_group(json_object, key, value, AutoStyle.method(:to_camel), '?CAPS_UNDERSCORE')
       end
     end
 
@@ -39,32 +39,28 @@ module Codgen
     private
     def self.add_property_group(json_object, key, value, translate, explicit_postfix)
       should_translate_val = value != nil && value.is_a?(String) && key.index('@')
-      is_plural = key.index('?plural')
+      is_plural = key.index('#plural')
 
-      new_key = translate.call(key)
+      new_key = translate.call(key.gsub('#plural', ''))
       new_value = should_translate_val ? translate.call(value) : value
-      explicit_key = new_key + explicit_postfix
 
-      requantified = pluralize_singularize(new_key, explicit_key, new_value, is_plural, should_translate_val)
+      requantified_key = pluralize_singularize(new_key, is_plural)
+      requantified_val = should_translate_val ? pluralize_singularize(new_value, is_plural) : new_value
+
+      requantified_suffix = is_plural ? '?singular' : '?plural'
+      original_quantity_suffix = is_plural ? '?plural' : '?singular'
 
       try_add_prop(json_object, new_key, new_value)
-      try_add_prop(json_object, explicit_key, new_value)
-      try_add_prop(json_object, requantified.short_key, requantified.value)
-      try_add_prop(json_object, requantified.explicit_key, requantified.value)
+      try_add_prop(json_object, new_key+explicit_postfix, new_value)
+      try_add_prop(json_object, new_key+explicit_postfix+original_quantity_suffix, new_value)
+
+      try_add_prop(json_object, requantified_key, requantified_val)
+      try_add_prop(json_object, requantified_key+explicit_postfix, requantified_val)
+      try_add_prop(json_object, requantified_key+explicit_postfix+requantified_suffix, requantified_val)
     end
 
-    def self.pluralize_singularize(short_key, explicit_key, value, is_plural, should_translate_value)
-      return_obj = OpenStruct.new
-      if is_plural
-        return_obj.short_key = short_key.singularize
-        return_obj.explicit_key = explicit_key.singularize
-        return_obj.value = should_translate_value ? value.singularize : value
-      else
-        return_obj.short_key = short_key.pluralize
-        return_obj.explicit_key = explicit_key.pluralize
-        return_obj.value = should_translate_value ? value.pluralize : value
-      end
-      return_obj
+    def self.pluralize_singularize(val, is_plural)
+      is_plural ? val.singularize : val.pluralize
     end
 
 

data/lib/codgen/template.rb

@@ -1,6 +1,7 @@
 require 'mustache'
 require_relative 'flattener'
 require_relative 'logger'
+require_relative 'template_provider'
 
 module Codgen
   class Template
@@ -13,17 +14,24 @@ module Codgen
       source_location = source_raw != nil ? source_raw.split('.') : []
       @data = Flattener.merge(data_root, source_location)
       @template = Template.get_template(@input_path)
+      @template_provider = Codgen.template_provider.named(template_info['template engine'])
+      if @template_provider == nil
+        @template_provider = Codgen.template_provider.for_extension(File.extname(@input_path))
+      end
+      if @template_provider == nil
+        @template_provider = Codgen.template_provider.named('static')
+      end
     end
 
     def fill_template
       if @data.is_a?(Array)
         output = Hash.new
         @data.each { |data|
-          output.store(Mustache.render(@out_raw, data), Mustache.render(@template, data))
+          output.store(Mustache.render(@out_raw, data), @template_provider.render(@template, data))
         }
         return output
       elsif @data.is_a?(Hash)
-      return { Mustache.render(@out_raw, data) => Mustache.render(@template, @data) }
+      return { Mustache.render(@out_raw, data) => @template_provider.render(@template, data) }
       end
     end
 

data/lib/codgen/template_provider.rb

@@ -0,0 +1,96 @@
+require 'mustache'
+require 'handlebars'
+
+module Codgen
+  class TemplateProvider
+    # @param [String] template: The template to be filled
+    # @param [Hash] data: A hash of data model
+    # @return [String]: The filled template
+    def render(template, data)
+      throw 'Not Implemented'
+    end
+
+    def name
+      throw 'Not Implemented'
+    end
+
+    def extension
+      throw 'Not Implemented'
+    end
+  end
+
+  class MustacheTemplateProvider < TemplateProvider
+    def render(template, data)
+      Mustache.render(template, data)
+    end
+
+    def name
+      'mustache'
+    end
+
+    def extension
+      '.mustache'
+    end
+  end
+
+  class HandleBarsTemplateProvider < TemplateProvider
+    def render(template, data)
+      handlebars = Handlebars::Context.new
+      template = handlebars.compile(template)
+      template.call(data)
+    end
+
+    def name
+      'handlebars'
+    end
+
+    def extension
+      '.handlebars'
+    end
+  end
+
+  class StaticTemplateProvider < TemplateProvider
+    def render(template, data)
+      template
+    end
+
+    def name
+      'static'
+    end
+
+    def extension
+      nil
+    end
+  end
+
+  class TemplateProviderList
+    def initialize
+      @by_ext = Hash.new
+      @by_name = Hash.new
+    end
+
+    def add(template_provider)
+      @by_name[template_provider.name] = template_provider
+      if template_provider.extension != nil
+        @by_ext[template_provider.extension] = template_provider
+      end
+    end
+
+    def for_extension(extension)
+      @by_ext[extension]
+    end
+
+    def named(name)
+      @by_name[name]
+    end
+  end
+
+  @@templates_providers = TemplateProviderList.new
+  @@templates_providers.add(MustacheTemplateProvider.new)
+  @@templates_providers.add(HandleBarsTemplateProvider.new)
+  @@templates_providers.add(StaticTemplateProvider.new)
+
+  def self.template_provider
+    @@templates_providers
+  end
+end

data/lib/codgen/version.rb

@@ -1,3 +1,3 @@
 module Codgen
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/data/Input/example-data.json

@@ -72,5 +72,5 @@
             "c": false
         }
     ],
-    "name" : "World"
+    "@name" : "World"
 }

data/test/data/Input/explicit_names.txt

@@ -0,0 +1,21 @@
+{{ApplicationName}}
+{{ApplicationNames}}
+{{ApplicationName?CapCamel}}
+{{ApplicationNames?CapCamel}}
+{{ApplicationName?CapCamel?singular}}
+{{ApplicationNames?CapCamel?plural}}
+
+
+{{application_name}}
+{{application_names}}
+{{application_name?underscored}}
+{{application_names?underscored}}
+{{application_name?underscored?singular}}
+{{application_names?underscored?plural}}
+
+{{applicationName}}
+{{applicationNames}}
+{{applicationName?camelCase}}
+{{applicationNames?camelCase}}
+{{applicationName?camelCase?singular}}
+{{applicationNames?camelCase?plural}}

data/test/data/Input/i_can_ride_my_bike_with_no.handlebars

@@ -0,0 +1,27 @@
+{{ApplicationName}}
+{{ApplicationNames}}
+{{ApplicationName?CapCamel}}
+{{ApplicationNames?CapCamel}}
+{{ApplicationName?CapCamel?singular}}
+{{ApplicationNames?CapCamel?plural}}
+
+
+{{application_name}}
+{{application_names}}
+{{application_name?underscored}}
+{{application_names?underscored}}
+{{application_name?underscored?singular}}
+{{application_names?underscored?plural}}
+
+{{applicationName}}
+{{applicationNames}}
+{{applicationName?camelCase}}
+{{applicationNames?camelCase}}
+{{applicationName?camelCase?singular}}
+{{applicationNames?camelCase?plural}}
+
+{{#each entities}}
+    {{EntityName}}
+    {{entity_name}}
+    {{entityName}}
+    {{ENTITY_NAME}}{{/each}}

data/test/data/Input/static_text.txt

@@ -0,0 +1 @@
+foo {{bar}}

data/test/data/config.json

@@ -2,23 +2,37 @@
     "map": "Map.json",
     "templates": [
         {
-            "in": "Input/model_template.rb.ctemp",
+            "in": "Input/model_template.rb.mustache",
             "source": "entities",
             "out": "Output/Ruby/{{application_name}}/Models/{{entity_name}}.rb"
         },
         {
-            "in": "Input/ModelTemplate.cs",
+            "in": "Input/ModelTemplate.cs.mustache",
             "source": "entities",
             "out": "Output/MsMvc/{{ApplicationName}}/Models/{{EntityName}}.cs"
         },
         {
-            "in": "Input/DbContextTemplate.cs",
+            "in": "Input/DbContextTemplate.cs.mustache",
             "source": "entities",
             "out": "Output/MsMvc/{{ApplicationName}}/DAL/{{ApplicationName}}Context.cs"
         },
         {
-            "in": "Input/CreateDatabase.sql",
+            "in": "Input/CreateDatabase.sql.mustache",
             "out": "Output/Create{{ApplicationName}}Database.sql"
+        },
+        {
+            "in": "Input/explicit_names.txt",
+            "out": "Output/explicit_names.txt",
+            "template engine": "mustache"
+        },
+        {
+            "in": "Input/static_text.txt",
+            "out": "Output/static_text.txt",
+            "template engine": "static"
+        },
+        {
+            "in": "Input/i_can_ride_my_bike_with_no.handlebars",
+            "out": "Output/i_can_ride_my_bike_with_no"
         }
     ],
 

data/test/data/expected_output/explicit_names.txt

@@ -0,0 +1,21 @@
+MyBlog
+MyBlogs
+MyBlog
+MyBlogs
+MyBlog
+MyBlogs
+
+
+my_blog
+my_blogs
+my_blog
+my_blogs
+my_blog
+my_blogs
+
+myBlog
+myBlogs
+myBlog
+myBlogs
+myBlog
+myBlogs

data/test/data/expected_output/i_can_ride_my_bike_with_no

@@ -0,0 +1,31 @@
+MyBlog
+MyBlogs
+MyBlog
+MyBlogs
+MyBlog
+MyBlogs
+
+
+my_blog
+my_blogs
+my_blog
+my_blogs
+my_blog
+my_blogs
+
+myBlog
+myBlogs
+myBlog
+myBlogs
+myBlog
+myBlogs
+
+
+    Post
+    post
+    post
+    
+    Comment
+    comment
+    comment
+    

data/test/data/expected_output/static_text.txt

@@ -0,0 +1 @@
+foo {{bar}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codgen
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Matthew Beatty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: handlebars
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   A cross language, template based, code generator, capable of generating multiple applications from a common model.
 
@@ -175,30 +189,24 @@ files:
 - lib/codgen/package.rb
 - lib/codgen/statement.rb
 - lib/codgen/template.rb
+- lib/codgen/template_provider.rb
 - lib/codgen/version.rb
 - test/behavior/basic_test.rb
 - test/behavior/output_spec.rb
 - test/behavior/test_utils.rb
-- test/data/Input/CreateDatabase.sql
-- test/data/Input/DbContextTemplate.cs
-- test/data/Input/ModelTemplate.cs
+- test/data/Input/CreateDatabase.sql.mustache
+- test/data/Input/DbContextTemplate.cs.mustache
+- test/data/Input/ModelTemplate.cs.mustache
 - test/data/Input/example-data.json
+- test/data/Input/explicit_names.txt
 - test/data/Input/hello_world.txt.mustache
-- test/data/Input/model_template.rb.ctemp
+- test/data/Input/i_can_ride_my_bike_with_no.handlebars
+- test/data/Input/model_template.rb.mustache
 - test/data/Input/package_test_dir/config.json
 - test/data/Input/package_test_dir/templates/package_hello_world.txt.mustache
 - test/data/Input/package_test_zip.zip
-- test/data/Input/test_conditionals
-- test/data/Input/test_escapes
+- test/data/Input/static_text.txt
 - test/data/Map.json
-- test/data/Output/CreateMyBlogDatabase.sql
-- test/data/Output/MsMvc/MyBlog/DAL/MyBlogContext.cs
-- test/data/Output/MsMvc/MyBlog/Models/Comment.cs
-- test/data/Output/MsMvc/MyBlog/Models/Post.cs
-- test/data/Output/Ruby/my_blog/Models/comment.rb
-- test/data/Output/Ruby/my_blog/Models/post.rb
-- test/data/Output/package_hello_world.txt
-- test/data/Output/package_zip_hello_world.txt
 - test/data/__MACOSX/package_test_zip/._.DS_Store
 - test/data/config.json
 - test/data/expected_output/MsMvc/MyBlog/DAL/MyBlogContext.cs
@@ -206,8 +214,11 @@ files:
 - test/data/expected_output/MsMvc/MyBlog/Models/Post.cs
 - test/data/expected_output/Ruby/my_blog/Models/comment.rb
 - test/data/expected_output/Ruby/my_blog/Models/post.rb
+- test/data/expected_output/explicit_names.txt
+- test/data/expected_output/i_can_ride_my_bike_with_no
 - test/data/expected_output/package_hello_world.txt
 - test/data/expected_output/package_zip_hello_world.txt
+- test/data/expected_output/static_text.txt
 - test/data/package_test_zip/config.json
 - test/data/package_test_zip/templates/config.json
 - test/data/package_test_zip/templates/package_zip_hello_world.txt.mustache
@@ -228,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -245,26 +256,19 @@ test_files:
 - test/behavior/basic_test.rb
 - test/behavior/output_spec.rb
 - test/behavior/test_utils.rb
-- test/data/Input/CreateDatabase.sql
-- test/data/Input/DbContextTemplate.cs
-- test/data/Input/ModelTemplate.cs
+- test/data/Input/CreateDatabase.sql.mustache
+- test/data/Input/DbContextTemplate.cs.mustache
+- test/data/Input/ModelTemplate.cs.mustache
 - test/data/Input/example-data.json
+- test/data/Input/explicit_names.txt
 - test/data/Input/hello_world.txt.mustache
-- test/data/Input/model_template.rb.ctemp
+- test/data/Input/i_can_ride_my_bike_with_no.handlebars
+- test/data/Input/model_template.rb.mustache
 - test/data/Input/package_test_dir/config.json
 - test/data/Input/package_test_dir/templates/package_hello_world.txt.mustache
 - test/data/Input/package_test_zip.zip
-- test/data/Input/test_conditionals
-- test/data/Input/test_escapes
+- test/data/Input/static_text.txt
 - test/data/Map.json
-- test/data/Output/CreateMyBlogDatabase.sql
-- test/data/Output/MsMvc/MyBlog/DAL/MyBlogContext.cs
-- test/data/Output/MsMvc/MyBlog/Models/Comment.cs
-- test/data/Output/MsMvc/MyBlog/Models/Post.cs
-- test/data/Output/Ruby/my_blog/Models/comment.rb
-- test/data/Output/Ruby/my_blog/Models/post.rb
-- test/data/Output/package_hello_world.txt
-- test/data/Output/package_zip_hello_world.txt
 - test/data/__MACOSX/package_test_zip/._.DS_Store
 - test/data/config.json
 - test/data/expected_output/MsMvc/MyBlog/DAL/MyBlogContext.cs
@@ -272,8 +276,11 @@ test_files:
 - test/data/expected_output/MsMvc/MyBlog/Models/Post.cs
 - test/data/expected_output/Ruby/my_blog/Models/comment.rb
 - test/data/expected_output/Ruby/my_blog/Models/post.rb
+- test/data/expected_output/explicit_names.txt
+- test/data/expected_output/i_can_ride_my_bike_with_no
 - test/data/expected_output/package_hello_world.txt
 - test/data/expected_output/package_zip_hello_world.txt
+- test/data/expected_output/static_text.txt
 - test/data/package_test_zip/config.json
 - test/data/package_test_zip/templates/config.json
 - test/data/package_test_zip/templates/package_zip_hello_world.txt.mustache