codgen 0.0.6 → 0.0.7

data/README.md

@@ -1,4 +1,4 @@
-# Codgen
+# Codgen [![Gem Version](https://badge.fury.io/rb/codgen.svg)](http://badge.fury.io/rb/codgen) [![Build Status](https://travis-ci.org/beattyml1/codgen.svg)](https://travis-ci.org/beattyml1/codgen) [![Code Climate](https://codeclimate.com/github/beattyml1/codgen/badges/gpa.svg)](https://codeclimate.com/github/beattyml1/codgen)
 
 Codgen is a cross language, template based, code generator, capable of generating multiple applications from a common model.
 
@@ -7,7 +7,7 @@ It uses JSON for it's model and config and you can use mustache or handlebars te
 If you find bugs or bad error messages be sure to log an issue. If it's not to big I'll probably get to pretty quickly. Pull requests are also most welcome!
 
 
-[![Gem Version](https://badge.fury.io/rb/codgen.svg)](http://badge.fury.io/rb/codgen) [![Build Status](https://travis-ci.org/beattyml1/codgen.svg)](https://travis-ci.org/beattyml1/codgen)
+
 
 ## Installation
 
@@ -15,7 +15,12 @@ If you find bugs or bad error messages be sure to log an issue. If it's not to b
 
 ## Usage
 
+    $ codgen.rb [input_directory_path|config_path.json] [output_directory_path]
+
+Examples
+
     $ codgen.rb codgen_config.json
+    $ codgen.rb input_dir output_dir
     
 For more info see the wiki page
 

data/Rakefile

@@ -3,20 +3,25 @@ require "bundler/gem_tasks"
 #Dir['test/unit/*.rb'].each {|file| require_relative file }
 require 'rspec/core/rake_task'
 
-
 task :unit_tests do
   Dir.chdir('test/data/Input')
   puts ''
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.pattern = '../../unit/*_spec.rb'
+  end
   puts 'Running unit tests'
-  puts `rspec ../../unit/*_spec.rb`
+  Rake::Task["spec"].execute
   puts ''
   puts ''
   Dir.chdir('../../..')
 end
 
 task :behavior_tests do
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.pattern = 'test/behavior/output_spec.rb'
+  end
   puts 'Running behavior tests'
-  puts `rspec test/behavior/output_spec.rb`
+  Rake::Task["spec"].execute
 end
 
 task :default => [:unit_tests, :behavior_tests] do

data/codgen.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "json"
   spec.add_runtime_dependency "activerecord"
   spec.add_runtime_dependency 'rubyzip'
-  spec.add_runtime_dependency 'handlebars'
+  spec.add_runtime_dependency 'handlebars', '0.6.0'
 end

data/lib/codgen.rb

@@ -4,6 +4,7 @@ require_relative 'codgen/mapping'
 require_relative 'codgen/logger'
 require_relative 'codgen/template'
 require_relative 'codgen/package'
+require 'net/http'
 
 module Codgen
   def self.run(json_config)
@@ -39,7 +40,12 @@ module Codgen
   def self.get_data_if_not_data(filepath_or_data)
     if filepath_or_data != nil
       if filepath_or_data.is_a?(String)
-        file = File.read(filepath_or_data)
+        if /https?:\/\//.match(filepath_or_data)
+          resp = Net::HTTP.get_response(URI.parse(filepath_or_data))
+          file = resp.body
+        else
+          file = File.read(filepath_or_data)
+        end
         JSON.parse(file)
       elsif filepath_or_data.is_a?(Hash)
         filepath_or_data

data/lib/codgen/statement.rb

@@ -99,37 +99,14 @@ module Codgen
     end
 
     def expand_and
-      new_words = Array.new
-      index = -1
-      skip = false
-      @words.each do |word|
-        index+=1
-        if skip
-          skip = false
-          next
-        end
-        if word.is_a?(Statement)
-          new_words.push(word)
-        elsif word.index(/and|&/)
-          if new_words.count > 0 && @words.count > index + 1
-            left = new_words[-1]
-            new_words.delete_at(-1)
-            new_words.push(Statement.new(:and))
-            new_words[-1].words.push(left)
-            new_words[-1].words.push(@words[index+1])
-            skip = true
-            next
-          else
-            throw 'Operator must have a left and a right side'
-          end
-        else
-          new_words.push(word)
-        end
-      end
-      @words = new_words
+      expand_two_sided(:and, /and|&/)
     end
 
     def expand_or
+      expand_two_sided(:or, /or|\|/)
+    end
+
+    def expand_two_sided(operator, regex)
       new_words = Array.new
       index = -1
       skip = false
@@ -141,13 +118,9 @@ module Codgen
         end
         if word.is_a?(Statement)
           new_words.push(word)
-        elsif word.index(/or|\|/)
+        elsif word.index(regex)
           if new_words.count > 0 && @words.count > index + 1
-            left = new_words[-1]
-            new_words.delete_at(-1)
-            new_words.push(Statement.new(:or))
-            new_words[-1].words.push(left)
-            new_words[-1].words.push(@words[index+1])
+            replace_with_statement(new_words, operator)
             skip = true
             next
           else
@@ -159,5 +132,13 @@ module Codgen
       end
       @words = new_words
     end
+
+    def replace_with_statement(new_words, operator)
+      left = new_words[-1]
+      new_words.delete_at(-1)
+      new_words.push(Statement.new(operator))
+      new_words[-1].words.push(left)
+      new_words[-1].words.push(@words[index+1])
+    end
   end
 end

data/lib/codgen/version.rb

@@ -1,3 +1,3 @@
 module Codgen
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/behavior/output_spec.rb

@@ -2,9 +2,9 @@ require 'rspec'
 require 'fileutils'
 require_relative 'test_utils'
 
+$expectation_directory = 'test/data/expected_output'
+$output_directory = 'test/data/Output'
 describe 'Application' do
-  $expectation_directory = 'test/data/expected_output'
-  $output_directory = 'test/data/Output'
   before :all do
 
     FileUtils.rm_rf($output_directory)
@@ -27,6 +27,37 @@ describe 'Application' do
   files_and_folders.each do |expected_file_path|
     if File.file?(expected_file_path)
       output_file_path = expected_file_path.sub($expectation_directory, $output_directory)
+      it "should produce file: '#{output_file_path}' that is the same as '#{expected_file_path}'" do
+        expect(File.exist?(output_file_path)).to be_truthy
+        expect(File.read(output_file_path)).to eq File.read(expected_file_path)
+      end
+    end
+  end
+end
+
+describe 'Application in web context' do
+  before :all do
+
+    FileUtils.rm_rf($output_directory)
+
+    puts `bin/codgen.rb test/data/Input-Web/ test/data/Output-Web`
+  end
+
+  it 'should produce all expected files' do
+    files_and_folders = Dir.glob($expectation_directory+'/**/*')
+    files_and_folders.each do |expected_file_path|
+      if File.file?(expected_file_path)
+        output_file_path = expected_file_path.sub($expectation_directory, $output_directory+'-Web')
+        expect(File.exist?(output_file_path)).to be_truthy
+      end
+    end
+  end
+
+
+  files_and_folders = Dir.glob($expectation_directory+'/**/*')
+  files_and_folders.each do |expected_file_path|
+    if File.file?(expected_file_path)
+      output_file_path = expected_file_path.sub($expectation_directory, $output_directory+'-Web')
       it "should produce file: '#{output_file_path}' that is the same as '#{expected_file_path}'" do
         expect(File.exist?(output_file_path)).to be_truthy
         expect(FileUtils.cmp(output_file_path, expected_file_path)).to be_truthy

data/test/data/Input-Web/CreateDatabase.sql.mustache

@@ -0,0 +1,10 @@
+Create Database {{ApplicationName}}
+{{#entities}}
+
+Create Table {{EntityNames}} (
+  {{#fields}}
+  {{FieldName}} {{type}}
+  , ##:!IsLastTemplateInstance?
+  {{/fields}}
+)
+{{/entities}}

data/test/data/Input-Web/DbContextTemplate.cs.mustache

@@ -0,0 +1,18 @@
+using {{ApplicationName}}.Models;
+using System.Data.Entity;
+using System.Data.Entity.ModelConfiguration.Conventions;
+
+namespace {{ApplicationName}}.DAL
+{
+    public class {{ApplicationName}}Context : DbContext
+    {
+        {{#entities}}
+        public DbSet<Blog> {{EntityNames}} { get; set; }
+        {{/entities}}
+
+        protected override void OnModelCreating(DbModelBuilder modelBuilder)
+        {
+
+        }
+    }
+}

data/test/data/Input-Web/Map.json

@@ -0,0 +1,36 @@
+{
+    "caseTo": "lower",
+    "type": {
+        "cstype": {
+            "(?i)bigint": "long",
+            "(?i)int": "int",
+            "(?i)varchar\\([0-9]*\\)": "string",
+            "(?i)nvarchar(\\([0-9]*\\))": "string",
+            "(?i)text": "string",
+            "(?i)smallint": "short",
+            "(?i)uniqueidentifier": "Guid",
+            "(?i)DateTime": "DateTime",
+            "(?i)Date": "DateTime"
+        },
+        "rbtype": {
+            "(?i)bigint": "Integer",
+            "(?i)int": "Integer",
+            "(?i)varchar\\([0-9]*\\)": "String",
+            "(?i)nvarchar(\\([0-9]*\\))": "String",
+            "(?i)text": "String",
+            "(?i)smallint": "Integer",
+            "(?i)uniqueidentifier": "String",
+            "(?i)DateTime": "DateTime",
+            "(?i)Date": "Date"
+        },
+        "jstype": {
+            "(?i)bigint": "Number",
+            "(?i)int": "Number",
+            "(?i)varchar\\([0-9]*\\)": "String",
+            "(?i)nvarchar(\\([0-9]*\\))": "String",
+            "(?i)text": "String",
+            "(?i)smallint": "Number",
+            "(?i)uniqueidentifier": "String"
+        }
+    }
+}

data/test/data/Input-Web/ModelTemplate.cs.mustache

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+
+
+namespace {{ApplicationName}}.Models
+{
+	public class {{EntityName}}
+	{
+        {{#fields}}
+        {{#Required}}
+        [Required]
+		{{/Required}}
+		{{#hasMaxLength}}
+		[StringLength({{maxLength}})]
+		{{/hasMaxLength}}
+		public {{cstype}} {{FieldName}} { get; set; }
+		{{/fields}}
+		{{#hasmany}}
+		ICollection<{{EntityName}}> {{EntityNames}} { get; set; }
+		{{/hasmany}}
+		{{#belongsto}}
+		{{EntityName}} {{EntityName}} { get; set; }
+		{{/belongsto}}
+	}
+}

data/test/data/Input-Web/config.json

@@ -0,0 +1,44 @@
+{
+    "map": "Map.json",
+    "templates": [
+        {
+            "in": "model_template.rb.mustache",
+            "source": "entities",
+            "out": "Ruby/{{application_name}}/Models/{{entity_name}}.rb"
+        },
+        {
+            "in": "ModelTemplate.cs.mustache",
+            "source": "entities",
+            "out": "MsMvc/{{ApplicationName}}/Models/{{EntityName}}.cs"
+        },
+        {
+            "in": "DbContextTemplate.cs.mustache",
+            "source": "entities",
+            "out": "MsMvc/{{ApplicationName}}/DAL/{{ApplicationName}}Context.cs"
+        },
+        {
+            "in": "CreateDatabase.sql.mustache",
+            "out": "Create{{ApplicationName}}Database.sql"
+        },
+        {
+            "in": "explicit_names.txt",
+            "out": "explicit_names.txt",
+            "template engine": "mustache"
+        },
+        {
+            "in": "static_text.txt",
+            "out": "static_text.txt",
+            "template engine": "static"
+        },
+        {
+            "in": "i_can_ride_my_bike_with_no.handlebars",
+            "out": "i_can_ride_my_bike_with_no"
+        }
+    ],
+
+    "packages": [
+        "package_test_dir",
+        "package_test_zip.zip"
+    ],
+    "data": "https://raw.githubusercontent.com/beattyml1/codgen/master/test/data/Input/example-data.json"
+}

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

@@ -0,0 +1,76 @@
+{
+	"@application name": "my blog",
+    "test_escapes": [
+        {
+            "codgenVar": "The Rain in Spain stays mainly in the plains"
+        }
+    ],
+    "entities": [
+        {
+            "@entity name": "post",
+            "fields": [
+                {
+                    "@field name": "post id",
+                    "type": "UniqueIdentifier",
+                    "read only": true
+                },
+                {
+                    "@field name": "post title",
+                    "type": "varchar(200)",
+                    "$required": true,
+                    "hasMaxLength": true,
+                    "maxLength": "200"
+                },
+                {
+                    "@field name": "post text",
+                    "type": "text"
+                }
+            ],
+            "hasmany": [
+                {
+                    "@entity name": "comment"
+                }
+            ]
+        },
+        {
+            "@entity name": "comment",
+            "fields": [
+                {
+                    "@field name": "comment id",
+                    "type": "UniqueIdentifier",
+                    "read only": true
+                },
+                {
+                    "@field name": "comment text",
+                    "type": "text"
+                }
+            ],
+            "belongsto": [
+                {
+                    "@entity name": "post"
+                }
+            ]
+        }
+    ],
+    "test_conditionals": [
+        {
+            "name": "if",
+            "a": true,
+            "b": true,
+            "c": true
+        },
+        {
+            "name": "elseif",
+            "a": true,
+            "b": false,
+            "c": false
+        },
+        {
+            "name": "else",
+            "a": false,
+            "b": false,
+            "c": false
+        }
+    ],
+    "@name" : "World"
+}

data/test/data/Input-Web/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}}