j2j 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f31a54131544c0d9cac9547e566d71a1ad62af81
-  data.tar.gz: f2c2a12b448256f333cc721e715471ba8fad3d7d
+  metadata.gz: 238f5a8434d7b84e025a144fdb43aa02ee53bcce
+  data.tar.gz: 2cd7fa1a31d5063e2129084bf975e05739576716
 SHA512:
-  metadata.gz: 0ca8381d43e8d5e49197a4910097f09bca5cf92f60f036b4797ad3bda16c29cc7c209e0811b78634434bc531b9f710ce960411d33937a9c438e98bd5ebcc2e1a
-  data.tar.gz: 715cfdf1418cf60a3b80ba6a8abb67fae467f4a985f132086bcc2f6307d68df2ae6be0696f120beda444f91738ccc91ae25389f57d3afa074699451e79f4d68c
+  metadata.gz: a99af232b6b9da3912f35d61a2463cef16bd1482afbd4f08d2ca67c0b81621e5e6a70e5909b4a653c67a9535a2f6e8987a142f13c932417876be04564dddb389
+  data.tar.gz: fa5d39edff363587293cc591a6c053abbfad96cfbb168234444d0c829286e31b204077ed2a874755e91fd810a511299b3c1c1d8f397c2d4f830263d8c3daf70c

data/README.md

@@ -1,36 +1,76 @@
-# J2j
+# j2j
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/j2j`. To experiment with that code, run `bin/console` for an interactive prompt.
+Convert any **Files.json** to corresponding **Classe.java** files
 
-TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 
-Add this line to your application's Gemfile:
+    $ gem install j2j
+
+## Usage
+
+    $ j2j ~/sample.json -o ~/destination_folder
+
+> `sample.json`:
 
-```ruby
-gem 'j2j'
+```json
+{
+  "total": 2,
+  "people": [
+    { "name": "jose" },
+    { "name": "maria" }
+  ]
+}
 ```
 
-And then execute:
+Lets look at the `~/destination_folder`...
 
-    $ bundle
+The files `Sample.java` and `Person.java` were created
 
-Or install it yourself as:
+> `Sample.java`:
 
-    $ gem install j2j
+```java
+public class Sample {
 
-## Usage
+  private Long total;
+  private List<Person> people;
+
+  public Long getTotal() { return total; }
+  public void setTotal(Long total) { this.total = total; }
+  public List<Person> getPerson() { return people; }
+  public void setPerson(List<Person> people) { this.people = people; }
+
+}
+```
+
+> `Person.java`:
+
+```java
+public class Person {
+
+  private String name;
+
+  public String getName() { return name; }
+  public void setName(String name) { this.name = name; }
+
+}
+```
+
+... and you're golden :)
 
-TODO: Write usage instructions here
+# Advanced
 
-## Development
+| Param        | Shortcut  | Default value | Usage |
+|:------------:|:---------:| :------------:|:------------|
+| root_class   | -r        | Example.java  | $ **j2j ~/file.json -r Person** |
+| package      | -p        | com.example   | $ **j2j ~/file.json -p com.company** |
+| output       | -o        | out           | $ **j2j ~/file.json -o src/** |
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake false` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Complete example:
+> $ j2j ~/file.json -r Person -p com.compay -o src/
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/j2j.
+Bug reports and pull requests are welcome on GitHub at https://github.com/cesarferreira/j2j.
 

data/j2j.gemspec

@@ -10,8 +10,20 @@ Gem::Specification.new do |spec|
   spec.email         = ["cesar.manuel.ferreira@gmail.com"]
 
   spec.license       = 'MIT'
-  spec.summary       = %q{Convert any file.json to Classe.java files}
-  spec.description   = %q{Convert any file.json to Classe.java files}
+  spec.summary       = %q{Convert any Files.json to corresponding Classe.java files}
+  spec.description = <<-EOF
+    Convert any Files.json to corresponding Classe.java files
+  EOF
+
+  #spec.extra_rdoc_files = ['README', 'README.md']
+
+  spec.post_install_message = <<-EOF
+    Thanks for installing!
+    Head here for documentation: https://github.com/cesarferreira/j2j
+  EOF
+
+  spec.metadata = { "issue_tracker" => "https://example/issues" }
+
   spec.homepage      = "https://github.com/cesarferreira/j2j"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -24,11 +36,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency 'pry-byebug', '~> 3.1'
 
-  spec.add_dependency 'pry-byebug', '~> 3.1'
   spec.add_dependency 'thor', '~> 0.19.1'
   spec.add_dependency 'colorize',  '~> 0.7'
   spec.add_dependency 'json', '~> 1.8.3'
-
+  spec.add_dependency 'activesupport', '~> 4.2'
 
 end

data/lib/j2j.rb

@@ -10,30 +10,14 @@ module J2j
 
     include Thor::Actions
 
-    no_commands do
-      def log(str)
-        puts str if options[:verbose]
-      end
-    end
-
-
-    def self.source_root
-      File.dirname(__FILE__)
-    end
-
     desc 'path/to/file.json', 'indicate the path to the file.json'
     class_option :root_class, :aliases => '-r', :default => 'Example.java'
     class_option :package, :aliases => '-p', :default => 'com.example'
-    class_option :output, :aliases => '-o', :description => 'Number to call', :default => 'out'
+    class_option :output, :aliases => '-o', :description => 'Output folder', :default => 'out'
     def json(path_to_json)
-      puts "JSON: #{path_to_json}"
-
       convert(path_to_json, options)
-
     end
 
-
-
     # map %w[--version -v] => :__print_version
     # desc "--version, -v", "print the version"
     # def __print_version

data/lib/j2j/converter.rb

@@ -1,15 +1,12 @@
 require 'json'
-require 'pry'
+
+require 'active_support'
+require 'active_support/inflector'
 
 require_relative './configurator'
 require_relative './field_details'
 
 
-@java_classes = {}
-@java_fields = {}
-@java_lists = {}
-@field_info = {}
-
 ##
 ## GET JAVA TYPES
 ##
@@ -25,13 +22,13 @@ def get_java_type(value, field_details, key)
     inner_value = get_java_type(value[0], field_details, key)
     if inner_value == @config.unknown_class
       inner_value = to_java_class_name(key)
-      if @do_chop
-        inner_value.chop!
-      end
-      inner_value = add_class_prefix_and_suffix(inner_value)
+      # if @do_chop
+      #   inner_value.chop!
+      # end
       setup_data(value[0], key)
       field_details.write_class_file = true
     end
+    binding.pry
     java_type = "List<" + inner_value + ">"
   elsif value.is_a?(String)
     java_type = "String"
@@ -107,7 +104,8 @@ def to_java_class_name(class_name)
     end
   end
 
-  return java_class_name
+  singular_class_name = java_class_name.singularize
+  return singular_class_name
 end
 
 
@@ -199,9 +197,6 @@ end
 def java_class_output(class_name, parent)
 
   proper_class_name = to_java_class_name(class_name)
-  if @java_lists[class_name]
-    proper_class_name.chop! if @do_chop
-  end
 
   field_list = ""
   list_import = ""
@@ -214,15 +209,15 @@ def java_class_output(class_name, parent)
       field_type = @field_info[field].type
       method_name = to_java_method_name(field)
       java_field = to_java_field_name(field)
+
       if @java_fields[field]
         field_type = to_java_class_name(field)
         method_name = to_java_method_name(field_type)
       end
+
       if (@java_lists[field] and @java_lists[field] == class_name)
         if @field_info[field].array_type
           field_type = @field_info[field].array_type
-        elsif @do_chop
-          field_type.chop!
         end
         field_type = "List<#{field_type}>"
         list_import = "import java.util.List;"
@@ -234,7 +229,11 @@ def java_class_output(class_name, parent)
         json_annotation = "  @SerializedName(\"#{field}\")\n"
 
       end
-      field_list = field_list + json_annotation + "  private #{field_type} #{java_field};\n"
+
+      json_serialize_import = @config.json_serialize_import
+
+
+      field_list = field_list + json_annotation + "  private #{field_type} #{java_field};\n\n"
       getters_and_setters = getters_and_setters + <<GS
 
   public #{field_type} get#{method_name}() {
@@ -249,7 +248,6 @@ GS
   end
 
   doc = <<JCO
-#{@java_class_header}
 package #@package;
 
 #{list_import}
@@ -275,7 +273,9 @@ JCO
 
   # don't write java file files "primitive" array/list fields
   if write_file(@field_info[class_name]) == true
-    File.open("#{@config.output_directory}/#{proper_class_name}.java", 'w') {|f| f.write(doc) }
+    fileName = "#{@config.output_directory}/#{proper_class_name}.java"
+    File.open(fileName, 'w') {|f| f.write(doc) }
+    puts "Creating.... #{fileName.green}"
   end
 
 end
@@ -286,8 +286,6 @@ end
 ##
 def parse_args(path, params)
 
-  ############################## TODO: analise path
-
   @config.json_file = path
   @config.package = params[:package]
   @config.top_level_class = params[:root_class].gsub(/.java/,'')
@@ -295,6 +293,27 @@ def parse_args(path, params)
 
 end
 
+def valid_json?(json)
+  begin
+    JSON.parse(IO.read(json))
+    return true
+  rescue Exception => e
+    return false
+  end
+end
+
+def print_intro
+  puts "\nThis are the settings you wanted:"
+
+  puts "  JSON file: #{@config.json_file.green}"
+  puts "  Java package: #{@config.package.green}"
+  puts "  Java top level class: #{@config.top_level_class.green}"
+  puts "  Output directory: #{@config.output_directory.green}"
+
+  puts "\n"
+
+end
+
 ##
 ## DO THE ACTUAL CONVERTING
 ##
@@ -310,19 +329,23 @@ def convert(path, options)
 
   parse_args(path, options)
 
-  puts "Using JSON file: #{@config.json_file.green}"
-  puts "Using Java package: #{@config.package.green}"
-  puts "Using Java top level class: #{@config.top_level_class.green}"
-  puts "Using output directory: #{@config.output_directory.green}"
-
-  @package = @config.package
-
   if !File.exists?(@config.json_file)
-    puts "JSON file: #{@config.json_file} does not exist!"
-    puts "Try -h flag for help"
+    puts "The file '#{@config.json_file.red}' does not exist!"
     exit -1
+  else
+    if !valid_json?(@config.json_file)
+      puts "'#{@config.json_file.red}' is not a valid json file!"
+      exit -1
+    end
   end
 
+
+  print_intro()
+
+
+  @package = @config.package
+
+
   json_file_contents = IO.read(@config.json_file)
   json = JSON.parse(json_file_contents)
 

data/lib/j2j/version.rb

@@ -1,3 +1,3 @@
 module J2j
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: j2j
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - cesar ferreira
@@ -87,7 +87,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -136,7 +136,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.3
-description: Convert any file.json to Classe.java files
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+description: |2
+      Convert any Files.json to corresponding Classe.java files
 email:
 - cesar.manuel.ferreira@gmail.com
 executables:
@@ -166,8 +181,11 @@ files:
 homepage: https://github.com/cesarferreira/j2j
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  issue_tracker: https://example/issues
+post_install_message: |2
+      Thanks for installing!
+      Head here for documentation: https://github.com/cesarferreira/j2j
 rdoc_options: []
 require_paths:
 - lib
@@ -186,5 +204,5 @@ rubyforge_project:
 rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
-summary: Convert any file.json to Classe.java files
+summary: Convert any Files.json to corresponding Classe.java files
 test_files: []